alighasami/vant
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'dev' into next

Browse Source
This commit is contained in:
chenjiahan
2020-09-18 22:01:02 +08:00
parent e4798138cb d9e24286d2
commit cc8b76c86d
12 changed files with 75 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/calendar/components/Month.js
-1
View File
@@ -254,7 +254,6 @@ export default createComponent({
() => props.realRowHeight,
() => {
height.value = useRect(monthRef).height;
console.log('height.value', height.value);
}
);
src/calendar/index.js
+14 -13
View File
@@ -1,5 +1,6 @@
// Utils
import { pick } from '../utils';
import { raf } from '../utils/dom/raf';
import { isDate } from '../utils/validate/date';
import { getScrollTop } from '../utils/dom/scroll';
import {
@@ -191,13 +192,13 @@ export default createComponent({
this.$refs.body.getBoundingClientRect().height
);
this.onScroll();
this.scrollIntoView();
});
this.scrollIntoView();
},
// scroll to current month
scrollIntoView() {
this.$nextTick(() => {
raf(() => {
const { currentDate } = this;
if (!currentDate) {
@@ -258,31 +259,27 @@ export default createComponent({
const { body } = this.$refs;
const { months, monthRefs } = this;
const top = getScrollTop(body);
const bottom = top + this.bodyHeight;
const heights = months.map(
(item, index) => monthRefs[index].height.value
);
const heightSum = heights.reduce((a, b) => a + b, 0);
// iOS scroll bounce may exceed the range
let bottom = top + this.bodyHeight;
if (bottom > heightSum && top > 0) {
bottom = heightSum;
return;
}
let height = 0;
let currentMonth;
// add offset to avoid rem accuracy issues
// see: https://github.com/youzan/vant/issues/6929
const viewportOffset = 50;
const viewportTop = top - viewportOffset;
const viewportBottom = bottom + viewportOffset;
let visibleIndex;
for (let i = 0; i < months.length; i++) {
const visible =
height <= viewportBottom && height + heights[i] >= viewportTop;
const visible = height <= bottom && height + heights[i] >= top;
if (visible && !currentMonth) {
visibleIndex = i;
currentMonth = monthRefs[i];
}
@@ -293,10 +290,14 @@ export default createComponent({
});
}
monthRefs[i].setVisible(visible);
height += heights[i];
}
months.forEach((month, index) => {
const visible = index >= visibleIndex - 1 && index <= visibleIndex + 1;
monthRefs[index].setVisible(visible);
});
/* istanbul ignore else */
if (currentMonth) {
this.subtitle = currentMonth.getTitle();
src/calendar/test/__snapshots__/demo.spec.js.snap
+1 -34
View File
@@ -139,40 +139,7 @@ exports[`renders demo correctly 1`] = `
</div>
<div class="van-calendar__month" style="padding-bottom: 0px;">
<div class="van-calendar__month-title">2012年3月</div>
<div role="grid" class="van-calendar__days">
<div class="van-calendar__month-mark">3</div>
<div role="gridcell" tabindex="-1" class="van-calendar__day" style="margin-left: 57.142857142857146%;">1</div>
<div role="gridcell" tabindex="-1" class="van-calendar__day">2</div>
<div role="gridcell" tabindex="-1" class="van-calendar__day">3</div>
<div role="gridcell" tabindex="-1" class="van-calendar__day">4</div>
<div role="gridcell" tabindex="-1" class="van-calendar__day">5</div>
<div role="gridcell" tabindex="-1" class="van-calendar__day">6</div>
<div role="gridcell" tabindex="-1" class="van-calendar__day">7</div>
<div role="gridcell" tabindex="-1" class="van-calendar__day">8</div>
<div role="gridcell" tabindex="-1" class="van-calendar__day">9</div>
<div role="gridcell" tabindex="-1" class="van-calendar__day">10</div>
<div role="gridcell" tabindex="-1" class="van-calendar__day">11</div>
<div role="gridcell" tabindex="-1" class="van-calendar__day">12</div>
<div role="gridcell" tabindex="-1" class="van-calendar__day">13</div>
<div role="gridcell" tabindex="-1" class="van-calendar__day">14</div>
<div role="gridcell" tabindex="-1" class="van-calendar__day">15</div>
<div role="gridcell" tabindex="-1" class="van-calendar__day">16</div>
<div role="gridcell" tabindex="-1" class="van-calendar__day">17</div>
<div role="gridcell" tabindex="-1" class="van-calendar__day">18</div>
<div role="gridcell" tabindex="-1" class="van-calendar__day">19</div>
<div role="gridcell" tabindex="-1" class="van-calendar__day">20</div>
<div role="gridcell" class="van-calendar__day van-calendar__day--disabled">21</div>
<div role="gridcell" class="van-calendar__day van-calendar__day--disabled">22</div>
<div role="gridcell" class="van-calendar__day van-calendar__day--disabled">23</div>
<div role="gridcell" class="van-calendar__day van-calendar__day--disabled">24</div>
<div role="gridcell" class="van-calendar__day van-calendar__day--disabled">25</div>
<div role="gridcell" class="van-calendar__day van-calendar__day--disabled">26</div>
<div role="gridcell" class="van-calendar__day van-calendar__day--disabled">27</div>
<div role="gridcell" class="van-calendar__day van-calendar__day--disabled">28</div>
<div role="gridcell" class="van-calendar__day van-calendar__day--disabled">29</div>
<div role="gridcell" class="van-calendar__day van-calendar__day--disabled">30</div>
<div role="gridcell" class="van-calendar__day van-calendar__day--disabled">31</div>
</div>
<div></div>
</div>
</div>
<div class="van-calendar__footer"></div>