Made deletions field nullable

facebook · Jul 7, 2020 · 2631117 · 2631117
1 parent 1033552
commit 2631117
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 13 deletions.
diff --git a/packages/react-reconciler/src/ReactChildFiber.new.js b/packages/react-reconciler/src/ReactChildFiber.new.js
@@ -288,7 +288,11 @@ function ChildReconciler(shouldTrackSideEffects) {
     } else {
       returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
     }
-    returnFiber.deletions.push(childToDelete);
+    if (returnFiber.deletions === null) {
+      returnFiber.deletions = [childToDelete];
+    } else {
+      returnFiber.deletions.push(childToDelete);
+    }
     childToDelete.nextEffect = null;
     childToDelete.effectTag = Deletion;
   }

diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.new.js b/packages/react-reconciler/src/ReactFiberBeginWork.new.js
@@ -2066,7 +2066,11 @@ function updateSuspensePrimaryChildren(
     currentFallbackChildFragment.nextEffect = null;
     currentFallbackChildFragment.effectTag = Deletion;
     workInProgress.firstEffect = workInProgress.lastEffect = currentFallbackChildFragment;
-    workInProgress.deletions.push(currentFallbackChildFragment);
+    if (workInProgress.deletions === null) {
+      workInProgress.deletions = [currentFallbackChildFragment];
+    } else {
+      workInProgress.deletions.push(currentFallbackChildFragment);
+    }
   }
 
   workInProgress.child = primaryChildFragment;
@@ -3043,7 +3047,11 @@ function remountFiber(
     } else {
       returnFiber.firstEffect = returnFiber.lastEffect = current;
     }
-    returnFiber.deletions.push(current);
+    if (returnFiber.deletions === null) {
+      returnFiber.deletions = [current];
+    } else {
+      returnFiber.deletions.push(current);
+    }
     current.nextEffect = null;
     current.effectTag = Deletion;
 

diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.new.js b/packages/react-reconciler/src/ReactFiberCompleteWork.new.js
@@ -1066,9 +1066,7 @@ function completeWork(
                   // TODO (effects) This probably isn't the best approach. Discuss with Brian
                   let child = workInProgress.child;
                   while (child !== null) {
-                    if (child.deletions.length > 0) {
-                      child.deletions = [];
-                    }
+                    child.deletions = null;
                     child = child.sibling;
                   }
                 }

diff --git a/packages/react-reconciler/src/ReactFiberHydrationContext.new.js b/packages/react-reconciler/src/ReactFiberHydrationContext.new.js
@@ -125,7 +125,11 @@ function deleteHydratableInstance(
   childToDelete.stateNode = instance;
   childToDelete.return = returnFiber;
   childToDelete.effectTag = Deletion;
-  returnFiber.deletions.push(childToDelete);
+  if (returnFiber.deletions === null) {
+    returnFiber.deletions = [childToDelete];
+  } else {
+    returnFiber.deletions.push(childToDelete);
+  }
 
   // This might seem like it belongs on progressedFirstDeletion. However,
   // these children are not part of the reconciliation list of children.

diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.new.js b/packages/react-reconciler/src/ReactFiberWorkLoop.new.js
@@ -1728,7 +1728,7 @@ function completeUnitOfWork(unitOfWork: Fiber): void {
         returnFiber.firstEffect = returnFiber.lastEffect = null;
         returnFiber.effectTag |= Incomplete;
         returnFiber.subtreeTag = NoEffect;
-        returnFiber.deletions = [];
+        returnFiber.deletions = null;
       }
     }
 
@@ -1789,7 +1789,7 @@ function resetChildLanes(completedWork: Fiber) {
 
       subtreeTag |= child.subtreeTag;
       subtreeTag |= child.effectTag & HostEffectMask;
-      if (child.deletions.length > 0) {
+      if (child.deletions !== null) {
         subtreeTag |= Deletion;
       }
 
@@ -1834,7 +1834,7 @@ function resetChildLanes(completedWork: Fiber) {
 
       subtreeTag |= child.subtreeTag;
       subtreeTag |= child.effectTag & HostEffectMask;
-      if (child.deletions.length > 0) {
+      if (child.deletions !== null) {
         subtreeTag |= Deletion;
       }
 
@@ -2125,7 +2125,9 @@ function commitRootImpl(root, renderPriorityLevel) {
 }
 
 function commitBeforeMutationEffects(fiber: Fiber) {
-  commitBeforeMutationEffectsDeletions(fiber.deletions);
+  if (fiber.deletions !== null) {
+    commitBeforeMutationEffectsDeletions(fiber.deletions);
+  }
 
   if (fiber.child !== null) {
     const primarySubtreeTag =
@@ -2213,7 +2215,9 @@ function commitMutationEffects(
   root: FiberRoot,
   renderPriorityLevel,
 ) {
-  commitMutationEffectsDeletions(fiber.deletions, root, renderPriorityLevel);
+  if (fiber.deletions !== null) {
+    commitMutationEffectsDeletions(fiber.deletions, root, renderPriorityLevel);
+  }
 
   if (fiber.child !== null) {
     const primarySubtreeTag =

diff --git a/packages/react-reconciler/src/ReactInternalTypes.js b/packages/react-reconciler/src/ReactInternalTypes.js
@@ -127,7 +127,7 @@ export type Fiber = {|
   // Effect
   effectTag: SideEffectTag,
   subtreeTag: SideEffectTag,
-  deletions: Array<Fiber>,
+  deletions: Array<Fiber> | null,
 
   // Singly linked list fast path to the next fiber with side-effects.
   nextEffect: Fiber | null,