diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js index 6e9e40d60..a2be38422 100644 --- a/Libraries/Components/ScrollView/ScrollView.js +++ b/Libraries/Components/ScrollView/ScrollView.js @@ -1041,7 +1041,7 @@ const ScrollView = createReactClass({ return ( // $FlowFixMe Invalid prop usage - {Platform.isTVOS ? null : refreshControl} + {Platform.isTV ? null : refreshControl} {contentContainer} ); diff --git a/Libraries/Components/Touchable/TouchableHighlight.js b/Libraries/Components/Touchable/TouchableHighlight.js index 117884faf..5a681c099 100644 --- a/Libraries/Components/Touchable/TouchableHighlight.js +++ b/Libraries/Components/Touchable/TouchableHighlight.js @@ -269,7 +269,7 @@ const TouchableHighlight = ((createReactClass({ touchableHandlePress: function(e: PressEvent) { clearTimeout(this._hideTimeout); - if (!Platform.isTVOS) { + if (!Platform.isTV) { this._showUnderlay(); this._hideTimeout = setTimeout( this._hideUnderlay, diff --git a/Libraries/Components/View/ViewPropTypes.js b/Libraries/Components/View/ViewPropTypes.js index addbc6e7e..0f7dea210 100644 --- a/Libraries/Components/View/ViewPropTypes.js +++ b/Libraries/Components/View/ViewPropTypes.js @@ -72,7 +72,7 @@ export type ViewProps = $ReadOnly<{| ...GestureResponderEventProps, ...TouchEventProps, - // There's no easy way to create a different type if (Platform.isTVOS): + // There's no easy way to create a different type if (Platform.isTV): // so we must include TVViewProps ...TVViewProps, diff --git a/Libraries/Modal/Modal.js b/Libraries/Modal/Modal.js index fcc3900da..1af6fec61 100644 --- a/Libraries/Modal/Modal.js +++ b/Libraries/Modal/Modal.js @@ -90,7 +90,7 @@ class Modal extends React.Component { * See https://facebook.github.io/react-native/docs/modal.html#onrequestclose */ onRequestClose: - Platform.isTVOS || Platform.OS === 'android' + Platform.isTV || Platform.OS === 'android' ? PropTypes.func.isRequired : PropTypes.func, /** diff --git a/Libraries/Utilities/BackHandler.ios.js b/Libraries/Utilities/BackHandler.ios.js index 968b707d6..969a031ab 100644 --- a/Libraries/Utilities/BackHandler.ios.js +++ b/Libraries/Utilities/BackHandler.ios.js @@ -53,7 +53,7 @@ function emptyFunction() {} */ let BackHandler; -if (Platform.isTVOS) { +if (Platform.isTV) { const _tvEventHandler = new TVEventHandler(); const _backPressSubscriptions = new Set(); diff --git a/RNTester/js/ARTExample.js b/RNTester/js/ARTExample.js index 15ae6de03..1a0745ec4 100644 --- a/RNTester/js/ARTExample.js +++ b/RNTester/js/ARTExample.js @@ -16,7 +16,7 @@ var {ART, Platform, View} = ReactNative; const {Surface, Path, Group, Transform, Shape} = ART; -var scale = Platform.isTVOS ? 4 : 1; +var scale = Platform.isTV ? 4 : 1; class ARTExample extends React.Component<{}> { render() { diff --git a/RNTester/js/ListExampleShared.js b/RNTester/js/ListExampleShared.js index 905985b52..62654e78e 100644 --- a/RNTester/js/ListExampleShared.js +++ b/RNTester/js/ListExampleShared.js @@ -237,7 +237,7 @@ function pressItem(context: Object, key: string) { } function renderSmallSwitchOption(context: Object, key: string) { - if (Platform.isTVOS) { + if (Platform.isTV) { return null; } return ( diff --git a/RNTester/js/ModalExample.js b/RNTester/js/ModalExample.js index cfb51abe6..a66d331d0 100644 --- a/RNTester/js/ModalExample.js +++ b/RNTester/js/ModalExample.js @@ -94,7 +94,7 @@ class ModalExample extends React.Component<{}, $FlowFixMeState> { }; renderSwitch() { - if (Platform.isTVOS) { + if (Platform.isTV) { return null; } return ( @@ -191,7 +191,7 @@ class ModalExample extends React.Component<{}, $FlowFixMeState> { ); } renderPickers() { - if (Platform.isTVOS) { + if (Platform.isTV) { return null; } return ( diff --git a/RNTester/js/RNTesterExampleList.js b/RNTester/js/RNTesterExampleList.js index c9ccce1a8..325a5bce8 100644 --- a/RNTester/js/RNTesterExampleList.js +++ b/RNTester/js/RNTesterExampleList.js @@ -80,7 +80,7 @@ class RNTesterExampleList extends React.Component { * comment and run Flow. */ this.props.disableSearch || (filterRegex.test(example.module.title) && - (!Platform.isTVOS || example.supportsTVOS)); + (!Platform.isTV || example.supportsTVOS)); const sections = [ { diff --git a/RNTester/js/TVEventHandlerExample.js b/RNTester/js/TVEventHandlerExample.js index 177614e7c..757a27ef9 100644 --- a/RNTester/js/TVEventHandlerExample.js +++ b/RNTester/js/TVEventHandlerExample.js @@ -74,7 +74,7 @@ class TVEventHandlerView extends React.Component< } render() { - if (Platform.isTVOS) { + if (Platform.isTV) { return ( {}}> diff --git a/RNTester/js/TextExample.ios.js b/RNTester/js/TextExample.ios.js index 6fdd942d4..52274d7c0 100644 --- a/RNTester/js/TextExample.ios.js +++ b/RNTester/js/TextExample.ios.js @@ -324,12 +324,12 @@ exports.examples = [ render: function() { return ( - + Cochin Cochin bold @@ -338,12 +338,12 @@ exports.examples = [ Helvetica bold - + Verdana Verdana bold @@ -817,14 +817,14 @@ exports.examples = [ Small Caps{'\n'} Old Style nums 0123456789{'\n'} Lining nums 0123456789{'\n'}