Use react-native's public interface where possible

Instead of requiring specific files and bypassing the public interface, require react-native's exports where possible instead.
facebook · Apr 10, 2019 · 7d90a08 · 7d90a08
1 parent 82ff7bd
commit 7d90a08
Show file tree

Hide file tree

Showing 94 changed files with 277 additions and 265 deletions.
diff --git a/RNTester/RCTTest/RCTSnapshotNativeComponent.js b/RNTester/RCTTest/RCTSnapshotNativeComponent.js
@@ -10,6 +10,8 @@
 
 'use strict';
 
+const {requireNativeComponent} = require('react-native');
+
 import type {SyntheticEvent} from '../../Libraries/Types/CoreEventTypes';
 import type {ViewProps} from '../../Libraries/Components/View/ViewPropTypes';
 import type {NativeComponent} from '../../Libraries/Renderer/shims/ReactNative';
@@ -28,8 +30,6 @@ type NativeProps = $ReadOnly<{|
 
 type SnapshotViewNativeType = Class<NativeComponent<NativeProps>>;
 
-const requireNativeComponent = require('../../Libraries/ReactNative/requireNativeComponent');
-
 module.exports = ((requireNativeComponent(
   'RCTSnapshot',
 ): any): SnapshotViewNativeType);
diff --git a/RNTester/js/ARTExample.js b/RNTester/js/ARTExample.js
@@ -11,8 +11,7 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {ART, Platform, View} = ReactNative;
+const {ART, Platform, View} = require('react-native');
 
 const {Surface, Path, Group, Shape} = ART;
 

diff --git a/RNTester/js/AccessibilityAndroidExample.android.js b/RNTester/js/AccessibilityAndroidExample.android.js
@@ -10,15 +10,12 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
 const {
-  AccessibilityInfo,
   StyleSheet,
   Text,
   View,
-  ToastAndroid,
   TouchableWithoutFeedback,
-} = ReactNative;
+} = require('react-native');
 
 const RNTesterBlock = require('./RNTesterBlock');
 const RNTesterPage = require('./RNTesterPage');

diff --git a/RNTester/js/AccessibilityExample.js b/RNTester/js/AccessibilityExample.js
@@ -10,8 +10,7 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {AccessibilityInfo, Text, View, TouchableOpacity, Alert} = ReactNative;
+const {AccessibilityInfo, Text, View, TouchableOpacity, Alert} = require('react-native');
 
 const RNTesterBlock = require('./RNTesterBlock');
 

diff --git a/RNTester/js/AccessibilityIOSExample.js b/RNTester/js/AccessibilityIOSExample.js
@@ -11,8 +11,7 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {AccessibilityInfo, Text, View, TouchableOpacity, Alert} = ReactNative;
+const {Text, View, Alert} = require('react-native');
 
 const RNTesterBlock = require('./RNTesterBlock');
 
@@ -34,7 +33,9 @@ class AccessibilityIOSExample extends React.Component<Props> {
           <Text>Accessibility magic tap example</Text>
         </View>
         <View
-          onAccessibilityEscape={() => alert('onAccessibilityEscape success')}
+          onAccessibilityEscape={() =>
+            Alert.alert('onAccessibilityEscape success')
+          }
           accessible={true}>
           <Text>Accessibility escape example</Text>
         </View>

diff --git a/RNTester/js/ActionSheetIOSExample.js b/RNTester/js/ActionSheetIOSExample.js
@@ -11,15 +11,15 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
 const {
   ActionSheetIOS,
   StyleSheet,
   Text,
   View,
   Alert,
   NativeModules,
-} = ReactNative;
+  findNodeHandle,
+} = require('react-native');
 const ScreenshotManager = NativeModules.ScreenshotManager;
 
 const BUTTONS = ['Option 0', 'Option 1', 'Option 2', 'Delete', 'Cancel'];
@@ -128,7 +128,7 @@ class ActionSheetAnchorExample extends React.Component<
         cancelButtonIndex: CANCEL_INDEX,
         destructiveButtonIndex: DESTRUCTIVE_INDEX,
         anchor: this.anchorRef.current
-          ? ReactNative.findNodeHandle(this.anchorRef.current)
+          ? findNodeHandle(this.anchorRef.current)
           : undefined,
       },
       buttonIndex => {
@@ -263,7 +263,7 @@ class ShareScreenshotAnchorExample extends React.Component<
             url: uri,
             excludedActivityTypes: ['com.apple.UIKit.activity.PostToTwitter'],
             anchor: this.anchorRef.current
-              ? ReactNative.findNodeHandle(this.anchorRef.current)
+              ? findNodeHandle(this.anchorRef.current)
               : undefined,
           },
           error => Alert.alert('Error', error),

