Refactor UIManager view manager accesses

Summary: Replaced each view manager access with a getViewManager() function call. This will later be used to lazily load view manager classes by allowing java to avoid sending the entire list of view managers to JS.

Reviewed By: QueryConnectionException

Differential Revision: D9695788

fbshipit-source-id: 949858aa2f0b0b00b68e260461ba8f1d085cf07f

Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js

@@ -21,7 +21,8 @@ const StyleSheet = require('StyleSheet');
 const UIManager = require('UIManager');
 const View = require('View');
 
-const DrawerConsts = UIManager.AndroidDrawerLayout.Constants;
+const DrawerConsts = UIManager.getViewManagerConfig('AndroidDrawerLayout')
+  .Constants;
 
 const createReactClass = require('create-react-class');
 const dismissKeyboard = require('dismissKeyboard');
@@ -254,7 +255,7 @@ const DrawerLayoutAndroid = createReactClass({
   openDrawer: function() {
     UIManager.dispatchViewManagerCommand(
       this._getDrawerLayoutHandle(),
-      UIManager.AndroidDrawerLayout.Commands.openDrawer,
+      UIManager.getViewManagerConfig('AndroidDrawerLayout').Commands.openDrawer,
       null,
     );
   },
@@ -265,7 +266,8 @@ const DrawerLayoutAndroid = createReactClass({
   closeDrawer: function() {
     UIManager.dispatchViewManagerCommand(
       this._getDrawerLayoutHandle(),
-      UIManager.AndroidDrawerLayout.Commands.closeDrawer,
+      UIManager.getViewManagerConfig('AndroidDrawerLayout').Commands
+        .closeDrawer,
       null,
     );
   },

Libraries/Components/RefreshControl/RefreshControl.js

@@ -21,8 +21,9 @@ import type {ColorValue} from 'StyleSheetTypes';
 import type {ViewProps} from 'ViewPropTypes';
 
 if (Platform.OS === 'android') {
-  const AndroidSwipeRefreshLayout = require('UIManager')
+  const AndroidSwipeRefreshLayout = require('UIManager').getViewManagerConfig(
-    .AndroidSwipeRefreshLayout;
+    'AndroidSwipeRefreshLayout',
+  );
   var RefreshLayoutConsts = AndroidSwipeRefreshLayout
     ? AndroidSwipeRefreshLayout.Constants
     : {SIZE: {}};

Libraries/Components/ScrollResponder.js

@@ -436,7 +436,7 @@ const ScrollResponderMixin = {
     }
     UIManager.dispatchViewManagerCommand(
       nullthrows(this.scrollResponderGetScrollableNode()),
-      UIManager.RCTScrollView.Commands.scrollTo,
+      UIManager.getViewManagerConfig('RCTScrollView').Commands.scrollTo,
       [x || 0, y || 0, animated !== false],
     );
   },
@@ -454,7 +454,7 @@ const ScrollResponderMixin = {
     const animated = (options && options.animated) !== false;
     UIManager.dispatchViewManagerCommand(
       this.scrollResponderGetScrollableNode(),
-      UIManager.RCTScrollView.Commands.scrollToEnd,
+      UIManager.getViewManagerConfig('RCTScrollView').Commands.scrollToEnd,
       [animated],
     );
   },
@@ -513,7 +513,8 @@ const ScrollResponderMixin = {
   scrollResponderFlashScrollIndicators: function() {
     UIManager.dispatchViewManagerCommand(
       this.scrollResponderGetScrollableNode(),
-      UIManager.RCTScrollView.Commands.flashScrollIndicators,
+      UIManager.getViewManagerConfig('RCTScrollView').Commands
+        .flashScrollIndicators,
       [],
     );
   },

Libraries/Components/TextInput/TextInput.js

@@ -875,7 +875,7 @@ const TextInput = createReactClass({
   render: function() {
     let textInput;
     if (Platform.OS === 'ios') {
-      textInput = UIManager.RCTVirtualText
+      textInput = UIManager.getViewManagerConfig('RCTVirtualText')
         ? this._renderIOS()
         : this._renderIOSLegacy();
     } else if (Platform.OS === 'android') {
@@ -1048,10 +1048,9 @@ const TextInput = createReactClass({
   _renderAndroid: function() {
     const props = Object.assign({}, this.props);
     props.style = [this.props.style];
-    props.autoCapitalize =
+    props.autoCapitalize = UIManager.getViewManagerConfig(
-      UIManager.AndroidTextInput.Constants.AutoCapitalizationType[
+      'AndroidTextInput',
-        props.autoCapitalize || 'sentences'
+    ).Constants.AutoCapitalizationType[props.autoCapitalize || 'sentences'];
-      ];
     /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
      * suppresses an error when upgrading Flow's support for React. To see the
      * error delete this comment and run Flow. */

Libraries/Components/TextInput/TextInputState.js

@@ -42,7 +42,8 @@ function focusTextInput(textFieldID: ?number) {
     } else if (Platform.OS === 'android') {
       UIManager.dispatchViewManagerCommand(
         textFieldID,
-        UIManager.AndroidTextInput.Commands.focusTextInput,
+        UIManager.getViewManagerConfig('AndroidTextInput').Commands
+          .focusTextInput,
         null,
       );
     }
@@ -62,7 +63,8 @@ function blurTextInput(textFieldID: ?number) {
     } else if (Platform.OS === 'android') {
       UIManager.dispatchViewManagerCommand(
         textFieldID,
-        UIManager.AndroidTextInput.Commands.blurTextInput,
+        UIManager.getViewManagerConfig('AndroidTextInput').Commands
+          .blurTextInput,
         null,
       );
     }

Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js

@@ -185,8 +185,9 @@ const ToolbarAndroid = createReactClass({
           action.icon = resolveAssetSource(action.icon);
         }
         if (action.show) {
-          action.show =
+          action.show = UIManager.getViewManagerConfig(
-            UIManager.ToolbarAndroid.Constants.ShowAsAction[action.show];
+            'ToolbarAndroid',
+          ).Constants.ShowAsAction[action.show];
         }
         nativeActions.push(action);
       }

Libraries/Components/Touchable/TouchableNativeFeedback.android.js

@@ -223,7 +223,7 @@ const TouchableNativeFeedback = createReactClass({
   _dispatchHotspotUpdate: function(destX, destY) {
     UIManager.dispatchViewManagerCommand(
       ReactNative.findNodeHandle(this),
-      UIManager.RCTView.Commands.hotspotUpdate,
+      UIManager.getViewManagerConfig('RCTView').Commands.hotspotUpdate,
       [destX || 0, destY || 0],
     );
   },
@@ -231,7 +231,7 @@ const TouchableNativeFeedback = createReactClass({
   _dispatchPressedStateChange: function(pressed) {
     UIManager.dispatchViewManagerCommand(
       ReactNative.findNodeHandle(this),
-      UIManager.RCTView.Commands.setPressed,
+      UIManager.getViewManagerConfig('RCTView').Commands.setPressed,
       [pressed],
     );
   },

Libraries/Components/ViewPager/ViewPagerAndroid.android.js

@@ -233,7 +233,7 @@ class ViewPagerAndroid extends React.Component<{
   setPage = (selectedPage: number) => {
     UIManager.dispatchViewManagerCommand(
       ReactNative.findNodeHandle(this),
-      UIManager.AndroidViewPager.Commands.setPage,
+      UIManager.getViewManagerConfig('AndroidViewPager').Commands.setPage,
       [selectedPage],
     );
   };
@@ -245,7 +245,8 @@ class ViewPagerAndroid extends React.Component<{
   setPageWithoutAnimation = (selectedPage: number) => {
     UIManager.dispatchViewManagerCommand(
       ReactNative.findNodeHandle(this),
-      UIManager.AndroidViewPager.Commands.setPageWithoutAnimation,
+      UIManager.getViewManagerConfig('AndroidViewPager').Commands
+        .setPageWithoutAnimation,
       [selectedPage],
     );
   };

Libraries/Components/WebView/WebView.android.js

@@ -366,7 +366,7 @@ class WebView extends React.Component {
   goForward = () => {
     UIManager.dispatchViewManagerCommand(
       this.getWebViewHandle(),
-      UIManager.RCTWebView.Commands.goForward,
+      UIManager.getViewManagerConfig('RCTWebView').Commands.goForward,
       null,
     );
   };
@@ -374,7 +374,7 @@ class WebView extends React.Component {
   goBack = () => {
     UIManager.dispatchViewManagerCommand(
       this.getWebViewHandle(),
-      UIManager.RCTWebView.Commands.goBack,
+      UIManager.getViewManagerConfig('RCTWebView').Commands.goBack,
       null,
     );
   };
@@ -385,7 +385,7 @@ class WebView extends React.Component {
     });
     UIManager.dispatchViewManagerCommand(
       this.getWebViewHandle(),
-      UIManager.RCTWebView.Commands.reload,
+      UIManager.getViewManagerConfig('RCTWebView').Commands.reload,
       null,
     );
   };
@@ -393,7 +393,7 @@ class WebView extends React.Component {
   stopLoading = () => {
     UIManager.dispatchViewManagerCommand(
       this.getWebViewHandle(),
-      UIManager.RCTWebView.Commands.stopLoading,
+      UIManager.getViewManagerConfig('RCTWebView').Commands.stopLoading,
       null,
     );
   };
@@ -401,7 +401,7 @@ class WebView extends React.Component {
   postMessage = data => {
     UIManager.dispatchViewManagerCommand(
       this.getWebViewHandle(),
-      UIManager.RCTWebView.Commands.postMessage,
+      UIManager.getViewManagerConfig('RCTWebView').Commands.postMessage,
       [String(data)],
     );
   };
@@ -415,7 +415,7 @@ class WebView extends React.Component {
   injectJavaScript = data => {
     UIManager.dispatchViewManagerCommand(
       this.getWebViewHandle(),
-      UIManager.RCTWebView.Commands.injectJavaScript,
+      UIManager.getViewManagerConfig('RCTWebView').Commands.injectJavaScript,
       [data],
     );
   };

Libraries/Components/WebView/WebView.ios.js

@@ -561,10 +561,10 @@ class WebView extends React.Component {
 
   _getCommands() {
     if (!this.props.useWebKit) {
-      return UIManager.RCTWebView.Commands;
+      return UIManager.getViewManagerConfig('RCTWebView').Commands;
     }
 
-    return UIManager.RCTWKWebView.Commands;
+    return UIManager.getViewManagerConfig('RCTWKWebView').Commands;
   }
 
   /**

Libraries/RCTTest/SnapshotViewIOS.ios.js

@@ -25,7 +25,7 @@ import type {ViewProps} from 'ViewPropTypes';
 // Verify that RCTSnapshot is part of the UIManager since it is only loaded
 // if you have linked against RCTTest like in tests, otherwise we will have
 // a warning printed out
-const RCTSnapshot = UIManager.RCTSnapshot
+const RCTSnapshot = UIManager.getViewManagerConfig('RCTSnapshot')
   ? requireNativeComponent('RCTSnapshot')
   : View;
 

Libraries/ReactNative/UIManager.js

@@ -35,6 +35,9 @@ UIManager.takeSnapshot = function() {
       'Use ReactNative.takeSnapshot instead.',
   );
 };
+UIManager.getViewManagerConfig = function(viewManagerName: string) {
+  return UIManager[viewManagerName];
+};
 
 /**
  * Copies the ViewManager constants and commands into UIManager. This is

Libraries/ReactNative/getNativeComponentAttributes.js

@@ -23,7 +23,7 @@ const invariant = require('fbjs/lib/invariant');
 const warning = require('fbjs/lib/warning');
 
 function getNativeComponentAttributes(uiViewClassName: string) {
-  const viewConfig = UIManager[uiViewClassName];
+  const viewConfig = UIManager.getViewManagerConfig(uiViewClassName);
 
   invariant(
     viewConfig != null && viewConfig.NativeProps != null,
@@ -36,7 +36,7 @@ function getNativeComponentAttributes(uiViewClassName: string) {
   let {baseModuleName, bubblingEventTypes, directEventTypes} = viewConfig;
   let nativeProps = viewConfig.NativeProps;
   while (baseModuleName) {
-    const baseModule = UIManager[baseModuleName];
+    const baseModule = UIManager.getViewManagerConfig(baseModuleName);
     if (!baseModule) {
       warning(false, 'Base module "%s" does not exist', baseModuleName);
       baseModuleName = null;

Libraries/Text/Text.js

@@ -258,7 +258,7 @@ const RCTText = createReactNativeComponentClass(
 );
 
 const RCTVirtualText =
-  UIManager.RCTVirtualText == null
+  UIManager.getViewManagerConfig('RCTVirtualText') == null
     ? RCTText
     : createReactNativeComponentClass('RCTVirtualText', () => ({
         validAttributes: {

Libraries/Utilities/deprecatedPropType.js

@@ -21,7 +21,10 @@ function deprecatedPropType(
 ): ReactPropsCheckType {
   return function validate(props, propName, componentName, ...rest) {
     // Don't warn for native components.
-    if (!UIManager[componentName] && props[propName] !== undefined) {
+    if (
+      !UIManager.getViewManagerConfig(componentName) &&
+      props[propName] !== undefined
+    ) {
       console.warn(
         `\`${propName}\` supplied to \`${componentName}\` has been deprecated. ${explanation}`,
       );

ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java

@@ -28,9 +28,9 @@ import javax.annotation.Nullable;
   /**
    * Generates a lazy discovery enabled version of {@link UIManagerModule} constants. It only
    * contains a list of view manager names, so that JS side is aware of the managers there are.
-   * Actual ViewManager instantiation happens when {@code UIManager.SpecificViewManager} call happens.
+   * Actual ViewManager instantiation happens when
-   * The View Manager is then registered on the JS side with the help of
+   * {@code UIManager.getViewManagerConfig('SpecificViewManager')} call happens. The View Manager is then
-   * {@code UIManagerModule.getConstantsForViewManager}.
+   * registered on the JS side with the help of {@code UIManagerModule.getConstantsForViewManager}.
    */
   /* package */ static Map<String, Object> createConstants(
       UIManagerModule.ViewManagerResolver resolver) {

jest/setup.js

@@ -253,6 +253,7 @@ const mockNativeModules = {
     createView: jest.fn(),
     dispatchViewManagerCommand: jest.fn(),
     focus: jest.fn(),
+    getViewManagerConfig: jest.fn(),
     setChildren: jest.fn(),
     manageChildren: jest.fn(),
     updateView: jest.fn(),