blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.x' of https://github.com/youzan/vant into 2.x

Browse Source
This commit is contained in:
chenjiahan 2020-11-01 10:47:50 +08:00
commit b54d9c7598
2 changed files with 57 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/swipe-item/index.js
View File

@ -9,6 +9,7 @@ export default createComponent({
data() { data() {
return { return {
offset: 0, offset: 0,
inited: false,
mounted: false, mounted: false,
}; };
}, },
@ -34,9 +35,9 @@ export default createComponent({
}, },
shouldRender() { shouldRender() {
const { index, parent, mounted } = this; const { index, inited, parent, mounted } = this;
if (!parent.lazyRender) { if (!parent.lazyRender || inited) {
return true; return true;
} }
@ -47,10 +48,16 @@ export default createComponent({
const active = parent.activeIndicator; const active = parent.activeIndicator;
const maxActive = parent.count - 1; const maxActive = parent.count - 1;
const prevActive = active === 0 ? maxActive : active - 1; const prevActive = active === 0 && parent.loop ? maxActive : active - 1;
const nextActive = active === maxActive ? 0 : active + 1; const nextActive = active === maxActive && parent.loop ? 0 : active + 1;
const shouldRender =
index === active || index === prevActive || index === nextActive;
return index === active || index === prevActive || index === nextActive; if (shouldRender) {
this.inited = true;
}
return shouldRender;
}, },
}, },

63
src/swipe/test/index.spec.js
View File

@ -163,6 +163,7 @@ test('lazy-render prop', async () => {
<van-swipe-item><span>2</span></van-swipe-item> <van-swipe-item><span>2</span></van-swipe-item>
<van-swipe-item><span>3</span></van-swipe-item> <van-swipe-item><span>3</span></van-swipe-item>
<van-swipe-item><span>4</span></van-swipe-item> <van-swipe-item><span>4</span></van-swipe-item>
<van-swipe-item><span>5</span></van-swipe-item>
</van-swipe> </van-swipe>
`, `,
data() { data() {
@ -175,26 +176,52 @@ test('lazy-render prop', async () => {
await later(); await later();
const items = wrapper.findAll('.van-swipe-item'); const items = wrapper.findAll('.van-swipe-item');
expect(items.at(0).contains('span')).toBeTruthy(); const expectRender = (results) => {
expect(items.at(1).contains('span')).toBeTruthy(); results.forEach((result, index) => {
expect(items.at(2).contains('span')).toBeFalsy(); expect(items.at(index).contains('span')).toEqual(result);
expect(items.at(3).contains('span')).toBeTruthy(); });
};
expectRender([true, true, false, false, true]);
wrapper.setData({ active: 1 }); wrapper.setData({ active: 1 });
expect(items.at(0).contains('span')).toBeTruthy(); expectRender([true, true, true, false, true]);
expect(items.at(1).contains('span')).toBeTruthy();
expect(items.at(2).contains('span')).toBeTruthy();
expect(items.at(3).contains('span')).toBeFalsy();
wrapper.setData({ active: 2 }); wrapper.setData({ active: 2 });
expect(items.at(0).contains('span')).toBeFalsy(); expectRender([true, true, true, true, true]);
expect(items.at(1).contains('span')).toBeTruthy(); });
expect(items.at(2).contains('span')).toBeTruthy();
expect(items.at(3).contains('span')).toBeTruthy(); test('lazy-render prop when loop is false', async () => {
const wrapper = mount({
wrapper.setData({ active: 3 }); template: `
expect(items.at(0).contains('span')).toBeTruthy(); <van-swipe :initial-swipe="active" :loop="false" lazy-render>
expect(items.at(1).contains('span')).toBeFalsy(); <van-swipe-item><span>1</span></van-swipe-item>
expect(items.at(2).contains('span')).toBeTruthy(); <van-swipe-item><span>2</span></van-swipe-item>
expect(items.at(3).contains('span')).toBeTruthy(); <van-swipe-item><span>3</span></van-swipe-item>
<van-swipe-item><span>4</span></van-swipe-item>
</van-swipe>
`,
data() {
return {
active: 0,
};
},
});
await later();
const items = wrapper.findAll('.van-swipe-item');
const expectRender = (results) => {
results.forEach((result, index) => {
expect(items.at(index).contains('span')).toEqual(result);
});
};
expectRender([true, true, false, false]);
wrapper.setData({ active: 1 });
expectRender([true, true, true, false]);
wrapper.setData({ active: 2 });
expectRender([true, true, true, true]);
}); });