From 5d6776b685c581ecfb8aaba49904b819a09ec9cf Mon Sep 17 00:00:00 2001 From: Emerson Berlik Date: Tue, 7 Jul 2026 12:53:27 -0700 Subject: [PATCH] Revert D110488985: Remove Touchable (base) from public API Differential Revision: D110488985 Original commit changeset: 394e3996bb45 Original Phabricator Diff: D110488985 fbshipit-source-id: c22ca419b749bceaa63f9978d2f9b2a37a8a383c --- packages/react-native/ReactNativeApi.d.ts | 51 ++++++++++++++++++- packages/react-native/__typetests__/index.tsx | 17 +++++++ packages/react-native/index.js | 18 ++----- packages/react-native/index.js.flow | 2 + 4 files changed, 72 insertions(+), 16 deletions(-) diff --git a/packages/react-native/ReactNativeApi.d.ts b/packages/react-native/ReactNativeApi.d.ts index c4a2d4ff0be..b5cdeaf1175 100644 --- a/packages/react-native/ReactNativeApi.d.ts +++ b/packages/react-native/ReactNativeApi.d.ts @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<> + * @generated SignedSource<<637f1d0b012ebca68c9e020a52eb2803>> * * This file was generated by scripts/js-api/build-types/index.js. */ @@ -403,6 +403,16 @@ declare const staggerImpl: ( time: number, animations: Array, ) => CompositeAnimation +declare const States: { + ERROR: "ERROR" + NOT_RESPONDER: "NOT_RESPONDER" + RESPONDER_ACTIVE_LONG_PRESS_IN: "RESPONDER_ACTIVE_LONG_PRESS_IN" + RESPONDER_ACTIVE_LONG_PRESS_OUT: "RESPONDER_ACTIVE_LONG_PRESS_OUT" + RESPONDER_ACTIVE_PRESS_IN: "RESPONDER_ACTIVE_PRESS_IN" + RESPONDER_ACTIVE_PRESS_OUT: "RESPONDER_ACTIVE_PRESS_OUT" + RESPONDER_INACTIVE_PRESS_IN: "RESPONDER_INACTIVE_PRESS_IN" + RESPONDER_INACTIVE_PRESS_OUT: "RESPONDER_INACTIVE_PRESS_OUT" +} declare const subtract: typeof $$AnimatedImplementation.subtract declare const subtractImpl: ( a: AnimatedNode_default | number, @@ -446,6 +456,7 @@ declare const ToastAndroid_default: { yOffset: number, ) => void } +declare const Touchable: typeof TouchableImpl_default declare const Touchable_default: ( props: TouchableOpacityProps & { ref?: React.Ref @@ -457,6 +468,33 @@ declare const TouchableHighlight_default: ( ref?: React.Ref }, ) => React.ReactNode +declare const TouchableImpl_default: { + Mixin: typeof TouchableMixinImpl + renderDebugView: ($$PARAM_0$$: { + color: ColorValue + hitSlop?: EdgeInsetsProp + }) => null | React.ReactNode +} +declare const TouchableMixinImpl: { + withoutDefaultFocusAndBlur: {} + componentDidMount: () => void + componentWillUnmount: () => void + touchableGetInitialState: () => { + touchable: { + responderID: GestureResponderEvent["currentTarget"] | undefined + touchState: TouchableState | undefined + } + } + touchableHandleBlur: (e: BlurEvent) => void + touchableHandleFocus: (e: FocusEvent) => void + touchableHandleResponderGrant: (e: GestureResponderEvent) => void + touchableHandleResponderMove: (e: GestureResponderEvent) => void + touchableHandleResponderRelease: (e: GestureResponderEvent) => void + touchableHandleResponderTerminate: (e: GestureResponderEvent) => void + touchableHandleResponderTerminationRequest: () => any + touchableHandleStartShouldSetResponder: () => any + touchableLongPressCancelsPress: () => boolean +} declare const TouchableOpacity: typeof Touchable_default declare const UIManager: typeof UIManager_default declare const UIManager_default: UIManagerJSInterface @@ -5333,6 +5371,7 @@ declare type TimingAnimationConfig = Readonly< } > declare type ToastAndroid = typeof ToastAndroid +declare type Touchable = typeof Touchable declare type TouchableHighlight = typeof TouchableHighlight declare type TouchableHighlightBaseProps = { readonly activeOpacity?: number @@ -5439,6 +5478,15 @@ declare type TouchableOpacityTVProps = { readonly nextFocusRight?: number readonly nextFocusUp?: number } +declare type TouchableState = + | typeof States.ERROR + | typeof States.NOT_RESPONDER + | typeof States.RESPONDER_ACTIVE_LONG_PRESS_IN + | typeof States.RESPONDER_ACTIVE_LONG_PRESS_OUT + | typeof States.RESPONDER_ACTIVE_PRESS_IN + | typeof States.RESPONDER_ACTIVE_PRESS_OUT + | typeof States.RESPONDER_INACTIVE_PRESS_IN + | typeof States.RESPONDER_INACTIVE_PRESS_OUT declare function TouchableWithoutFeedback( props: TouchableWithoutFeedbackProps, ): React.ReactNode @@ -6126,6 +6174,7 @@ export { TextProps, // 58466ea1 TextStyle, // b62b8399 ToastAndroid, // 88a8969a + Touchable, // c15da0a2 TouchableHighlight, // 20ba0199 TouchableHighlightInstance, // b510c0eb TouchableHighlightProps, // 337a9164 diff --git a/packages/react-native/__typetests__/index.tsx b/packages/react-native/__typetests__/index.tsx index 54ea8b7694b..1df236c3bc7 100644 --- a/packages/react-native/__typetests__/index.tsx +++ b/packages/react-native/__typetests__/index.tsx @@ -124,6 +124,7 @@ import { // @ts-ignore SectionListData, ToastAndroid, + Touchable, LayoutAnimation, processColor, experimental_LayoutConformance as LayoutConformance, @@ -486,6 +487,22 @@ class Welcome extends React.Component< export default Welcome; +// TouchableTest +function TouchableTest() { + function basicUsage() { + return Touchable.renderDebugView({ + color: 'mediumspringgreen', + hitSlop: {bottom: 5, top: 5}, + }); + } + + function defaultHitSlop() { + return Touchable.renderDebugView({ + color: 'red', + }); + } +} + export class TouchableHighlightTest extends React.Component { buttonRef = React.createRef>(); diff --git a/packages/react-native/index.js b/packages/react-native/index.js index 0fb660e9aaf..201ee115755 100644 --- a/packages/react-native/index.js +++ b/packages/react-native/index.js @@ -149,6 +149,9 @@ module.exports = { get TextInput() { return require('./Libraries/Components/TextInput/TextInput').default; }, + get Touchable() { + return require('./Libraries/Components/Touchable/Touchable').default; + }, get TouchableHighlight() { return require('./Libraries/Components/Touchable/TouchableHighlight') .default; @@ -409,21 +412,6 @@ module.exports = { // #endregion } as ReactNativePublicAPI; -// `Touchable` has been removed from the public API types, but remains -// re-exported at runtime here because of a hanging `react-native-svg` call -// site (fbsource). -// TODO(huntie): Remove this re-export once `react-native-svg` is updated. -/* $FlowFixMe[prop-missing] This is intentional: `Touchable` is a value-only - * re-export that is absent from the public API types. */ -/* $FlowFixMe[invalid-export] This is intentional: `Touchable` is a value-only - * re-export that is absent from the public API types. */ -Object.defineProperty(module.exports, 'Touchable', { - configurable: true, - get() { - return require('./Libraries/Components/Touchable/Touchable').default; - }, -}); - if (__DEV__) { /* $FlowFixMe[prop-missing] This is intentional: Flow will error when * attempting to access InteractionManager. */ diff --git a/packages/react-native/index.js.flow b/packages/react-native/index.js.flow index 51e4a54e055..9869ed8c590 100644 --- a/packages/react-native/index.js.flow +++ b/packages/react-native/index.js.flow @@ -175,6 +175,8 @@ export type { } from './Libraries/Components/TextInput/TextInput'; export {default as TextInput} from './Libraries/Components/TextInput/TextInput'; +export {default as Touchable} from './Libraries/Components/Touchable/Touchable'; + export type { TouchableHighlightInstance, TouchableHighlightProps,