Partial React Sync

Summary: This diff is a partial sync of React into React Native. ## Source The source branch is from my fork [here](https://github.com/facebook/react/compare/master...rickhanlonii:react-native-partial-sync-october-9?expand=1) This branch is created from D17456249 which partially synced Dan's branch [here](facebook/react@master...gaearon:partsync). To create my branch, I forked from Dan's branch and added two commits from these PRs: - Joshua's PR to improve view config errors facebook/react#16879 - Eli's PR to remove setNativeProps warning facebook/react#17045 Reviewed By: gaearon Differential Revision: D17828989 fbshipit-source-id: 75c99737f2dec4889d7d453bbdebaeb47656b5ce
youmoxiyou · Oct 10, 2019 · 5d1e573 · 5d1e573
1 parent 80ba45a
commit 5d1e573
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 269 deletions.
diff --git a/Libraries/Renderer/__flowtests__/ReactNativeTypes-flowtest.js b/Libraries/Renderer/__flowtests__/ReactNativeTypes-flowtest.js
@@ -13,7 +13,7 @@
 import * as React from 'react';
 import type {
   HostComponent,
-  ReactNativeComponentClass_ForTestsOnly,
+  _InternalReactNativeComponentClass,
 } from '../shims/ReactNativeTypes';
 
 function takesHostComponentInstance(
@@ -34,7 +34,7 @@ const MyHostComponent = (('Host': any): HostComponent<mixed>);
   }}
 />;
 
-declare var NativeComponent: ReactNativeComponentClass_ForTestsOnly<{}>;
+declare var NativeComponent: _InternalReactNativeComponentClass<{}>;
 class MyNativeComponent extends NativeComponent {}
 
 <MyNativeComponent

diff --git a/Libraries/Renderer/implementations/ReactFabric-dev.fb.js b/Libraries/Renderer/implementations/ReactFabric-dev.fb.js
@@ -2804,7 +2804,6 @@ var debugRenderPhaseSideEffectsForStrictMode = true;
 
 var replayFailedUnitOfWorkWithInvokeGuardedCallback = true;
 var warnAboutDeprecatedLifecycles = true;
-var warnAboutDeprecatedSetNativeProps = true;
 var enableFlareAPI = false;
 var enableFundamentalAPI = false;
 
@@ -3827,6 +3826,8 @@ var ReactNativeComponent = (function(_React$Component) {
   return ReactNativeComponent;
 })(React.Component);
 
