removed circular dependency

Author: akwasniewski

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

@@ -162,7 +162,7 @@ export type {
 } from './components/DrawerLayout';
 export { default as DrawerLayout } from './components/DrawerLayout';
 
-export type { NativeDetectorProps } from './v3/NativeDetector';
+export type { NativeDetectorProps } from './v3/types';
 export { NativeDetector } from './v3/NativeDetector';
 
 export { LogicDetector } from './v3/LogicDetector';

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

@@ -4,14 +4,21 @@ import { ActionType } from '../ActionType';
 import { PropsRef } from '../web/interfaces';
 import { View } from 'react-native';
 import { tagMessage } from '../utils';
-import { LogicDetectorProps } from './LogicDetector.web';
+
 export interface GestureHandlerDetectorProps extends PropsRef {
   handlerTags: number[];
   moduleId: number;
   children?: React.ReactNode;
   logicChildren?: Set<LogicDetectorProps>;
 }
 
+export interface LogicDetectorProps {
+  viewTag: number;
+  moduleId: number;
+  handlerTags: number[];
+  viewRef: RefObject<Element | null>;
+}
+
 interface LogicChild {
   attachedHandlerTags: Set<number>;
   attachedNativeHandlerTags: Set<number>;

packages/react-native-gesture-handler/src/v3/LogicDetector.tsx

@@ -1,13 +1,8 @@
 import { useEffect, useRef, useState } from 'react';
-import { NativeDetectorProps, useDetectorContext } from './NativeDetector';
+import { useDetectorContext } from './NativeDetector';
 import { Wrap } from '../handlers/gestures/GestureDetector/Wrap';
 import { findNodeHandle } from 'react-native';
-
-export interface LogicDetectorProps {
-  viewTag: number;
-  moduleId: number;
-  handlerTags: number[];
-}
+import { NativeDetectorProps } from './types';
 
 export const LogicDetector = (props: NativeDetectorProps) => {
   const { register, unregister } = useDetectorContext();

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

@@ -1,13 +1,7 @@
-import { RefObject, useEffect, useRef, useState } from 'react';
-import { NativeDetectorProps, useDetectorContext } from './NativeDetector';
-
+import { useEffect, useRef, useState } from 'react';
+import { useDetectorContext } from './NativeDetector';
 import { Wrap } from '../handlers/gestures/GestureDetector/Wrap';
-export interface LogicDetectorProps {
-  viewTag: number;
-  viewRef: RefObject<Element | null>;
-  moduleId: number;
-  handlerTags: number[];
-}
+import { NativeDetectorProps } from './types';
 
 export const LogicDetector = (props: NativeDetectorProps) => {
   const { register, unregister } = useDetectorContext();

packages/react-native-gesture-handler/src/v3/NativeDetector.tsx

@@ -6,24 +6,12 @@ import React, {
   useRef,
   useState,
 } from 'react';
-import { NativeGesture } from './hooks/useGesture';
 import { Reanimated } from '../handlers/gestures/reanimatedWrapper';
-
 import { Animated, StyleSheet } from 'react-native';
 import HostGestureDetector from './HostGestureDetector';
 import { invokeNullableMethod, tagMessage } from '../utils';
-import { LogicDetectorProps } from './LogicDetector';
-
-export interface NativeDetectorProps {
-  children?: React.ReactNode;
-  gesture: NativeGesture;
-}
+import { LogicDetectorProps, LogicMethods, NativeDetectorProps } from './types';
 
-interface LogicMethods {
-  onGestureHandlerEvent?: (e: any) => void;
-  onGestureHandlerStateChange?: (e: any) => void;
-  onGestureHandlerTouchEvent?: (e: any) => void;
-}
 const AnimatedNativeDetector =
   Animated.createAnimatedComponent(HostGestureDetector);
 

packages/react-native-gesture-handler/src/v3/hooks/useGesture.ts

@@ -7,33 +7,8 @@ import {
   SharedValue,
 } from '../../handlers/gestures/reanimatedWrapper';
 import { tagMessage } from '../../utils';
-import { AnimatedEvent } from '../types';
 import { hash, prepareConfig } from './utils';
-
-type GestureType =
-  | 'TapGestureHandler'
-  | 'LongPressGestureHandler'
-  | 'PanGestureHandler'
-  | 'PinchGestureHandler'
-  | 'RotationGestureHandler'
-  | 'FlingGestureHandler'
-  | 'ForceTouchGestureHandler'
-  | 'ManualGestureHandler'
-  | 'NativeViewGestureHandler';
-
-type GestureEvents = {
-  onGestureHandlerStateChange: (event: any) => void;
-  onGestureHandlerEvent: undefined | ((event: any) => void);
-  onGestureHandlerTouchEvent: (event: any) => void;
-  onGestureHandlerAnimatedEvent: undefined | AnimatedEvent;
-};
-
-export interface NativeGesture {
-  tag: number;
-  name: GestureType;
-  config: Record<string, unknown>;
-  gestureEvents: GestureEvents;
-}
+import { GestureType, NativeGesture } from '../types';
 
 function hasWorkletEventHandlers(config: Record<string, unknown>) {
   return Object.values(config).some(

packages/react-native-gesture-handler/src/v3/types.ts

@@ -6,6 +6,31 @@ import {
 } from '../handlers/gestureHandlerCommon';
 import { HandlerCallbacks } from '../handlers/gestures/gesture';
 
+export type GestureType =
+  | 'TapGestureHandler'
+  | 'LongPressGestureHandler'
+  | 'PanGestureHandler'
+  | 'PinchGestureHandler'
+  | 'RotationGestureHandler'
+  | 'FlingGestureHandler'
+  | 'ForceTouchGestureHandler'
+  | 'ManualGestureHandler'
+  | 'NativeViewGestureHandler';
+
+export type GestureEvents = {
+  onGestureHandlerStateChange: (event: any) => void;
+  onGestureHandlerEvent: undefined | ((event: any) => void);
+  onGestureHandlerTouchEvent: (event: any) => void;
+  onGestureHandlerAnimatedEvent: undefined | AnimatedEvent;
+};
+
+export interface NativeGesture {
+  tag: number;
+  name: GestureType;
+  config: Record<string, unknown>;
+  gestureEvents: GestureEvents;
+}
+
 export type GestureUpdateEventWithData<T> = GestureEventPayload & {
   handlerData: T;
 };
@@ -48,3 +73,20 @@ export type CallbackHandlers = Omit<
 export type AnimatedEvent = ((...args: any[]) => void) & {
   _argMapping?: unknown;
 };
+
+export interface LogicDetectorProps {
+  viewTag: number;
+  moduleId: number;
+  handlerTags: number[];
+}
+
+export interface NativeDetectorProps {
+  children?: React.ReactNode;
+  gesture: NativeGesture;
+}
+
+export interface LogicMethods {
+  onGestureHandlerEvent?: (e: any) => void;
+  onGestureHandlerStateChange?: (e: any) => void;
+  onGestureHandlerTouchEvent?: (e: any) => void;
+}