Revert D110488985: Remove Touchable (base) from public API

Differential Revision:
D110488985

Original commit changeset: 394e3996bb45

Original Phabricator Diff: D110488985

fbshipit-source-id: c22ca419b749bceaa63f9978d2f9b2a37a8a383c

Author: EmersonB

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<<e85dfe98c549ac9fff85a8d7b90b5fd3>>
+ * @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>,
 ) => 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<TouchableOpacityInstance>
@@ -457,6 +468,33 @@ declare const TouchableHighlight_default: (
     ref?: React.Ref<TouchableHighlightInstance>
   },
 ) => 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

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<React.ComponentRef<typeof TouchableHighlight>>();
 

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. */

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,