react-native-gesture-handler 3.0.0-beta.1 → 3.0.0-beta.3

package/src/handlers/gestures/GestureDetector/useViewRefHandler.ts

@@ -1,9 +1,10 @@
-import { tagMessage } from '../../../utils';
-import { getShadowNodeFromRef } from '../../../getShadowNodeFromRef';
+import type React from 'react';
+import { useCallback } from 'react';
 
-import { GestureDetectorState } from './types';
-import React, { useCallback } from 'react';
 import findNodeHandle from '../../../findNodeHandle';
+import { getShadowNodeFromRef } from '../../../getShadowNodeFromRef';
+import { tagMessage } from '../../../utils';
+import type { GestureDetectorState } from './types';
 
 declare const global: {
   _isViewFlatteningDisabled: (node: unknown) => boolean | null; // JSI function

package/src/handlers/gestures/GestureDetector/utils.ts

@@ -1,28 +1,28 @@
+import { useCallback, useRef, useState } from 'react';
 import { Platform } from 'react-native';
 
+import { RNRenderer } from '../../../RNRenderer';
 import { isTestEnv, tagMessage } from '../../../utils';
-import { GestureRef, BaseGesture, GestureType } from '../gesture';
-
+import type {
+  GestureHandlerNativeEvent,
+  PropsRef,
+  ResultEvent,
+} from '../../../web/interfaces';
 import { flingGestureHandlerProps } from '../../FlingGestureHandler';
 import { forceTouchGestureHandlerProps } from '../../ForceTouchGestureHandler';
+import { baseGestureHandlerWithDetectorProps } from '../../gestureHandlerCommon';
 import { longPressGestureHandlerProps } from '../../LongPressGestureHandler';
+import { nativeViewGestureHandlerProps } from '../../NativeViewGestureHandler';
 import {
-  panGestureHandlerProps,
   panGestureHandlerCustomNativeProps,
+  panGestureHandlerProps,
 } from '../../PanGestureHandler';
 import { tapGestureHandlerProps } from '../../TapGestureHandler';
+import { onGestureHandlerEvent } from '../eventReceiver';
+import type { GestureRef, GestureType } from '../gesture';
+import { BaseGesture } from '../gesture';
 import { hoverGestureHandlerProps } from '../hoverGesture';
-import { nativeViewGestureHandlerProps } from '../../NativeViewGestureHandler';
-import { baseGestureHandlerWithDetectorProps } from '../../gestureHandlerCommon';
-import { RNRenderer } from '../../../RNRenderer';
-import { useCallback, useRef, useState } from 'react';
 import { Reanimated } from '../reanimatedWrapper';
-import { onGestureHandlerEvent } from '../eventReceiver';
-import {
-  GestureHandlerNativeEvent,
-  PropsRef,
-  ResultEvent,
-} from '../../../web/interfaces';
 
 export const ALLOWED_PROPS = [
   ...baseGestureHandlerWithDetectorProps,

package/src/handlers/gestures/eventReceiver.ts

@@ -1,17 +1,17 @@
-import { DeviceEventEmitter, EmitterSubscription } from 'react-native';
+import type { EmitterSubscription } from 'react-native';
+import { DeviceEventEmitter } from 'react-native';
+
 import { State } from '../../State';
 import { TouchEventType } from '../../TouchEventType';
-import {
+import type {
+  GestureStateChangeEvent,
   GestureTouchEvent,
   GestureUpdateEvent,
-  GestureStateChangeEvent,
 } from '../gestureHandlerCommon';
 import { findHandler, findOldGestureHandler } from '../handlersRegistry';
-import { BaseGesture } from './gesture';
-import {
-  GestureStateManager,
-  GestureStateManagerType,
-} from './gestureStateManager';
+import type { BaseGesture } from './gesture';
+import type { GestureStateManagerType } from './gestureStateManager';
+import { GestureStateManager } from './gestureStateManager';
 
 let gestureHandlerEventSubscription: EmitterSubscription | null = null;
 let gestureHandlerStateChangeEventSubscription: EmitterSubscription | null =

package/src/handlers/gestures/flingGesture.ts

@@ -1,6 +1,7 @@
-import { BaseGesture, BaseGestureConfig } from './gesture';
-import { FlingGestureConfig } from '../FlingGestureHandler';
+import type { FlingGestureConfig } from '../FlingGestureHandler';
 import type { FlingGestureHandlerEventPayload } from '../GestureHandlerEventPayload';
+import type { BaseGestureConfig } from './gesture';
+import { BaseGesture } from './gesture';
 
 export class FlingGesture extends BaseGesture<FlingGestureHandlerEventPayload> {
   public override config: BaseGestureConfig & FlingGestureConfig = {};

package/src/handlers/gestures/forceTouchGesture.ts

@@ -1,7 +1,8 @@
-import { BaseGestureConfig, ContinousBaseGesture } from './gesture';
-import { ForceTouchGestureConfig } from '../ForceTouchGestureHandler';
+import type { ForceTouchGestureConfig } from '../ForceTouchGestureHandler';
+import type { GestureUpdateEvent } from '../gestureHandlerCommon';
 import type { ForceTouchGestureHandlerEventPayload } from '../GestureHandlerEventPayload';
-import { GestureUpdateEvent } from '../gestureHandlerCommon';
+import type { BaseGestureConfig } from './gesture';
+import { ContinousBaseGesture } from './gesture';
 
 /**
  * @deprecated ForceTouch gesture is deprecated and will be removed in the future.

package/src/handlers/gestures/gesture.ts

@@ -1,26 +1,26 @@
-import {
-  HitSlop,
+import { isRemoteDebuggingEnabled } from '../../utils';
+import type {
+  ActiveCursor,
   CommonGestureConfig,
-  GestureTouchEvent,
   GestureStateChangeEvent,
+  GestureTouchEvent,
   GestureUpdateEvent,
-  ActiveCursor,
+  HitSlop,
   MouseButton,
 } from '../gestureHandlerCommon';
-import { getNextHandlerTag } from '../getNextHandlerTag';
-import { GestureStateManagerType } from './gestureStateManager';
 import type {
   FlingGestureHandlerEventPayload,
   ForceTouchGestureHandlerEventPayload,
+  HoverGestureHandlerEventPayload,
   LongPressGestureHandlerEventPayload,
+  NativeViewGestureHandlerPayload,
   PanGestureHandlerEventPayload,
   PinchGestureHandlerEventPayload,
   RotationGestureHandlerEventPayload,
   TapGestureHandlerEventPayload,
-  NativeViewGestureHandlerPayload,
-  HoverGestureHandlerEventPayload,
 } from '../GestureHandlerEventPayload';
-import { isRemoteDebuggingEnabled } from '../../utils';
+import { getNextHandlerTag } from '../getNextHandlerTag';
+import type { GestureStateManagerType } from './gestureStateManager';
 
 export type GestureType =
   | BaseGesture<Record<string, unknown>>

package/src/handlers/gestures/gestureComposition.ts

@@ -1,4 +1,5 @@
-import { BaseGesture, Gesture, GestureRef, GestureType } from './gesture';
+import type { GestureRef, GestureType } from './gesture';
+import { BaseGesture, Gesture } from './gesture';
 
 function extendRelation(
   currentRelation: GestureRef[] | undefined,

package/src/handlers/gestures/gestureObjects.ts

@@ -1,19 +1,19 @@
 import { FlingGesture } from './flingGesture';
 import { ForceTouchGesture } from './forceTouchGesture';
-import { Gesture } from './gesture';
+import type { Gesture } from './gesture';
 import {
   ComposedGesture,
   ExclusiveGesture,
   SimultaneousGesture,
 } from './gestureComposition';
+import { HoverGesture } from './hoverGesture';
 import { LongPressGesture } from './longPressGesture';
+import { ManualGesture } from './manualGesture';
+import { NativeGesture } from './nativeGesture';
 import { PanGesture } from './panGesture';
 import { PinchGesture } from './pinchGesture';
 import { RotationGesture } from './rotationGesture';
 import { TapGesture } from './tapGesture';
-import { NativeGesture } from './nativeGesture';
-import { ManualGesture } from './manualGesture';
-import { HoverGesture } from './hoverGesture';
 
 /**
  * `Gesture` is the object that allows you to create and compose gestures.

package/src/handlers/gestures/gestureStateManager.web.ts

@@ -1,6 +1,6 @@
 import { State } from '../../State';
 import NodeManager from '../../web/tools/NodeManager';
-import { GestureStateManagerType } from './gestureStateManager';
+import type { GestureStateManagerType } from './gestureStateManager';
 
 export const GestureStateManager = {
   create(handlerTag: number): GestureStateManagerType {

package/src/handlers/gestures/hoverGesture.ts

@@ -1,6 +1,7 @@
-import { BaseGestureConfig, ContinousBaseGesture } from './gesture';
-import { GestureUpdateEvent } from '../gestureHandlerCommon';
+import type { GestureUpdateEvent } from '../gestureHandlerCommon';
 import type { HoverGestureHandlerEventPayload } from '../GestureHandlerEventPayload';
+import type { BaseGestureConfig } from './gesture';
+import { ContinousBaseGesture } from './gesture';
 
 export type HoverGestureChangeEventPayload = {
   changeX: number;

package/src/handlers/gestures/longPressGesture.ts

@@ -1,6 +1,7 @@
-import { BaseGesture, BaseGestureConfig } from './gesture';
-import { LongPressGestureConfig } from '../LongPressGestureHandler';
 import type { LongPressGestureHandlerEventPayload } from '../GestureHandlerEventPayload';
+import type { LongPressGestureConfig } from '../LongPressGestureHandler';
+import type { BaseGestureConfig } from './gesture';
+import { BaseGesture } from './gesture';
 
 export class LongPressGesture extends BaseGesture<LongPressGestureHandlerEventPayload> {
   public override config: BaseGestureConfig & LongPressGestureConfig = {};

package/src/handlers/gestures/manualGesture.ts

@@ -1,4 +1,4 @@
-import { GestureUpdateEvent } from '../gestureHandlerCommon';
+import type { GestureUpdateEvent } from '../gestureHandlerCommon';
 import { ContinousBaseGesture } from './gesture';
 
 function changeEventCalculator(

package/src/handlers/gestures/nativeGesture.ts

@@ -1,6 +1,7 @@
-import { BaseGestureConfig, BaseGesture } from './gesture';
-import { NativeViewGestureConfig } from '../NativeViewGestureHandler';
 import type { NativeViewGestureHandlerPayload } from '../GestureHandlerEventPayload';
+import type { NativeViewGestureConfig } from '../NativeViewGestureHandler';
+import type { BaseGestureConfig } from './gesture';
+import { BaseGesture } from './gesture';
 
 export class NativeGesture extends BaseGesture<NativeViewGestureHandlerPayload> {
   public override config: BaseGestureConfig & NativeViewGestureConfig = {};

package/src/handlers/gestures/panGesture.ts

@@ -1,7 +1,8 @@
-import { BaseGestureConfig, ContinousBaseGesture } from './gesture';
-import { GestureUpdateEvent } from '../gestureHandlerCommon';
-import { PanGestureConfig } from '../PanGestureHandler';
+import type { GestureUpdateEvent } from '../gestureHandlerCommon';
 import type { PanGestureHandlerEventPayload } from '../GestureHandlerEventPayload';
+import type { PanGestureConfig } from '../PanGestureHandler';
+import type { BaseGestureConfig } from './gesture';
+import { ContinousBaseGesture } from './gesture';
 
 export type PanGestureChangeEventPayload = {
   changeX: number;

package/src/handlers/gestures/pinchGesture.ts

@@ -1,6 +1,6 @@
-import { ContinousBaseGesture } from './gesture';
+import type { GestureUpdateEvent } from '../gestureHandlerCommon';
 import type { PinchGestureHandlerEventPayload } from '../GestureHandlerEventPayload';
-import { GestureUpdateEvent } from '../gestureHandlerCommon';
+import { ContinousBaseGesture } from './gesture';
 
 export type PinchGestureChangeEventPayload = {
   scaleChange: number;

package/src/handlers/gestures/reanimatedWrapper.ts

@@ -1,11 +1,12 @@
-import { ComponentClass } from 'react';
+import type { ComponentClass } from 'react';
+
 import { tagMessage } from '../../utils';
-import {
+import { NativeProxy } from '../../v3/NativeProxy';
+import type {
   GestureCallbacks,
   GestureUpdateEventWithHandlerData,
   SharedValue,
 } from '../../v3/types';
-import { NativeProxy } from '../../v3/NativeProxy';
 
 export type ReanimatedContext<THandlerData> = {
   lastUpdateEvent: GestureUpdateEventWithHandlerData<THandlerData> | undefined;
@@ -53,9 +54,9 @@ let Reanimated:
         ): ComponentClass<P>;
       };
       NativeEventsManager: NativeEventsManager;
-      useHandler: <THandlerData>(
-        handlers: GestureCallbacks<THandlerData>
-      ) => ReanimatedHandler<THandlerData>;
+      useHandler: <THandlerData, TExtendedHandlerData extends THandlerData>(
+        handlers: GestureCallbacks<THandlerData, TExtendedHandlerData>
+      ) => ReanimatedHandler<TExtendedHandlerData>;
       useEvent: <T>(
         callback: (event: T) => void,
         events: string[],

package/src/handlers/gestures/rotationGesture.ts

@@ -1,6 +1,6 @@
-import { ContinousBaseGesture } from './gesture';
+import type { GestureUpdateEvent } from '../gestureHandlerCommon';
 import type { RotationGestureHandlerEventPayload } from '../GestureHandlerEventPayload';
-import { GestureUpdateEvent } from '../gestureHandlerCommon';
+import { ContinousBaseGesture } from './gesture';
 
 type RotationGestureChangeEventPayload = {
   rotationChange: number;

package/src/handlers/gestures/tapGesture.ts

@@ -1,6 +1,7 @@
-import { BaseGestureConfig, BaseGesture } from './gesture';
-import { TapGestureConfig } from '../TapGestureHandler';
 import type { TapGestureHandlerEventPayload } from '../GestureHandlerEventPayload';
+import type { TapGestureConfig } from '../TapGestureHandler';
+import type { BaseGestureConfig } from './gesture';
+import { BaseGesture } from './gesture';
 
 export class TapGesture extends BaseGesture<TapGestureHandlerEventPayload> {
   public override config: BaseGestureConfig & TapGestureConfig = {};

package/src/handlers/handlersRegistry.ts

@@ -1,21 +1,28 @@
 import { isTestEnv } from '../utils';
-import { GestureType } from './gestures/gesture';
-import { GestureEvent, HandlerStateChangeEvent } from './gestureHandlerCommon';
-import { SingleGesture } from '../v3/types';
+import type { SingleGesture } from '../v3/types';
+import type {
+  GestureEvent,
+  HandlerStateChangeEvent,
+} from './gestureHandlerCommon';
+import type { GestureType } from './gestures/gesture';
 
 export const handlerIDToTag: Record<string, number> = {};
 
 // There were attempts to create types that merge possible HandlerData and Config,
 // but ts was not able to infer them properly in many cases, so we use any here.
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const hookGestures = new Map<number, SingleGesture<any, any>>();
+const hookGestures = new Map<number, SingleGesture<any, any, any>>();
 const gestures = new Map<number, GestureType>();
 const oldHandlers = new Map<number, GestureHandlerCallbacks>();
 const testIDs = new Map<string, number>();
 
-export function registerGesture<THandlerData, TConfig>(
+export function registerGesture<
+  TConfig,
+  THandlerData,
+  TExtendedHandlerData extends THandlerData,
+>(
   handlerTag: number,
-  gesture: SingleGesture<THandlerData, TConfig>
+  gesture: SingleGesture<TConfig, THandlerData, TExtendedHandlerData>
 ) {
   if (isTestEnv() && gesture.config.testID) {
     hookGestures.set(handlerTag, gesture);

package/src/handlers/utils.ts

@@ -1,9 +1,10 @@
-import * as React from 'react';
-import { Platform, findNodeHandle as findNodeHandleRN } from 'react-native';
-import { handlerIDToTag } from './handlersRegistry';
-import { toArray } from '../utils';
-import RNGestureHandlerModule from '../RNGestureHandlerModule';
+import type * as React from 'react';
+import { findNodeHandle as findNodeHandleRN, Platform } from 'react-native';
+
 import { ghQueueMicrotask } from '../ghQueueMicrotask';
+import RNGestureHandlerModule from '../RNGestureHandlerModule';
+import { toArray } from '../utils';
+import { handlerIDToTag } from './handlersRegistry';
 
 function isConfigParam(param: unknown, name: string) {
   // param !== Object(param) returns false if `param` is a function

package/src/index.ts

@@ -2,160 +2,153 @@ import './globals';
 
 import { initialize } from './init';
 
-export { Directions } from './Directions';
-export { State } from './State';
-export { PointerType } from './PointerType';
+export {
+  LegacyBaseButton,
+  LegacyBorderlessButton,
+  LegacyRawButton,
+  LegacyRectButton,
+} from './components/GestureButtons';
+export type {
+  LegacyBaseButtonProps,
+  LegacyBorderlessButtonProps,
+  LegacyRawButtonProps,
+  LegacyRectButtonProps,
+} from './components/GestureButtonsProps';
+export {
+  LegacyDrawerLayoutAndroid,
+  LegacyFlatList,
+  LegacyRefreshControl,
+  LegacyScrollView,
+  LegacySwitch,
+  LegacyTextInput,
+} from './components/GestureComponents';
 export { default as GestureHandlerRootView } from './components/GestureHandlerRootView';
 export type {
+  LegacyPressableProps,
+  PressableProps,
+  PressableStateCallbackType,
+} from './components/Pressable';
+export { default as LegacyPressable } from './components/Pressable';
+export { LegacyText } from './components/Text';
+export type {
+  TouchableHighlightProps,
+  TouchableOpacityProps,
+  TouchableWithoutFeedbackProps,
+} from './components/touchables';
+export {
+  TouchableHighlight,
+  TouchableNativeFeedback,
+  TouchableOpacity,
+  TouchableWithoutFeedback,
+} from './components/touchables';
+export { Directions } from './Directions';
+export { default as legacy_createNativeWrapper } from './handlers/createNativeWrapper';
+export type { FlingGestureHandlerProps } from './handlers/FlingGestureHandler';
+export { FlingGestureHandler } from './handlers/FlingGestureHandler';
+export type { ForceTouchGestureHandlerProps } from './handlers/ForceTouchGestureHandler';
+export { ForceTouchGestureHandler } from './handlers/ForceTouchGestureHandler';
+export type {
+  // Config types
+  ActiveCursor,
   // Event types
   GestureEvent,
-  HandlerStateChangeEvent,
   // Event payloads types
   GestureEventPayload,
-  HandlerStateChangeEventPayload,
+  GestureStateChangeEvent,
   // Pointer events
   GestureTouchEvent,
-  GestureTouchEvent as SingleGestureTouchEvent,
-  TouchData,
   // New api event types
   GestureUpdateEvent,
-  GestureStateChangeEvent,
-  // Config types
-  ActiveCursor,
+  HandlerStateChangeEvent,
+  HandlerStateChangeEventPayload,
+  GestureTouchEvent as SingleGestureTouchEvent,
+  TouchData,
 } from './handlers/gestureHandlerCommon';
 export { MouseButton } from './handlers/gestureHandlerCommon';
-export type { GestureType } from './handlers/gestures/gesture';
 export type {
-  TapGestureHandlerEventPayload,
+  FlingGestureHandlerEventPayload,
   ForceTouchGestureHandlerEventPayload,
   LongPressGestureHandlerEventPayload,
+  NativeViewGestureHandlerPayload,
   PanGestureHandlerEventPayload,
   PinchGestureHandlerEventPayload,
   RotationGestureHandlerEventPayload,
-  NativeViewGestureHandlerPayload,
-  FlingGestureHandlerEventPayload,
+  TapGestureHandlerEventPayload,
 } from './handlers/GestureHandlerEventPayload';
-export type { TapGestureHandlerProps } from './handlers/TapGestureHandler';
-export type { ForceTouchGestureHandlerProps } from './handlers/ForceTouchGestureHandler';
-export type { ForceTouchGestureChangeEventPayload } from './handlers/gestures/forceTouchGesture';
-export type { LongPressGestureHandlerProps } from './handlers/LongPressGestureHandler';
-export type { PanGestureHandlerProps } from './handlers/PanGestureHandler';
-export type { PanGestureChangeEventPayload } from './handlers/gestures/panGesture';
-export type { PinchGestureHandlerProps } from './handlers/PinchGestureHandler';
-export type { PinchGestureChangeEventPayload } from './handlers/gestures/pinchGesture';
-export type { RotationGestureHandlerProps } from './handlers/RotationGestureHandler';
-export type { FlingGestureHandlerProps } from './handlers/FlingGestureHandler';
-export { TapGestureHandler } from './handlers/TapGestureHandler';
-export { ForceTouchGestureHandler } from './handlers/ForceTouchGestureHandler';
-export { LongPressGestureHandler } from './handlers/LongPressGestureHandler';
-export { PanGestureHandler } from './handlers/PanGestureHandler';
-export { PinchGestureHandler } from './handlers/PinchGestureHandler';
-export { RotationGestureHandler } from './handlers/RotationGestureHandler';
-export { FlingGestureHandler } from './handlers/FlingGestureHandler';
-export { default as createNativeWrapper } from './handlers/createNativeWrapper';
-export type { NativeViewGestureHandlerProps } from './handlers/NativeViewGestureHandler';
-export { GestureDetector as LegacyGestureDetector } from './handlers/gestures/GestureDetector';
-export { GestureObjects as Gesture } from './handlers/gestures/gestureObjects';
-export type { TapGestureType as LegacyTapGesture } from './handlers/gestures/tapGesture';
-export type { PanGestureType as LegacyPanGesture } from './handlers/gestures/panGesture';
-export type { FlingGestureType as LegacyFlingGesture } from './handlers/gestures/flingGesture';
-export type { LongPressGestureType as LegacyLongPressGesture } from './handlers/gestures/longPressGesture';
-export type { PinchGestureType as LegacyPinchGesture } from './handlers/gestures/pinchGesture';
-export type { RotationGestureType as LegacyRotationGesture } from './handlers/gestures/rotationGesture';
-export type { ForceTouchGestureType as LegacyForceTouchGesture } from './handlers/gestures/forceTouchGesture';
-export type { ManualGestureType as LegacyManualGesture } from './handlers/gestures/manualGesture';
-export type { HoverGestureType as LegacyHoverGesture } from './handlers/gestures/hoverGesture';
-export type {
-  ComposedGestureType as LegacyComposedGesture,
-  RaceGestureType as LegacyRaceGesture,
-  SimultaneousGestureType as LegacySimultaneousGesture,
-  ExclusiveGestureType as LegacyExclusiveGesture,
-} from './handlers/gestures/gestureComposition';
-export type { GestureStateManagerType as LegacyGestureStateManager } from './handlers/gestures/gestureStateManager';
-export { NativeViewGestureHandler } from './handlers/NativeViewGestureHandler';
-export type {
-  LegacyRawButtonProps,
-  LegacyBaseButtonProps,
-  LegacyRectButtonProps,
-  LegacyBorderlessButtonProps,
-} from './components/GestureButtonsProps';
-
-export {
-  LegacyRawButton,
-  LegacyBaseButton,
-  LegacyRectButton,
-  LegacyBorderlessButton,
-  LegacyPureNativeButton,
-} from './components/GestureButtons';
-
-export type {
-  TouchableHighlightProps,
-  TouchableOpacityProps,
-  TouchableWithoutFeedbackProps,
-} from './components/touchables';
-export {
-  TouchableHighlight,
-  TouchableNativeFeedback,
-  TouchableOpacity,
-  TouchableWithoutFeedback,
-} from './components/touchables';
-export {
-  LegacyScrollView,
-  LegacySwitch,
-  LegacyTextInput,
-  LegacyDrawerLayoutAndroid,
-  LegacyFlatList,
-  LegacyRefreshControl,
-} from './components/GestureComponents';
-
-export { Text } from './components/Text';
-export { HoverEffect } from './handlers/gestures/hoverGesture';
 export type {
+  FlingGestureHandlerGestureEvent,
+  FlingGestureHandlerProperties,
+  FlingGestureHandlerStateChangeEvent,
+  ForceTouchGestureHandlerGestureEvent,
+  ForceTouchGestureHandlerProperties,
+  ForceTouchGestureHandlerStateChangeEvent,
   // Events
   GestureHandlerGestureEvent,
-  GestureHandlerStateChangeEvent,
   // Event payloads
   GestureHandlerGestureEventNativeEvent,
+  GestureHandlerStateChangeEvent,
   GestureHandlerStateChangeNativeEvent,
-  NativeViewGestureHandlerGestureEvent,
-  NativeViewGestureHandlerStateChangeEvent,
-  TapGestureHandlerGestureEvent,
-  TapGestureHandlerStateChangeEvent,
-  ForceTouchGestureHandlerGestureEvent,
-  ForceTouchGestureHandlerStateChangeEvent,
+  LegacyBaseButtonProperties,
+  LegacyBorderlessButtonProperties,
+  // Buttons props
+  LegacyRawButtonProperties,
+  LegacyRectButtonProperties,
   LongPressGestureHandlerGestureEvent,
+  LongPressGestureHandlerProperties,
   LongPressGestureHandlerStateChangeEvent,
+  NativeViewGestureHandlerGestureEvent,
+  // Handlers props
+  NativeViewGestureHandlerProperties,
+  NativeViewGestureHandlerStateChangeEvent,
   PanGestureHandlerGestureEvent,
+  PanGestureHandlerProperties,
   PanGestureHandlerStateChangeEvent,
   PinchGestureHandlerGestureEvent,
+  PinchGestureHandlerProperties,
   PinchGestureHandlerStateChangeEvent,
   RotationGestureHandlerGestureEvent,
+  RotationGestureHandlerProperties,
   RotationGestureHandlerStateChangeEvent,
-  FlingGestureHandlerGestureEvent,
-  FlingGestureHandlerStateChangeEvent,
-  // Handlers props
-  NativeViewGestureHandlerProperties,
+  TapGestureHandlerGestureEvent,
   TapGestureHandlerProperties,
-  LongPressGestureHandlerProperties,
-  PanGestureHandlerProperties,
-  PinchGestureHandlerProperties,
-  RotationGestureHandlerProperties,
-  FlingGestureHandlerProperties,
-  ForceTouchGestureHandlerProperties,
-  // Buttons props
-  LegacyRawButtonProperties,
-  LegacyBaseButtonProperties,
-  LegacyRectButtonProperties,
-  LegacyBorderlessButtonProperties,
+  TapGestureHandlerStateChangeEvent,
 } from './handlers/gestureHandlerTypesCompat';
-
+export type { FlingGestureType as LegacyFlingGesture } from './handlers/gestures/flingGesture';
+export type { ForceTouchGestureChangeEventPayload } from './handlers/gestures/forceTouchGesture';
+export type { ForceTouchGestureType as LegacyForceTouchGesture } from './handlers/gestures/forceTouchGesture';
+export type { GestureType } from './handlers/gestures/gesture';
 export type {
-  PressableProps,
-  LegacyPressableProps,
-  PressableStateCallbackType,
-} from './components/Pressable';
-export { default as LegacyPressable } from './components/Pressable';
-
+  ComposedGestureType as LegacyComposedGesture,
+  ExclusiveGestureType as LegacyExclusiveGesture,
+  RaceGestureType as LegacyRaceGesture,
+  SimultaneousGestureType as LegacySimultaneousGesture,
+} from './handlers/gestures/gestureComposition';
+export { GestureObjects as Gesture } from './handlers/gestures/gestureObjects';
+export type { GestureStateManagerType as LegacyGestureStateManager } from './handlers/gestures/gestureStateManager';
+export type { HoverGestureType as LegacyHoverGesture } from './handlers/gestures/hoverGesture';
+export { HoverEffect } from './handlers/gestures/hoverGesture';
+export type { LongPressGestureType as LegacyLongPressGesture } from './handlers/gestures/longPressGesture';
+export type { ManualGestureType as LegacyManualGesture } from './handlers/gestures/manualGesture';
+export type { PanGestureChangeEventPayload } from './handlers/gestures/panGesture';
+export type { PanGestureType as LegacyPanGesture } from './handlers/gestures/panGesture';
+export type { PinchGestureChangeEventPayload } from './handlers/gestures/pinchGesture';
+export type { PinchGestureType as LegacyPinchGesture } from './handlers/gestures/pinchGesture';
+export type { RotationGestureType as LegacyRotationGesture } from './handlers/gestures/rotationGesture';
+export type { TapGestureType as LegacyTapGesture } from './handlers/gestures/tapGesture';
+export type { LongPressGestureHandlerProps } from './handlers/LongPressGestureHandler';
+export { LongPressGestureHandler } from './handlers/LongPressGestureHandler';
+export type { NativeViewGestureHandlerProps } from './handlers/NativeViewGestureHandler';
+export { NativeViewGestureHandler } from './handlers/NativeViewGestureHandler';
+export type { PanGestureHandlerProps } from './handlers/PanGestureHandler';
+export { PanGestureHandler } from './handlers/PanGestureHandler';
+export type { PinchGestureHandlerProps } from './handlers/PinchGestureHandler';
+export { PinchGestureHandler } from './handlers/PinchGestureHandler';
+export type { RotationGestureHandlerProps } from './handlers/RotationGestureHandler';
+export { RotationGestureHandler } from './handlers/RotationGestureHandler';
+export type { TapGestureHandlerProps } from './handlers/TapGestureHandler';
+export { TapGestureHandler } from './handlers/TapGestureHandler';
+export { PointerType } from './PointerType';
+export { State } from './State';
 export * from './v3';
 
 initialize();

package/src/jestUtils/index.ts

@@ -1 +1 @@
-export { getByGestureTestId, fireGestureHandler } from './jestUtils';
+export { fireGestureHandler, getByGestureTestId } from './jestUtils';