diff --git a/packages/react-native-gesture-handler/src/handlers/gestures/reanimatedWrapper.ts b/packages/react-native-gesture-handler/src/handlers/gestures/reanimatedWrapper.ts index 1d73f5b4de..30d03130d7 100644 --- a/packages/react-native-gesture-handler/src/handlers/gestures/reanimatedWrapper.ts +++ b/packages/react-native-gesture-handler/src/handlers/gestures/reanimatedWrapper.ts @@ -1,6 +1,6 @@ import { ComponentClass } from 'react'; import { tagMessage } from '../../utils'; -import { GestureCallbacks, UpdateEvent } from '../../v3/types'; +import { GestureCallbacks, GestureUpdateEvent } from '../../v3/types'; export interface SharedValue { value: Value; @@ -15,7 +15,7 @@ export interface SharedValue { } export type ReanimatedContext = { - lastUpdateEvent: UpdateEvent | undefined; + lastUpdateEvent: GestureUpdateEvent | undefined; }; interface WorkletProps { diff --git a/packages/react-native-gesture-handler/src/v3/hooks/callbacks/stateChangeHandler.ts b/packages/react-native-gesture-handler/src/v3/hooks/callbacks/stateChangeHandler.ts index afd268e45b..b8852bb505 100644 --- a/packages/react-native-gesture-handler/src/v3/hooks/callbacks/stateChangeHandler.ts +++ b/packages/react-native-gesture-handler/src/v3/hooks/callbacks/stateChangeHandler.ts @@ -1,48 +1,46 @@ import { CALLBACK_TYPE } from '../../../handlers/gestures/gesture'; import { State } from '../../../State'; -import { GestureCallbacks, StateChangeEvent } from '../../types'; -import { isEventForHandlerWithTag, isNativeEvent } from '../utils'; +import { + GestureCallbacks, + GestureStateChangeEvent, + StateChangeEvent, +} from '../../types'; +import { isEventForHandlerWithTag, maybeExtractNativeEvent } from '../utils'; import { runCallback } from '../utils/eventHandlersUtils'; export function getStateChangeHandler( handlerTag: number, callbacks: GestureCallbacks ) { - return (event: StateChangeEvent) => { + return (sourceEvent: StateChangeEvent) => { 'worklet'; + const event = maybeExtractNativeEvent( + sourceEvent + ) as GestureStateChangeEvent; + if (!isEventForHandlerWithTag(handlerTag, event)) { return; } - let oldState: State | undefined; - let state: State | undefined; - - if (isNativeEvent(event)) { - oldState = event.nativeEvent.oldState; - state = event.nativeEvent.state; - } else { - oldState = event.oldState; - state = event.state; - } - - if (oldState === State.UNDETERMINED && state === State.BEGAN) { + if (event.oldState === State.UNDETERMINED && event.state === State.BEGAN) { runCallback(CALLBACK_TYPE.BEGAN, callbacks, event); } else if ( - (oldState === State.BEGAN || oldState === State.UNDETERMINED) && - state === State.ACTIVE + (event.oldState === State.BEGAN || + event.oldState === State.UNDETERMINED) && + event.state === State.ACTIVE ) { runCallback(CALLBACK_TYPE.START, callbacks, event); - } else if (oldState !== state && state === State.END) { - if (oldState === State.ACTIVE) { + } else if (event.oldState !== event.state && event.state === State.END) { + if (event.oldState === State.ACTIVE) { runCallback(CALLBACK_TYPE.END, callbacks, event, true); } runCallback(CALLBACK_TYPE.FINALIZE, callbacks, event, true); } else if ( - (state === State.FAILED || state === State.CANCELLED) && - state !== oldState + (event.state === State.FAILED || event.state === State.CANCELLED) && + event.state !== event.oldState ) { - if (oldState === State.ACTIVE) { + if (event.oldState === State.ACTIVE) { runCallback(CALLBACK_TYPE.END, callbacks, event, false); } runCallback(CALLBACK_TYPE.FINALIZE, callbacks, event, false); diff --git a/packages/react-native-gesture-handler/src/v3/hooks/callbacks/touchEventHandler.ts b/packages/react-native-gesture-handler/src/v3/hooks/callbacks/touchEventHandler.ts index 6b39e82fb8..65f915d269 100644 --- a/packages/react-native-gesture-handler/src/v3/hooks/callbacks/touchEventHandler.ts +++ b/packages/react-native-gesture-handler/src/v3/hooks/callbacks/touchEventHandler.ts @@ -1,6 +1,5 @@ -import { NativeSyntheticEvent } from 'react-native'; import { GestureCallbacks, TouchEvent } from '../../types'; -import { isEventForHandlerWithTag, isNativeEvent } from '../utils'; +import { isEventForHandlerWithTag, maybeExtractNativeEvent } from '../utils'; import { TouchEventType } from '../../../TouchEventType'; import { GestureTouchEvent } from '../../../handlers/gestureHandlerCommon'; import { @@ -12,30 +11,18 @@ export function getTouchEventHandler( handlerTag: number, callbacks: GestureCallbacks ) { - return (event: TouchEvent) => { + return (sourceEvent: TouchEvent) => { 'worklet'; + const event = maybeExtractNativeEvent(sourceEvent) as GestureTouchEvent; + if (!isEventForHandlerWithTag(handlerTag, event)) { return; } - if ( - isNativeEvent(event) && - event.nativeEvent.eventType !== TouchEventType.UNDETERMINED - ) { - runCallback( - touchEventTypeToCallbackType( - (event as NativeSyntheticEvent).nativeEvent - .eventType - ), - callbacks, - event - ); - } else if ( - (event as GestureTouchEvent).eventType !== TouchEventType.UNDETERMINED - ) { + if (event.eventType !== TouchEventType.UNDETERMINED) { runCallback( - touchEventTypeToCallbackType((event as GestureTouchEvent).eventType), + touchEventTypeToCallbackType(event.eventType), callbacks, event ); diff --git a/packages/react-native-gesture-handler/src/v3/hooks/callbacks/updateHandler.ts b/packages/react-native-gesture-handler/src/v3/hooks/callbacks/updateHandler.ts index 8f37633857..032f666e60 100644 --- a/packages/react-native-gesture-handler/src/v3/hooks/callbacks/updateHandler.ts +++ b/packages/react-native-gesture-handler/src/v3/hooks/callbacks/updateHandler.ts @@ -4,9 +4,10 @@ import { ReanimatedContext } from '../../../handlers/gestures/reanimatedWrapper' import { ChangeCalculatorType, GestureCallbacks, + GestureUpdateEvent, UpdateEvent, } from '../../types'; -import { isEventForHandlerWithTag } from '../utils'; +import { isEventForHandlerWithTag, maybeExtractNativeEvent } from '../utils'; import { runCallback } from '../utils/eventHandlersUtils'; export function getUpdateHandler( @@ -15,9 +16,13 @@ export function getUpdateHandler( context: ReanimatedContext | undefined, changeEventCalculator?: ChangeCalculatorType ) { - return (event: UpdateEvent) => { + return (sourceEvent: UpdateEvent) => { 'worklet'; + const event = maybeExtractNativeEvent( + sourceEvent + ) as GestureUpdateEvent; + if (!isEventForHandlerWithTag(handlerTag, event)) { return; } @@ -36,7 +41,6 @@ export function getUpdateHandler( : event ); - // TODO: Investigate why this is always undefined context.lastUpdateEvent = event; }; } diff --git a/packages/react-native-gesture-handler/src/v3/hooks/gestures/useHover.ts b/packages/react-native-gesture-handler/src/v3/hooks/gestures/useHover.ts index cbcf16d4b3..948ec66445 100644 --- a/packages/react-native-gesture-handler/src/v3/hooks/gestures/useHover.ts +++ b/packages/react-native-gesture-handler/src/v3/hooks/gestures/useHover.ts @@ -3,10 +3,11 @@ import { HoverEffect } from '../../../handlers/gestures/hoverGesture'; import { BaseGestureConfig, ExcludeInternalConfigProps, + HandlerData, SingleGestureName, } from '../../types'; import { useGesture } from '../useGesture'; -import { cloneConfig } from '../utils'; +import { cloneConfig, getChangeEventCalculator } from '../utils'; type HoverGestureProperties = { /** @@ -27,6 +28,8 @@ type HoverHandlerData = { absoluteX: number; absoluteY: number; stylusData: StylusData; + changeX: number; + changeY: number; }; type HoverGestureInternalConfig = BaseGestureConfig< @@ -37,10 +40,23 @@ type HoverGestureInternalConfig = BaseGestureConfig< export type HoverGestureConfig = ExcludeInternalConfigProps; +function diffCalculator( + current: HandlerData, + previous: HandlerData | null +) { + 'worklet'; + return { + changeX: previous ? current.x - previous.x : 0, + changeY: previous ? current.y - previous.y : 0, + }; +} + export function useHover(config: HoverGestureConfig) { const hoverConfig = cloneConfig( config ); + hoverConfig.changeEventCalculator = getChangeEventCalculator(diffCalculator); + return useGesture(SingleGestureName.Hover, hoverConfig); } diff --git a/packages/react-native-gesture-handler/src/v3/hooks/gestures/usePan.ts b/packages/react-native-gesture-handler/src/v3/hooks/gestures/usePan.ts index c79dc9cb12..4030b63add 100644 --- a/packages/react-native-gesture-handler/src/v3/hooks/gestures/usePan.ts +++ b/packages/react-native-gesture-handler/src/v3/hooks/gestures/usePan.ts @@ -2,10 +2,11 @@ import { StylusData } from '../../../handlers/gestureHandlerCommon'; import { BaseGestureConfig, ExcludeInternalConfigProps, + HandlerData, SingleGestureName, } from '../../types'; import { useGesture } from '../useGesture'; -import { cloneConfig, remapProps } from '../utils'; +import { getChangeEventCalculator, remapProps, cloneConfig } from '../utils'; type CommonPanGestureProperties = { /** @@ -114,6 +115,8 @@ type PanHandlerData = { velocityX: number; velocityY: number; stylusData: StylusData; + changeX: number; + changeY: number; }; export type PanGestureConfig = ExcludeInternalConfigProps< @@ -236,6 +239,21 @@ function transformPanProps( } } +function diffCalculator( + current: HandlerData, + previous: HandlerData | null +) { + 'worklet'; + return { + changeX: previous + ? current.translationX - previous.translationX + : current.translationX, + changeY: previous + ? current.translationY - previous.translationY + : current.translationY, + }; +} + export function usePan(config: PanGestureConfig) { if (__DEV__) { validatePanConfig(config); @@ -252,6 +270,8 @@ export function usePan(config: PanGestureConfig) { transformPanProps(panConfig); + panConfig.changeEventCalculator = getChangeEventCalculator(diffCalculator); + return useGesture( SingleGestureName.Pan, panConfig diff --git a/packages/react-native-gesture-handler/src/v3/hooks/gestures/usePinch.ts b/packages/react-native-gesture-handler/src/v3/hooks/gestures/usePinch.ts index ed61b0202c..1d654f7496 100644 --- a/packages/react-native-gesture-handler/src/v3/hooks/gestures/usePinch.ts +++ b/packages/react-native-gesture-handler/src/v3/hooks/gestures/usePinch.ts @@ -1,10 +1,11 @@ import { BaseGestureConfig, ExcludeInternalConfigProps, + HandlerData, SingleGestureName, } from '../../types'; import { useGesture } from '../useGesture'; -import { cloneConfig } from '../utils'; +import { cloneConfig, getChangeEventCalculator } from '../utils'; type PinchGestureProperties = Record; @@ -13,6 +14,7 @@ type PinchHandlerData = { focalX: number; focalY: number; velocity: number; + scaleChange: number; }; type PinchGestureInternalConfig = BaseGestureConfig< @@ -23,10 +25,22 @@ type PinchGestureInternalConfig = BaseGestureConfig< export type PinchGestureConfig = ExcludeInternalConfigProps; +function diffCalculator( + current: HandlerData, + previous: HandlerData | null +) { + 'worklet'; + return { + scaleChange: previous ? current.scale / previous.scale : current.scale, + }; +} + export function usePinch(config: PinchGestureConfig) { const pinchConfig = cloneConfig( config ); + pinchConfig.changeEventCalculator = getChangeEventCalculator(diffCalculator); + return useGesture(SingleGestureName.Pinch, pinchConfig); } diff --git a/packages/react-native-gesture-handler/src/v3/hooks/gestures/useRotation.ts b/packages/react-native-gesture-handler/src/v3/hooks/gestures/useRotation.ts index 542def7146..6d43ea0f3b 100644 --- a/packages/react-native-gesture-handler/src/v3/hooks/gestures/useRotation.ts +++ b/packages/react-native-gesture-handler/src/v3/hooks/gestures/useRotation.ts @@ -1,10 +1,11 @@ import { BaseGestureConfig, ExcludeInternalConfigProps, + HandlerData, SingleGestureName, } from '../../types'; import { useGesture } from '../useGesture'; -import { cloneConfig } from '../utils'; +import { cloneConfig, getChangeEventCalculator } from '../utils'; type RotationGestureProperties = Record; @@ -13,6 +14,7 @@ type RotationHandlerData = { anchorX: number; anchorY: number; velocity: number; + rotationChange: number; }; type RotationGestureInternalConfig = BaseGestureConfig< @@ -23,11 +25,26 @@ type RotationGestureInternalConfig = BaseGestureConfig< export type RotationGestureConfig = ExcludeInternalConfigProps; +function diffCalculator( + current: HandlerData, + previous: HandlerData | null +) { + 'worklet'; + return { + rotationChange: previous + ? current.rotation - previous.rotation + : current.rotation, + }; +} + export function useRotation(config: RotationGestureConfig) { const rotationConfig = cloneConfig< RotationHandlerData, RotationGestureProperties >(config); + rotationConfig.changeEventCalculator = + getChangeEventCalculator(diffCalculator); + return useGesture(SingleGestureName.Rotation, rotationConfig); } diff --git a/packages/react-native-gesture-handler/src/v3/hooks/utils.ts b/packages/react-native-gesture-handler/src/v3/hooks/utils.ts index 37a6fddee7..48ed475203 100644 --- a/packages/react-native-gesture-handler/src/v3/hooks/utils.ts +++ b/packages/react-native-gesture-handler/src/v3/hooks/utils.ts @@ -2,7 +2,10 @@ import { NativeSyntheticEvent } from 'react-native'; import { AnimatedEvent, BaseGestureConfig, + ChangeCalculatorType, + DiffCalculatorType, ExcludeInternalConfigProps, + UnpackedGestureHandlerEvent, GestureHandlerEvent, GestureStateChangeEvent, GestureUpdateEvent, @@ -22,15 +25,21 @@ export function isNativeEvent( return 'nativeEvent' in event; } +export function maybeExtractNativeEvent( + event: GestureHandlerEvent +) { + 'worklet'; + + return isNativeEvent(event) ? event.nativeEvent : event; +} + export function isEventForHandlerWithTag( handlerTag: number, - event: GestureHandlerEvent + event: UnpackedGestureHandlerEvent ) { 'worklet'; - return isNativeEvent(event) - ? event.nativeEvent.handlerTag === handlerTag - : event.handlerTag === handlerTag; + return event.handlerTag === handlerTag; } export function isAnimatedEvent( @@ -121,3 +130,23 @@ export function remapProps( return config; } + +export function getChangeEventCalculator( + diffCalculator: DiffCalculatorType +): ChangeCalculatorType { + 'worklet'; + return ( + current: GestureUpdateEvent, + previous?: GestureUpdateEvent + ) => { + 'worklet'; + const currentEventData = current.handlerData; + const previousEventData = previous ? previous.handlerData : null; + + const changePayload = diffCalculator(currentEventData, previousEventData); + + current.handlerData = { ...currentEventData, ...changePayload }; + + return current; + }; +} diff --git a/packages/react-native-gesture-handler/src/v3/hooks/utils/eventHandlersUtils.ts b/packages/react-native-gesture-handler/src/v3/hooks/utils/eventHandlersUtils.ts index 2503541d79..459588f4a6 100644 --- a/packages/react-native-gesture-handler/src/v3/hooks/utils/eventHandlersUtils.ts +++ b/packages/react-native-gesture-handler/src/v3/hooks/utils/eventHandlersUtils.ts @@ -3,10 +3,9 @@ import { CALLBACK_TYPE } from '../../../handlers/gestures/gesture'; import { BaseGestureConfig, ChangeCalculatorType, + UnpackedGestureHandlerEvent, GestureCallbacks, - GestureHandlerEvent, } from '../../types'; -import { isNativeEvent } from '../utils'; export function extractStateChangeHandlers( config: BaseGestureConfig @@ -105,7 +104,7 @@ export function touchEventTypeToCallbackType( export function runCallback( type: CALLBACK_TYPE, callbacks: GestureCallbacks, - event: GestureHandlerEvent, + event: UnpackedGestureHandlerEvent, ...args: unknown[] ) { 'worklet'; @@ -113,5 +112,5 @@ export function runCallback( // TODO: add proper types (likely boolean) // @ts-ignore It works, duh - handler?.(isNativeEvent(event) ? event.nativeEvent : event, ...args); + handler?.(event, ...args); } diff --git a/packages/react-native-gesture-handler/src/v3/types.ts b/packages/react-native-gesture-handler/src/v3/types.ts index 110edade40..acb55bb23d 100644 --- a/packages/react-native-gesture-handler/src/v3/types.ts +++ b/packages/react-native-gesture-handler/src/v3/types.ts @@ -39,6 +39,11 @@ export type GestureHandlerEvent = | StateChangeEvent | TouchEvent; +export type UnpackedGestureHandlerEvent = + | GestureUpdateEvent + | GestureStateChangeEvent + | GestureTouchEvent; + export type UpdateEvent = | GestureUpdateEvent | NativeSyntheticEvent>; @@ -119,9 +124,14 @@ export type ComposedGesture = { }; export type ChangeCalculatorType = ( - current: UpdateEvent, - previous?: UpdateEvent -) => UpdateEvent; + current: GestureUpdateEvent, + previous?: GestureUpdateEvent +) => GestureUpdateEvent; + +export type DiffCalculatorType = ( + current: HandlerData, + previous: HandlerData | null +) => Partial>; export type Gesture = | SingleGesture