Split utils into multiple files (#3746)

m-bert · web-flow · commit 07edd7a0d37e · 2025-10-15T15:44:26.000+02:00
## Description

I've decided to split `utils` into multiple files for better readability
😅

## Test plan

`yarn ts-check`
diff --git a/packages/react-native-gesture-handler/src/v3/NativeDetector/HostGestureDetector.web.tsx b/packages/react-native-gesture-handler/src/v3/NativeDetector/HostGestureDetector.web.tsx
@@ -4,7 +4,6 @@ import { ActionType } from '../../ActionType';
 import { PropsRef } from '../../web/interfaces';
 import { View } from 'react-native';
 import { tagMessage } from '../../utils';
-import { EMPTY_SET } from './utils';
 
 export interface GestureHandlerDetectorProps extends PropsRef {
   handlerTags: number[];
@@ -19,6 +18,8 @@ export interface LogicChildrenWeb {
   viewRef: RefObject<Element | null>;
 }
 
+const EMPTY_HANDLERS = new Set<number>();
+
 const HostGestureDetector = (props: GestureHandlerDetectorProps) => {
   const { handlerTags, children } = props;
 
@@ -96,9 +97,9 @@ const HostGestureDetector = (props: GestureHandlerDetectorProps) => {
     );
 
     return () => {
-      detachHandlers(EMPTY_SET, attachedHandlers.current);
+      detachHandlers(EMPTY_HANDLERS, attachedHandlers.current);
       attachedLogicHandlers?.current.forEach((childHandlerTags) => {
-        detachHandlers(EMPTY_SET, childHandlerTags);
+        detachHandlers(EMPTY_HANDLERS, childHandlerTags);
       });
     };
   }, [handlerTags, children]);
@@ -130,7 +131,7 @@ const HostGestureDetector = (props: GestureHandlerDetectorProps) => {
     });
 
     logicChildrenToDetach.forEach((tag) => {
-      detachHandlers(EMPTY_SET, attachedLogicHandlers.current.get(tag)!);
+      detachHandlers(EMPTY_HANDLERS, attachedLogicHandlers.current.get(tag)!);
     });
   }, [props.logicChildren]);
 
diff --git a/packages/react-native-gesture-handler/src/v3/NativeDetector/utils.ts b/packages/react-native-gesture-handler/src/v3/NativeDetector/utils.ts
@@ -149,5 +149,3 @@ export function configureRelations<THandlerData, TConfig>(
 
   RNGestureHandlerModule.flushOperations();
 }
-
-export const EMPTY_SET = new Set<number>();
diff --git a/packages/react-native-gesture-handler/src/v3/hooks/callbacks/js/useGestureStateChangeEvent.ts b/packages/react-native-gesture-handler/src/v3/hooks/callbacks/js/useGestureStateChangeEvent.ts
@@ -1,5 +1,5 @@
 import { BaseGestureConfig } from '../../../types';