+// This type is only used for FlowTests. It shouldn't be imported directly
+
 /**
  * This type keeps ReactNativeFiberHostComponent and NativeMethodsMixin in sync.
  * It can also provide types for ReactNative applications that use NMM or refs.
@@ -22798,18 +22799,6 @@ var NativeMethodsMixin = function(findNodeHandle, findHostInstance) {
         return;
       }
 
-      {
-        if (warnAboutDeprecatedSetNativeProps) {
-          warningWithoutStack$1(
-            false,
-            "Warning: Calling ref.setNativeProps(nativeProps) " +
-              "is deprecated and will be removed in a future release. " +
-              "Use the setNativeProps export from the react-native package instead." +
-              "\n\timport {setNativeProps} from 'react-native';\n\tsetNativeProps(ref, nativeProps);\n"
-          );
-        }
-      }
-
       var nativeTag =
         maybeInstance._nativeTag || maybeInstance.canonical._nativeTag;
       var viewConfig =
@@ -23185,18 +23174,6 @@ var ReactNativeComponent$1 = function(findNodeHandle, findHostInstance) {
         return;
       }
 
-      {
-        if (warnAboutDeprecatedSetNativeProps) {
-          warningWithoutStack$1(
-            false,
-            "Warning: Calling ref.setNativeProps(nativeProps) " +
-              "is deprecated and will be removed in a future release. " +
-              "Use the setNativeProps export from the react-native package instead." +
-              "\n\timport {setNativeProps} from 'react-native';\n\tsetNativeProps(ref, nativeProps);\n"
-          );
-        }
-      }
-
       var nativeTag =
         maybeInstance._nativeTag || maybeInstance.canonical._nativeTag;
       var viewConfig =
@@ -23408,14 +23385,6 @@ var ReactFabric = {
 
   findNodeHandle: findNodeHandle,
 
-  setNativeProps: function(handle, nativeProps) {
-    warningWithoutStack$1(
-      false,
-      "Warning: setNativeProps is not currently supported in Fabric"
-    );
-
-    return;
-  },
   dispatchCommand: function(handle, command, args) {
     var invalid =
       handle._nativeTag == null || handle._internalInstanceHandle == null;

diff --git a/Libraries/Renderer/implementations/ReactFabric-dev.js b/Libraries/Renderer/implementations/ReactFabric-dev.js
@@ -2800,7 +2800,6 @@ var enableProfilerTimer = true;
 var enableSchedulerTracing = true;
 var enableSuspenseServerRenderer = false;
 
-var warnAboutDeprecatedSetNativeProps = false;
 var enableFlareAPI = false;
 var enableFundamentalAPI = false;
 
@@ -3823,6 +3822,8 @@ var ReactNativeComponent = (function(_React$Component) {
   return ReactNativeComponent;
 })(React.Component);
 
+// This type is only used for FlowTests. It shouldn't be imported directly
+
 /**
  * This type keeps ReactNativeFiberHostComponent and NativeMethodsMixin in sync.
  * It can also provide types for ReactNative applications that use NMM or refs.
@@ -22794,18 +22795,6 @@ var NativeMethodsMixin = function(findNodeHandle, findHostInstance) {
         return;
       }
 
-      {
-        if (warnAboutDeprecatedSetNativeProps) {
-          warningWithoutStack$1(
-            false,
-            "Warning: Calling ref.setNativeProps(nativeProps) " +
-              "is deprecated and will be removed in a future release. " +
-              "Use the setNativeProps export from the react-native package instead." +
-              "\n\timport {setNativeProps} from 'react-native';\n\tsetNativeProps(ref, nativeProps);\n"
-          );
-        }
-      }
-
       var nativeTag =
         maybeInstance._nativeTag || maybeInstance.canonical._nativeTag;
       var viewConfig =
@@ -23181,18 +23170,6 @@ var ReactNativeComponent$1 = function(findNodeHandle, findHostInstance) {
         return;
       }
 
-      {
-        if (warnAboutDeprecatedSetNativeProps) {
-          warningWithoutStack$1(
-            false,
-            "Warning: Calling ref.setNativeProps(nativeProps) " +
-              "is deprecated and will be removed in a future release. " +
-              "Use the setNativeProps export from the react-native package instead." +
-              "\n\timport {setNativeProps} from 'react-native';\n\tsetNativeProps(ref, nativeProps);\n"
-          );
-        }
-      }
-
       var nativeTag =
         maybeInstance._nativeTag || maybeInstance.canonical._nativeTag;
       var viewConfig =
@@ -23404,14 +23381,6 @@ var ReactFabric = {
 
   findNodeHandle: findNodeHandle,
 
-  setNativeProps: function(handle, nativeProps) {
-    warningWithoutStack$1(
-      false,
-      "Warning: setNativeProps is not currently supported in Fabric"
-    );
-
-    return;
-  },
   dispatchCommand: function(handle, command, args) {
     var invalid =
       handle._nativeTag == null || handle._internalInstanceHandle == null;

diff --git a/Libraries/Renderer/implementations/ReactFabric-prod.fb.js b/Libraries/Renderer/implementations/ReactFabric-prod.fb.js
@@ -7605,7 +7605,6 @@ var roots = new Map(),
       })(React.Component);
     })(findNodeHandle, findHostInstance),
     findNodeHandle: findNodeHandle,
-    setNativeProps: function() {},
     dispatchCommand: function(handle, command, args) {
       null != handle._nativeTag &&
         null != handle._internalInstanceHandle &&

diff --git a/Libraries/Renderer/implementations/ReactFabric-prod.js b/Libraries/Renderer/implementations/ReactFabric-prod.js
@@ -7605,7 +7605,6 @@ var roots = new Map(),
       })(React.Component);
     })(findNodeHandle, findHostInstance),
     findNodeHandle: findNodeHandle,
-    setNativeProps: function() {},
     dispatchCommand: function(handle, command, args) {
       null != handle._nativeTag &&
         null != handle._internalInstanceHandle &&

diff --git a/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js b/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js
@@ -7838,7 +7838,6 @@ var roots = new Map(),
       })(React.Component);
     })(findNodeHandle, findHostInstance),
     findNodeHandle: findNodeHandle,
-    setNativeProps: function() {},
     dispatchCommand: function(handle, command, args) {
       null != handle._nativeTag &&
         null != handle._internalInstanceHandle &&

diff --git a/Libraries/Renderer/implementations/ReactFabric-profiling.js b/Libraries/Renderer/implementations/ReactFabric-profiling.js
@@ -7838,7 +7838,6 @@ var roots = new Map(),
       })(React.Component);
     })(findNodeHandle, findHostInstance),
     findNodeHandle: findNodeHandle,
-    setNativeProps: function() {},
     dispatchCommand: function(handle, command, args) {
       null != handle._nativeTag &&
         null != handle._internalInstanceHandle &&

diff --git a/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js b/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js
@@ -2658,7 +2658,6 @@ var debugRenderPhaseSideEffectsForStrictMode = true;
 
 var replayFailedUnitOfWorkWithInvokeGuardedCallback = true;
 var warnAboutDeprecatedLifecycles = true;
-var warnAboutDeprecatedSetNativeProps = true;
 var enableFlareAPI = false;
 var enableFundamentalAPI = false;
 
@@ -3928,9 +3927,13 @@ var ReactNativeFiberHostComponent = (function() {
     } else if (relativeToNativeNode._nativeTag) {
       relativeNode = relativeToNativeNode._nativeTag;
     } else if (
+      /* $FlowFixMe canonical doesn't exist on the node.
+     I think this branch is dead and will remove it in a followup */
       relativeToNativeNode.canonical &&
       relativeToNativeNode.canonical._nativeTag
     ) {
+      /* $FlowFixMe canonical doesn't exist on the node.
+       I think this branch is dead and will remove it in a followup */
       relativeNode = relativeToNativeNode.canonical._nativeTag;
     }
 
