Split flushPassiveUnmountEffects() into two functions

One is used for mounted fibers, and one for unmounted subtrees.

Author: Brian Vaughn

packages/react-reconciler/src/ReactFiberWorkLoop.new.js

@@ -2783,15 +2783,12 @@ function flushPassiveUnmountEffects(firstChild: Fiber): void {
           primarySubtreeTag !== NoSubtreeTag ||
           primaryEffectTag !== NoEffect
         ) {
-          flushPassiveUnmountEffects(fiberToDelete);
+          flushPassiveUnmountEffectsInsideOfDeletedTree(fiberToDelete);
         }
 
         // Now that passive effects have been processed, it's safe to detach lingering pointers.
         detachFiberAfterEffects(fiberToDelete);
       }
-
-      // Clear deletions now that passive effects have  been procssed.
-      fiber.deletions = null;
     }
 
     const child = fiber.child;
@@ -2822,6 +2819,39 @@ function flushPassiveUnmountEffects(firstChild: Fiber): void {
   }
 }
 
+function flushPassiveUnmountEffectsInsideOfDeletedTree(
+  firstChild: Fiber,
+): void {
+  let fiber = firstChild;
+  while (fiber !== null) {
+    const child = fiber.child;
+    if (child !== null) {
+      // If any children have passive effects then traverse the subtree.
+      // Note that this requires checking subtreeTag of the current Fiber,
+      // rather than the subtreeTag/effectsTag of the first child,
+      // since that would not cover passive effects in siblings.
+      const primarySubtreeTag = fiber.subtreeTag & PassiveSubtreeTag;
+      if (primarySubtreeTag !== NoSubtreeTag) {
+        flushPassiveUnmountEffectsInsideOfDeletedTree(child);
+      }
+    }
+
+    switch (fiber.tag) {
+      case FunctionComponent:
+      case ForwardRef:
+      case SimpleMemoComponent:
+      case Block: {
+        const primaryEffectTag = fiber.effectTag & Passive;
+        if (primaryEffectTag !== NoEffect) {
+          flushPassiveUnmountEffectsImpl(fiber);
+        }
+      }
+    }
+
+    fiber = fiber.sibling;
+  }
+}
+
 function flushPassiveUnmountEffectsImpl(fiber: Fiber): void {
   const updateQueue: FunctionComponentUpdateQueue | null = (fiber.updateQueue: any);
   const lastEffect = updateQueue !== null ? updateQueue.lastEffect : null;