Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Swipe): avoid Vue 2.6 event bubble issues #5346

Merged
merged 1 commit into from
Dec 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/mixins/touch.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Vue from 'vue';
import { on } from '../utils/dom/event';

const MIN_DISTANCE = 10;

Expand Down Expand Up @@ -42,7 +43,8 @@ export const TouchMixin = Vue.extend({
this.deltaY = touch.clientY - this.startY;
this.offsetX = Math.abs(this.deltaX);
this.offsetY = Math.abs(this.deltaY);
this.direction = this.direction || getDirection(this.offsetX, this.offsetY);
this.direction =
this.direction || getDirection(this.offsetX, this.offsetY);
},

resetTouchStatus() {
Expand All @@ -51,6 +53,16 @@ export const TouchMixin = Vue.extend({
this.deltaY = 0;
this.offsetX = 0;
this.offsetY = 0;
},

// avoid Vue 2.6 event bubble issues by manually binding events
// https://github.com/youzan/vant/issues/3015
bindTouchEvent(el: HTMLElement) {
const { onTouchStart, onTouchMove, onTouchEnd } = (this as any);
on(el, 'touchstart', onTouchStart);
on(el, 'touchmove', onTouchMove);
on(el, 'touchend', onTouchEnd);
on(el, 'touchcancel', onTouchEnd);
}
}
});
9 changes: 2 additions & 7 deletions src/picker/PickerColumn.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { deepClone } from '../utils/deep-clone';
import { createNamespace, isObj } from '../utils';
import { range } from '../utils/format/number';
import { on, preventDefault } from '../utils/dom/event';
import { preventDefault } from '../utils/dom/event';
import { TouchMixin } from '../mixins/touch';

const DEFAULT_DURATION = 200;
Expand Down Expand Up @@ -61,12 +61,7 @@ export default createComponent({
},

mounted() {
// avoid Vue 2.6 event bubble issues by manually binding events
// https://github.com/youzan/vant/issues/3015
on(this.$el, 'touchstart', this.onTouchStart);
on(this.$el, 'touchmove', this.onTouchMove);
on(this.$el, 'touchend', this.onTouchEnd);
on(this.$el, 'touchcancel', this.onTouchEnd);
this.bindTouchEvent(this.$el);
},

destroyed() {
Expand Down
18 changes: 8 additions & 10 deletions src/swipe/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,16 @@ export default createComponent({

minOffset() {
const rect = this.$el.getBoundingClientRect();
return (this.vertical ? rect.height : rect.width) - this.size * this.count;
return (
(this.vertical ? rect.height : rect.width) - this.size * this.count
);
}
},

mounted() {
this.bindTouchEvent(this.$refs.track);
},

methods: {
// initialize swipe position
initialize(active = this.initialSwipe) {
Expand Down Expand Up @@ -344,15 +350,7 @@ export default createComponent({
render() {
return (
<div class={bem()}>
<div
ref="track"
style={this.trackStyle}
class={bem('track')}
onTouchstart={this.onTouchStart}
onTouchmove={this.onTouchMove}
onTouchend={this.onTouchEnd}
onTouchcancel={this.onTouchEnd}
>
<div ref="track" style={this.trackStyle} class={bem('track')}>
{this.slots()}
</div>
{this.genIndicator()}
Expand Down