Merge branch '@akwasniewski/native-detector-web' into @akwasniewski/v3-web-typing

Author: akwasniewski

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

@@ -1,4 +1,4 @@
-import { useEffect, useRef, useCallback } from 'react';
+import { useEffect, useRef } from 'react';
 import { View } from 'react-native';
 import RNGestureHandlerModule from '../RNGestureHandlerModule.web';
 import { ActionType } from '../ActionType';
@@ -17,13 +17,13 @@ const HostGestureDetector = (props: GestureHandlerDetectorProps) => {
   const propsRef = useRef<PropsRef>(props);
   const attachedHandlerTags = useRef<Set<number>>(new Set<number>());
 
-  const detachHandlers = useCallback((oldHandlerTags: Set<number>) => {
+  const detachHandlers = (oldHandlerTags: Set<number>) => {
     oldHandlerTags.forEach((tag) => {
       RNGestureHandlerModule.detachGestureHandler(tag);
     });
-  }, []);
+  };
 
-  const attachHandlers = useCallback((currentHandlerTags: Set<number>) => {
+  const attachHandlers = (currentHandlerTags: Set<number>) => {
     const oldHandlerTags =
       attachedHandlerTags.current.difference(currentHandlerTags);
     const newHandlerTags = currentHandlerTags.difference(
@@ -41,7 +41,7 @@ const HostGestureDetector = (props: GestureHandlerDetectorProps) => {
       );
     });
     attachedHandlerTags.current = currentHandlerTags;
-  }, []);
+  };
 
   useEffect(() => {
     attachHandlers(new Set(handlerTags));

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

@@ -31,7 +31,7 @@ export default abstract class GestureHandler implements IGestureHandler {
   private _enabled = false;
 
   private viewRef: number | null = null;
-  protected propsRef: React.RefObject<PropsRef> | null = null;
+  private propsRef: React.RefObject<PropsRef> | null = null;
   private actionType: ActionType | null = null;
   private forAnimated: boolean | null = null;
   private _handlerTag!: number;
@@ -363,7 +363,7 @@ export default abstract class GestureHandler implements IGestureHandler {
     }
     this.ensurePropsRef();
     const { onGestureHandlerEvent, onGestureHandlerTouchEvent }: PropsRef =
-      this.propsRef.current;
+      this.propsRef!.current;
 
     const touchEvent: ResultEvent | undefined = this.transformTouchEvent(event);
 
@@ -389,7 +389,7 @@ export default abstract class GestureHandler implements IGestureHandler {
       onGestureHandlerEvent,
       onGestureHandlerStateChange,
       onGestureHandlerAnimatedEvent,
-    }: PropsRef = this.propsRef.current;
+    }: PropsRef = this.propsRef!.current;
     const resultEvent: ResultEvent = this.transformEventData(
       newState,
       oldState
@@ -578,14 +578,12 @@ export default abstract class GestureHandler implements IGestureHandler {
       timeStamp: Date.now(),
     };
 
-    const { onGestureHandlerEvent }: PropsRef = this.propsRef.current;
+    const { onGestureHandlerEvent }: PropsRef = this.propsRef!.current;
 
     invokeNullableMethod(onGestureHandlerEvent, cancelEvent);
   }
 
-  protected ensurePropsRef(): asserts this is this & {
-    propsRef: React.RefObject<PropsRef>;
-  } {
+  protected ensurePropsRef(): void {
     if (!this.propsRef) {
       throw new Error(
         tagMessage('Cannot handle event when component props are null')

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

@@ -45,7 +45,7 @@ export default class NativeViewGestureHandler extends GestureHandler {
     if (this.config.disallowInterruption !== undefined) {
       this.disallowInterruption = this.config.disallowInterruption;
     }
-    if (this.delegate.isInitialized) {
+    if (this.delegate.initialized) {
       // this function is called on handler creation, which happens before initializing delegate
       const view = this.delegate.view as HTMLElement;
       this.restoreViewStyles(view);

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

@@ -8,7 +8,7 @@ export interface MeasureResult {
 }
 
 export interface GestureHandlerDelegate<TComponent, THandler> {
-  isInitialized: boolean;
+  readonly initialized: boolean;
   view: TComponent;
 
   init(viewRef: number, handler: THandler): void;

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

@@ -22,7 +22,7 @@ interface DefaultViewStyles {
 export class GestureHandlerWebDelegate
   implements GestureHandlerDelegate<HTMLElement, IGestureHandler>
 {
-  public isInitialized = false;
+  private isInitialized = false;
   private _view: HTMLElement | null = null;
 
   private gestureHandler!: IGestureHandler;
@@ -240,7 +240,12 @@ export class GestureHandlerWebDelegate
 
     return this._view;
   }
+
   public set view(value: HTMLElement) {
     this._view = value;
   }
+
+  get initialized(): boolean {
+    return this.isInitialized;
+  }
 }