Ensure passive effects are flushed after a suspended commit resolves

facebook · Dec 19, 2024 · d94334a · d94334a
1 parent a8efb5b
commit d94334a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.js b/packages/react-reconciler/src/ReactFiberWorkLoop.js
@@ -3278,6 +3278,9 @@ function commitRootImpl(
       // We don't schedule a separate task for flushing passive effects.
       // Instead, we just rely on ensureRootIsScheduled below to schedule
       // a callback for us to flush the passive effects.
+      // We do need to clear this callback.
+      // Otherwise, we'll still think the commit is suspended.
+      root.cancelPendingCommit = null;
     } else {
       // So we can clear these now to allow a new callback to be scheduled.
       root.callbackNode = null;

diff --git a/packages/react-reconciler/src/__tests__/ReactSuspenseyCommitPhase-test.js b/packages/react-reconciler/src/__tests__/ReactSuspenseyCommitPhase-test.js
@@ -492,8 +492,6 @@ describe('ReactSuspenseyCommitPhase', () => {
     );
   });
 
-  // FIXME: Should pass with `enableYieldingBeforePassive`
-  // @gate !enableYieldingBeforePassive
   it('runs passive effects after suspended commit resolves', async () => {
     function Effect() {
       React.useEffect(() => {

diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js
@@ -78,8 +78,7 @@ export const enableLegacyFBSupport = false;
 // -----------------------------------------------------------------------------
 
 // Yield to the browser event loop and not just the scheduler event loop before passive effects.
-// Fix gated tests that fail with this flag enabled before turning it back on.
-export const enableYieldingBeforePassive = false;
+export const enableYieldingBeforePassive = __EXPERIMENTAL__;
 
 export const enableLegacyCache = __EXPERIMENTAL__;