Skip to content

fix: TouchEvent not supported in Safari #329 #330

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 14, 2023
Merged

fix: TouchEvent not supported in Safari #329 #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions packages/vue-final-modal/src/dom.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }
}
}
Expand Down
7 changes: 6 additions & 1 deletion packages/vue-final-modal/src/useSwipeToClose.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ export function useSwipeToClose(

const vfmContentEl = ref<HTMLDivElement>()
const swipeBannerEl = ref<HTMLDivElement>()
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<boolean | undefined>(true)
Expand Down