fix suspense throttling

sunderls · sunderls · commit 980593521ad0 · 2022-04-02T00:57:47.000+01:00
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.new.js b/packages/react-reconciler/src/ReactFiberCommitWork.new.js
@@ -2250,22 +2250,25 @@ function commitMutationEffectsOnFiber(
     }
   }
 
-  if (flags & Visibility) {
-    switch (finishedWork.tag) {
-      case SuspenseComponent: {
-        const newState: OffscreenState | null = finishedWork.memoizedState;
+  switch (finishedWork.tag) {
+    case SuspenseComponent: {
+      const offscreenFiber: Fiber = (finishedWork.child: any);
+      if (offscreenFiber.flags & Visibility) {
+        const newState: OffscreenState | null = offscreenFiber.memoizedState;
         const isHidden = newState !== null;
         if (isHidden) {
-          const current = finishedWork.alternate;
+          const current = offscreenFiber.alternate;
           const wasHidden = current !== null && current.memoizedState !== null;
           if (!wasHidden) {
             // TODO: Move to passive phase
             markCommitTimeOfFallback();
           }
         }
-        break;
       }
-      case OffscreenComponent: {
+      break;
+    }
+    case OffscreenComponent: {
+      if (flags & Visibility) {
         const newState: OffscreenState | null = finishedWork.memoizedState;
         const isHidden = newState !== null;
         const current = finishedWork.alternate;
@@ -2301,7 +2304,6 @@ function commitMutationEffectsOnFiber(
       }
     }
   }
-
   // The following switch statement is only concerned about placement,
   // updates, and deletions. To avoid needing to add a case for every possible
   // bitmap value, we remove the secondary effects from the effect tag and
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.old.js b/packages/react-reconciler/src/ReactFiberCommitWork.old.js
@@ -2250,22 +2250,25 @@ function commitMutationEffectsOnFiber(
     }
   }
 
-  if (flags & Visibility) {
-    switch (finishedWork.tag) {
-      case SuspenseComponent: {
-        const newState: OffscreenState | null = finishedWork.memoizedState;
+  switch (finishedWork.tag) {
+    case SuspenseComponent: {
+      const offscreenFiber: Fiber = (finishedWork.child: any);
+      if (offscreenFiber.flags & Visibility) {
+        const newState: OffscreenState | null = offscreenFiber.memoizedState;
         const isHidden = newState !== null;
         if (isHidden) {
-          const current = finishedWork.alternate;
+          const current = offscreenFiber.alternate;
           const wasHidden = current !== null && current.memoizedState !== null;
           if (!wasHidden) {
             // TODO: Move to passive phase
             markCommitTimeOfFallback();
           }
         }
-        break;
       }
-      case OffscreenComponent: {
+      break;
+    }
+    case OffscreenComponent: {
+      if (flags & Visibility) {
         const newState: OffscreenState | null = finishedWork.memoizedState;
         const isHidden = newState !== null;
         const current = finishedWork.alternate;
@@ -2301,7 +2304,6 @@ function commitMutationEffectsOnFiber(
       }
     }
   }
-
   // The following switch statement is only concerned about placement,
   // updates, and deletions. To avoid needing to add a case for every possible
   // bitmap value, we remove the secondary effects from the effect tag and

Original file line number	Diff line number	Diff line change
`@@ -2250,22 +2250,25 @@ function commitMutationEffectsOnFiber(`
`2250`	`2250`	`}`
`2251`	`2251`	`}`
`2252`	`2252`
`2253`		`- if (flags & Visibility) {`
`2254`		`- switch (finishedWork.tag) {`
`2255`		`- case SuspenseComponent: {`
`2256`		`- const newState: OffscreenState \| null = finishedWork.memoizedState;`
	`2253`	`+ switch (finishedWork.tag) {`
	`2254`	`+ case SuspenseComponent: {`
	`2255`	`+ const offscreenFiber: Fiber = (finishedWork.child: any);`
	`2256`	`+ if (offscreenFiber.flags & Visibility) {`
	`2257`	`+ const newState: OffscreenState \| null = offscreenFiber.memoizedState;`
`2257`	`2258`	`const isHidden = newState !== null;`
`2258`	`2259`	`if (isHidden) {`
`2259`		`- const current = finishedWork.alternate;`
	`2260`	`+ const current = offscreenFiber.alternate;`
`2260`	`2261`	`const wasHidden = current !== null && current.memoizedState !== null;`
`2261`	`2262`	`if (!wasHidden) {`
`2262`	`2263`	`// TODO: Move to passive phase`
`2263`	`2264`	`markCommitTimeOfFallback();`
`2264`	`2265`	`}`
`2265`	`2266`	`}`
`2266`		`- break;`
`2267`	`2267`	`}`
`2268`		`- case OffscreenComponent: {`
	`2268`	`+ break;`
	`2269`	`+ }`
	`2270`	`+ case OffscreenComponent: {`
	`2271`	`+ if (flags & Visibility) {`
`2269`	`2272`	`const newState: OffscreenState \| null = finishedWork.memoizedState;`
`2270`	`2273`	`const isHidden = newState !== null;`
`2271`	`2274`	`const current = finishedWork.alternate;`
`@@ -2301,7 +2304,6 @@ function commitMutationEffectsOnFiber(`
`2301`	`2304`	`}`
`2302`	`2305`	`}`
`2303`	`2306`	`}`
`2304`		`-`
`2305`	`2307`	`// The following switch statement is only concerned about placement,`
`2306`	`2308`	`// updates, and deletions. To avoid needing to add a case for every possible`
`2307`	`2309`	`// bitmap value, we remove the secondary effects from the effect tag and`