first refactor

Author: akwasniewski

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

@@ -67,7 +67,7 @@ export default {
   },
   detachGestureHandler(handlerTag: number) {
     shouldPreventDrop = false;
-    NodeManager.getHandler(handlerTag).detachHtml();
+    NodeManager.getHandler(handlerTag).detach();
   },
   updateGestureHandler(handlerTag: number, newConfig: Config) {
     NodeManager.getHandler(handlerTag).updateGestureConfig(newConfig);
@@ -84,6 +84,7 @@ export default {
     if (shouldPreventDrop) {
       return;
     }
+
     NodeManager.dropGestureHandler(handlerTag);
   },
   // eslint-disable-next-line @typescript-eslint/no-empty-function

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

@@ -1,40 +1,45 @@
 import { useEffect, useRef } from 'react';
 import { View } from 'react-native';
-import RNGestureHandlerModuleWeb from '../RNGestureHandlerModule.web';
+import RNGestureHandlerModule from '../RNGestureHandlerModule.web';
 import { ActionType } from '../ActionType';
 export interface GestureHandlerDetectorProps {
   handlerTags: number[];
   dispatchesAnimatedEvents: boolean;
   moduleId: number;
   children?: React.ReactNode;
+  actionType?: ActionType;
 }
 
 const HostGestureDetector = (props: GestureHandlerDetectorProps) => {
-  const { handlerTags, children } = props;
+  const {
+    handlerTags,
+    children,
+    actionType = ActionType.NATIVE_DETECTOR,
+  } = props;
 
   const viewRef = useRef(null);
   const propsRef = useRef<GestureHandlerDetectorProps>(props);
   const oldHandlerTags = useRef<Set<number>>(new Set<number>());
 
-  const attachHandlers = (): void => {
+  const attachHandlers = () => {
     const currentHandlerTags = new Set(handlerTags);
-    const newHandlerTags: Set<number> = currentHandlerTags.difference(
+    const newHandlerTags = currentHandlerTags.difference(
       oldHandlerTags.current
     );
     newHandlerTags.forEach((tag) => {
-      RNGestureHandlerModuleWeb.attachGestureHandler(
+      RNGestureHandlerModule.attachGestureHandler(
         tag,
         viewRef.current,
-        ActionType.NATIVE_DETECTOR,
+        actionType,
         propsRef
       );
     });
     oldHandlerTags.current = currentHandlerTags;
   };
 
-  const detachHandlers = (): void => {
+  const detachHandlers = () => {
     handlerTags.forEach((tag) => {
-      RNGestureHandlerModuleWeb.detachGestureHandler(tag);
+      RNGestureHandlerModule.detachGestureHandler(tag);
     });
   };
 

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

@@ -71,13 +71,13 @@ export default abstract class GestureHandler implements IGestureHandler {
     this.delegate.init(viewRef, this);
   }
 
-  public detachHtml() {
+  public detach() {
     this.propsRef = null;
     this.viewRef = null;
     this.actionType = null;
     this.state = State.UNDETERMINED;
 
-    this.delegate.detachHtml();
+    this.delegate.detach();
   }
 
   public attachEventManager(manager: EventManager<unknown>): void {
@@ -396,7 +396,7 @@ export default abstract class GestureHandler implements IGestureHandler {
     if (this.state === State.ACTIVE) {
       resultEvent.nativeEvent.oldState = undefined;
       if (
-        this.actionType === ActionType.NATIVE_DETECTOR ||
+        this.actionType === ActionType.NATIVE_ANIMATED_EVENT ||
         this.actionType === ActionType.NATIVE_DETECTOR_ANIMATED_EVENT
       ) {
         invokeNullableMethod(onGestureHandlerAnimatedEvent, resultEvent);
@@ -524,14 +524,17 @@ export default abstract class GestureHandler implements IGestureHandler {
   }
 
   private cancelTouches(): void {
+    if (!this.propsRef) {
+      return;
+    }
     const rect = this.delegate.measureView();
 
     const all: PointerData[] = [];
     const changed: PointerData[] = [];
 
     const trackerData = this.tracker.trackedPointers;
 
-    if (trackerData.size === 0 || !this.propsRef) {
+    if (trackerData.size === 0) {
       return;
     }
 

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

@@ -35,7 +35,7 @@ export default interface IGestureHandler {
   cancel: () => void;
 
   reset: () => void;
-  detachHtml: () => void;
+  detach: () => void;
 
   shouldWaitForHandlerFailure: (handler: IGestureHandler) => boolean;
   shouldRequireToWaitForFailure: (handler: IGestureHandler) => boolean;

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

@@ -11,7 +11,7 @@ export interface GestureHandlerDelegate<TComponent, THandler> {
   view: TComponent;
 
   init(viewRef: number, handler: THandler): void;
-  detachHtml(): void;
+  detach(): void;
   isPointerInBounds({ x, y }: { x: number; y: number }): boolean;
   measureView(): MeasureResult;
   reset(): void;

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

@@ -63,7 +63,7 @@ export class GestureHandlerWebDelegate
     );
   }
 
-  detachHtml(): void {
+  detach(): void {
     this.view = null as unknown as HTMLElement;
     this.defaultViewStyles = {
       userSelect: '',