@@ -3955,15 +3958,6 @@ var ReactNativeFiberHostComponent = (function() {
     nativeProps
   ) {
     {
-      if (warnAboutDeprecatedSetNativeProps) {
-        warningWithoutStack$1(
-          false,
-          "Warning: Calling ref.setNativeProps(nativeProps) " +
-            "is deprecated and will be removed in a future release. " +
-            "Use the setNativeProps export from the react-native package instead." +
-            "\n\timport {setNativeProps} from 'react-native';\n\tsetNativeProps(ref, nativeProps);\n"
-        );
-      }
       warnForStyleProps(nativeProps, this.viewConfig.validAttributes);
     }
 
@@ -22374,18 +22368,6 @@ var NativeMethodsMixin = function(findNodeHandle, findHostInstance) {
         return;
       }
 
-      {
-        if (warnAboutDeprecatedSetNativeProps) {
-          warningWithoutStack$1(
-            false,
-            "Warning: Calling ref.setNativeProps(nativeProps) " +
-              "is deprecated and will be removed in a future release. " +
-              "Use the setNativeProps export from the react-native package instead." +
-              "\n\timport {setNativeProps} from 'react-native';\n\tsetNativeProps(ref, nativeProps);\n"
-          );
-        }
-      }
-
       var nativeTag =
         maybeInstance._nativeTag || maybeInstance.canonical._nativeTag;
       var viewConfig =
@@ -22761,18 +22743,6 @@ var ReactNativeComponent = function(findNodeHandle, findHostInstance) {
         return;
       }
 
-      {
-        if (warnAboutDeprecatedSetNativeProps) {
-          warningWithoutStack$1(
-            false,
-            "Warning: Calling ref.setNativeProps(nativeProps) " +
-              "is deprecated and will be removed in a future release. " +
-              "Use the setNativeProps export from the react-native package instead." +
-              "\n\timport {setNativeProps} from 'react-native';\n\tsetNativeProps(ref, nativeProps);\n"
-          );
-        }
-      }
-
       var nativeTag =
         maybeInstance._nativeTag || maybeInstance.canonical._nativeTag;
       var viewConfig =
@@ -22907,36 +22877,6 @@ var getInspectorDataForViewTag = void 0;
   };
 }
 
-// Module provided by RN:
-function setNativeProps(handle, nativeProps) {
-  if (handle._nativeTag == null) {
-    !(handle._nativeTag != null)
-      ? warningWithoutStack$1(
-          false,
-          "setNativeProps was called with a ref that isn't a " +
-            "native component. Use React.forwardRef to get access to the underlying native component"
-        )
-      : void 0;
-    return;
-  }
-
-  {
-    warnForStyleProps(nativeProps, handle.viewConfig.validAttributes);
-  }
-
-  var updatePayload = create(nativeProps, handle.viewConfig.validAttributes);
-  // Avoid the overhead of bridge calls if there's no update.
-  // This is an expensive no-op for Android, and causes an unnecessary
-  // view invalidation for certain components (eg RCTTextInput) on iOS.
-  if (updatePayload != null) {
-    ReactNativePrivateInterface.UIManager.updateView(
-      handle._nativeTag,
-      handle.viewConfig.uiViewClassName,
-      updatePayload
-    );
-  }
-}
-
 // TODO: direct imports like some-package/src/* are bad. Fix me.
 // Module provided by RN:
 var ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
@@ -23031,9 +22971,6 @@ var ReactNativeRenderer = {
       args
     );
   },
-
-  setNativeProps: setNativeProps,
-
   render: function(element, containerTag, callback) {
     var root = roots.get(containerTag);