reduce redundancy

Author: akwasniewski

packages/react-native-gesture-handler/src/components/Pressable/Pressable.tsx

@@ -9,8 +9,8 @@ import { GestureObjects as Gesture } from '../../handlers/gestures/gestureObject
 import { GestureDetector } from '../../handlers/gestures/GestureDetector';
 import {
   PressableEvent,
-  PressableProps,
   PressableDimensions,
+  LegacyPressableProps,
 } from './PressableProps';
 import {
   Insets,
@@ -40,7 +40,7 @@ import { PressableStateMachine } from './StateMachine';
 const DEFAULT_LONG_PRESS_DURATION = 500;
 const IS_TEST_ENV = isTestEnv();
 
-const Pressable = (props: PressableProps) => {
+const Pressable = (props: LegacyPressableProps) => {
   const {
     testOnly_pressed,
     hitSlop,

packages/react-native-gesture-handler/src/components/Pressable/PressableProps.tsx

@@ -9,6 +9,7 @@ import {
   View,
 } from 'react-native';
 import { RelationPropType } from '../utils';
+import { AnyGesture } from '../../v3/types';
 
 export type PressableDimensions = { width: number; height: number };
 
@@ -30,7 +31,47 @@ export type InnerPressableEvent = {
 
 export type PressableEvent = { nativeEvent: InnerPressableEvent };
 
-export interface PressableProps
+export interface LegacyPressableProps extends CommonPressableProps {
+  /**
+   * A gesture object or an array of gesture objects containing the configuration and callbacks to be
+   * used with the Pressable's gesture handlers.
+   */
+  simultaneousWithExternalGesture?: RelationPropType;
+
+  /**
+   * A gesture object or an array of gesture objects containing the configuration and callbacks to be
+   * used with the Pressable's gesture handlers.
+   */
+  requireExternalGestureToFail?: RelationPropType;
+
+  /**
+   * A gesture object or an array of gesture objects containing the configuration and callbacks to be
+   * used with the Pressable's gesture handlers.
+   */
+  blocksExternalGesture?: RelationPropType;
+}
+
+export interface PressableProps extends CommonPressableProps {
+  /**
+   * A gesture object or an array of gesture objects containing the configuration and callbacks to be
+   * used with the Pressable's gesture handlers.
+   */
+  simultaneousWith?: AnyGesture;
+
+  /**
+   * A gesture object or an array of gesture objects containing the configuration and callbacks to be
+   * used with the Pressable's gesture handlers.
+   */
+  requireToFail?: AnyGesture;
+
+  /**
+   * A gesture object or an array of gesture objects containing the configuration and callbacks to be
+   * used with the Pressable's gesture handlers.
+   */
+  block?: AnyGesture;
+}
+
+interface CommonPressableProps
   extends AccessibilityProps,
     Omit<ViewProps, 'children' | 'style' | 'hitSlop'> {
   /**
@@ -149,24 +190,6 @@ export interface PressableProps
    */
   unstable_pressDelay?: number;
 
-  /**
-   * A gesture object or an array of gesture objects containing the configuration and callbacks to be
-   * used with the Pressable's gesture handlers.
-   */
-  simultaneousWithExternalGesture?: RelationPropType;
-
-  /**
-   * A gesture object or an array of gesture objects containing the configuration and callbacks to be
-   * used with the Pressable's gesture handlers.
-   */
-  requireExternalGestureToFail?: RelationPropType;
-
-  /**
-   * A gesture object or an array of gesture objects containing the configuration and callbacks to be
-   * used with the Pressable's gesture handlers.
-   */
-  blocksExternalGesture?: RelationPropType;
-
   /**
    * @deprecated This property is no longer used, and will be removed in the future.
    */

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

@@ -1,4 +1,5 @@
 export type {
+  LegacyPressableProps,
   PressableProps,
   PressableStateCallbackType,
 } from './PressableProps';

packages/react-native-gesture-handler/src/components/Pressable/utils.ts

@@ -13,6 +13,7 @@ import {
   InnerPressableEvent,
   PressableEvent,
 } from './PressableProps';
+import { HoverGestureEvent, LongPressGestureEvent } from '../../v3';
 
 const numberAsInset = (value: number): Insets => ({
   left: value,
@@ -45,9 +46,12 @@ const touchDataToPressEvent = (
 });
 
 const gestureToPressEvent = (
-  event: GestureStateChangeEvent<
-    HoverGestureHandlerEventPayload | LongPressGestureHandlerEventPayload
-  >,
+  event:
+    | GestureStateChangeEvent<
+        HoverGestureHandlerEventPayload | LongPressGestureHandlerEventPayload
+      >
+    | HoverGestureEvent
+    | LongPressGestureEvent,
   timestamp: number,
   targetId: number
 ): InnerPressableEvent => ({
@@ -73,9 +77,12 @@ const isTouchWithinInset = (
   (touch?.locationY ?? 0) > -(inset.top ?? 0);
 
 const gestureToPressableEvent = (
-  event: GestureStateChangeEvent<
-    HoverGestureHandlerEventPayload | LongPressGestureHandlerEventPayload
-  >
+  event:
+    | GestureStateChangeEvent<
+        HoverGestureHandlerEventPayload | LongPressGestureHandlerEventPayload
+      >
+    | HoverGestureEvent
+    | LongPressGestureEvent
 ): PressableEvent => {
   const timestamp = Date.now();
 

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

@@ -147,8 +147,9 @@ export type {
 } from './handlers/gestureHandlerTypesCompat';
 
 export type {
-  PressableProps as LegacyPressableProps,
-  PressableStateCallbackType as LegacyPressableCallbackType,
+  PressableProps,
+  LegacyPressableProps,
+  PressableStateCallbackType,
 } from './components/Pressable';
 export { default as LegacyPressable } from './components/Pressable';
 

…rc/v3/components/Pressable/Pressable.tsx …-handler/src/v3/components/Pressable.tsxpackages/react-native-gesture-handler/src/v3/components/Pressable/Pressable.tsx renamed to packages/react-native-gesture-handler/src/v3/components/Pressable.tsx packages/react-native-gesture-handler/src/v3/components/Pressable/Pressable.tsx renamed to packages/react-native-gesture-handler/src/v3/components/Pressable.tsx

@@ -6,10 +6,10 @@ import React, {
   useState,
 } from 'react';
 import {
+  PressableDimensions,
   PressableEvent,
   PressableProps,
-  FullPressableDimensions,
-} from './PressableProps';
+} from '../../components/Pressable/PressableProps';
 import {
   Insets,
   LayoutChangeEvent,
@@ -23,21 +23,23 @@ import {
   gestureTouchToPressableEvent,
   isTouchWithinInset,
   gestureToPressableEvent,
-} from './utils';
-
-import { getStatesConfig, StateMachineEvent } from './stateDefinitions';
-import { PressableStateMachine } from './StateMachine';
+} from '../../components/Pressable/utils';
+import {
+  getStatesConfig,
+  StateMachineEvent,
+} from '../../components/Pressable/stateDefinitions';
+import { PressableStateMachine } from '../../components/Pressable/StateMachine';
 import {
   useHoverGesture,
   useLongPressGesture,
   useNativeGesture,
   useSimultaneousGestures,
-} from '../../hooks';
-import { GestureDetector } from '../../detectors';
-import { PureNativeButton } from '../GestureButtons';
+} from '../hooks';
+import { GestureDetector } from '../detectors';
+import { PureNativeButton } from './GestureButtons';
 
-import { PressabilityDebugView } from '../../../handlers/PressabilityDebugView';
-import { INT32_MAX } from '../../../utils';
+import { PressabilityDebugView } from '../../handlers/PressabilityDebugView';
+import { INT32_MAX } from '../../utils';
 const DEFAULT_LONG_PRESS_DURATION = 500;
 // const IS_TEST_ENV = isTestEnv();
 
@@ -75,11 +77,9 @@ const Pressable = (props: PressableProps) => {
   const pressDelayTimeoutRef = useRef<number | null>(null);
   const isOnPressAllowed = useRef<boolean>(true);
   const isCurrentlyPressed = useRef<boolean>(false);
-  const dimensions = useRef<FullPressableDimensions>({
+  const dimensions = useRef<PressableDimensions>({
     width: 0,
     height: 0,
-    x: 0,
-    y: 0,
   });
 
   const normalizedHitSlop: Insets = useMemo(