react-native-gesture-handler 3.0.0-beta.2 → 3.0.0-beta.4

package/src/handlers/gestures/tapGesture.ts

@@ -1,7 +1,11 @@
-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';
 
+/**
+ * @deprecated `TapGesture` is deprecated and will be removed in the future. Please use `useTapGesture` instead.
+ */
 export class TapGesture extends BaseGesture<TapGestureHandlerEventPayload> {
   public override config: BaseGestureConfig & TapGestureConfig = {};
 
@@ -83,4 +87,7 @@ export class TapGesture extends BaseGesture<TapGestureHandlerEventPayload> {
   }
 }
 
+/**
+ * @deprecated `TapGestureType` is deprecated and will be removed in the future. Please use `TapGesture` instead.
+ */
 export type TapGestureType = InstanceType<typeof TapGesture>;

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,159 +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 legacy_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,
-} 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';

package/src/jestUtils/jestUtils.ts

@@ -1,33 +1,16 @@
 import invariant from 'invariant';
 import { DeviceEventEmitter } from 'react-native';
-import { ReactTestInstance } from 'react-test-renderer';
-import {
-  FlingGestureHandler,
-  flingHandlerName,
-} from '../handlers/FlingGestureHandler';
-import {
-  ForceTouchGestureHandler,
-  forceTouchHandlerName,
-} from '../handlers/ForceTouchGestureHandler';
-import {
+import type { ReactTestInstance } from 'react-test-renderer';
+
+import type { FlingGestureHandler } from '../handlers/FlingGestureHandler';
+import { flingHandlerName } from '../handlers/FlingGestureHandler';
+import type { ForceTouchGestureHandler } from '../handlers/ForceTouchGestureHandler';
+import { forceTouchHandlerName } from '../handlers/ForceTouchGestureHandler';
+import type {
   BaseGestureHandlerProps,
   GestureEvent,
   HandlerStateChangeEvent,
 } from '../handlers/gestureHandlerCommon';
-import { FlingGesture } from '../handlers/gestures/flingGesture';
-import { ForceTouchGesture } from '../handlers/gestures/forceTouchGesture';
-import { BaseGesture, GestureType } from '../handlers/gestures/gesture';
-import { LongPressGesture } from '../handlers/gestures/longPressGesture';
-import { NativeGesture } from '../handlers/gestures/nativeGesture';
-import { PanGesture } from '../handlers/gestures/panGesture';
-import { PinchGesture } from '../handlers/gestures/pinchGesture';
-import { RotationGesture } from '../handlers/gestures/rotationGesture';
-import { TapGesture } from '../handlers/gestures/tapGesture';
-import { findHandlerByTestID } from '../handlers/handlersRegistry';
-import {
-  LongPressGestureHandler,
-  longPressHandlerName,
-} from '../handlers/LongPressGestureHandler';
 import type {
   FlingGestureHandlerEventPayload,
   ForceTouchGestureHandlerEventPayload,
@@ -38,30 +21,33 @@ import type {
   RotationGestureHandlerEventPayload,
   TapGestureHandlerEventPayload,
 } from '../handlers/GestureHandlerEventPayload';
-import {
-  NativeViewGestureHandler,
-  nativeViewHandlerName,
-} from '../handlers/NativeViewGestureHandler';
-import {
-  PanGestureHandler,
-  panHandlerName,
-} from '../handlers/PanGestureHandler';
-import {
-  PinchGestureHandler,
-  pinchHandlerName,
-} from '../handlers/PinchGestureHandler';
-import {
-  RotationGestureHandler,
-  rotationHandlerName,
-} from '../handlers/RotationGestureHandler';
-import {
-  TapGestureHandler,
-  tapHandlerName,
-} from '../handlers/TapGestureHandler';
+import type { FlingGesture } from '../handlers/gestures/flingGesture';
+import type { ForceTouchGesture } from '../handlers/gestures/forceTouchGesture';
+import type { GestureType } from '../handlers/gestures/gesture';
+import { BaseGesture } from '../handlers/gestures/gesture';
+import type { LongPressGesture } from '../handlers/gestures/longPressGesture';
+import type { NativeGesture } from '../handlers/gestures/nativeGesture';
+import type { PanGesture } from '../handlers/gestures/panGesture';
+import type { PinchGesture } from '../handlers/gestures/pinchGesture';
+import type { RotationGesture } from '../handlers/gestures/rotationGesture';
+import type { TapGesture } from '../handlers/gestures/tapGesture';
+import { findHandlerByTestID } from '../handlers/handlersRegistry';
+import type { LongPressGestureHandler } from '../handlers/LongPressGestureHandler';
+import { longPressHandlerName } from '../handlers/LongPressGestureHandler';
+import type { NativeViewGestureHandler } from '../handlers/NativeViewGestureHandler';
+import { nativeViewHandlerName } from '../handlers/NativeViewGestureHandler';
+import type { PanGestureHandler } from '../handlers/PanGestureHandler';
+import { panHandlerName } from '../handlers/PanGestureHandler';
+import type { PinchGestureHandler } from '../handlers/PinchGestureHandler';
+import { pinchHandlerName } from '../handlers/PinchGestureHandler';
+import type { RotationGestureHandler } from '../handlers/RotationGestureHandler';
+import { rotationHandlerName } from '../handlers/RotationGestureHandler';
+import type { TapGestureHandler } from '../handlers/TapGestureHandler';
+import { tapHandlerName } from '../handlers/TapGestureHandler';
 import { State } from '../State';
 import { hasProperty, withPrevAndCurrent } from '../utils';
-import type { SingleGesture } from '../v3/types';
 import { maybeUnpackValue } from '../v3/hooks/utils';
+import type { SingleGesture } from '../v3/types';
 
 // Load fireEvent conditionally, so RNGH may be used in setups without testing-library
 let fireEvent = (
@@ -166,14 +152,17 @@ const handlersDefaultEvents: DefaultEventsMapping = {
 };
 
 function isGesture(
-  componentOrGesture: ReactTestInstance | GestureType | SingleGesture<any, any>
+  componentOrGesture:
+    | ReactTestInstance
+    | GestureType
+    | SingleGesture<any, any, any>
 ): componentOrGesture is GestureType {
   return componentOrGesture instanceof BaseGesture;
 }
 
 function isHookGesture(
-  componentOrGesture: ReactTestInstance | SingleGesture<any, any>
-): componentOrGesture is SingleGesture<any, any> {
+  componentOrGesture: ReactTestInstance | SingleGesture<any, any, any>
+): componentOrGesture is SingleGesture<any, any, any> {
   return 'detectorCallbacks' in componentOrGesture;
 }
 
@@ -416,7 +405,10 @@ interface HandlerData {
   enabled: boolean | undefined;
 }
 function getHandlerData(
-  componentOrGesture: ReactTestInstance | GestureType | SingleGesture<any, any>
+  componentOrGesture:
+    | ReactTestInstance
+    | GestureType
+    | SingleGesture<any, any, any>
 ): HandlerData {
   if (isGesture(componentOrGesture)) {
     const gesture = componentOrGesture;
@@ -500,7 +492,10 @@ type ExtractConfig<T> =
       : Record<string, unknown>;
 
 export function fireGestureHandler<THandler extends AllGestures | AllHandlers>(
-  componentOrGesture: ReactTestInstance | GestureType | SingleGesture<any, any>,
+  componentOrGesture:
+    | ReactTestInstance
+    | GestureType
+    | SingleGesture<any, any, any>,
   eventList: Partial<GestureHandlerTestEvent<ExtractConfig<THandler>>>[] = []
 ): void {
   const { emitEvent, handlerType, handlerTag, enabled } =

package/src/mocks/GestureButtons.tsx

@@ -1,10 +1,14 @@
 import React from 'react';
 import { TouchableNativeFeedback, View } from 'react-native';
-export const RawButton = ({ enabled, ...rest }: any) => (
+
+const RawButton = ({ enabled, children, ...rest }: any) => (
   <TouchableNativeFeedback disabled={enabled === false} {...rest}>
-    <View />
+    {children ?? <View />}
   </TouchableNativeFeedback>
 );
-export const BaseButton = RawButton;
-export const RectButton = RawButton;
-export const BorderlessButton = TouchableNativeFeedback;
+
+export const LegacyRawButton = RawButton;
+export const LegacyBaseButton = RawButton;
+export const LegacyRectButton = RawButton;
+export const LegacyBorderlessButton = RawButton;
+export const LegacyPureNativeButton = RawButton;

package/src/mocks/Touchables.tsx

@@ -0,0 +1,6 @@
+export {
+  TouchableHighlight,
+  TouchableNativeFeedback,
+  TouchableOpacity,
+  TouchableWithoutFeedback,
+} from 'react-native';

package/src/mocks/gestureComponents.tsx

@@ -1,23 +1,8 @@
-import {
-  TouchableHighlight,
-  TouchableNativeFeedback,
-  TouchableOpacity,
-  TouchableWithoutFeedback,
-  ScrollView,
-  FlatList,
-  Switch,
-  TextInput,
-  DrawerLayoutAndroid,
+export {
+  DrawerLayoutAndroid as LegacyDrawerLayoutAndroid,
+  FlatList as LegacyFlatList,
+  RefreshControl as LegacyRefreshControl,
+  ScrollView as LegacyScrollView,
+  Switch as LegacySwitch,
+  TextInput as LegacyTextInput,
 } from 'react-native';
-
-export default {
-  TouchableHighlight,
-  TouchableNativeFeedback,
-  TouchableOpacity,
-  TouchableWithoutFeedback,
-  ScrollView,
-  FlatList,
-  Switch,
-  TextInput,
-  DrawerLayoutAndroid,
-} as const;

package/src/mountRegistry.ts

@@ -1,4 +1,4 @@
-import { GestureType } from './handlers/gestures/gesture';
+import type { GestureType } from './handlers/gestures/gesture';
 
 interface ReactComponentWithHandlerTag extends React.Component {
   handlerTag: number;

package/src/specs/NativeRNGestureHandlerModule.ts

@@ -1,5 +1,6 @@
-import { TurboModuleRegistry, TurboModule } from 'react-native';
-import { Double } from 'react-native/Libraries/Types/CodegenTypes';
+import type { TurboModule } from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
+import type { Double } from 'react-native/Libraries/Types/CodegenTypes';
 
 export interface Spec extends TurboModule {
   // This method returns a boolean only to force the codegen to generate

package/src/specs/RNGestureHandlerButtonNativeComponent.ts

@@ -1,10 +1,10 @@
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import type { ColorValue, ViewProps } from 'react-native';
 import type {
+  Float,
   Int32,
   WithDefault,
-  Float,
 } from 'react-native/Libraries/Types/CodegenTypes';
-import type { ViewProps, ColorValue } from 'react-native';
+import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
 
 // @ts-ignore - Redefining pointerEvents with WithDefault for codegen, conflicts with ViewProps type but codegen needs it
 interface NativeProps extends ViewProps {
@@ -15,13 +15,56 @@ interface NativeProps extends ViewProps {
   rippleColor?: ColorValue;
   rippleRadius?: Int32;
   touchSoundDisabled?: WithDefault<boolean, false>;
-  borderWidth?: Float;
-  borderColor?: ColorValue;
-  borderStyle?: WithDefault<string, 'solid'>;
   pointerEvents?: WithDefault<
     'box-none' | 'none' | 'box-only' | 'auto',
     'auto'
   >;
+  pressAndHoldAnimationDuration?: WithDefault<Int32, -1>;
+  tapAnimationDuration?: WithDefault<Int32, 100>;
+  activeOpacity?: WithDefault<Float, 1>;
+  activeScale?: WithDefault<Float, 1>;
+  activeUnderlayOpacity?: WithDefault<Float, 0>;
+  defaultOpacity?: WithDefault<Float, 1>;
+  defaultScale?: WithDefault<Float, 1>;
+  defaultUnderlayOpacity?: WithDefault<Float, 0>;
+  underlayColor?: ColorValue;
+
+  // Border style
+  borderWidth?: Float;
+  borderColor?: ColorValue;
+  borderStyle?: WithDefault<string, 'solid'>;
+  overflow?: WithDefault<string, 'visible'>;
+
+  // Border width per-edge
+  borderLeftWidth?: Float;
+  borderRightWidth?: Float;
+  borderTopWidth?: Float;
+  borderBottomWidth?: Float;
+  borderStartWidth?: Float;
+  borderEndWidth?: Float;
+
+  // Border color per-edge
+  borderLeftColor?: ColorValue;
+  borderRightColor?: ColorValue;
+  borderTopColor?: ColorValue;
+  borderBottomColor?: ColorValue;
+  borderStartColor?: ColorValue;
+  borderEndColor?: ColorValue;
+  borderBlockColor?: ColorValue;
+  borderBlockEndColor?: ColorValue;
+  borderBlockStartColor?: ColorValue;
+
+  // Border radius — logical variants beyond what ViewProps provides
+  // WithDefault -1 so the codegen sends -1 (our "unset" sentinel) instead of 0
+  // when the prop is absent, letting physical / general radii take effect.
+  borderTopStartRadius?: WithDefault<Float, -1>;
+  borderTopEndRadius?: WithDefault<Float, -1>;
+  borderBottomStartRadius?: WithDefault<Float, -1>;
+  borderBottomEndRadius?: WithDefault<Float, -1>;
+  borderEndEndRadius?: WithDefault<Float, -1>;
+  borderEndStartRadius?: WithDefault<Float, -1>;
+  borderStartEndRadius?: WithDefault<Float, -1>;
+  borderStartStartRadius?: WithDefault<Float, -1>;
 }
 
 export default codegenNativeComponent<NativeProps>('RNGestureHandlerButton');