Skip to content

[General] Remove createNativeWrapper from Touchable #4138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
j-piasecki merged 2 commits into from
May 4, 2026
+28 −26
Merged

[General] Remove createNativeWrapper from Touchable #4138

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bc6e76
Remove createNativeWrapper from Touchable
j-piasecki Apr 30, 2026
113af3d
Pass props
j-piasecki Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions packages/react-native-gesture-handler/src/v3/components/Touchable/Touchable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,15 @@
import React, { useCallback, useRef } from 'react';
import { Platform } from 'react-native';

import type { ButtonProps } from '../../../components/GestureHandlerButton';
import GestureHandlerButton from '../../../components/GestureHandlerButton';
import createNativeWrapper from '../../createNativeWrapper';
import { NativeDetector } from '../../detectors/NativeDetector';
import { useNativeGesture } from '../../hooks';
import type {
CallbackEventType,
EndCallbackEventType,
TouchableProps,
} from './TouchableProps';

const TouchableButton = createNativeWrapper<
React.ComponentRef<typeof GestureHandlerButton>,
ButtonProps
>(GestureHandlerButton, {
shouldCancelWhenOutside: true,
shouldActivateOnStart: false,
disallowInterruption: true,
});

const isAndroid = Platform.OS === 'android';
const TRANSPARENT_RIPPLE = { rippleColor: 'transparent' as const };

Expand Down Expand Up @@ -135,6 +126,18 @@ export const Touchable = (props: TouchableProps) => {
[onPressIn, onPressOut]
);

const nativeGesture = useNativeGesture({
onBegin,
onActivate,
onFinalize,
onUpdate,
enabled: !disabled,
shouldCancelWhenOutside: cancelOnLeave,
disableReanimated: true,
shouldActivateOnStart: false,
disallowInterruption: true,
});
Comment thread
j-piasecki marked this conversation as resolved.

const rippleProps = shouldUseNativeRipple
? {
rippleColor: androidRipple?.color,
Expand All @@ -145,20 +148,17 @@ export const Touchable = (props: TouchableProps) => {
: TRANSPARENT_RIPPLE;

return (
<TouchableButton
{...rest}
{...rippleProps}
ref={ref ?? null}
enabled={!disabled}
onBegin={onBegin}
onActivate={onActivate}
onFinalize={onFinalize}
onUpdate={onUpdate}
defaultOpacity={defaultOpacity}
defaultUnderlayOpacity={defaultUnderlayOpacity}
underlayColor={underlayColor}
shouldCancelWhenOutside={cancelOnLeave}>
{children}
</TouchableButton>
<NativeDetector gesture={nativeGesture}>
<GestureHandlerButton
{...rest}
{...rippleProps}
ref={ref ?? null}
enabled={!disabled}
defaultOpacity={defaultOpacity}
defaultUnderlayOpacity={defaultUnderlayOpacity}
underlayColor={underlayColor}>
{children}
</GestureHandlerButton>
</NativeDetector>
);
};
Loading