moved forAnimated to config

Author: akwasniewski

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

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

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

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

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

@@ -6,13 +6,12 @@ import { PropsRef } from '../web/interfaces';
 
 export interface GestureHandlerDetectorProps extends PropsRef {
   handlerTags: number[];
-  dispatchesAnimatedEvents: boolean;
   moduleId: number;
   children?: React.ReactNode;
 }
 
 const HostGestureDetector = (props: GestureHandlerDetectorProps) => {
-  const { handlerTags, dispatchesAnimatedEvents, children } = props;
+  const { handlerTags, children } = props;
 
   const viewRef = useRef(null);
   const propsRef = useRef<PropsRef>(props);
@@ -24,29 +23,25 @@ const HostGestureDetector = (props: GestureHandlerDetectorProps) => {
     });
   }, []);
 
-  const attachHandlers = useCallback(
-    (currentHandlerTags: Set<number>) => {
-      const oldHandlerTags =
-        attachedHandlerTags.current.difference(currentHandlerTags);
-      const newHandlerTags = currentHandlerTags.difference(
-        attachedHandlerTags.current
+  const attachHandlers = useCallback((currentHandlerTags: Set<number>) => {
+    const oldHandlerTags =
+      attachedHandlerTags.current.difference(currentHandlerTags);
+    const newHandlerTags = currentHandlerTags.difference(
+      attachedHandlerTags.current
+    );
+
+    detachHandlers(oldHandlerTags);
+
+    newHandlerTags.forEach((tag) => {
+      RNGestureHandlerModule.attachGestureHandler(
+        tag,
+        viewRef.current,
+        ActionType.NATIVE_DETECTOR,
+        propsRef
       );
-
-      detachHandlers(oldHandlerTags);
-
-      newHandlerTags.forEach((tag) => {
-        RNGestureHandlerModule.attachGestureHandler(
-          tag,
-          viewRef.current,
-          ActionType.NATIVE_DETECTOR,
-          propsRef,
-          dispatchesAnimatedEvents
-        );
-      });
-      attachedHandlerTags.current = currentHandlerTags;
-    },
-    [dispatchesAnimatedEvents]
-  );
+    });
+    attachedHandlerTags.current = currentHandlerTags;
+  }, []);
 
   useEffect(() => {
     attachHandlers(new Set(handlerTags));

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

@@ -615,8 +615,16 @@ export default abstract class GestureHandler implements IGestureHandler {
   // Handling config
   //
 
-  public updateGestureConfig({ enabled = true, ...props }: Config): void {
-    this._config = { enabled: enabled, ...props };
+  public updateGestureConfig({
+    enabled = true,
+    dispatchesAnimatedEvents = false,
+    ...props
+  }: Config): void {
+    this._config = {
+      enabled: enabled,
+      dispatchesAnimatedEvents: dispatchesAnimatedEvents,
+      ...props,
+    };
 
     if (this.enabled !== enabled) {
       this.delegate.onEnabledChange(enabled);
@@ -628,6 +636,7 @@ export default abstract class GestureHandler implements IGestureHandler {
       this.shouldCancelWhenOutside = this.config.shouldCancelWhenOutside;
     }
 
+    this.forAnimated = dispatchesAnimatedEvents;
     this.validateHitSlops();
 
     if (this.enabled) {

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

@@ -48,6 +48,7 @@ export interface Config extends Record<string, ConfigArgs> {
   enableContextMenu?: boolean;
   touchAction?: TouchAction;
   manualActivation?: boolean;
+  dispatchesAnimatedEvents?: false;
 
   activateAfterLongPress?: number;
   failOffsetXStart?: number;

packages/react-native-gesture-handler/src/web/tools/GestureHandlerWebDelegate.ts

@@ -12,7 +12,6 @@ import { Config } from '../interfaces';
 import { MouseButton } from '../../handlers/gestureHandlerCommon';
 import KeyboardEventManager from './KeyboardEventManager';
 import WheelEventManager from './WheelEventManager';
-import { tagMessage } from '../../utils';
 
 interface DefaultViewStyles {
   userSelect: string;
@@ -234,11 +233,7 @@ export class GestureHandlerWebDelegate
   }
 
   public get view() {
-    if (!this._view) {
-      throw new Error(tagMessage("component's view is null"));
-    }
-
-    return this._view;
+    return this._view!;
   }
   public set view(value: HTMLElement) {
     this._view = value;