Skip to content

Commit 52c99b8

Browse files
committed
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.
1 parent 82ff7bd commit 52c99b8

File tree

94 files changed

+283
-265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+283
-265
lines changed

RNTester/RCTTest/RCTSnapshotNativeComponent.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
'use strict';
1212

13+
const {requireNativeComponent} = require('react-native');
14+
1315
import type {SyntheticEvent} from '../../Libraries/Types/CoreEventTypes';
1416
import type {ViewProps} from '../../Libraries/Components/View/ViewPropTypes';
1517
import type {NativeComponent} from '../../Libraries/Renderer/shims/ReactNative';
@@ -28,8 +30,6 @@ type NativeProps = $ReadOnly<{|
2830

2931
type SnapshotViewNativeType = Class<NativeComponent<NativeProps>>;
3032

31-
const requireNativeComponent = require('../../Libraries/ReactNative/requireNativeComponent');
32-
3333
module.exports = ((requireNativeComponent(
3434
'RCTSnapshot',
3535
): any): SnapshotViewNativeType);

RNTester/js/ARTExample.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
'use strict';
1212

1313
const React = require('react');
14-
const ReactNative = require('react-native');
15-
const {ART, Platform, View} = ReactNative;
14+
const {ART, Platform, View} = require('react-native');
1615

1716
const {Surface, Path, Group, Shape} = ART;
1817

RNTester/js/AccessibilityAndroidExample.android.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,12 @@
1010
'use strict';
1111

1212
const React = require('react');
13-
const ReactNative = require('react-native');
1413
const {
15-
AccessibilityInfo,
1614
StyleSheet,
1715
Text,
1816
View,
19-
ToastAndroid,
2017
TouchableWithoutFeedback,
21-
} = ReactNative;
18+
} = require('react-native');
2219

2320
const RNTesterBlock = require('./RNTesterBlock');
2421
const RNTesterPage = require('./RNTesterPage');

RNTester/js/AccessibilityExample.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,13 @@
1010
'use strict';
1111

1212
const React = require('react');
13-
const ReactNative = require('react-native');
14-
const {AccessibilityInfo, Text, View, TouchableOpacity, Alert} = ReactNative;
13+
const {
14+
AccessibilityInfo,
15+
Text,
16+
View,
17+
TouchableOpacity,
18+
Alert,
19+
} = require('react-native');
1520

1621
const RNTesterBlock = require('./RNTesterBlock');
1722

RNTester/js/AccessibilityIOSExample.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
'use strict';
1212

1313
const React = require('react');
14-
const ReactNative = require('react-native');
15-
const {AccessibilityInfo, Text, View, TouchableOpacity, Alert} = ReactNative;
14+
const {Text, View, Alert} = require('react-native');
1615

1716
const RNTesterBlock = require('./RNTesterBlock');
1817

@@ -34,7 +33,9 @@ class AccessibilityIOSExample extends React.Component<Props> {
3433
<Text>Accessibility magic tap example</Text>
3534
</View>
3635
<View
37-
onAccessibilityEscape={() => alert('onAccessibilityEscape success')}
36+
onAccessibilityEscape={() =>
37+
Alert.alert('onAccessibilityEscape success')
38+
}
3839
accessible={true}>
3940
<Text>Accessibility escape example</Text>
4041
</View>

RNTester/js/ActionSheetIOSExample.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
'use strict';
1212

1313
const React = require('react');
14-
const ReactNative = require('react-native');
1514
const {
1615
ActionSheetIOS,
1716
StyleSheet,
1817
Text,
1918
View,
2019
Alert,
2120
NativeModules,
22-
} = ReactNative;
21+
findNodeHandle,
22+
} = require('react-native');
2323
const ScreenshotManager = NativeModules.ScreenshotManager;
2424

2525
const BUTTONS = ['Option 0', 'Option 1', 'Option 2', 'Delete', 'Cancel'];
@@ -128,7 +128,7 @@ class ActionSheetAnchorExample extends React.Component<
128128
cancelButtonIndex: CANCEL_INDEX,
129129
destructiveButtonIndex: DESTRUCTIVE_INDEX,
130130
anchor: this.anchorRef.current
131-
? ReactNative.findNodeHandle(this.anchorRef.current)
131+
? findNodeHandle(this.anchorRef.current)
132132
: undefined,
133133
},
134134
buttonIndex => {
@@ -263,7 +263,7 @@ class ShareScreenshotAnchorExample extends React.Component<
263263
url: uri,
264264
excludedActivityTypes: ['com.apple.UIKit.activity.PostToTwitter'],
265265
anchor: this.anchorRef.current
266-
? ReactNative.findNodeHandle(this.anchorRef.current)
266+
? findNodeHandle(this.anchorRef.current)
267267
: undefined,
268268
},
269269
error => Alert.alert('Error', error),

RNTester/js/AlertExample.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,13 @@
1010
'use strict';
1111

1212
const React = require('react');
13-
const ReactNative = require('react-native');
14-
const {Alert, StyleSheet, Text, TouchableHighlight, View} = ReactNative;
13+
const {
14+
Alert,
15+
StyleSheet,
16+
Text,
17+
TouchableHighlight,
18+
View,
19+
} = require('react-native');
1520

1621
const RNTesterBlock = require('./RNTesterBlock');
1722

RNTester/js/AlertIOSExample.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,13 @@
1111
'use strict';
1212

1313
const React = require('react');
14-
const ReactNative = require('react-native');
15-
const {StyleSheet, View, Text, TouchableHighlight, Alert} = ReactNative;
14+
const {
15+
StyleSheet,
16+
View,
17+
Text,
18+
TouchableHighlight,
19+
Alert,
20+
} = require('react-native');
1621

1722
const {SimpleAlertExampleBlock} = require('./AlertExample');
1823

RNTester/js/AnimatedExample.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
'use strict';
1212

1313
const React = require('react');
14-
const ReactNative = require('react-native');
15-
const {Animated, Easing, StyleSheet, Text, View} = ReactNative;
14+
const {Animated, Easing, StyleSheet, Text, View} = require('react-native');
1615
const RNTesterButton = require('./RNTesterButton');
1716

1817
const styles = StyleSheet.create({

RNTester/js/AnimatedGratuitousApp/AnExApp.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,13 @@
1111
'use strict';
1212

1313
const React = require('react');
14-
const ReactNative = require('react-native');
15-
const {Animated, LayoutAnimation, PanResponder, StyleSheet, View} = ReactNative;
14+
const {
15+
Animated,
16+
LayoutAnimation,
17+
PanResponder,
18+
StyleSheet,
19+
View,
20+
} = require('react-native');
1621

1722
const AnExSet = require('./AnExSet');
1823

0 commit comments

Comments
 (0)