[Fiber] New error boundary semantics

scripts/fiber/tests-passing.txt

@@ -1080,16 +1080,29 @@ src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
 * reads context when setState is above the provider
 
 src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
-* catches render error in a boundary during mounting
-* propagates an error from a noop error boundary
+* catches render error in a boundary during full deferred mounting
+* catches render error in a boundary during partial deferred mounting
+* catches render error in a boundary during animation mounting
+* catches render error in a boundary during synchronous mounting
+* catches render error in a boundary during batched mounting
+* propagates an error from a noop error boundary during full deferred mounting
+* propagates an error from a noop error boundary during partial deferred mounting
+* propagates an error from a noop error boundary during animation mounting
+* propagates an error from a noop error boundary during synchronous mounting
+* propagates an error from a noop error boundary during batched mounting
+* applies batched updates regardless despite errors in scheduling
+* applies nested batched updates despite errors in scheduling
+* applies sync updates regardless despite errors in scheduling
 * can schedule updates after uncaught error in render on mount
 * can schedule updates after uncaught error in render on update
 * can schedule updates after uncaught error during umounting
 * continues work on other roots despite caught errors
 * continues work on other roots despite uncaught errors
+* unwinds the context stack correctly on error
 * catches reconciler errors in a boundary during mounting
 * catches reconciler errors in a boundary during update
 * recovers from uncaught reconciler errors
+* unmounts components with uncaught errors
 
 src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
 * handles isMounted even when the initial render is deferred
@@ -1323,6 +1336,8 @@ src/renderers/shared/shared/__tests__/ReactErrorBoundaries-test.js
 * catches errors in componentDidUpdate
 * propagates errors inside boundary during componentDidMount
 * lets different boundaries catch their own first errors
+* discards a bad root if the root component fails
+* renders empty output if error boundary does not handle the error
 
 src/renderers/shared/shared/__tests__/ReactIdentity-test.js
 * should allow key property to express identity

src/renderers/shared/fiber/ReactFiberBeginWork.js

@@ -481,8 +481,31 @@ module.exports = function<T, P, I, TI, C>(
     }
   }
 
+  function beginFailedWork(current : ?Fiber, workInProgress : Fiber, priorityLevel : PriorityLevel) {
+    if (workInProgress.tag !== ClassComponent &&
+        workInProgress.tag !== HostContainer) {
+      throw new Error('Invalid type of work');
+    }
+
+    if (workInProgress.pendingWorkPriority === NoWork ||
+        workInProgress.pendingWorkPriority > priorityLevel) {
+      return bailoutOnLowPriority(current, workInProgress);
+    }
+
+    // If we don't bail out, we're going be recomputing our children so we need
+    // to drop our effect list.
+    workInProgress.firstEffect = null;
+    workInProgress.lastEffect = null;
+
+    // Unmount the current children as if the component rendered null
+    const nextChildren = null;
+    reconcileChildren(current, workInProgress, nextChildren);
+    return workInProgress.child;
+  }
+
   return {
     beginWork,
+    beginFailedWork,
   };
 
 };

src/renderers/shared/fiber/ReactFiberCommitWork.js

@@ -34,7 +34,7 @@ var {
 
 module.exports = function<T, P, I, TI, C>(
   config : HostConfig<T, P, I, TI, C>,
-  trapError : (failedFiber : Fiber, error: Error, isUnmounting : boolean) => void
+  captureError : (failedFiber : Fiber, error: Error, isUnmounting : boolean) => Fiber | null
 ) {
 
   const commitUpdate = config.commitUpdate;
@@ -133,6 +133,10 @@ module.exports = function<T, P, I, TI, C>(
   }
 
   function commitPlacement(finishedWork : Fiber) : void {
+    // Clear effect from effect tag before any errors can be thrown, so that
+    // we don't attempt to do this again
+    finishedWork.effectTag &= ~Placement;
+
     // Recursively insert all host nodes into the parent.
     const parent = getHostParent(finishedWork);
     const before = getHostSibling(finishedWork);
@@ -272,7 +276,7 @@ module.exports = function<T, P, I, TI, C>(
         if (typeof instance.componentWillUnmount === 'function') {
           const error = tryCallComponentWillUnmount(instance);
           if (error) {
-            trapError(current, error, true);
+            captureError(current, error, true);
           }
         }
         return;
@@ -362,7 +366,7 @@ module.exports = function<T, P, I, TI, C>(
           }
         }
         if (firstError) {
-          trapError(finishedWork, firstError, false);
+          captureError(finishedWork, firstError, false);
         }
         return;
       }
@@ -375,7 +379,7 @@ module.exports = function<T, P, I, TI, C>(
           firstError = callCallbacks(callbackList, rootFiber.current.child.stateNode);
         }
         if (firstError) {
-          trapError(rootFiber, firstError, false);
+          captureError(rootFiber, firstError, false);
         }
         return;
       }

src/renderers/shared/fiber/ReactFiberContext.js

@@ -69,16 +69,19 @@ exports.hasContextChanged = function() : boolean {
 function isContextProvider(fiber : Fiber) : boolean {
   return (
     fiber.tag === ClassComponent &&
+    // Instance might be null, if the fiber errored during construction
+    fiber.stateNode &&
     typeof fiber.stateNode.getChildContext === 'function'
   );
 }
 exports.isContextProvider = isContextProvider;
 
-exports.popContextProvider = function() : void {
+function popContextProvider() : void {
   contextStack[index] = emptyObject;
   didPerformWorkStack[index] = false;
   index--;
-};
+}
+exports.popContextProvider = popContextProvider;
 
 exports.pushTopLevelContextObject = function(context : Object, didChange : boolean) : void {
   invariant(index === -1, 'Unexpected context found on stack');
@@ -149,3 +152,13 @@ exports.findCurrentUnmaskedContext = function(fiber: Fiber) : Object {
   }
   return node.stateNode.context;
 };
+
+exports.unwindContext = function(from : Fiber, to: Fiber) {
+  let node = from;
+  while (node && (node !== to) && (node.alternate !== to)) {
+    if (isContextProvider(node)) {
+      popContextProvider();
+    }
+    node = node.return;
+  }
+};