diff --git a/RNTester/js/AlertExample.js b/RNTester/js/AlertExample.js
@@ -10,8 +10,13 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {Alert, StyleSheet, Text, TouchableHighlight, View} = ReactNative;
+const {
+  Alert,
+  StyleSheet,
+  Text,
+  TouchableHighlight,
+  View,
+} = require('react-native');
 
 const RNTesterBlock = require('./RNTesterBlock');
 

diff --git a/RNTester/js/AlertIOSExample.js b/RNTester/js/AlertIOSExample.js
@@ -11,8 +11,13 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {StyleSheet, View, Text, TouchableHighlight, Alert} = ReactNative;
+const {
+  StyleSheet,
+  View,
+  Text,
+  TouchableHighlight,
+  Alert,
+} = require('react-native');
 
 const {SimpleAlertExampleBlock} = require('./AlertExample');
 

diff --git a/RNTester/js/AnimatedExample.js b/RNTester/js/AnimatedExample.js
@@ -11,8 +11,7 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {Animated, Easing, StyleSheet, Text, View} = ReactNative;
+const {Animated, Easing, StyleSheet, Text, View} = require('react-native');
 const RNTesterButton = require('./RNTesterButton');
 
 const styles = StyleSheet.create({

diff --git a/RNTester/js/AnimatedGratuitousApp/AnExApp.js b/RNTester/js/AnimatedGratuitousApp/AnExApp.js
@@ -11,8 +11,13 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {Animated, LayoutAnimation, PanResponder, StyleSheet, View} = ReactNative;
+const {
+  Animated,
+  LayoutAnimation,
+  PanResponder,
+  StyleSheet,
+  View,
+} = require('react-native');
 
 const AnExSet = require('./AnExSet');
 

diff --git a/RNTester/js/AnimatedGratuitousApp/AnExBobble.js b/RNTester/js/AnimatedGratuitousApp/AnExBobble.js
@@ -11,8 +11,7 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {Animated, PanResponder, StyleSheet, View} = ReactNative;
+const {Animated, PanResponder, StyleSheet, View} = require('react-native');
 
 const NUM_BOBBLES = 5;
 const RAD_EACH = Math.PI / 2 / (NUM_BOBBLES - 2);

diff --git a/RNTester/js/AnimatedGratuitousApp/AnExChained.js b/RNTester/js/AnimatedGratuitousApp/AnExChained.js
@@ -11,8 +11,7 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {Animated, PanResponder, StyleSheet, View} = ReactNative;
+const {Animated, PanResponder, StyleSheet, View} = require('react-native');
 
 class AnExChained extends React.Component<Object, any> {
   constructor(props: Object) {

diff --git a/RNTester/js/AnimatedGratuitousApp/AnExScroll.js b/RNTester/js/AnimatedGratuitousApp/AnExScroll.js
@@ -11,8 +11,14 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {Animated, Image, ScrollView, StyleSheet, Text, View} = ReactNative;
+const {
+  Animated,
+  Image,
+  ScrollView,
+  StyleSheet,
+  Text,
+  View,
+} = require('react-native');
 
 class AnExScroll extends React.Component<$FlowFixMeProps, any> {
   state: any = {scrollX: new Animated.Value(0)};

diff --git a/RNTester/js/AnimatedGratuitousApp/AnExSet.js b/RNTester/js/AnimatedGratuitousApp/AnExSet.js
@@ -11,8 +11,13 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {Animated, PanResponder, StyleSheet, Text, View} = ReactNative;
+const {
+  Animated,
+  PanResponder,
+  StyleSheet,
+  Text,
+  View,
+} = require('react-native');
 
 const AnExBobble = require('./AnExBobble');
 const AnExChained = require('./AnExChained');

diff --git a/RNTester/js/AnimatedGratuitousApp/AnExTilt.js b/RNTester/js/AnimatedGratuitousApp/AnExTilt.js
@@ -11,8 +11,7 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {Animated, PanResponder, StyleSheet} = ReactNative;
+const {Animated, PanResponder, StyleSheet} = require('react-native');
 
 class AnExTilt extends React.Component<Object, any> {
   constructor(props: Object) {

diff --git a/RNTester/js/AppStateExample.js b/RNTester/js/AppStateExample.js
@@ -11,8 +11,7 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {AppState, Text, View} = ReactNative;
+const {AppState, Text, View} = require('react-native');
 
 class AppStateSubscription extends React.Component<
   $FlowFixMeProps,

diff --git a/RNTester/js/AssetScaledImageExample.js b/RNTester/js/AssetScaledImageExample.js
@@ -11,8 +11,7 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {Image, StyleSheet, View, ScrollView} = ReactNative;
+const {Image, StyleSheet, View, ScrollView} = require('react-native');
 
 import type {PhotoIdentifier} from '../../Libraries/CameraRoll/CameraRoll';
 

diff --git a/RNTester/js/AsyncStorageExample.js b/RNTester/js/AsyncStorageExample.js
@@ -11,8 +11,7 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {AsyncStorage, PickerIOS, Text, View} = ReactNative;
+const {AsyncStorage, PickerIOS, Text, View} = require('react-native');
 const PickerItemIOS = PickerIOS.Item;
 
 const STORAGE_KEY = '@AsyncStorageExample:key';

diff --git a/RNTester/js/BorderExample.js b/RNTester/js/BorderExample.js
@@ -10,8 +10,7 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {StyleSheet, View} = ReactNative;
+const {StyleSheet, View} = require('react-native');
 
 const styles = StyleSheet.create({
   box: {

diff --git a/RNTester/js/BoxShadowExample.js b/RNTester/js/BoxShadowExample.js
@@ -10,8 +10,7 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {Image, StyleSheet, View} = ReactNative;
+const {Image, StyleSheet, View} = require('react-native');
 
 const styles = StyleSheet.create({
   box: {

diff --git a/RNTester/js/ButtonExample.js b/RNTester/js/ButtonExample.js
@@ -11,8 +11,7 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {Alert, Button, View, StyleSheet} = ReactNative;
+const {Alert, Button, View, StyleSheet} = require('react-native');
 
 function onButtonPress(buttonName) {
   Alert.alert(`${buttonName} has been pressed!`);

diff --git a/RNTester/js/CameraRollExample.js b/RNTester/js/CameraRollExample.js
@@ -10,7 +10,6 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
 const {
   CameraRoll,
   Image,
@@ -20,7 +19,7 @@ const {
   Text,
   View,
   TouchableOpacity,
-} = ReactNative;
+} = require('react-native');
 
 const invariant = require('invariant');
 

diff --git a/RNTester/js/CameraRollView.js b/RNTester/js/CameraRollView.js
@@ -11,7 +11,6 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
 const {
   ActivityIndicator,
   Alert,
@@ -22,7 +21,7 @@ const {
   Platform,
   StyleSheet,
   View,
-} = ReactNative;
+} = require('react-native');
 
 const groupByEveryN = require('../../Libraries/Utilities/groupByEveryN');
 const logError = require('../../Libraries/Utilities/logError');

diff --git a/RNTester/js/CheckBoxExample.js b/RNTester/js/CheckBoxExample.js
@@ -11,8 +11,7 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {CheckBox, Text, View, StyleSheet} = ReactNative;
+const {CheckBox, Text, View, StyleSheet} = require('react-native');
 
 type BasicState = {|
   trueCheckBoxIsOn: boolean,

diff --git a/RNTester/js/ClipboardExample.js b/RNTester/js/ClipboardExample.js
@@ -11,8 +11,7 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {Clipboard, View, Text, StyleSheet} = ReactNative;
+const {Clipboard, View, Text, StyleSheet} = require('react-native');
 
 type Props = $ReadOnly<{||}>;
 type State = {|

diff --git a/RNTester/js/DatePickerAndroidExample.js b/RNTester/js/DatePickerAndroidExample.js
@@ -10,13 +10,12 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
 const {
   DatePickerAndroid,
   StyleSheet,
   Text,
   TouchableWithoutFeedback,
-} = ReactNative;
+} = require('react-native');
 
 const RNTesterBlock = require('./RNTesterBlock');
 const RNTesterPage = require('./RNTesterPage');

diff --git a/RNTester/js/DatePickerIOSExample.js b/RNTester/js/DatePickerIOSExample.js
@@ -11,8 +11,7 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {DatePickerIOS, StyleSheet, Text, View} = ReactNative;
+const {DatePickerIOS, StyleSheet, Text, View} = require('react-native');
 
 type State = {|
   date: Date,

diff --git a/RNTester/js/DimensionsExample.js b/RNTester/js/DimensionsExample.js
@@ -11,8 +11,7 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {Dimensions, Text, View} = ReactNative;
+const {Dimensions, Text, View} = require('react-native');
 
 class DimensionsSubscription extends React.Component<
   {dim: string},

diff --git a/RNTester/js/FlatListExample.js b/RNTester/js/FlatListExample.js
@@ -12,10 +12,8 @@
 
 import type {Item} from './ListExampleShared';
 
-const Alert = require('../../Libraries/Alert/Alert');
 const React = require('react');
-const ReactNative = require('react-native');
-const {Animated, StyleSheet, View} = ReactNative;
+const {Alert, Animated, StyleSheet, View} = require('react-native');
 
 const RNTesterPage = require('./RNTesterPage');