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

[bugfix] Swipe: wrong position (#1723)

Browse Source
This commit is contained in:
neverland 2018-08-30 16:55:28 +08:00 committed by GitHub
parent 56cc2ce837
commit dee56c75b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/mixins/touch.js
View File

@ -1,11 +1,7 @@
export default { export default {
methods: { methods: {
touchStart(event) { touchStart(event) {
this.direction = ''; this.resetTouchStatus();
this.deltaX = 0;
this.deltaY = 0;
this.offsetX = 0;
this.offsetY = 0;
this.startX = event.touches[0].clientX; this.startX = event.touches[0].clientX;
this.startY = event.touches[0].clientY; this.startY = event.touches[0].clientY;
}, },
@ -17,6 +13,14 @@ export default {
this.offsetX = Math.abs(this.deltaX); this.offsetX = Math.abs(this.deltaX);
this.offsetY = Math.abs(this.deltaY); this.offsetY = Math.abs(this.deltaY);
this.direction = this.offsetX > this.offsetY ? 'horizontal' : this.offsetX < this.offsetY ? 'vertical' : ''; this.direction = this.offsetX > this.offsetY ? 'horizontal' : this.offsetX < this.offsetY ? 'vertical' : '';
},
resetTouchStatus() {
this.direction = '';
this.deltaX = 0;
this.deltaY = 0;
this.offsetX = 0;
this.offsetY = 0;
} }
} }
}; };

15
packages/swipe/index.vue
View File

@ -211,21 +211,13 @@ export default create({
return; return;
} }
swipes[0].offset = (atLast && (delta < 0 || move > 0)) ? trackSize : 0;
swipes[count - 1].offset = (atFirst && (delta > 0 || move < 0)) ? -trackSize : 0;
if (move && active + move >= -1 && active + move <= count) { if (move && active + move >= -1 && active + move <= count) {
if (active === -1) {
swipes[count - 1].offset = 0;
}
swipes[0].offset = atLast && move > 0 ? trackSize : 0;
this.active += move; this.active += move;
} }
if (atFirst) {
swipes[count - 1].offset = delta > 0 || move < 0 ? -trackSize : 0;
} else if (atLast) {
swipes[0].offset = delta < 0 || move > 0 ? trackSize : 0;
}
this.offset = offset - this.active * this.size; this.offset = offset - this.active * this.size;
}, },
@ -258,6 +250,7 @@ export default create({
this.clear(); this.clear();
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.swiping = true; this.swiping = true;
this.resetTouchStatus();
this.correctPosition(); this.correctPosition();
setTimeout(() => { setTimeout(() => {