Check PassiveStatic instead of Passive (facebook#19489)

acdlite · web-flow · commit e1f96b82b4af · 2020-07-30T09:13:04.000-04:00
Saves us from having to set a flag on `current` during the layout phase.

Could result in some redundant traversal, since PassiveStatic includes
effects that don't need clean-up. But it's worth it to remove the work
from the layout phase.

While I was editing this, I also re-arranged it so that we check the
`effectTag` check before we check the `tag`, since the `effectTag` check
is the one that's more likely to fail.
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.new.js b/packages/react-reconciler/src/ReactFiberCommitWork.new.js
@@ -68,7 +68,6 @@ import {
   Placement,
   Snapshot,
   Update,
-  Passive,
 } from './ReactSideEffectTags';
 import getComponentName from 'shared/getComponentName';
 import invariant from 'shared/invariant';
@@ -881,8 +880,6 @@ function commitUnmount(
                 // TODO: Consider if we can move this block out of the synchronous commit phase
                 effect.tag |= HookHasEffect;
 
-                current.effectTag |= Passive;
-
                 schedulePassiveEffectCallback();
               } else {
                 if (
diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.new.js b/packages/react-reconciler/src/ReactFiberWorkLoop.new.js
@@ -2836,13 +2836,12 @@ function flushPassiveUnmountEffectsInsideOfDeletedTree(
       }
     }
 
-    switch (fiber.tag) {
-      case FunctionComponent:
-      case ForwardRef:
-      case SimpleMemoComponent:
-      case Block: {
-        const primaryEffectTag = fiber.effectTag & Passive;
-        if (primaryEffectTag !== NoEffect) {
+    if ((fiber.effectTag & PassiveStatic) !== NoEffect) {
+      switch (fiber.tag) {
+        case FunctionComponent:
+        case ForwardRef:
+        case SimpleMemoComponent:
+        case Block: {
           flushPassiveUnmountEffectsImpl(fiber);
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -2836,13 +2836,12 @@ function flushPassiveUnmountEffectsInsideOfDeletedTree(`
`2836`	`2836`	`}`
`2837`	`2837`	`}`
`2838`	`2838`
`2839`		`- switch (fiber.tag) {`
`2840`		`- case FunctionComponent:`
`2841`		`- case ForwardRef:`
`2842`		`- case SimpleMemoComponent:`
`2843`		`- case Block: {`
`2844`		`- const primaryEffectTag = fiber.effectTag & Passive;`
`2845`		`- if (primaryEffectTag !== NoEffect) {`
	`2839`	`+ if ((fiber.effectTag & PassiveStatic) !== NoEffect) {`
	`2840`	`+ switch (fiber.tag) {`
	`2841`	`+ case FunctionComponent:`
	`2842`	`+ case ForwardRef:`
	`2843`	`+ case SimpleMemoComponent:`
	`2844`	`+ case Block: {`
`2846`	`2845`	`flushPassiveUnmountEffectsImpl(fiber);`
`2847`	`2846`	`}`
`2848`	`2847`	`}`