From d061afdc872ab20998df892d6ff617ce02fe6a71 Mon Sep 17 00:00:00 2001 From: Eric Kreutzer Date: Thu, 17 Apr 2025 06:10:29 -0600 Subject: [PATCH] fix: prevent canceling touchmove events when not cancelable Fix warnings about attempting to cancel touchmove events with cancelable=false by checking the event.cancelable property before calling preventDefault() --- src/hooks/useScrollHandler.web.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hooks/useScrollHandler.web.ts b/src/hooks/useScrollHandler.web.ts index 4e6abeae..3d89c705 100644 --- a/src/hooks/useScrollHandler.web.ts +++ b/src/hooks/useScrollHandler.web.ts @@ -51,7 +51,7 @@ export const useScrollHandler = (_: never, onScroll?: ScrollableEvent) => { } function handleOnTouchMove(event: TouchEvent) { - if (animatedScrollableState.value === SCROLLABLE_STATE.LOCKED) { + if (animatedScrollableState.value === SCROLLABLE_STATE.LOCKED && event.cancelable) { return event.preventDefault(); } @@ -61,7 +61,7 @@ export const useScrollHandler = (_: never, onScroll?: ScrollableEvent) => { const touchY = event.touches[0].clientY; const touchYDelta = touchY - lastTouchY; - if (touchYDelta > 0) { + if (touchYDelta > 0 && event.cancelable) { return event.preventDefault(); } } @@ -92,7 +92,7 @@ export const useScrollHandler = (_: never, onScroll?: ScrollableEvent) => { animatedScrollableContentOffsetY.value = Math.max(0, scrollOffset); } - if (scrollOffset <= 0) { + if (scrollOffset <= 0 && event.cancelable) { event.preventDefault(); event.stopPropagation(); return false;