removed action type native detector animated event

Author: akwasniewski

packages/react-native-gesture-handler/src/ActionType.ts

@@ -4,22 +4,7 @@ export const ActionType = {
   JS_FUNCTION_OLD_API: 3,
   JS_FUNCTION_NEW_API: 4,
   NATIVE_DETECTOR: 5,
-  NATIVE_DETECTOR_ANIMATED_EVENT: 6,
 } as const;
 
-export function isNativeDetectorActionType(type: ActionType | null): boolean {
-  return (
-    type === ActionType.NATIVE_ANIMATED_EVENT ||
-    type === ActionType.NATIVE_DETECTOR_ANIMATED_EVENT
-  );
-}
-
-export function isAnimatedActionType(type: ActionType | null): boolean {
-  return (
-    type === ActionType.NATIVE_DETECTOR ||
-    type === ActionType.NATIVE_DETECTOR_ANIMATED_EVENT
-  );
-}
-
 // eslint-disable-next-line @typescript-eslint/no-redeclare -- backward compatibility; it can be used as a type and as a value
 export type ActionType = (typeof ActionType)[keyof typeof ActionType];

packages/react-native-gesture-handler/src/RNGestureHandlerModule.web.ts

@@ -48,7 +48,8 @@ export default {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     newView: any,
     actionType: ActionType,
-    propsRef: React.RefObject<PropsRef>
+    propsRef: React.RefObject<PropsRef>,
+    forAnimated: boolean
   ) {
     if (!(newView instanceof Element || newView instanceof React.Component)) {
       shouldPreventDrop = true;
@@ -63,7 +64,12 @@ export default {
     }
 
     // @ts-ignore Types should be HTMLElement or React.Component
-    NodeManager.getHandler(handlerTag).init(newView, propsRef, actionType);
+    NodeManager.getHandler(handlerTag).init(
+      newView,
+      propsRef,
+      actionType,
+      forAnimated
+    );
   },
   detachGestureHandler(handlerTag: number) {
     if (shouldPreventDrop) {

packages/react-native-gesture-handler/src/handlers/createHandler.tsx

@@ -160,7 +160,8 @@ type AttachGestureHandlerWeb = (
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   newView: any,
   _actionType: ActionType,
-  propsRef: React.RefObject<unknown>
+  propsRef: React.RefObject<unknown>,
+  forAnimated: boolean
 ) => void;
 
 const UNRESOLVED_REFS_RETRY_LIMIT = 1;
@@ -349,7 +350,8 @@ export default function createHandler<
           this.handlerTag,
           newViewTag,
           ActionType.JS_FUNCTION_OLD_API, // ignored on web
-          this.propsRef
+          this.propsRef,
+          false
         );
       } else {
         registerOldGestureHandler(this.handlerTag, {

packages/react-native-gesture-handler/src/handlers/gestures/GestureDetector/attachHandlers.ts

@@ -86,7 +86,8 @@ export function attachHandlers({
         gesture.handlerTag,
         viewTag,
         ActionType.JS_FUNCTION_OLD_API, // Ignored on web
-        webEventHandlersRef
+        webEventHandlersRef,
+        false
       );
     } else {
       RNGestureHandlerModule.attachGestureHandler(

packages/react-native-gesture-handler/src/v3/HostGestureDetector.web.tsx

@@ -29,10 +29,9 @@ const HostGestureDetector = (props: GestureHandlerDetectorProps) => {
       RNGestureHandlerModule.attachGestureHandler(
         tag,
         viewRef.current,
+        ActionType.NATIVE_DETECTOR,
+        propsRef,
         dispatchesAnimatedEvents
-          ? ActionType.NATIVE_DETECTOR_ANIMATED_EVENT
-          : ActionType.NATIVE_DETECTOR,
-        propsRef
       );
     });
   }, [handlerTags, dispatchesAnimatedEvents]);

packages/react-native-gesture-handler/src/web/handlers/GestureHandler.ts

@@ -18,11 +18,7 @@ import IGestureHandler from './IGestureHandler';
 import { MouseButton } from '../../handlers/gestureHandlerCommon';
 import { PointerType } from '../../PointerType';
 import { GestureHandlerDelegate } from '../tools/GestureHandlerDelegate';
-import {
-  ActionType,
-  isAnimatedActionType,
-  isNativeDetectorActionType,
-} from '../../ActionType';
+import { ActionType } from '../../ActionType';
 import { tagMessage } from '../../utils';
 
 export default abstract class GestureHandler implements IGestureHandler {
@@ -37,6 +33,7 @@ export default abstract class GestureHandler implements IGestureHandler {
   private viewRef: number | null = null;
   private propsRef: React.RefObject<PropsRef> | null = null;
   private actionType: ActionType | null = null;
+  private forAnimated: boolean | null = null;
   private _handlerTag!: number;
   private _config: Config = { enabled: false };
 
@@ -50,7 +47,6 @@ export default abstract class GestureHandler implements IGestureHandler {
 
   private _shouldResetProgress = false;
   private _pointerType: PointerType = PointerType.MOUSE;
-
   private _delegate: GestureHandlerDelegate<unknown, IGestureHandler>;
 
   public constructor(
@@ -66,12 +62,14 @@ export default abstract class GestureHandler implements IGestureHandler {
   protected init(
     viewRef: number,
     propsRef: React.RefObject<PropsRef>,
-    actionType: ActionType
+    actionType: ActionType,
+    forAnimated: boolean
   ) {
     this.propsRef = propsRef;
     this.viewRef = viewRef;
     this.actionType = actionType;
     this.state = State.UNDETERMINED;
+    this.forAnimated = forAnimated;
 
     this.delegate.init(viewRef, this);
   }
@@ -86,6 +84,7 @@ export default abstract class GestureHandler implements IGestureHandler {
     this.viewRef = null;
     this.actionType = null;
     this.state = State.UNDETERMINED;
+    this.forAnimated = null;
 
     this.delegate.detach();
   }
@@ -374,7 +373,7 @@ export default abstract class GestureHandler implements IGestureHandler {
     if (touchEvent) {
       if (
         onGestureHandlerTouchEvent &&
-        isNativeDetectorActionType(this.actionType)
+        this.actionType === ActionType.NATIVE_DETECTOR
       ) {
         invokeNullableMethod(onGestureHandlerTouchEvent, touchEvent);
       } else {
@@ -412,7 +411,8 @@ export default abstract class GestureHandler implements IGestureHandler {
       resultEvent.nativeEvent.oldState = undefined;
       if (
         onGestureHandlerAnimatedEvent &&
-        isAnimatedActionType(this.actionType)
+        (this.actionType === ActionType.NATIVE_ANIMATED_EVENT ||
+          this.forAnimated)
       ) {
         invokeNullableMethod(onGestureHandlerAnimatedEvent, resultEvent);
       }

packages/react-native-gesture-handler/src/web/handlers/LongPressGestureHandler.ts

@@ -25,13 +25,14 @@ export default class LongPressGestureHandler extends GestureHandler {
   public init(
     ref: number,
     propsRef: React.RefObject<PropsRef>,
-    actionType: ActionType
+    actionType: ActionType,
+    forAnimated: boolean
   ) {
     if (this.config.enableContextMenu === undefined) {
       this.config.enableContextMenu = false;
     }
 
-    super.init(ref, propsRef, actionType);
+    super.init(ref, propsRef, actionType, forAnimated);
   }
 
   protected transformNativeEvent() {

packages/react-native-gesture-handler/src/web/handlers/NativeViewGestureHandler.ts

@@ -20,9 +20,10 @@ export default class NativeViewGestureHandler extends GestureHandler {
   public init(
     ref: number,
     propsRef: React.RefObject<PropsRef>,
-    actionType: ActionType
+    actionType: ActionType,
+    forAnimated: boolean
   ): void {
-    super.init(ref, propsRef, actionType);
+    super.init(ref, propsRef, actionType, forAnimated);
 
     this.shouldCancelWhenOutside = true;
 

packages/react-native-gesture-handler/src/web/handlers/PinchGestureHandler.ts

@@ -52,9 +52,10 @@ export default class PinchGestureHandler extends GestureHandler {
   public init(
     ref: number,
     propsRef: React.RefObject<PropsRef>,
-    actionType: ActionType
+    actionType: ActionType,
+    forAnimated: boolean
   ) {
-    super.init(ref, propsRef, actionType);
+    super.init(ref, propsRef, actionType, forAnimated);
 
     this.shouldCancelWhenOutside = false;
   }

packages/react-native-gesture-handler/src/web/handlers/RotationGestureHandler.ts

@@ -48,9 +48,10 @@ export default class RotationGestureHandler extends GestureHandler {
   public init(
     ref: number,
     propsRef: React.RefObject<PropsRef>,
-    actionType: ActionType
+    actionType: ActionType,
+    forAnimated: boolean
   ): void {
-    super.init(ref, propsRef, actionType);
+    super.init(ref, propsRef, actionType, forAnimated);
 
     this.shouldCancelWhenOutside = false;
   }