Fallback to owner of returnFiber

Won't work if the returnFiber is a fragment. Not sure it matters; warning will just be less descriptive.
facebook · Jan 31, 2017 · 802c820 · 802c820
1 parent 3089db9
commit 802c820
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/renderers/shared/fiber/ReactChildFiber.js b/src/renderers/shared/fiber/ReactChildFiber.js
@@ -109,7 +109,7 @@ function coerceRef(current: ?Fiber, element: ReactElement) {
   return mixedRef;
 }
 
-function throwOnInvalidObjectType(newChild : Object) {
+function throwOnInvalidObjectType(returnFiber : Fiber, newChild : Object) {
   const childrenString = String(newChild);
   let addendum = '';
   if (__DEV__) {
@@ -122,9 +122,9 @@ function throwOnInvalidObjectType(newChild : Object) {
         ' It looks like you\'re using an element created by a different ' +
         'version of React. Make sure to use only one copy of React.';
     }
-    if (ReactCurrentOwner.current) {
-      const owner : Fiber = (ReactCurrentOwner.current : any);
-      let name = getComponentName(owner);
+    const owner = ReactCurrentOwner.owner || returnFiber._debugOwner;
+    if (owner && typeof owner.tag === 'number') {
+      const name = getComponentName((owner : any));
       if (name) {
         addendum += ' Check the render method of `' + name + '`.';
       }
@@ -452,7 +452,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
         return created;
       }
 
-      throwOnInvalidObjectType(newChild);
+      throwOnInvalidObjectType(returnFiber, newChild);
     }
 
     return null;
@@ -517,7 +517,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
         return updateFragment(returnFiber, oldFiber, newChild, priority);
       }
 
-      throwOnInvalidObjectType(newChild);
+      throwOnInvalidObjectType(returnFiber, newChild);
     }
 
     return null;
@@ -574,7 +574,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
         return updateFragment(returnFiber, matchedFiber, newChild, priority);
       }
 
-      throwOnInvalidObjectType(newChild);
+      throwOnInvalidObjectType(returnFiber, newChild);
     }
 
     return null;
@@ -1240,7 +1240,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
     }
 
     if (isObject) {
-      throwOnInvalidObjectType(newChild);
+      throwOnInvalidObjectType(returnFiber, newChild);
     }
 
     if (!disableNewFiberFeatures && typeof newChild === 'undefined') {