From 3adf96630bfe14184c0aa84c2349e15076628175 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Thu, 3 Aug 2017 14:46:49 -0700
Subject: [PATCH] Log captured errors sooner This prevents the captured error
 from becoming separated from the component stack if other errors (or
 console.error calls) are made between them, eg a component errors during
 unmount.

---
 .../shared/fiber/ReactFiberScheduler.js       | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/renderers/shared/fiber/ReactFiberScheduler.js b/src/renderers/shared/fiber/ReactFiberScheduler.js
index 9a5d4abe2362b..df1a13cfd4fb4 100644
--- a/src/renderers/shared/fiber/ReactFiberScheduler.js
+++ b/src/renderers/shared/fiber/ReactFiberScheduler.js
@@ -1189,7 +1189,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         capturedErrors = new Map();
       }
 
-      capturedErrors.set(boundary, {
+      const capturedError = {
         componentName,
         componentStack,
         error,
@@ -1197,7 +1197,17 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         errorBoundaryFound,
         errorBoundaryName,
         willRetry,
-      });
+      };
+
+      capturedErrors.set(boundary, capturedError);
+
+      try {
+        logCapturedError(capturedError);
+      } catch (e) {
+        // Prevent cycle if logCapturedError() throws.
+        // A cycle may still occur if logCapturedError renders a component that throws.
+        console.error(e);
+      }
 
       // If we're in the commit phase, defer scheduling an update on the
       // boundary until after the commit is complete
@@ -1261,15 +1271,6 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         'bug in React. Please file an issue.',
     );
 
-    const error = capturedError.error;
-    try {
-      logCapturedError(capturedError);
-    } catch (e) {
-      // Prevent cycle if logCapturedError() throws.
-      // A cycle may still occur if logCapturedError renders a component that throws.
-      console.error(e);
-    }
-
     switch (effectfulFiber.tag) {
       case ClassComponent:
         const instance = effectfulFiber.stateNode;
@@ -1280,14 +1281,14 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
 
         // Allow the boundary to handle the error, usually by scheduling
         // an update to itself
-        instance.componentDidCatch(error, info);
+        instance.componentDidCatch(capturedError.error, info);
         return;
       case HostRoot:
         if (firstUncaughtError === null) {
           // If this is the host container, we treat it as a no-op error
           // boundary. We'll throw the first uncaught error once it's safe to
           // do so, at the end of the batch.
-          firstUncaughtError = error;
+          firstUncaughtError = capturedError.error;
         }
         return;
       default: