Merge branch 'next' into @mbert/components-new-api

m-bert · m-bert · commit a2298ef47adc · 2025-11-28T19:41:49.000+01:00
diff --git a/packages/react-native-gesture-handler/apple/RNGestureHandlerDetector.h b/packages/react-native-gesture-handler/apple/RNGestureHandlerDetector.h
@@ -18,6 +18,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)dispatchGestureEvent:(RNGestureHandlerDetectorEventEmitter::OnGestureHandlerEvent)event;
 
+- (void)dispatchAnimatedGestureEvent:(RNGestureHandlerDetectorEventEmitter::OnGestureHandlerEvent)event;
+
 - (void)dispatchTouchEvent:(RNGestureHandlerDetectorEventEmitter::OnGestureHandlerTouchEvent)event;
 
 - (void)dispatchReanimatedStateChangeEvent:
diff --git a/packages/react-native-gesture-handler/apple/RNGestureHandlerDetector.mm b/packages/react-native-gesture-handler/apple/RNGestureHandlerDetector.mm
@@ -92,6 +92,17 @@ - (void)dispatchGestureEvent:(RNGestureHandlerDetectorEventEmitter::OnGestureHan
   }
 }
 
+- (void)dispatchAnimatedGestureEvent:(RNGestureHandlerDetectorEventEmitter::OnGestureHandlerEvent)event
+{
+  if (_eventEmitter != nullptr) {
+    std::dynamic_pointer_cast<const RNGestureHandlerDetectorEventEmitter>(_eventEmitter)->onGestureHandlerAnimatedEvent({
+      .state = event.state,
+      .handlerTag = event.handlerTag,
+      .handlerData = event.handlerData,
+    });
+  }
+}
+
 - (void)dispatchTouchEvent:(RNGestureHandlerDetectorEventEmitter::OnGestureHandlerTouchEvent)event
 {
   if (_eventEmitter != nullptr) {
diff --git a/packages/react-native-gesture-handler/apple/RNGestureHandlerManager.mm b/packages/react-native-gesture-handler/apple/RNGestureHandlerManager.mm
@@ -464,18 +464,21 @@ - (void)sendNativeOrVirtualEvent:(RNGestureHandlerStateChange *)event
                          forView:(RNGHUIView *)detectorView
 {
   if ([event isKindOfClass:[RNGestureHandlerEvent class]]) {
+    RNGestureHandlerEvent *gestureEvent = (RNGestureHandlerEvent *)event;
+
     switch (eventHandlerType) {
-      case RNGestureHandlerEventHandlerTypeAnimated:
+      case RNGestureHandlerEventHandlerTypeAnimated: {
         [self sendEventForNativeAnimatedEvent:event];
+        auto nativeEvent = [gestureEvent getNativeEvent];
+        [(RNGestureHandlerDetector *)detectorView dispatchAnimatedGestureEvent:nativeEvent];
         break;
+      }
       case RNGestureHandlerEventHandlerTypeReanimated: {
-        RNGestureHandlerEvent *gestureEvent = (RNGestureHandlerEvent *)event;
         auto nativeEvent = [gestureEvent getReanimatedNativeEvent];
         [(RNGestureHandlerDetector *)detectorView dispatchReanimatedGestureEvent:nativeEvent];
         break;
       }
       case RNGestureHandlerEventHandlerTypeJS: {
-        RNGestureHandlerEvent *gestureEvent = (RNGestureHandlerEvent *)event;
         auto nativeEvent = [gestureEvent getNativeEvent];
         [(RNGestureHandlerDetector *)detectorView dispatchGestureEvent:nativeEvent];
         break;
diff --git a/packages/react-native-gesture-handler/src/__tests__/RelationsTraversal.test.tsx b/packages/react-native-gesture-handler/src/__tests__/RelationsTraversal.test.tsx
@@ -1,7 +1,7 @@
 import { tagMessage } from '../utils';
 import {
   useExclusiveGestures,
-  useMultipleGestures,
+  useCompetingGestures,
   useSimultaneousGestures,
 } from '../v3/hooks/composition';
 import { useGesture } from '../v3/hooks/useGesture';
@@ -39,7 +39,7 @@ describe('Ensure only one leaf node', () => {
   });
 
   test('useRace', () => {
-    expect(() => useMultipleGestures(pan1, pan1)).toThrow(errorMessage);
+    expect(() => useCompetingGestures(pan1, pan1)).toThrow(errorMessage);
   });
 
   test('Complex composition', () => {
@@ -93,7 +93,7 @@ describe('Simple relations', () => {
   });
 
   test('useRace', () => {
-    const composedGesture = renderHook(() => useMultipleGestures(pan1, pan2))
+    const composedGesture = renderHook(() => useCompetingGestures(pan1, pan2))
       .result.current;
 
     configureRelations(composedGesture);
diff --git a/packages/react-native-gesture-handler/src/components/ReanimatedDrawerLayout.tsx b/packages/react-native-gesture-handler/src/components/ReanimatedDrawerLayout.tsx
@@ -501,7 +501,7 @@ const DrawerLayout = forwardRef<DrawerLayoutMethods, DrawerLayoutProps>(
 
     const overlayDismissGesture = useTapGesture({
       maxDistance: 25,
-      onEnd: () => {
+      onDeactivate: () => {
         'worklet';
         if (
           isDrawerOpen.value &&
@@ -535,7 +535,7 @@ const DrawerLayout = forwardRef<DrawerLayoutMethods, DrawerLayoutProps>(
         (drawerOpened
           ? drawerLockMode !== DrawerLockMode.LOCKED_OPEN
           : drawerLockMode !== DrawerLockMode.LOCKED_CLOSED),
-      onStart: () => {
+      onActivate: () => {
         'worklet';
         emitStateChanged(DrawerState.DRAGGING, false);
         runOnJS(setDrawerState)(DrawerState.DRAGGING);
@@ -577,7 +577,7 @@ const DrawerLayout = forwardRef<DrawerLayoutMethods, DrawerLayoutProps>(
           Extrapolation.CLAMP
         );
       },
-      onEnd: handleRelease,
+      onDeactivate: handleRelease,
     });
 
     // When using RTL, row and row-reverse flex directions are flipped.
diff --git a/packages/react-native-gesture-handler/src/components/ReanimatedSwipeable/ReanimatedSwipeable.tsx b/packages/react-native-gesture-handler/src/components/ReanimatedSwipeable/ReanimatedSwipeable.tsx
@@ -460,7 +460,7 @@ const Swipeable = (props: SwipeableProps) => {
     simultaneousWith: simultaneousWithExternalGesture,
     requireToFail: requireExternalGestureToFail,
     block: blocksExternalGesture,
-    onStart: () => {
+    onActivate: () => {
       'worklet';
       if (rowState.value !== 0) {
         close();
@@ -476,7 +476,7 @@ const Swipeable = (props: SwipeableProps) => {
     requireToFail: requireExternalGestureToFail,
     block: blocksExternalGesture,
     hitSlop: hitSlop,
-    onStart: updateElementWidths,
+    onActivate: updateElementWidths,
     onUpdate: (event: PanGestureUpdateEvent) => {
       'worklet';
       userDrag.value = event.translationX;
@@ -501,7 +501,7 @@ const Swipeable = (props: SwipeableProps) => {
 
       updateAnimatedEvent();
     },
-    onEnd: (event: PanGestureStateChangeEvent) => {
+    onDeactivate: (event: PanGestureStateChangeEvent) => {
       'worklet';
       handleRelease(event);
     },
diff --git a/packages/react-native-gesture-handler/src/v3/hooks/callbacks/js/useGestureStateChangeEvent.ts b/packages/react-native-gesture-handler/src/v3/hooks/callbacks/js/useGestureStateChangeEvent.ts
@@ -2,7 +2,7 @@ import { useMemo } from 'react';
 import { BaseGestureConfig } from '../../../types';
 import { prepareStateChangeHandlers } from '../../utils';
 import { getStateChangeHandler } from '../stateChangeHandler';
-import { ReanimatedContext } from 'packages/react-native-gesture-handler/src/handlers/gestures/reanimatedWrapper';
+import { ReanimatedContext } from '../../../../handlers/gestures/reanimatedWrapper';
 
 export function useGestureStateChangeEvent<THandlerData, TConfig>(
   handlerTag: number,
@@ -12,16 +12,16 @@ export function useGestureStateChangeEvent<THandlerData, TConfig>(
   return useMemo(() => {
     const handlers = prepareStateChangeHandlers({
       onBegin: config.onBegin,
-      onStart: config.onStart,
-      onEnd: config.onEnd,
+      onActivate: config.onActivate,
+      onDeactivate: config.onDeactivate,
       onFinalize: config.onFinalize,
     });
     return getStateChangeHandler(handlerTag, handlers, context);
   }, [
     handlerTag,
     config.onBegin,
-    config.onStart,
-    config.onEnd,
+    config.onActivate,
+    config.onDeactivate,
     config.onFinalize,
     context,
   ]);
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
@@ -1,4 +1,4 @@
-import { ReanimatedContext } from 'packages/react-native-gesture-handler/src/handlers/gestures/reanimatedWrapper';
+import { ReanimatedContext } from '../../../handlers/gestures/reanimatedWrapper';
 import { CALLBACK_TYPE } from '../../../handlers/gestures/gesture';
 import { State } from '../../../State';
 import {
diff --git a/packages/react-native-gesture-handler/src/v3/hooks/composition/index.ts b/packages/react-native-gesture-handler/src/v3/hooks/composition/index.ts
@@ -1,3 +1,3 @@
 export { useSimultaneousGestures } from './useSimultaneousGestures';
 export { useExclusiveGestures } from './useExclusiveGestures';
-export { useMultipleGestures } from './useMultipleGestures';
+export { useCompetingGestures } from './useCompetingGestures';
diff --git a/packages/react-native-gesture-handler/src/v3/hooks/composition/useCompetingGestures.ts b/packages/react-native-gesture-handler/src/v3/hooks/composition/useCompetingGestures.ts
@@ -1,6 +1,6 @@
 import { AnyGesture, ComposedGestureName } from '../../types';
 import { useComposedGesture } from './useComposedGesture';
 
-export function useMultipleGestures(...gestures: AnyGesture[]) {
+export function useCompetingGestures(...gestures: AnyGesture[]) {
   return useComposedGesture(ComposedGestureName.Race, ...gestures);
 }
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
@@ -10,12 +10,12 @@ export function prepareStateChangeHandlers<THandlerData>(
   callbacks: GestureCallbacks<THandlerData>
 ): GestureCallbacks<THandlerData> {
   'worklet';
-  const { onBegin, onStart, onEnd, onFinalize } = callbacks;
+  const { onBegin, onActivate, onDeactivate, onFinalize } = callbacks;
 
   const handlers: GestureCallbacks<THandlerData> = {
     ...(onBegin ? { onBegin } : {}),
-    ...(onStart ? { onStart } : {}),
-    ...(onEnd ? { onEnd } : {}),
+    ...(onActivate ? { onActivate } : {}),
+    ...(onDeactivate ? { onDeactivate } : {}),
     ...(onFinalize ? { onFinalize } : {}),
   };
 
@@ -66,11 +66,11 @@ export function getHandler<THandlerData>(
     case CALLBACK_TYPE.BEGAN:
       return callbacks.onBegin;
     case CALLBACK_TYPE.START:
-      return callbacks.onStart;
+      return callbacks.onActivate;
     case CALLBACK_TYPE.UPDATE:
       return callbacks.onUpdate;
     case CALLBACK_TYPE.END:
-      return callbacks.onEnd;
+      return callbacks.onDeactivate;
     case CALLBACK_TYPE.FINALIZE:
       return callbacks.onFinalize;
     case CALLBACK_TYPE.TOUCHES_DOWN:
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
@@ -47,9 +47,9 @@ export const HandlerCallbacks = new Set<
   keyof Required<GestureCallbacks<unknown>>
 >([
   'onBegin',
-  'onStart',
+  'onActivate',
   'onUpdate',
-  'onEnd',
+  'onDeactivate',
   'onFinalize',
   'onTouchesDown',
   'onTouchesMove',
diff --git a/packages/react-native-gesture-handler/src/v3/types/ConfigTypes.ts b/packages/react-native-gesture-handler/src/v3/types/ConfigTypes.ts
@@ -16,8 +16,8 @@ import { WithSharedValue } from './ReanimatedTypes';
 
 export type GestureCallbacks<THandlerData> = {
   onBegin?: (event: GestureStateChangeEvent<THandlerData>) => void;
-  onStart?: (event: GestureStateChangeEvent<THandlerData>) => void;
-  onEnd?: (
+  onActivate?: (event: GestureStateChangeEvent<THandlerData>) => void;
+  onDeactivate?: (
     event: GestureStateChangeEvent<THandlerData>,
     didSucceed: boolean
   ) => void;

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,17 @@ - (void)dispatchGestureEvent:(RNGestureHandlerDetectorEventEmitter::OnGestureHan`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`
	`95`	`+- (void)dispatchAnimatedGestureEvent:(RNGestureHandlerDetectorEventEmitter::OnGestureHandlerEvent)event`
	`96`	`+{`
	`97`	`+ if (_eventEmitter != nullptr) {`
	`98`	`+ std::dynamic_pointer_cast<const RNGestureHandlerDetectorEventEmitter>(_eventEmitter)->onGestureHandlerAnimatedEvent({`
	`99`	`+ .state = event.state,`
	`100`	`+ .handlerTag = event.handlerTag,`
	`101`	`+ .handlerData = event.handlerData,`
	`102`	`+ });`
	`103`	`+ }`
	`104`	`+}`
	`105`	`+`
`95`	`106`	`- (void)dispatchTouchEvent:(RNGestureHandlerDetectorEventEmitter::OnGestureHandlerTouchEvent)event`
`96`	`107`	`{`
`97`	`108`	`if (_eventEmitter != nullptr) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { ReanimatedContext } from 'packages/react-native-gesture-handler/src/handlers/gestures/reanimatedWrapper';`
	`1`	`+import { ReanimatedContext } from '../../../handlers/gestures/reanimatedWrapper';`
`2`	`2`	`import { CALLBACK_TYPE } from '../../../handlers/gestures/gesture';`
`3`	`3`	`import { State } from '../../../State';`
`4`	`4`	`import {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import { AnyGesture, ComposedGestureName } from '../../types';`
`2`	`2`	`import { useComposedGesture } from './useComposedGesture';`
`3`	`3`
`4`		`-export function useMultipleGestures(...gestures: AnyGesture[]) {`
	`4`	`+export function useCompetingGestures(...gestures: AnyGesture[]) {`
`5`	`5`	`return useComposedGesture(ComposedGestureName.Race, ...gestures);`
`6`	`6`	`}`