From abe76fbb5695e497926a4a38cdf9ce4c18812566 Mon Sep 17 00:00:00 2001 From: Christoph Purrer Date: Mon, 7 Nov 2022 03:07:05 -0800 Subject: [PATCH] Remove tvOS support rememants (#35214) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/35214 Changelog: [Internal] Reviewed By: philIip Differential Revision: D41058649 fbshipit-source-id: 16b1ec537d09e9ee50fe609417f62a146bc0f075 --- .../RNTesterSnapshotTests.m | 4 -- .../js/components/RNTesterModuleList.js | 3 +- packages/rn-tester/js/types/RNTesterTypes.js | 1 - .../js/utils/RNTesterList.android.js | 1 - .../rn-tester/js/utils/RNTesterList.ios.js | 56 ------------------- 5 files changed, 1 insertion(+), 64 deletions(-) diff --git a/packages/rn-tester/RNTesterIntegrationTests/RNTesterSnapshotTests.m b/packages/rn-tester/RNTesterIntegrationTests/RNTesterSnapshotTests.m index cf97294c73faab..d0d4f1d95d176c 100644 --- a/packages/rn-tester/RNTesterIntegrationTests/RNTesterSnapshotTests.m +++ b/packages/rn-tester/RNTesterIntegrationTests/RNTesterSnapshotTests.m @@ -40,10 +40,6 @@ -(void)test##name \ RCT_TEST(LayoutExample) RCT_TEST(ScrollViewExample) RCT_TEST(TextExample) -#if !TARGET_OS_TV -// No switch available on tvOS -RCT_TEST(SwitchExample) -#endif - (void)testZZZNotInRecordMode { diff --git a/packages/rn-tester/js/components/RNTesterModuleList.js b/packages/rn-tester/js/components/RNTesterModuleList.js index 8dbcb28b3b9777..04421e3cf229fe 100644 --- a/packages/rn-tester/js/components/RNTesterModuleList.js +++ b/packages/rn-tester/js/components/RNTesterModuleList.js @@ -122,8 +122,7 @@ const RNTesterModuleList: React$AbstractComponent = React.memo( ({sections, toggleBookmark, handleModuleCardPress}) => { const filter = ({example, filterRegex, category}: any) => filterRegex.test(example.module.title) && - (!category || example.category === category) && - (!Platform.isTV || example.supportsTVOS); + (!category || example.category === category); /* $FlowFixMe[missing-local-annot] The type annotation(s) required by * Flow's LTI update could not be added via codemod */ diff --git a/packages/rn-tester/js/types/RNTesterTypes.js b/packages/rn-tester/js/types/RNTesterTypes.js index 76416a5cf400f4..83c030e2b6a06e 100644 --- a/packages/rn-tester/js/types/RNTesterTypes.js +++ b/packages/rn-tester/js/types/RNTesterTypes.js @@ -37,7 +37,6 @@ export type RNTesterModuleInfo = $ReadOnly<{| key: string, module: RNTesterModule, category?: string, - supportsTVOS?: boolean, documentationURL?: string, isBookmarked?: boolean, exampleType?: 'components' | 'apis', diff --git a/packages/rn-tester/js/utils/RNTesterList.android.js b/packages/rn-tester/js/utils/RNTesterList.android.js index 5156c746ceef50..f92ff40c207528 100644 --- a/packages/rn-tester/js/utils/RNTesterList.android.js +++ b/packages/rn-tester/js/utils/RNTesterList.android.js @@ -29,7 +29,6 @@ const Components: Array = [ key: 'FlatListExampleIndex', module: require('../examples/FlatList/FlatListExampleIndex').default, category: 'ListView', - supportsTVOS: true, }, { key: 'ImageExample', diff --git a/packages/rn-tester/js/utils/RNTesterList.ios.js b/packages/rn-tester/js/utils/RNTesterList.ios.js index 61db89b0b4bedd..af266e7ea0efdb 100644 --- a/packages/rn-tester/js/utils/RNTesterList.ios.js +++ b/packages/rn-tester/js/utils/RNTesterList.ios.js @@ -19,25 +19,21 @@ const Components: Array = [ key: 'ActivityIndicatorExample', category: 'UI', module: require('../examples/ActivityIndicator/ActivityIndicatorExample'), - supportsTVOS: true, }, { key: 'ButtonExample', module: require('../examples/Button/ButtonExample'), category: 'UI', - supportsTVOS: true, }, { key: 'FlatListExampleIndex', module: require('../examples/FlatList/FlatListExampleIndex').default, category: 'ListView', - supportsTVOS: true, }, { key: 'ImageExample', module: require('../examples/Image/ImageExample'), category: 'Basic', - supportsTVOS: true, }, { key: 'JSResponderHandlerExample', @@ -46,59 +42,48 @@ const Components: 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: 'ModalExample', module: require('../examples/Modal/ModalExample'), - supportsTVOS: true, }, { key: 'NewAppScreenExample', module: require('../examples/NewAppScreen/NewAppScreenExample'), - supportsTVOS: false, }, { key: 'PressableExample', module: require('../examples/Pressable/PressableExample'), - supportsTVOS: true, }, { key: 'RefreshControlExample', module: require('../examples/RefreshControl/RefreshControlExample'), - supportsTVOS: false, }, { key: 'ScrollViewSimpleExample', module: require('../examples/ScrollView/ScrollViewSimpleExample'), category: 'Basic', - supportsTVOS: true, }, { key: 'SafeAreaViewExample', module: require('../examples/SafeAreaView/SafeAreaViewExample'), - supportsTVOS: true, }, { key: 'ScrollViewExample', module: require('../examples/ScrollView/ScrollViewExample'), category: 'Basic', - supportsTVOS: true, }, { key: 'ScrollViewAnimatedExample', module: require('../examples/ScrollView/ScrollViewAnimatedExample'), - supportsTVOS: true, }, { key: 'ScrollViewIndicatorInsetsExample', @@ -108,58 +93,48 @@ const Components: Array = [ key: 'SectionListIndex', module: require('../examples/SectionList/SectionListIndex'), category: 'ListView', - supportsTVOS: true, }, { key: 'StatusBarExample', module: require('../examples/StatusBar/StatusBarExample'), - supportsTVOS: false, }, { key: 'SwipeableCardExample', module: require('../examples/SwipeableCardExample/SwipeableCardExample'), category: 'UI', - supportsTVOS: false, }, { key: 'SwitchExample', module: require('../examples/Switch/SwitchExample'), category: 'UI', - supportsTVOS: false, }, { key: 'TextExample', module: require('../examples/Text/TextExample.ios'), category: 'Basic', - supportsTVOS: true, }, { key: 'TextInputExample', module: require('../examples/TextInput/TextInputExample'), category: 'Basic', - 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'), category: 'Basic', - supportsTVOS: true, }, { key: 'NewArchitectureExample', category: 'UI', module: require('../examples/NewArchitecture/NewArchitectureExample'), - supportsTVOS: false, }, ]; @@ -167,60 +142,49 @@ const APIs: Array = [ { key: 'AccessibilityExample', module: require('../examples/Accessibility/AccessibilityExample'), - supportsTVOS: false, }, { key: 'AccessibilityIOSExample', module: require('../examples/Accessibility/AccessibilityIOSExample'), category: 'iOS', - supportsTVOS: false, }, { key: 'ActionSheetIOSExample', module: require('../examples/ActionSheetIOS/ActionSheetIOSExample'), category: 'iOS', - supportsTVOS: true, }, { key: 'AlertIOSExample', module: require('../examples/Alert/AlertIOSExample'), category: 'iOS', - supportsTVOS: true, }, { key: 'AnimatedIndex', module: require('../examples/Animated/AnimatedIndex').default, - supportsTVOS: true, }, { key: 'AnExApp', module: require('../examples/AnimatedGratuitousApp/AnExApp'), - supportsTVOS: true, }, { key: 'AppearanceExample', module: require('../examples/Appearance/AppearanceExample'), - supportsTVOS: false, }, { key: 'AppStateExample', module: require('../examples/AppState/AppStateExample'), - supportsTVOS: true, }, { key: 'BorderExample', module: require('../examples/Border/BorderExample'), - supportsTVOS: true, }, { key: 'BoxShadowExample', module: require('../examples/BoxShadow/BoxShadowExample'), - supportsTVOS: true, }, { key: 'CrashExample', module: require('../examples/Crash/CrashExample'), - supportsTVOS: false, }, { key: 'DevSettings', @@ -229,102 +193,82 @@ const APIs: Array = [ { key: 'Dimensions', module: require('../examples/Dimensions/DimensionsExample'), - supportsTVOS: true, }, { key: 'Keyboard', module: require('../examples/Keyboard/KeyboardExample').default, - 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: '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: '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, }, ];