Skip to content

Commit f7c14ea

Browse files
huntiefacebook-github-bot
authored andcommitted
Align organisation of index exports
Summary: Removes the "Plugins" category from the non-structural grouping of exports in `index.js`, `index.js.flow`, aligning these with the "APIs" and "Components" categories in our docs. Changelog: [Internal] Differential Revision: D71033295
1 parent 6ecd9a4 commit f7c14ea

File tree

2 files changed

+54
-63
lines changed

2 files changed

+54
-63
lines changed

packages/react-native/index.js

+40-42
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,7 @@ const warnOnce = require('./Libraries/Utilities/warnOnce').default;
3131
const invariant = require('invariant');
3232

3333
module.exports = {
34-
get registerCallableModule() {
35-
return require('./Libraries/Core/registerCallableModule').default;
36-
},
3734
// #region Components
38-
get AccessibilityInfo() {
39-
return require('./Libraries/Components/AccessibilityInfo/AccessibilityInfo')
40-
.default;
41-
},
4235
get ActivityIndicator() {
4336
return require('./Libraries/Components/ActivityIndicator/ActivityIndicator')
4437
.default;
@@ -63,14 +56,14 @@ module.exports = {
6356
return require('./Libraries/Components/TextInput/InputAccessoryView')
6457
.default;
6558
},
66-
get experimental_LayoutConformance() {
67-
return require('./Libraries/Components/LayoutConformance/LayoutConformance')
68-
.default;
69-
},
7059
get KeyboardAvoidingView() {
7160
return require('./Libraries/Components/Keyboard/KeyboardAvoidingView')
7261
.default;
7362
},
63+
get experimental_LayoutConformance() {
64+
return require('./Libraries/Components/LayoutConformance/LayoutConformance')
65+
.default;
66+
},
7467
get Modal() {
7568
return require('./Libraries/Modal/Modal').default;
7669
},
@@ -141,6 +134,10 @@ module.exports = {
141134
},
142135
// #endregion
143136
// #region APIs
137+
get AccessibilityInfo() {
138+
return require('./Libraries/Components/AccessibilityInfo/AccessibilityInfo')
139+
.default;
140+
},
144141
get ActionSheetIOS() {
145142
return require('./Libraries/ActionSheetIOS/ActionSheetIOS').default;
146143
},
@@ -173,6 +170,9 @@ module.exports = {
173170
);
174171
return require('./Libraries/Components/Clipboard/Clipboard').default;
175172
},
173+
get DeviceEventEmitter() {
174+
return require('./Libraries/EventEmitter/RCTDeviceEventEmitter').default;
175+
},
176176
get DeviceInfo() {
177177
return require('./Libraries/Utilities/DeviceInfo').default;
178178
},
@@ -185,6 +185,10 @@ module.exports = {
185185
get Dimensions() {
186186
return require('./Libraries/Utilities/Dimensions').default;
187187
},
188+
get DynamicColorIOS() {
189+
return require('./Libraries/StyleSheet/PlatformColorValueTypesIOS')
190+
.DynamicColorIOS;
191+
},
188192
get Easing() {
189193
return require('./Libraries/Animated/Easing').default;
190194
},
@@ -209,13 +213,19 @@ module.exports = {
209213
get LogBox() {
210214
return require('./Libraries/LogBox/LogBox').default;
211215
},
216+
get NativeAppEventEmitter() {
217+
return require('./Libraries/EventEmitter/RCTNativeAppEventEmitter').default;
218+
},
212219
get NativeDialogManagerAndroid() {
213220
return require('./Libraries/NativeModules/specs/NativeDialogManagerAndroid')
214221
.default;
215222
},
216223
get NativeEventEmitter() {
217224
return require('./Libraries/EventEmitter/NativeEventEmitter').default;
218225
},
226+
get NativeModules() {
227+
return require('./Libraries/BatchedBridge/NativeModules').default;
228+
},
219229
get Networking() {
220230
return require('./Libraries/Network/RCTNetworking').default;
221231
},
@@ -228,6 +238,13 @@ module.exports = {
228238
get PixelRatio() {
229239
return require('./Libraries/Utilities/PixelRatio').default;
230240
},
241+
get Platform() {
242+
return require('./Libraries/Utilities/Platform').default;
243+
},
244+
get PlatformColor() {
245+
return require('./Libraries/StyleSheet/PlatformColorValueTypes')
246+
.PlatformColor;
247+
},
231248
get PushNotificationIOS() {
232249
warnOnce(
233250
'pushNotificationIOS-moved',
@@ -238,6 +255,18 @@ module.exports = {
238255
return require('./Libraries/PushNotificationIOS/PushNotificationIOS')
239256
.default;
240257
},
258+
get processColor() {
259+
return require('./Libraries/StyleSheet/processColor').default;
260+
},
261+
get registerCallableModule() {
262+
return require('./Libraries/Core/registerCallableModule').default;
263+
},
264+
get requireNativeComponent() {
265+
return require('./Libraries/ReactNative/requireNativeComponent').default;
266+
},
267+
get RootTagContext() {
268+
return require('./Libraries/ReactNative/RootTag').RootTagContext;
269+
},
241270
get Settings() {
242271
return require('./Libraries/Settings/Settings').default;
243272
},
@@ -279,37 +308,6 @@ module.exports = {
279308
return require('./Libraries/Vibration/Vibration').default;
280309
},
281310
// #endregion
282-
// #region Plugins
283-
get DeviceEventEmitter() {
284-
return require('./Libraries/EventEmitter/RCTDeviceEventEmitter').default;
285-
},
286-
get DynamicColorIOS() {
287-
return require('./Libraries/StyleSheet/PlatformColorValueTypesIOS')
288-
.DynamicColorIOS;
289-
},
290-
get NativeAppEventEmitter() {
291-
return require('./Libraries/EventEmitter/RCTNativeAppEventEmitter').default;
292-
},
293-
get NativeModules() {
294-
return require('./Libraries/BatchedBridge/NativeModules').default;
295-
},
296-
get Platform() {
297-
return require('./Libraries/Utilities/Platform').default;
298-
},
299-
get PlatformColor() {
300-
return require('./Libraries/StyleSheet/PlatformColorValueTypes')
301-
.PlatformColor;
302-
},
303-
get processColor() {
304-
return require('./Libraries/StyleSheet/processColor').default;
305-
},
306-
get requireNativeComponent() {
307-
return require('./Libraries/ReactNative/requireNativeComponent').default;
308-
},
309-
get RootTagContext() {
310-
return require('./Libraries/ReactNative/RootTag').RootTagContext;
311-
},
312-
// #endregion
313311
} as ReactNativePublicAPI;
314312

315313
if (__DEV__) {

packages/react-native/index.js.flow

+14-21
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,19 @@
1515
// updating React Native's public API.
1616
// ----------------------------------------------------------------------------
1717

18-
// TODO(T215317597): Reconsider the pre-existing grouping of these APIs
19-
20-
export type {HostInstance} from './src/private/types/HostInstance';
21-
export type {HostComponent} from './src/private/types/HostComponent';
22-
export {default as registerCallableModule} from './Libraries/Core/registerCallableModule';
23-
2418
/// <reference path="src/types/globals.d.ts" />
2519

2620
// #region Components
2721

28-
export {default as AccessibilityInfo} from './Libraries/Components/AccessibilityInfo/AccessibilityInfo';
2922
export {default as ActivityIndicator} from './Libraries/Components/ActivityIndicator/ActivityIndicator';
3023
export {default as Button} from './Libraries/Components/Button';
3124
export {default as DrawerLayoutAndroid} from './Libraries/Components/DrawerAndroid/DrawerLayoutAndroid';
32-
export {default as experimental_LayoutConformance} from './Libraries/Components/LayoutConformance/LayoutConformance';
3325
export {default as FlatList} from './Libraries/Lists/FlatList';
3426
export {default as Image} from './Libraries/Image/Image';
3527
export {default as ImageBackground} from './Libraries/Image/ImageBackground';
3628
export {default as InputAccessoryView} from './Libraries/Components/TextInput/InputAccessoryView';
3729
export {default as KeyboardAvoidingView} from './Libraries/Components/Keyboard/KeyboardAvoidingView';
30+
export {default as experimental_LayoutConformance} from './Libraries/Components/LayoutConformance/LayoutConformance';
3831
export {default as Modal} from './Libraries/Modal/Modal';
3932
export {default as Pressable} from './Libraries/Components/Pressable/Pressable';
4033
export {default as ProgressBarAndroid} from './Libraries/Components/ProgressBarAndroid/ProgressBarAndroid';
@@ -58,6 +51,7 @@ export {default as VirtualizedSectionList} from './Libraries/Lists/VirtualizedSe
5851
// #endregion
5952
// #region APIs
6053

54+
export {default as AccessibilityInfo} from './Libraries/Components/AccessibilityInfo/AccessibilityInfo';
6155
export {default as ActionSheetIOS} from './Libraries/ActionSheetIOS/ActionSheetIOS';
6256
export {default as Alert} from './Libraries/Alert/Alert';
6357
export {default as Animated} from './Libraries/Animated/Animated';
@@ -66,25 +60,37 @@ export {AppRegistry} from './Libraries/ReactNative/AppRegistry';
6660
export {default as AppState} from './Libraries/AppState/AppState';
6761
export {default as BackHandler} from './Libraries/Utilities/BackHandler';
6862
export {default as Clipboard} from './Libraries/Components/Clipboard/Clipboard';
63+
export {default as DeviceEventEmitter} from './Libraries/EventEmitter/RCTDeviceEventEmitter';
6964
export {default as DeviceInfo} from './Libraries/Utilities/DeviceInfo';
7065
export {default as DevMenu} from './src/private/devmenu/DevMenu';
7166
export {default as DevSettings} from './Libraries/Utilities/DevSettings';
7267
export {default as Dimensions} from './Libraries/Utilities/Dimensions';
68+
export {DynamicColorIOS} from './Libraries/StyleSheet/PlatformColorValueTypesIOS';
7369
export {default as Easing} from './Libraries/Animated/Easing';
7470
export {findNodeHandle} from './Libraries/ReactNative/RendererProxy';
71+
export type {HostInstance} from './src/private/types/HostInstance';
72+
export type {HostComponent} from './src/private/types/HostComponent';
7573
export {default as I18nManager} from './Libraries/ReactNative/I18nManager';
7674
export {default as InteractionManager} from './Libraries/Interaction/InteractionManager';
7775
export {default as Keyboard} from './Libraries/Components/Keyboard/Keyboard';
7876
export {default as LayoutAnimation} from './Libraries/LayoutAnimation/LayoutAnimation';
7977
export {default as Linking} from './Libraries/Linking/Linking';
8078
export {default as LogBox} from './Libraries/LogBox/LogBox';
79+
export {default as NativeAppEventEmitter} from './Libraries/EventEmitter/RCTNativeAppEventEmitter';
8180
export {default as NativeDialogManagerAndroid} from './Libraries/NativeModules/specs/NativeDialogManagerAndroid';
8281
export {default as NativeEventEmitter} from './Libraries/EventEmitter/NativeEventEmitter';
82+
export {default as NativeModules} from './Libraries/BatchedBridge/NativeModules';
8383
export {default as Networking} from './Libraries/Network/RCTNetworking';
8484
export {default as PanResponder} from './Libraries/Interaction/PanResponder';
8585
export {default as PermissionsAndroid} from './Libraries/PermissionsAndroid/PermissionsAndroid';
8686
export {default as PixelRatio} from './Libraries/Utilities/PixelRatio';
87+
export {default as Platform} from './Libraries/Utilities/Platform';
88+
export {PlatformColor} from './Libraries/StyleSheet/PlatformColorValueTypes';
8789
export {default as PushNotificationIOS} from './Libraries/PushNotificationIOS/PushNotificationIOS';
90+
export {default as processColor} from './Libraries/StyleSheet/processColor';
91+
export {default as registerCallableModule} from './Libraries/Core/registerCallableModule';
92+
export {default as requireNativeComponent} from './Libraries/ReactNative/requireNativeComponent';
93+
export {RootTagContext} from './Libraries/ReactNative/RootTag';
8894
export {default as Settings} from './Libraries/Settings/Settings';
8995
export {default as Share} from './Libraries/Share/Share';
9096
export {default as StyleSheet} from './Libraries/StyleSheet/StyleSheet';
@@ -100,16 +106,3 @@ export {default as UTFSequence} from './Libraries/UTFSequence';
100106
export {default as Vibration} from './Libraries/Vibration/Vibration';
101107

102108
// #endregion
103-
// #region Plugins
104-
105-
export {default as DeviceEventEmitter} from './Libraries/EventEmitter/RCTDeviceEventEmitter';
106-
export {DynamicColorIOS} from './Libraries/StyleSheet/PlatformColorValueTypesIOS';
107-
export {default as NativeAppEventEmitter} from './Libraries/EventEmitter/RCTNativeAppEventEmitter';
108-
export {default as NativeModules} from './Libraries/BatchedBridge/NativeModules';
109-
export {default as Platform} from './Libraries/Utilities/Platform';
110-
export {PlatformColor} from './Libraries/StyleSheet/PlatformColorValueTypes';
111-
export {default as processColor} from './Libraries/StyleSheet/processColor';
112-
export {default as requireNativeComponent} from './Libraries/ReactNative/requireNativeComponent';
113-
export {RootTagContext} from './Libraries/ReactNative/RootTag';
114-
115-
// #endregion

0 commit comments

Comments
 (0)