From 01e2610ada5bd85b66d2633dc1c8957a91742330 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Thu, 13 Nov 2025 15:02:45 +0100 Subject: [PATCH 1/2] `onTouchesCalcelled` -> `onTouchesCancel` --- .../swmansion/gesturehandler/core/GestureHandler.kt | 2 +- .../react/events/RNGestureHandlerTouchEvent.kt | 2 +- .../apple/RNGHTouchEventType.h | 2 +- .../apple/RNGestureHandlerPointerTracker.mm | 2 +- .../src/TouchEventType.ts | 2 +- .../gestures/GestureDetector/useAnimatedGesture.ts | 6 +++--- .../src/handlers/gestures/eventReceiver.ts | 2 +- .../src/handlers/gestures/gesture.ts | 4 ++-- .../src/v3/hooks/utils/eventHandlersUtils.ts | 13 ++++++------- .../src/v3/hooks/utils/eventUtils.ts | 2 +- .../src/v3/hooks/utils/propsWhiteList.ts | 2 +- .../src/v3/types/ConfigTypes.ts | 2 +- .../src/web/handlers/GestureHandler.ts | 4 ++-- 13 files changed, 22 insertions(+), 23 deletions(-) diff --git a/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandler.kt b/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandler.kt index aeddaaa4e9..9ffa77a4d3 100644 --- a/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandler.kt +++ b/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandler.kt @@ -537,7 +537,7 @@ open class GestureHandler { } private fun cancelPointers() { - touchEventType = RNGestureHandlerTouchEvent.EVENT_TOUCH_CANCELLED + touchEventType = RNGestureHandlerTouchEvent.EVENT_TOUCH_CANCEL changedTouchesPayload = null extractAllPointersData() diff --git a/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/events/RNGestureHandlerTouchEvent.kt b/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/events/RNGestureHandlerTouchEvent.kt index ca70bbdfcf..b9945a9de8 100644 --- a/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/events/RNGestureHandlerTouchEvent.kt +++ b/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/events/RNGestureHandlerTouchEvent.kt @@ -49,7 +49,7 @@ class RNGestureHandlerTouchEvent private constructor() : Event( export function extractTouchHandlers( config: BaseGestureConfig ): GestureCallbacks { - const { onTouchesDown, onTouchesMove, onTouchesUp, onTouchesCancelled } = - config; + const { onTouchesDown, onTouchesMove, onTouchesUp, onTouchesCancel } = config; const handlers: GestureCallbacks = { ...(onTouchesDown ? { onTouchesDown } : {}), ...(onTouchesMove ? { onTouchesMove } : {}), ...(onTouchesUp ? { onTouchesUp } : {}), - ...(onTouchesCancelled ? { onTouchesCancelled } : {}), + ...(onTouchesCancel ? { onTouchesCancel } : {}), }; return handlers; @@ -79,8 +78,8 @@ export function getHandler( return callbacks.onTouchesMove; case CALLBACK_TYPE.TOUCHES_UP: return callbacks.onTouchesUp; - case CALLBACK_TYPE.TOUCHES_CANCELLED: - return callbacks.onTouchesCancelled; + case CALLBACK_TYPE.TOUCHES_CANCEL: + return callbacks.onTouchesCancel; } } @@ -95,8 +94,8 @@ export function touchEventTypeToCallbackType( return CALLBACK_TYPE.TOUCHES_MOVE; case TouchEventType.TOUCHES_UP: return CALLBACK_TYPE.TOUCHES_UP; - case TouchEventType.TOUCHES_CANCELLED: - return CALLBACK_TYPE.TOUCHES_CANCELLED; + case TouchEventType.TOUCHES_CANCEL: + return CALLBACK_TYPE.TOUCHES_CANCEL; } return CALLBACK_TYPE.UNDEFINED; } diff --git a/packages/react-native-gesture-handler/src/v3/hooks/utils/eventUtils.ts b/packages/react-native-gesture-handler/src/v3/hooks/utils/eventUtils.ts index 1e061d9b6a..0fc4e063c7 100644 --- a/packages/react-native-gesture-handler/src/v3/hooks/utils/eventUtils.ts +++ b/packages/react-native-gesture-handler/src/v3/hooks/utils/eventUtils.ts @@ -77,7 +77,7 @@ export function shouldHandleTouchEvents( !!config.onTouchesDown || !!config.onTouchesMove || !!config.onTouchesUp || - !!config.onTouchesCancelled + !!config.onTouchesCancel ); } diff --git a/packages/react-native-gesture-handler/src/v3/hooks/utils/propsWhiteList.ts b/packages/react-native-gesture-handler/src/v3/hooks/utils/propsWhiteList.ts index ecc6fc9efc..1091cbe8ce 100644 --- a/packages/react-native-gesture-handler/src/v3/hooks/utils/propsWhiteList.ts +++ b/packages/react-native-gesture-handler/src/v3/hooks/utils/propsWhiteList.ts @@ -43,7 +43,7 @@ export const HandlerCallbacks = new Set< 'onTouchesDown', 'onTouchesMove', 'onTouchesUp', - 'onTouchesCancelled', + 'onTouchesCancel', ]); export const PropsToFilter = new Set>([ diff --git a/packages/react-native-gesture-handler/src/v3/types/ConfigTypes.ts b/packages/react-native-gesture-handler/src/v3/types/ConfigTypes.ts index cab60f0f65..3953a0fc65 100644 --- a/packages/react-native-gesture-handler/src/v3/types/ConfigTypes.ts +++ b/packages/react-native-gesture-handler/src/v3/types/ConfigTypes.ts @@ -29,7 +29,7 @@ export type GestureCallbacks = { onTouchesDown?: (event: GestureTouchEvent) => void; onTouchesMove?: (event: GestureTouchEvent) => void; onTouchesUp?: (event: GestureTouchEvent) => void; - onTouchesCancelled?: (event: GestureTouchEvent) => void; + onTouchesCancel?: (event: GestureTouchEvent) => void; }; export type GestureRelations = { diff --git a/packages/react-native-gesture-handler/src/web/handlers/GestureHandler.ts b/packages/react-native-gesture-handler/src/web/handlers/GestureHandler.ts index 97ab566662..f27f80311f 100644 --- a/packages/react-native-gesture-handler/src/web/handlers/GestureHandler.ts +++ b/packages/react-native-gesture-handler/src/web/handlers/GestureHandler.ts @@ -588,7 +588,7 @@ export default abstract class GestureHandler implements IGestureHandler { eventType = TouchEventType.TOUCHES_MOVE; break; case EventTypes.CANCEL: - eventType = TouchEventType.TOUCHES_CANCELLED; + eventType = TouchEventType.TOUCHES_CANCEL; break; } @@ -655,7 +655,7 @@ export default abstract class GestureHandler implements IGestureHandler { nativeEvent: { handlerTag: this.handlerTag, state: this.state, - eventType: TouchEventType.TOUCHES_CANCELLED, + eventType: TouchEventType.TOUCHES_CANCEL, changedTouches: changed, allTouches: all, numberOfTouches: all.length, From 68335bd098b288de2bd7f8d146cbcf17d8988eec Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Thu, 13 Nov 2025 15:07:08 +0100 Subject: [PATCH 2/2] `success` -> `didSucceed` --- .../react-native-gesture-handler/src/v3/types/ConfigTypes.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-native-gesture-handler/src/v3/types/ConfigTypes.ts b/packages/react-native-gesture-handler/src/v3/types/ConfigTypes.ts index 3953a0fc65..9d8b244495 100644 --- a/packages/react-native-gesture-handler/src/v3/types/ConfigTypes.ts +++ b/packages/react-native-gesture-handler/src/v3/types/ConfigTypes.ts @@ -19,11 +19,11 @@ export type GestureCallbacks = { onStart?: (event: GestureStateChangeEvent) => void; onEnd?: ( event: GestureStateChangeEvent, - success: boolean + didSucceed: boolean ) => void; onFinalize?: ( event: GestureStateChangeEvent, - success: boolean + didSucceed: boolean ) => void; onUpdate?: (event: GestureUpdateEvent) => void | AnimatedEvent; onTouchesDown?: (event: GestureTouchEvent) => void;