From ff690283e0c8c81d436b7a96311ee2bfe4384658 Mon Sep 17 00:00:00 2001 From: simek Date: Fri, 19 Jun 2020 00:00:43 -0700 Subject: [PATCH] RNTester: remove 'supportsTVOS' flag (#29018) Summary: Refs: [0.62 release](https://reactnative.dev/blog/#moving-apple-tv-to-react-native-tvos), https://github.com/facebook/react-native/issues/28706, https://github.com/facebook/react-native/issues/28743 Support for the tvOS with the 0.62 release has been moved out to the `react-native-tvos` package. This PR removes the legacy flag related to the tvOS in the RNTester app examples. Since Android TV support is still included in the Core I assume that the TV platform check cannot be removed completely. ## Changelog [Internal] [Removed] - remove 'supportsTVOS' flag from the RNTester examples ## Test Plan I have used the local working copy of `react-native` repo and test the changes in the RNTester app build from this code. Flow and List checks passed (but there is one, unrelated Prettier issue in the `AlertExample.js` file). Pull Request resolved: https://github.com/facebook/react-native/pull/29018 Reviewed By: kacieb Differential Revision: D22109549 Pulled By: TheSavior fbshipit-source-id: d0f71f3d5f5f89d554972ec194ebf2801386fcff --- RNTester/js/components/RNTesterExampleList.js | 3 +- RNTester/js/types/RNTesterTypes.js | 1 - RNTester/js/utils/RNTesterList.ios.js | 65 ------------------- 3 files changed, 1 insertion(+), 68 deletions(-) diff --git a/RNTester/js/components/RNTesterExampleList.js b/RNTester/js/components/RNTesterExampleList.js index bbbfb764a7785e..6ac51c0dd39c63 100644 --- a/RNTester/js/components/RNTesterExampleList.js +++ b/RNTester/js/components/RNTesterExampleList.js @@ -110,8 +110,7 @@ const renderSectionHeader = ({section}) => ( class RNTesterExampleList extends React.Component { render(): React.Node { const filter = ({example, filterRegex}) => - filterRegex.test(example.module.title) && - (!Platform.isTV || example.supportsTVOS); + filterRegex.test(example.module.title) && !Platform.isTV; const sections = [ { diff --git a/RNTester/js/types/RNTesterTypes.js b/RNTester/js/types/RNTesterTypes.js index cd6a03c9fb18e0..7abf2f875b1390 100644 --- a/RNTester/js/types/RNTesterTypes.js +++ b/RNTester/js/types/RNTesterTypes.js @@ -43,5 +43,4 @@ export type RNTesterExampleModule = $ReadOnly<{| export type RNTesterExample = $ReadOnly<{| key: string, module: RNTesterExampleModule, - supportsTVOS?: boolean, |}>; diff --git a/RNTester/js/utils/RNTesterList.ios.js b/RNTester/js/utils/RNTesterList.ios.js index a3e6e4f71d1167..8e43dacf5415ac 100644 --- a/RNTester/js/utils/RNTesterList.ios.js +++ b/RNTester/js/utils/RNTesterList.ios.js @@ -16,27 +16,22 @@ const ComponentExamples: Array = [ { key: 'ActivityIndicatorExample', module: require('../examples/ActivityIndicator/ActivityIndicatorExample'), - supportsTVOS: true, }, { key: 'ButtonExample', module: require('../examples/Button/ButtonExample'), - supportsTVOS: true, }, { key: 'DatePickerIOSExample', module: require('../examples/DatePicker/DatePickerIOSExample'), - supportsTVOS: false, }, { key: 'FlatListExample', module: require('../examples/FlatList/FlatListExample'), - supportsTVOS: true, }, { key: 'ImageExample', module: require('../examples/Image/ImageExample'), - supportsTVOS: true, }, { key: 'JSResponderHandlerExample', @@ -45,132 +40,106 @@ const ComponentExamples: Array = [ { key: 'InputAccessoryViewExample', module: require('../examples/InputAccessoryView/InputAccessoryViewExample'), - supportsTVOS: true, }, { key: 'KeyboardAvoidingViewExample', module: require('../examples/KeyboardAvoidingView/KeyboardAvoidingViewExample'), - supportsTVOS: false, }, { key: 'LayoutEventsExample', module: require('../examples/Layout/LayoutEventsExample'), - supportsTVOS: true, }, { key: 'MaskedViewExample', module: require('../examples/MaskedView/MaskedViewExample'), - supportsTVOS: true, }, { key: 'ModalExample', module: require('../examples/Modal/ModalExample'), - supportsTVOS: true, }, { key: 'MultiColumnExample', module: require('../examples/MultiColumn/MultiColumnExample'), - supportsTVOS: true, }, { key: 'NewAppScreenExample', module: require('../examples/NewAppScreen/NewAppScreenExample'), - supportsTVOS: false, }, { key: 'PickerExample', module: require('../examples/Picker/PickerExample'), - supportsTVOS: false, }, { key: 'PickerIOSExample', module: require('../examples/Picker/PickerIOSExample'), - supportsTVOS: false, }, { key: 'PressableExample', module: require('../examples/Pressable/PressableExample'), - supportsTVOS: true, }, { key: 'ProgressViewIOSExample', module: require('../examples/ProgressViewIOS/ProgressViewIOSExample'), - supportsTVOS: true, }, { key: 'RefreshControlExample', module: require('../examples/RefreshControl/RefreshControlExample'), - supportsTVOS: false, }, { key: 'ScrollViewSimpleExample', module: require('../examples/ScrollView/ScrollViewSimpleExample'), - supportsTVOS: true, }, { key: 'SafeAreaViewExample', module: require('../examples/SafeAreaView/SafeAreaViewExample'), - supportsTVOS: true, }, { key: 'ScrollViewExample', module: require('../examples/ScrollView/ScrollViewExample'), - supportsTVOS: true, }, { key: 'ScrollViewAnimatedExample', module: require('../examples/ScrollView/ScrollViewAnimatedExample'), - supportsTVOS: true, }, { key: 'SectionListExample', module: require('../examples/SectionList/SectionListExample'), - supportsTVOS: true, }, { key: 'SegmentedControlIOSExample', module: require('../examples/SegmentedControlIOS/SegmentedControlIOSExample'), - supportsTVOS: false, }, { key: 'SliderExample', module: require('../examples/Slider/SliderExample'), - supportsTVOS: false, }, { key: 'StatusBarExample', module: require('../examples/StatusBar/StatusBarExample'), - supportsTVOS: false, }, { key: 'SwitchExample', module: require('../examples/Switch/SwitchExample'), - supportsTVOS: false, }, { key: 'TextExample', module: require('../examples/Text/TextExample.ios'), - supportsTVOS: true, }, { key: 'TextInputExample', module: require('../examples/TextInput/TextInputExample.ios'), - supportsTVOS: true, }, { key: 'TouchableExample', module: require('../examples/Touchable/TouchableExample'), - supportsTVOS: true, }, { key: 'TransparentHitTestExample', module: require('../examples/TransparentHitTest/TransparentHitTestExample'), - supportsTVOS: false, }, { key: 'ViewExample', module: require('../examples/View/ViewExample'), - supportsTVOS: true, }, ]; @@ -178,67 +147,54 @@ const APIExamples: Array = [ { key: 'AccessibilityExample', module: require('../examples/Accessibility/AccessibilityExample'), - supportsTVOS: false, }, { key: 'AccessibilityIOSExample', module: require('../examples/Accessibility/AccessibilityIOSExample'), - supportsTVOS: false, }, { key: 'ActionSheetIOSExample', module: require('../examples/ActionSheetIOS/ActionSheetIOSExample'), - supportsTVOS: true, }, { key: 'AlertIOSExample', module: require('../examples/Alert/AlertIOSExample'), - supportsTVOS: true, }, { key: 'AnimatedExample', module: require('../examples/Animated/AnimatedExample'), - supportsTVOS: true, }, { key: 'AnExApp', module: require('../examples/Animated/AnimatedGratuitousApp/AnExApp'), - supportsTVOS: true, }, { key: 'AppearanceExample', module: require('../examples/Appearance/AppearanceExample'), - supportsTVOS: false, }, { key: 'AppStateExample', module: require('../examples/AppState/AppStateExample'), - supportsTVOS: true, }, { key: 'AsyncStorageExample', module: require('../examples/AsyncStorage/AsyncStorageExample'), - supportsTVOS: true, }, { key: 'BorderExample', module: require('../examples/Border/BorderExample'), - supportsTVOS: true, }, { key: 'BoxShadowExample', module: require('../examples/BoxShadow/BoxShadowExample'), - supportsTVOS: true, }, { key: 'ClipboardExample', module: require('../examples/Clipboard/ClipboardExample'), - supportsTVOS: false, }, { key: 'CrashExample', module: require('../examples/Crash/CrashExample'), - supportsTVOS: false, }, { key: 'DevSettings', @@ -247,107 +203,86 @@ const APIExamples: Array = [ { key: 'Dimensions', module: require('../examples/Dimensions/DimensionsExample'), - supportsTVOS: true, }, { key: 'LayoutAnimationExample', module: require('../examples/Layout/LayoutAnimationExample'), - supportsTVOS: true, }, { key: 'LayoutExample', module: require('../examples/Layout/LayoutExample'), - supportsTVOS: true, }, { key: 'LinkingExample', module: require('../examples/Linking/LinkingExample'), - supportsTVOS: true, }, { key: 'NativeAnimationsExample', module: require('../examples/NativeAnimation/NativeAnimationsExample'), - supportsTVOS: true, }, { key: 'OrientationChangeExample', module: require('../examples/OrientationChange/OrientationChangeExample'), - supportsTVOS: false, }, { key: 'PanResponderExample', module: require('../examples/PanResponder/PanResponderExample'), - supportsTVOS: false, }, { key: 'PlatformColorExample', module: require('../examples/PlatformColor/PlatformColorExample'), - supportsTVOS: true, }, { key: 'PointerEventsExample', module: require('../examples/PointerEvents/PointerEventsExample'), - supportsTVOS: false, }, { key: 'PushNotificationIOSExample', module: require('../examples/PushNotificationIOS/PushNotificationIOSExample'), - supportsTVOS: false, }, { key: 'RCTRootViewIOSExample', module: require('../examples/RCTRootView/RCTRootViewIOSExample'), - supportsTVOS: true, }, { key: 'RTLExample', module: require('../examples/RTL/RTLExample'), - supportsTVOS: true, }, { key: 'ShareExample', module: require('../examples/Share/ShareExample'), - supportsTVOS: true, }, { key: 'SnapshotExample', module: require('../examples/Snapshot/SnapshotExample'), - supportsTVOS: true, }, { key: 'TimerExample', module: require('../examples/Timer/TimerExample'), - supportsTVOS: true, }, { key: 'TransformExample', module: require('../examples/Transform/TransformExample'), - supportsTVOS: true, }, { key: 'TurboModuleExample', module: require('../examples/TurboModule/TurboModuleExample'), - supportsTVOS: false, }, { key: 'TVEventHandlerExample', module: require('../examples/TVEventHandler/TVEventHandlerExample'), - supportsTVOS: true, }, { key: 'VibrationExample', module: require('../examples/Vibration/VibrationExample'), - supportsTVOS: false, }, { key: 'WebSocketExample', module: require('../examples/WebSocket/WebSocketExample'), - supportsTVOS: true, }, { key: 'XHRExample', module: require('../examples/XHR/XHRExample'), - supportsTVOS: true, }, ];