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..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,17 +19,17 @@ 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; 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,