-import { extractStateChangeHandlers } from '../../utils/eventHandlersUtils';
+import { extractStateChangeHandlers } from '../../utils';
 import { getStateChangeHandler } from '../stateChangeHandler';
 
 export function useGestureStateChangeEvent<THandlerData, TConfig>(
diff --git a/packages/react-native-gesture-handler/src/v3/hooks/callbacks/js/useGestureTouchEvent.ts b/packages/react-native-gesture-handler/src/v3/hooks/callbacks/js/useGestureTouchEvent.ts
@@ -1,5 +1,5 @@
 import { BaseGestureConfig } from '../../../types';
-import { extractTouchHandlers } from '../../utils/eventHandlersUtils';
+import { extractTouchHandlers } from '../../utils';
 import { getTouchEventHandler } from '../touchEventHandler';
 
 export function useGestureTouchEvent<THandlerData, TConfig>(
diff --git a/packages/react-native-gesture-handler/src/v3/hooks/callbacks/js/useGestureUpdateEvent.ts b/packages/react-native-gesture-handler/src/v3/hooks/callbacks/js/useGestureUpdateEvent.ts
@@ -1,6 +1,5 @@
-import { isAnimatedEvent } from '../../utils';
+import { extractUpdateHandlers, isAnimatedEvent } from '../../utils';
 import { ReanimatedContext } from '../../../../handlers/gestures/reanimatedWrapper';
-import { extractUpdateHandlers } from '../../utils/eventHandlersUtils';
 import { getUpdateHandler } from '../updateHandler';
 import { BaseGestureConfig } from '../../../types';
 
diff --git a/packages/react-native-gesture-handler/src/v3/hooks/callbacks/reanimated/useReanimatedStateChangeEvent.ts b/packages/react-native-gesture-handler/src/v3/hooks/callbacks/reanimated/useReanimatedStateChangeEvent.ts
@@ -1,6 +1,6 @@
 import { Reanimated } from '../../../../handlers/gestures/reanimatedWrapper';
 import { BaseGestureConfig } from '../../../types';
-import { extractStateChangeHandlers } from '../../utils/eventHandlersUtils';
+import { extractStateChangeHandlers } from '../../utils';
 import { getStateChangeHandler } from '../stateChangeHandler';
 
 export function useReanimatedStateChangeEvent<THandlerData, TConfig>(
diff --git a/packages/react-native-gesture-handler/src/v3/hooks/callbacks/reanimated/useReanimatedTouchEvent.ts b/packages/react-native-gesture-handler/src/v3/hooks/callbacks/reanimated/useReanimatedTouchEvent.ts
@@ -1,6 +1,6 @@
 import { Reanimated } from '../../../../handlers/gestures/reanimatedWrapper';
 import { BaseGestureConfig } from '../../../types';
-import { extractTouchHandlers } from '../../utils/eventHandlersUtils';
+import { extractTouchHandlers } from '../../utils';
 import { getTouchEventHandler } from '../touchEventHandler';
 
 export function useReanimatedTouchEvent<THandlerData, TConfig>(
diff --git a/packages/react-native-gesture-handler/src/v3/hooks/callbacks/reanimated/useReanimatedUpdateEvent.ts b/packages/react-native-gesture-handler/src/v3/hooks/callbacks/reanimated/useReanimatedUpdateEvent.ts
@@ -1,6 +1,6 @@
 import { Reanimated } from '../../../../handlers/gestures/reanimatedWrapper';
 import { BaseGestureConfig } from '../../../types';
-import { extractUpdateHandlers } from '../../utils/eventHandlersUtils';
+import { extractUpdateHandlers } from '../../utils';
 import { getUpdateHandler } from '../updateHandler';
 
 export function useReanimatedUpdateEvent<THandlerData, TConfig>(
diff --git a/packages/react-native-gesture-handler/src/v3/hooks/callbacks/stateChangeHandler.ts b/packages/react-native-gesture-handler/src/v3/hooks/callbacks/stateChangeHandler.ts
@@ -5,8 +5,11 @@ import {
   GestureStateChangeEvent,
   StateChangeEvent,
 } from '../../types';
-import { isEventForHandlerWithTag, maybeExtractNativeEvent } from '../utils';
-import { runCallback } from '../utils/eventHandlersUtils';
+import {
+  isEventForHandlerWithTag,
+  maybeExtractNativeEvent,
+  runCallback,
+} from '../utils';
 
 export function getStateChangeHandler<THandlerData>(
   handlerTag: number,
diff --git a/packages/react-native-gesture-handler/src/v3/hooks/callbacks/touchEventHandler.ts b/packages/react-native-gesture-handler/src/v3/hooks/callbacks/touchEventHandler.ts
@@ -1,11 +1,12 @@
 import { GestureCallbacks, TouchEvent } from '../../types';
-import { isEventForHandlerWithTag, maybeExtractNativeEvent } from '../utils';
-import { TouchEventType } from '../../../TouchEventType';
-import { GestureTouchEvent } from '../../../handlers/gestureHandlerCommon';
 import {
+  isEventForHandlerWithTag,
+  maybeExtractNativeEvent,
   runCallback,
   touchEventTypeToCallbackType,
-} from '../utils/eventHandlersUtils';
+} from '../utils';
+import { TouchEventType } from '../../../TouchEventType';
+import { GestureTouchEvent } from '../../../handlers/gestureHandlerCommon';
 
 export function getTouchEventHandler<THandlerData>(
   handlerTag: number,
diff --git a/packages/react-native-gesture-handler/src/v3/hooks/callbacks/updateHandler.ts b/packages/react-native-gesture-handler/src/v3/hooks/callbacks/updateHandler.ts
@@ -7,8 +7,11 @@ import {
   GestureUpdateEvent,
   UpdateEvent,
 } from '../../types';
-import { isEventForHandlerWithTag, maybeExtractNativeEvent } from '../utils';
-import { runCallback } from '../utils/eventHandlersUtils';
+import {
+  isEventForHandlerWithTag,
+  maybeExtractNativeEvent,
+  runCallback,
+} from '../utils';
 
 export function getUpdateHandler<THandlerData>(
   handlerTag: number,
diff --git a/packages/react-native-gesture-handler/src/v3/hooks/relations/useComposedGesture.ts b/packages/react-native-gesture-handler/src/v3/hooks/relations/useComposedGesture.ts
@@ -8,7 +8,7 @@ import {
 } from '../../types';
 import { tagMessage } from '../../../utils';
 import { Reanimated } from '../../../handlers/gestures/reanimatedWrapper';
-import { containsDuplicates, isComposedGesture } from '../utils/relationUtils';
+import { containsDuplicates, isComposedGesture } from '../utils';
 
 // TODO: Simplify repeated relations (Simultaneous with Simultaneous, Exclusive with Exclusive, etc.)
 export function useComposedGesture(
diff --git a/packages/react-native-gesture-handler/src/v3/hooks/useGesture.ts b/packages/react-native-gesture-handler/src/v3/hooks/useGesture.ts
@@ -7,15 +7,13 @@ import {
   prepareConfig,
   isAnimatedEvent,
   shouldHandleTouchEvents,
-} from './utils';
-import { tagMessage } from '../../utils';
-import { BaseGestureConfig, SingleGesture, SingleGestureName } from '../types';
-import {
+  prepareRelations,
   bindSharedValues,
   hasWorkletEventHandlers,
   unbindSharedValues,
-} from './utils/reanimatedUtils';
-import { prepareRelations } from './utils/relationUtils';
+} from './utils';
+import { tagMessage } from '../../utils';
+import { BaseGestureConfig, SingleGesture, SingleGestureName } from '../types';
 
 export function useGesture<THandlerData, TConfig>(
   type: SingleGestureName,
diff --git a/packages/react-native-gesture-handler/src/v3/hooks/utils/configUtils.ts b/packages/react-native-gesture-handler/src/v3/hooks/utils/configUtils.ts
@@ -1,94 +1,20 @@
-import { NativeSyntheticEvent } from 'react-native';
+import { Reanimated } from '../../../handlers/gestures/reanimatedWrapper';
+import { tagMessage } from '../../../utils';
 import {
-  AnimatedEvent,
   BaseGestureConfig,
-  ChangeCalculatorType,
   CommonGestureConfig,
-  DiffCalculatorType,
   ExcludeInternalConfigProps,
-  UnpackedGestureHandlerEvent,
-  GestureHandlerEvent,
-  GestureStateChangeEvent,
-  GestureUpdateEvent,
-  SharedValueOrT,
-  SingleGestureName,
-  InternalConfigProps,
-  HandlersPropsWhiteList,
   GestureCallbacks,
-} from '../types';
-import { GestureTouchEvent } from '../../handlers/gestureHandlerCommon';
-import { tagMessage } from '../../utils';
-import { Reanimated } from '../../handlers/gestures/reanimatedWrapper';
-import { PanNativeProperties } from './gestures/pan/PanProperties';
-import { FlingNativeProperties } from './gestures/fling/FlingProperties';
-import { HoverNativeProperties } from './gestures/hover/HoverProperties';
-import { LongPressNativeProperties } from './gestures/longPress/LongPressProperties';
-import { NativeHandlerNativeProperties } from './gestures/native/NativeProperties';
-import { TapNativeProperties } from './gestures/tap/TapProperties';
-
-export function isNativeEvent<THandlerData>(
-  event: GestureHandlerEvent<THandlerData>
-): event is
-  | NativeSyntheticEvent<GestureUpdateEvent<THandlerData>>
-  | NativeSyntheticEvent<GestureStateChangeEvent<THandlerData>>
-  | NativeSyntheticEvent<GestureTouchEvent> {
-  'worklet';
-
-  return 'nativeEvent' in event;
-}
-
-export function maybeExtractNativeEvent<THandlerData>(
-  event: GestureHandlerEvent<THandlerData>
-) {
-  'worklet';
-
-  return isNativeEvent(event) ? event.nativeEvent : event;
-}
-
-export function isEventForHandlerWithTag<THandlerData>(
-  handlerTag: number,
-  event: UnpackedGestureHandlerEvent<THandlerData>
-) {
-  'worklet';
-
-  return event.handlerTag === handlerTag;
-}
-
-export function isAnimatedEvent<THandlerData>(
-  callback:
-    | ((event: GestureUpdateEvent<THandlerData>) => void)
-    | AnimatedEvent
-    | undefined
-): callback is AnimatedEvent {
-  'worklet';
-
-  return !!callback && '_argMapping' in callback;
-}
-
-export function maybeUnpackValue<T>(v: SharedValueOrT<T>) {
-  'worklet';
-
-  return (Reanimated?.isSharedValue(v) ? v.value : v) as T;
-}
-
-export function checkMappingForChangeProperties(animatedEvent: AnimatedEvent) {
-  for (const mapping of animatedEvent._argMapping) {
-    if (
-      !mapping ||
-      !('nativeEvent' in mapping && 'handlerData' in mapping.nativeEvent)
-    ) {
-      continue;
-    }
-
-    for (const key in mapping.nativeEvent.handlerData) {
-      if (key.startsWith('change')) {
-        throw new Error(
-          tagMessage(`${key} is not available when using Animated.Event.`)
-        );
-      }
-    }
-  }
-}
+  HandlersPropsWhiteList,
+  InternalConfigProps,
+  SingleGestureName,
+} from '../../types';
+import { PanNativeProperties } from '../gestures/pan/PanProperties';
+import { FlingNativeProperties } from '../gestures/fling/FlingProperties';
+import { HoverNativeProperties } from '../gestures/hover/HoverProperties';
+import { LongPressNativeProperties } from '../gestures/longPress/LongPressProperties';
+import { NativeHandlerNativeProperties } from '../gestures/native/NativeProperties';
+import { TapNativeProperties } from '../gestures/tap/TapProperties';
 
 const allowedNativeProps = new Set<
   keyof CommonGestureConfig | keyof InternalConfigProps<unknown>
@@ -181,17 +107,6 @@ export function prepareConfig<THandlerData, TConfig extends object>(
   return filteredConfig;
 }
 
-export function shouldHandleTouchEvents<THandlerData, TConfig>(
-  config: BaseGestureConfig<THandlerData, TConfig>
-) {
-  return (
-    !!config.onTouchesDown ||
-    !!config.onTouchesMove ||
-    !!config.onTouchesUp ||
-    !!config.onTouchesCancelled
-  );
-}
-
 export function cloneConfig<THandlerData, TConfig>(
   config: ExcludeInternalConfigProps<BaseGestureConfig<THandlerData, TConfig>>
 ): BaseGestureConfig<THandlerData, TConfig> {
@@ -216,23 +131,3 @@ export function remapProps<TConfig extends object, TInternalConfig>(
 
   return config;
 }
-
-export function getChangeEventCalculator<THandlerData>(
-  diffCalculator: DiffCalculatorType<THandlerData>
-): ChangeCalculatorType<THandlerData> {
-  'worklet';
-  return (
-    current: GestureUpdateEvent<THandlerData>,
-    previous?: GestureUpdateEvent<THandlerData>
-  ) => {
-    'worklet';
-    const currentEventData = current.handlerData;
-    const previousEventData = previous ? previous.handlerData : null;
-
-    const changePayload = diffCalculator(currentEventData, previousEventData);
-
-    current.handlerData = { ...currentEventData, ...changePayload };
-
-    return current;
-  };
-}
diff --git a/packages/react-native-gesture-handler/src/v3/hooks/utils/eventUtils.ts b/packages/react-native-gesture-handler/src/v3/hooks/utils/eventUtils.ts
diff --git a/packages/react-native-gesture-handler/src/v3/hooks/utils/index.ts b/packages/react-native-gesture-handler/src/v3/hooks/utils/index.ts
diff --git a/packages/react-native-gesture-handler/src/v3/hooks/utils/reanimatedUtils.ts b/packages/react-native-gesture-handler/src/v3/hooks/utils/reanimatedUtils.ts

Original file line number	Diff line number	Diff line change
`@@ -149,5 +149,3 @@ export function configureRelations<THandlerData, TConfig>(`
`149`	`149`
`150`	`150`	`RNGestureHandlerModule.flushOperations();`
`151`	`151`	`}`
`152`		`-`
`153`		`-export const EMPTY_SET = new Set<number>();`