From 29552c7907230222acd3f2c586784d24f9da6200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= <sebastian@calyptus.eu>
Date: Wed, 10 Jul 2024 16:58:46 -0400
Subject: [PATCH] Override the getCurrentStack temporarily while printing
 uncaught errors (#30309)

This is just a follow up to #30300.

I forgot the uncaught branch.
---
 .../src/ReactFiberErrorLogger.js              | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/packages/react-reconciler/src/ReactFiberErrorLogger.js b/packages/react-reconciler/src/ReactFiberErrorLogger.js
index 59af033b56804..a8667b4bb5969 100644
--- a/packages/react-reconciler/src/ReactFiberErrorLogger.js
+++ b/packages/react-reconciler/src/ReactFiberErrorLogger.js
@@ -46,27 +46,29 @@ export function defaultOnUncaughtError(
       'Consider adding an error boundary to your tree to customize error handling behavior.\n' +
       'Visit https://react.dev/link/error-boundaries to learn more about error boundaries.';
 
-    if (enableOwnerStacks) {
-      console.warn(
-        '%s\n\n%s\n',
-        componentNameMessage,
-        errorBoundaryMessage,
-        // We let our console.error wrapper add the component stack to the end.
-      );
-    } else {
+    const prevGetCurrentStack = ReactSharedInternals.getCurrentStack;
+    if (!enableOwnerStacks) {
       // The current Fiber is disconnected at this point which means that console printing
       // cannot add a component stack since it terminates at the deletion node. This is not
       // a problem for owner stacks which are not disconnected but for the parent component
       // stacks we need to use the snapshot we've previously extracted.
       const componentStack =
         errorInfo.componentStack != null ? errorInfo.componentStack : '';
-      // Don't transform to our wrapper
-      console['warn'](
-        '%s\n\n%s\n%s',
+      ReactSharedInternals.getCurrentStack = function () {
+        return componentStack;
+      };
+    }
+    try {
+      console.warn(
+        '%s\n\n%s\n',
         componentNameMessage,
         errorBoundaryMessage,
-        componentStack,
+        // We let our console.error wrapper add the component stack to the end.
       );
+    } finally {
+      if (!enableOwnerStacks) {
+        ReactSharedInternals.getCurrentStack = prevGetCurrentStack;
+      }
     }
   }
 }