Merge branch '@mbert/gesture-hooks' into @mbert/add-event-calculators

Author: m-bert

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

@@ -175,5 +175,8 @@ export function useWebEventHandlers() {
     onGestureHandlerStateChange: (e: ResultEvent) => {
       onGestureHandlerEvent(e.nativeEvent as GestureHandlerNativeEvent);
     },
+    onGestureHandlerTouchEvent: () => {
+      // no-op
+    },
   });
 }

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

@@ -6,7 +6,7 @@ import {
 import { useGesture } from '../useGesture';
 import { cloneConfig } from '../utils';
 
-type FlingGestureProps = {
+type FlingGestureProperties = {
   /**
    * Expressed allowed direction of movement. It's possible to pass one or many
    * directions in one parameter:
@@ -38,14 +38,16 @@ type FlingHandlerData = {
 
 type FlingGestureInternalConfig = BaseGestureConfig<
   FlingHandlerData,
-  FlingGestureProps
+  FlingGestureProperties
 >;
 
 export type FlingGestureConfig =
   ExcludeInternalConfigProps<FlingGestureInternalConfig>;
 
 export function useFling(config: FlingGestureConfig) {
-  const flingConfig = cloneConfig<FlingHandlerData, FlingGestureProps>(config);
+  const flingConfig = cloneConfig<FlingHandlerData, FlingGestureProperties>(
+    config
+  );
 
   return useGesture(SingleGestureName.Fling, flingConfig);
 }

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

@@ -9,7 +9,7 @@ import {
 import { useGesture } from '../useGesture';
 import { cloneConfig, getChangeEventCalculator } from '../utils';
 
-type HoverGestureProps = {
+type HoverGestureProperties = {
   /**
    * Visual effect applied to the view while the view is hovered. The possible values are:
    *
@@ -34,7 +34,7 @@ type HoverHandlerData = {
 
 type HoverGestureInternalConfig = BaseGestureConfig<
   HoverHandlerData,
-  HoverGestureProps
+  HoverGestureProperties
 >;
 
 export type HoverGestureConfig =
@@ -52,7 +52,9 @@ function diffCalculator(
 }
 
 export function useHover(config: HoverGestureConfig) {
-  const hoverConfig = cloneConfig<HoverHandlerData, HoverGestureProps>(config);
+  const hoverConfig = cloneConfig<HoverHandlerData, HoverGestureProperties>(
+    config
+  );
 
   hoverConfig.changeEventCalculator = getChangeEventCalculator(diffCalculator);
 

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

@@ -4,9 +4,9 @@ import {
   SingleGestureName,
 } from '../../types';
 import { useGesture } from '../useGesture';
-import { remapProps } from '../utils';
+import { cloneConfig, remapProps } from '../utils';
 
-type LongPressGestureProps = {
+type LongPressGestureProperties = {
   /**
    * Minimum time, expressed in milliseconds, that a finger must remain pressed on
    * the corresponding view. The default value is 500.
@@ -27,7 +27,7 @@ type LongPressGestureProps = {
   numberOfPointers?: number;
 };
 
-type LongPressGestureInternalProps = {
+type LongPressGestureInternalProperties = {
   minDurationMs?: number;
   maxDist?: number;
   numberOfPointers?: number;
@@ -42,33 +42,38 @@ type LongPressHandlerData = {
 };
 
 export type LongPressGestureConfig = ExcludeInternalConfigProps<
-  BaseGestureConfig<LongPressHandlerData, LongPressGestureProps>
+  BaseGestureConfig<LongPressHandlerData, LongPressGestureProperties>
 >;
 
 type LongPressGestureInternalConfig = BaseGestureConfig<
   LongPressHandlerData,
-  LongPressGestureInternalProps
+  LongPressGestureInternalProperties
 >;
 
 const LongPressPropsMapping = new Map<
-  keyof LongPressGestureProps,
-  keyof LongPressGestureInternalProps
+  keyof LongPressGestureProperties,
+  keyof LongPressGestureInternalProperties
 >([
   ['minDuration', 'minDurationMs'],
   ['maxDistance', 'maxDist'],
 ]);
 
 export function useLongPress(config: LongPressGestureConfig) {
-  const longPressConfig = remapProps<
-    LongPressGestureConfig,
-    LongPressGestureInternalConfig
-  >(config, LongPressPropsMapping);
+  const longPressConfig = cloneConfig<
+    LongPressHandlerData,
+    LongPressGestureInternalProperties
+  >(config);
+
+  remapProps<LongPressGestureConfig, LongPressGestureInternalConfig>(
+    longPressConfig,
+    LongPressPropsMapping
+  );
 
   if (longPressConfig.shouldCancelWhenOutside === undefined) {
     longPressConfig.shouldCancelWhenOutside = true;
   }
 
-  return useGesture<LongPressHandlerData, LongPressGestureInternalProps>(
+  return useGesture<LongPressHandlerData, LongPressGestureInternalProperties>(
     SingleGestureName.LongPress,
     longPressConfig
   );

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

@@ -6,19 +6,19 @@ import {
 import { useGesture } from '../useGesture';
 import { cloneConfig } from '../utils';
 
-type ManualGestureProps = Record<string, never>;
+type ManualGestureProperties = Record<string, never>;
 type ManualHandlerData = Record<string, never>;
 
 type ManualGestureInternalConfig = BaseGestureConfig<
   ManualHandlerData,
-  ManualGestureProps
+  ManualGestureProperties
 >;
 
 export type ManualGestureConfig =
   ExcludeInternalConfigProps<ManualGestureInternalConfig>;
 
 export function useManual(config: ManualGestureConfig) {
-  const manualConfig = cloneConfig<ManualHandlerData, ManualGestureProps>(
+  const manualConfig = cloneConfig<ManualHandlerData, ManualGestureProperties>(
     config
   );
 

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

@@ -6,7 +6,7 @@ import {
 import { useGesture } from '../useGesture';
 import { cloneConfig } from '../utils';
 
-type NativeViewGestureProps = {
+type NativeViewGestureProperties = {
   /**
    * Android only.
    *
@@ -28,7 +28,7 @@ type NativeViewHandlerData = {
 
 type NativeViewGestureInternalConfig = BaseGestureConfig<
   NativeViewHandlerData,
-  NativeViewGestureProps
+  NativeViewGestureProperties
 >;
 
 export type NativeViewGestureConfig =
@@ -37,7 +37,7 @@ export type NativeViewGestureConfig =
 export function useNative(config: NativeViewGestureConfig) {
   const nativeConfig = cloneConfig<
     NativeViewHandlerData,
-    NativeViewGestureProps
+    NativeViewGestureProperties
   >(config);
 
   return useGesture(SingleGestureName.Native, nativeConfig);

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

@@ -6,9 +6,9 @@ import {
   SingleGestureName,
 } from '../../types';
 import { useGesture } from '../useGesture';
-import { getChangeEventCalculator, remapProps } from '../utils';
+import { getChangeEventCalculator, remapProps, cloneConfig } from '../utils';
 
-type CommonPanGestureProps = {
+type CommonPanGestureProperties = {
   /**
    * Minimum distance the finger (or multiple finger) need to travel before the
    * handler activates. Expressed in points.
@@ -47,7 +47,7 @@ type CommonPanGestureProps = {
   activateAfterLongPress?: number;
 };
 
-export type PanGestureProps = CommonPanGestureProps & {
+export type PanGestureProperties = CommonPanGestureProperties & {
   /**
    * Range along X axis (in points) where fingers travels without activation of
    * handler. Moving outside of this range implies activation of handler. Range
@@ -93,7 +93,7 @@ export type PanGestureProps = CommonPanGestureProps & {
   failOffsetX?: number | [failOffsetXStart: number, failOffsetXEnd: number];
 };
 
-type PanGestureInternalProps = CommonPanGestureProps & {
+type PanGestureInternalProperties = CommonPanGestureProperties & {
   minDist?: number;
   activeOffsetYStart?: number;
   activeOffsetYEnd?: number;
@@ -120,17 +120,17 @@ type PanHandlerData = {
 };
 
 export type PanGestureConfig = ExcludeInternalConfigProps<
-  BaseGestureConfig<PanHandlerData, PanGestureProps>
+  BaseGestureConfig<PanHandlerData, PanGestureProperties>
 >;
 
 type PanGestureInternalConfig = BaseGestureConfig<
   PanHandlerData,
-  PanGestureInternalProps
+  PanGestureInternalProperties
 >;
 
 const PanPropsMapping = new Map<
-  keyof PanGestureProps,
-  keyof PanGestureInternalProps
+  keyof PanGestureProperties,
+  keyof PanGestureInternalProperties
 >([['minDistance', 'minDist']]);
 
 function validatePanConfig(config: PanGestureConfig) {
@@ -259,16 +259,20 @@ export function usePan(config: PanGestureConfig) {
     validatePanConfig(config);
   }
 
-  const panConfig = remapProps<PanGestureConfig, PanGestureInternalConfig>(
-    config,
+  const panConfig = cloneConfig<PanHandlerData, PanGestureInternalProperties>(
+    config
+  );
+
+  remapProps<PanGestureConfig, PanGestureInternalConfig>(
+    panConfig,
     PanPropsMapping
   );
 
   transformPanProps(panConfig);
 
   panConfig.changeEventCalculator = getChangeEventCalculator(diffCalculator);
 
-  return useGesture<PanHandlerData, PanGestureInternalProps>(
+  return useGesture<PanHandlerData, PanGestureInternalProperties>(
     SingleGestureName.Pan,
     panConfig
   );

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

@@ -7,7 +7,7 @@ import {
 import { useGesture } from '../useGesture';
 import { cloneConfig, getChangeEventCalculator } from '../utils';
 
-type PinchGestureProps = Record<string, never>;
+type PinchGestureProperties = Record<string, never>;
 
 type PinchHandlerData = {
   scale: number;
@@ -19,7 +19,7 @@ type PinchHandlerData = {
 
 type PinchGestureInternalConfig = BaseGestureConfig<
   PinchHandlerData,
-  PinchGestureProps
+  PinchGestureProperties
 >;
 
 export type PinchGestureConfig =
@@ -36,7 +36,9 @@ function diffCalculator(
 }
 
 export function usePinch(config: PinchGestureConfig) {
-  const pinchConfig = cloneConfig<PinchHandlerData, PinchGestureProps>(config);
+  const pinchConfig = cloneConfig<PinchHandlerData, PinchGestureProperties>(
+    config
+  );
 
   pinchConfig.changeEventCalculator = getChangeEventCalculator(diffCalculator);
 

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

@@ -7,7 +7,7 @@ import {
 import { useGesture } from '../useGesture';
 import { cloneConfig, getChangeEventCalculator } from '../utils';
 
-type RotationGestureProps = Record<string, never>;
+type RotationGestureProperties = Record<string, never>;
 
 type RotationHandlerData = {
   rotation: number;
@@ -19,7 +19,7 @@ type RotationHandlerData = {
 
 type RotationGestureInternalConfig = BaseGestureConfig<
   RotationHandlerData,
-  RotationGestureProps
+  RotationGestureProperties
 >;
 
 export type RotationGestureConfig =
@@ -38,9 +38,10 @@ function diffCalculator(
 }
 
 export function useRotation(config: RotationGestureConfig) {
-  const rotationConfig = cloneConfig<RotationHandlerData, RotationGestureProps>(
-    config
-  );
+  const rotationConfig = cloneConfig<
+    RotationHandlerData,
+    RotationGestureProperties
+  >(config);
 
   rotationConfig.changeEventCalculator =
     getChangeEventCalculator(diffCalculator);

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

@@ -4,9 +4,9 @@ import {
   SingleGestureName,
 } from '../../types';
 import { useGesture } from '../useGesture';
-import { remapProps } from '../utils';
+import { cloneConfig, remapProps } from '../utils';
 
-type TapGestureProps = {
+type TapGestureProperties = {
   /**
    * Minimum number of pointers (fingers) required to be placed before the
    * handler activates. Should be a positive integer.
@@ -57,7 +57,7 @@ type TapGestureProps = {
   maxDistance?: number;
 };
 
-type TapGestureInternalProps = {
+type TapGestureInternalProperties = {
   minPointers?: number;
   numberOfTaps?: number;
   maxDeltaX?: number;
@@ -75,30 +75,34 @@ type TapHandlerData = {
 };
 
 export type TapGestureConfig = ExcludeInternalConfigProps<
-  BaseGestureConfig<TapHandlerData, TapGestureProps>
+  BaseGestureConfig<TapHandlerData, TapGestureProperties>
 >;
 
 type TapGestureInternalConfig = BaseGestureConfig<
   TapHandlerData,
-  TapGestureInternalProps
+  TapGestureInternalProperties
 >;
 
 const TapPropsMapping = new Map<
-  keyof TapGestureProps,
-  keyof TapGestureInternalProps
+  keyof TapGestureProperties,
+  keyof TapGestureInternalProperties
 >([
   ['maxDistance', 'maxDist'],
   ['maxDuration', 'maxDurationMs'],
   ['maxDelay', 'maxDelayMs'],
 ]);
 
 export function useTap(config: TapGestureConfig) {
-  const tapConfig = remapProps<TapGestureConfig, TapGestureInternalConfig>(
-    config,
+  const tapConfig = cloneConfig<TapHandlerData, TapGestureInternalProperties>(
+    config
+  );
+
+  remapProps<TapGestureConfig, TapGestureInternalConfig>(
+    tapConfig,
     TapPropsMapping
   );
 
-  return useGesture<TapHandlerData, TapGestureInternalProps>(
+  return useGesture<TapHandlerData, TapGestureInternalProperties>(
     SingleGestureName.Tap,
     tapConfig
   );