fix: restore execution context after RetryAfterError completed

facebook · Jun 29, 2021 · 7f9e7a9 · 7f9e7a9
1 parent 2ff9c68
commit 7f9e7a9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.new.js b/packages/react-reconciler/src/ReactFiberWorkLoop.new.js
@@ -813,6 +813,8 @@ function performConcurrentWorkOnRoot(root, didTimeout) {
         lanes = errorRetryLanes;
         exitStatus = renderRootSync(root, errorRetryLanes);
       }
+
+      executionContext &= ~RetryAfterError;
     }
 
     if (exitStatus === RootFatalErrored) {
@@ -1006,6 +1008,8 @@ function performSyncWorkOnRoot(root) {
       lanes = errorRetryLanes;
       exitStatus = renderRootSync(root, lanes);
     }
+
+    executionContext &= ~RetryAfterError;
   }
 
   if (exitStatus === RootFatalErrored) {

diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.old.js b/packages/react-reconciler/src/ReactFiberWorkLoop.old.js
@@ -813,6 +813,8 @@ function performConcurrentWorkOnRoot(root, didTimeout) {
         lanes = errorRetryLanes;
         exitStatus = renderRootSync(root, errorRetryLanes);
       }
+
+      executionContext &= ~RetryAfterError;
     }
 
     if (exitStatus === RootFatalErrored) {
@@ -1006,6 +1008,8 @@ function performSyncWorkOnRoot(root) {
       lanes = errorRetryLanes;
       exitStatus = renderRootSync(root, lanes);
     }
+
+    executionContext &= ~RetryAfterError;
   }
 
   if (exitStatus === RootFatalErrored) {