From 7bcae812997f669de5803cc781dcf3ea65baf0e9 Mon Sep 17 00:00:00 2001 From: Tim Yung Date: Wed, 27 Nov 2019 01:44:39 -0800 Subject: [PATCH] RN: Stop Exporting TouchableWithoutFeedback Props Summary: Changes `TouchableWithoutFeedback` so that `Props` is no longer exported as a Flow type. Instead, other modules should use `React.ElementConfig`. Changelog: [General] [Removed] - TouchableWithoutFeedback no longer exports Props. Use React.ElementConfig, instead. Reviewed By: zackargyle, TheSavior Differential Revision: D18718131 fbshipit-source-id: 0bd63123c49564fdab160d5fc8e7f1bf86da1fbe --- Libraries/Components/Touchable/TouchableBounce.js | 4 ++-- Libraries/Components/Touchable/TouchableHighlight.js | 4 ++-- Libraries/Components/Touchable/TouchableNativeFeedback.js | 4 ++-- Libraries/Components/Touchable/TouchableOpacity.js | 4 ++-- Libraries/Components/Touchable/TouchableWithoutFeedback.js | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Libraries/Components/Touchable/TouchableBounce.js b/Libraries/Components/Touchable/TouchableBounce.js index cf63a22cb9a..76ec665d351 100644 --- a/Libraries/Components/Touchable/TouchableBounce.js +++ b/Libraries/Components/Touchable/TouchableBounce.js @@ -14,12 +14,12 @@ import Pressability from '../../Pressability/Pressability.js'; import {PressabilityDebugView} from '../../Pressability/PressabilityDebug.js'; import type {ViewStyleProp} from '../../StyleSheet/StyleSheet.js'; import TVTouchable from './TVTouchable.js'; -import type {Props as TouchableWithoutFeedbackProps} from './TouchableWithoutFeedback.js'; +import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback.js'; import {Animated, Platform} from 'react-native'; import * as React from 'react'; type Props = $ReadOnly<{| - ...TouchableWithoutFeedbackProps, + ...React.ElementConfig, onPressAnimationComplete?: ?() => void, onPressWithCompletion?: ?(callback: () => void) => void, diff --git a/Libraries/Components/Touchable/TouchableHighlight.js b/Libraries/Components/Touchable/TouchableHighlight.js index 231ff7b298f..7b293300a3e 100644 --- a/Libraries/Components/Touchable/TouchableHighlight.js +++ b/Libraries/Components/Touchable/TouchableHighlight.js @@ -15,7 +15,7 @@ import {PressabilityDebugView} from '../../Pressability/PressabilityDebug.js'; import type {ViewStyleProp} from '../../StyleSheet/StyleSheet.js'; import type {ColorValue} from '../../StyleSheet/StyleSheetTypes.js'; import TVTouchable from './TVTouchable.js'; -import type {Props as TouchableWithoutFeedbackProps} from './TouchableWithoutFeedback.js'; +import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback.js'; import {Platform, StyleSheet, View} from 'react-native'; import * as React from 'react'; @@ -32,7 +32,7 @@ type IOSProps = $ReadOnly<{| |}>; type Props = $ReadOnly<{| - ...TouchableWithoutFeedbackProps, + ...React.ElementConfig, ...AndroidProps, ...IOSProps, diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.js b/Libraries/Components/Touchable/TouchableNativeFeedback.js index 2b54b95c076..4003c97d146 100644 --- a/Libraries/Components/Touchable/TouchableNativeFeedback.js +++ b/Libraries/Components/Touchable/TouchableNativeFeedback.js @@ -13,7 +13,7 @@ import Pressability from '../../Pressability/Pressability.js'; import {PressabilityDebugView} from '../../Pressability/PressabilityDebug.js'; import TVTouchable from './TVTouchable.js'; -import type {Props as TouchableWithoutFeedbackProps} from './TouchableWithoutFeedback.js'; +import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback.js'; import {Commands} from 'react-native/Libraries/Components/View/ViewNativeComponent'; import ReactNative from 'react-native/Libraries/Renderer/shims/ReactNative'; import type {PressEvent} from 'react-native/Libraries/Types/CoreEventTypes'; @@ -21,7 +21,7 @@ import {Platform, View, processColor} from 'react-native'; import * as React from 'react'; type Props = $ReadOnly<{| - ...TouchableWithoutFeedbackProps, + ...React.ElementConfig, /** * Determines the type of background drawable that's going to be used to diff --git a/Libraries/Components/Touchable/TouchableOpacity.js b/Libraries/Components/Touchable/TouchableOpacity.js index f06475dc98b..bf61e54c2a2 100644 --- a/Libraries/Components/Touchable/TouchableOpacity.js +++ b/Libraries/Components/Touchable/TouchableOpacity.js @@ -13,7 +13,7 @@ import Pressability from '../../Pressability/Pressability.js'; import {PressabilityDebugView} from '../../Pressability/PressabilityDebug.js'; import TVTouchable from './TVTouchable.js'; -import type {Props as TouchableWithoutFeedbackProps} from './TouchableWithoutFeedback.js'; +import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback.js'; import Animated from 'react-native/Libraries/Animated/src/Animated'; import Easing from 'react-native/Libraries/Animated/src/Easing'; import type {ViewStyleProp} from 'react-native/Libraries/StyleSheet/StyleSheet'; @@ -31,7 +31,7 @@ type TVProps = $ReadOnly<{| |}>; type Props = $ReadOnly<{| - ...TouchableWithoutFeedbackProps, + ...React.ElementConfig, ...TVProps, activeOpacity?: ?number, diff --git a/Libraries/Components/Touchable/TouchableWithoutFeedback.js b/Libraries/Components/Touchable/TouchableWithoutFeedback.js index 7db2a540204..58f47e23b65 100755 --- a/Libraries/Components/Touchable/TouchableWithoutFeedback.js +++ b/Libraries/Components/Touchable/TouchableWithoutFeedback.js @@ -30,7 +30,7 @@ import type { import {Platform, View} from 'react-native'; import * as React from 'react'; -export type Props = $ReadOnly<{| +type Props = $ReadOnly<{| accessibilityActions?: ?$ReadOnlyArray, accessibilityElementsHidden?: ?boolean, accessibilityHint?: ?Stringish,