From 8b338fb2e02e9f5af9207f4c3a3f5efaf605efd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Bert?= Date: Wed, 19 Feb 2025 14:26:20 +0100 Subject: [PATCH] Remove circular dependency --- src/components/touchables/ExtraButtonProps.ts | 7 +++++++ src/components/touchables/GenericTouchableProps.ts | 4 ++-- .../touchables/TouchableNativeFeedbackProps.tsx | 10 ++-------- 3 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 src/components/touchables/ExtraButtonProps.ts diff --git a/src/components/touchables/ExtraButtonProps.ts b/src/components/touchables/ExtraButtonProps.ts new file mode 100644 index 0000000000..0658560482 --- /dev/null +++ b/src/components/touchables/ExtraButtonProps.ts @@ -0,0 +1,7 @@ +export type ExtraButtonProps = { + borderless?: boolean; + rippleColor?: number | string | null; + rippleRadius?: number | null; + foreground?: boolean; + exclusive?: boolean; +}; diff --git a/src/components/touchables/GenericTouchableProps.ts b/src/components/touchables/GenericTouchableProps.ts index 3824760164..667acbe36c 100644 --- a/src/components/touchables/GenericTouchableProps.ts +++ b/src/components/touchables/GenericTouchableProps.ts @@ -5,7 +5,7 @@ import type { Insets, } from 'react-native'; import type { UserSelect } from '../../handlers/gestureHandlerCommon'; -import type { TouchableNativeFeedbackExtraProps } from './TouchableNativeFeedbackProps'; +import { ExtraButtonProps } from './ExtraButtonProps'; export interface GenericTouchableProps extends Omit { @@ -24,5 +24,5 @@ export interface GenericTouchableProps containerStyle?: StyleProp; hitSlop?: Insets | number; userSelect?: UserSelect; - extraButtonProps?: TouchableNativeFeedbackExtraProps; + extraButtonProps?: ExtraButtonProps; } diff --git a/src/components/touchables/TouchableNativeFeedbackProps.tsx b/src/components/touchables/TouchableNativeFeedbackProps.tsx index bbb51ee012..f5d12cf14e 100644 --- a/src/components/touchables/TouchableNativeFeedbackProps.tsx +++ b/src/components/touchables/TouchableNativeFeedbackProps.tsx @@ -1,14 +1,8 @@ import type { TouchableNativeFeedbackProps as RNTouchableNativeFeedbackProps } from 'react-native'; import type { GenericTouchableProps } from './GenericTouchableProps'; +import { ExtraButtonProps } from './ExtraButtonProps'; -export type TouchableNativeFeedbackExtraProps = { - borderless?: boolean; - rippleColor?: number | string | null; - rippleRadius?: number | null; - foreground?: boolean; - exclusive?: boolean; -}; - +export type TouchableNativeFeedbackExtraProps = ExtraButtonProps; /** * @deprecated TouchableNativeFeedback will be removed in the future version of Gesture Handler. Use Pressable instead. */