diff --git a/packages/vue-final-modal/src/dom.ts b/packages/vue-final-modal/src/dom.ts index c359e409..b07753f8 100644 --- a/packages/vue-final-modal/src/dom.ts +++ b/packages/vue-final-modal/src/dom.ts @@ -1,12 +1,12 @@ import { noop } from '~/utils' export const getPosition = (e: TouchEvent | MouseEvent) => { - if (e instanceof TouchEvent) { - const { clientX: x, clientY: y } = e.targetTouches[0] + if (e instanceof MouseEvent) { + const { clientX: x, clientY: y } = e return { x, y } } else { - const { clientX: x, clientY: y } = e + const { clientX: x, clientY: y } = e.targetTouches[0] return { x, y } } } diff --git a/packages/vue-final-modal/src/useSwipeToClose.ts b/packages/vue-final-modal/src/useSwipeToClose.ts index 4c7683c7..c17bb590 100644 --- a/packages/vue-final-modal/src/useSwipeToClose.ts +++ b/packages/vue-final-modal/src/useSwipeToClose.ts @@ -17,7 +17,12 @@ export function useSwipeToClose( const vfmContentEl = ref() const swipeBannerEl = ref() - const swipeEl = computed(() => (props.showSwipeBanner ? swipeBannerEl.value : vfmContentEl.value)) + const swipeEl = computed(() => { + if (props.swipeToClose === undefined || props.swipeToClose === 'none') + return undefined + else + return (props.showSwipeBanner ? swipeBannerEl.value : vfmContentEl.value) + }) const offset = ref(0) const isCollapsed = ref(true)