Don't clear other flags when adding Deletion

Same as #20398 but for Deletions. There's no new regression test, but in the effects refactor, existing tests will fail without this.
facebook · Dec 17, 2020 · ff17fc1 · ff17fc1
1 parent 5687864
commit ff17fc1
Show file tree

Hide file tree

Showing 13 changed files with 88 additions and 343 deletions.
diff --git a/packages/react-reconciler/src/ReactChildFiber.new.js b/packages/react-reconciler/src/ReactChildFiber.new.js
@@ -13,7 +13,12 @@ import type {Fiber} from './ReactInternalTypes';
 import type {Lanes} from './ReactFiberLane.new';
 
 import getComponentName from 'shared/getComponentName';
-import {Deletion, ChildDeletion, Placement} from './ReactFiberFlags';
+import {
+ Deletion,
+ ChildDeletion,
+ Placement,
+ StaticMask,
+} from './ReactFiberFlags';
 import {
  getIteratorFn,
  REACT_ELEMENT_TYPE,
@@ -275,7 +280,7 @@ function ChildReconciler(shouldTrackSideEffects) {
  returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
  }
  childToDelete.nextEffect = null;
- childToDelete.flags = Deletion;
+ childToDelete.flags = (childToDelete.flags & StaticMask) | Deletion;
 
  let deletions = returnFiber.deletions;
  if (deletions === null) {

diff --git a/packages/react-reconciler/src/ReactChildFiber.old.js b/packages/react-reconciler/src/ReactChildFiber.old.js
@@ -13,7 +13,12 @@ import type {Fiber} from './ReactInternalTypes';
 import type {Lanes} from './ReactFiberLane.old';
 
 import getComponentName from 'shared/getComponentName';
-import {Deletion, ChildDeletion, Placement} from './ReactFiberFlags';
+import {
+ Deletion,
+ ChildDeletion,
+ Placement,
+ StaticMask,
+} from './ReactFiberFlags';
 import {
  getIteratorFn,
  REACT_ELEMENT_TYPE,
@@ -275,7 +280,7 @@ function ChildReconciler(shouldTrackSideEffects) {
  returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
  }
  childToDelete.nextEffect = null;
- childToDelete.flags = Deletion;
+ childToDelete.flags = (childToDelete.flags & StaticMask) | Deletion;
 
  let deletions = returnFiber.deletions;
  if (deletions === null) {

diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.new.js b/packages/react-reconciler/src/ReactFiberBeginWork.new.js
@@ -2007,7 +2007,8 @@ function updateSuspensePrimaryChildren(
  if (currentFallbackChildFragment !== null) {
  // Delete the fallback child fragment
  currentFallbackChildFragment.nextEffect = null;
- currentFallbackChildFragment.flags = Deletion;
+ currentFallbackChildFragment.flags =
+ (currentFallbackChildFragment.flags & StaticMask) | Deletion;
  workInProgress.firstEffect = workInProgress.lastEffect = currentFallbackChildFragment;
  let deletions = workInProgress.deletions;
  if (deletions === null) {
@@ -2998,7 +2999,7 @@ function remountFiber(
  returnFiber.firstEffect = returnFiber.lastEffect = current;
  }
  current.nextEffect = null;
- current.flags = Deletion;
+ current.flags = (current.flags & StaticMask) | Deletion;
 
  let deletions = returnFiber.deletions;
  if (deletions === null) {

diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.old.js b/packages/react-reconciler/src/ReactFiberBeginWork.old.js
@@ -2007,7 +2007,8 @@ function updateSuspensePrimaryChildren(
  if (currentFallbackChildFragment !== null) {
  // Delete the fallback child fragment
  currentFallbackChildFragment.nextEffect = null;
- currentFallbackChildFragment.flags = Deletion;
+ currentFallbackChildFragment.flags =
+ (currentFallbackChildFragment.flags & StaticMask) | Deletion;
  workInProgress.firstEffect = workInProgress.lastEffect = currentFallbackChildFragment;
  let deletions = workInProgress.deletions;
  if (deletions === null) {
@@ -2998,7 +2999,7 @@ function remountFiber(
  returnFiber.firstEffect = returnFiber.lastEffect = current;
  }
  current.nextEffect = null;
- current.flags = Deletion;
+ current.flags = (current.flags & StaticMask) | Deletion;
 
  let deletions = returnFiber.deletions;
  if (deletions === null) {

diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.old.js b/packages/react-reconciler/src/ReactFiberClassComponent.old.js
@@ -12,14 +12,13 @@ import type {Lanes} from './ReactFiberLane.old';
 import type {UpdateQueue} from './ReactUpdateQueue.old';
 
 import * as React from 'react';
-import {Update, Snapshot, MountLayoutDev} from './ReactFiberFlags';
+import {Update, Snapshot} from './ReactFiberFlags';
 import {
  debugRenderPhaseSideEffectsForStrictMode,
  disableLegacyContext,
  enableDebugTracing,
  enableSchedulingProfiler,
  warnAboutDeprecatedLifecycles,
- enableDoubleInvokingEffects,
 } from 'shared/ReactFeatureFlags';
 import ReactStrictModeWarnings from './ReactStrictModeWarnings.old';
 import {isMounted} from './ReactFiberTreeReflection';
@@ -30,7 +29,7 @@ import invariant from 'shared/invariant';
 import {REACT_CONTEXT_TYPE, REACT_PROVIDER_TYPE} from 'shared/ReactSymbols';
 
 import {resolveDefaultProps} from './ReactFiberLazyComponent.old';
-import {DebugTracingMode, NoMode, StrictMode} from './ReactTypeOfMode';
+import {DebugTracingMode, StrictMode} from './ReactTypeOfMode';
 
 import {
  enqueueUpdate,
@@ -891,15 +890,7 @@ function mountClassInstance(
  }
 
  if (typeof instance.componentDidMount === 'function') {
- if (
- __DEV__ &&
- enableDoubleInvokingEffects &&
- (workInProgress.mode & StrictMode) !== NoMode
- ) {
- workInProgress.flags |= MountLayoutDev | Update;
- } else {
- workInProgress.flags |= Update;
- }
+ workInProgress.flags |= Update;
  }
 }
 
@@ -969,15 +960,7 @@ function resumeMountClassInstance(
  // If an update was already in progress, we should schedule an Update
  // effect even though we're bailing out, so that cWU/cDU are called.
  if (typeof instance.componentDidMount === 'function') {
- if (
- __DEV__ &&
- enableDoubleInvokingEffects &&
- (workInProgress.mode & StrictMode) !== NoMode
- ) {
- workInProgress.flags |= MountLayoutDev | Update;
- } else {
- workInProgress.flags |= Update;
- }
+ workInProgress.flags |= Update;
  }
  return false;
  }
@@ -1020,29 +1003,13 @@ function resumeMountClassInstance(
  }
  }
  if (typeof instance.componentDidMount === 'function') {
- if (
- __DEV__ &&
- enableDoubleInvokingEffects &&
- (workInProgress.mode & StrictMode) !== NoMode
- ) {
- workInProgress.flags |= MountLayoutDev | Update;
- } else {
- workInProgress.flags |= Update;
- }
+ workInProgress.flags |= Update;
  }
  } else {
  // If an update was already in progress, we should schedule an Update
  // effect even though we're bailing out, so that cWU/cDU are called.
  if (typeof instance.componentDidMount === 'function') {
- if (
- __DEV__ &&
- enableDoubleInvokingEffects &&
- (workInProgress.mode & StrictMode) !== NoMode
- ) {
- workInProgress.flags |= MountLayoutDev | Update;
- } else {
- workInProgress.flags |= Update;
- }
+ workInProgress.flags |= Update;
  }
 
  // If shouldComponentUpdate returned false, we should still update the

diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.old.js b/packages/react-reconciler/src/ReactFiberCommitWork.old.js
@@ -35,7 +35,6 @@ import {
  enableFundamentalAPI,
  enableSuspenseCallback,
  enableScopeAPI,
- enableDoubleInvokingEffects,
 } from 'shared/ReactFeatureFlags';
 import {
  FunctionComponent,
@@ -1799,116 +1798,6 @@ function commitResetTextContent(current: Fiber) {
  resetTextContent(current.stateNode);
 }
 
-function invokeLayoutEffectMountInDEV(fiber: Fiber): void {
- if (__DEV__ && enableDoubleInvokingEffects) {
- switch (fiber.tag) {
- case FunctionComponent:
- case ForwardRef:
- case SimpleMemoComponent: {
- invokeGuardedCallback(
- null,
- commitHookEffectListMount,
- null,
- HookLayout | HookHasEffect,
- fiber,
- );
- if (hasCaughtError()) {
- const mountError = clearCaughtError();
- captureCommitPhaseError(fiber, mountError);
- }
- break;
- }
- case ClassComponent: {
- const instance = fiber.stateNode;
- invokeGuardedCallback(null, instance.componentDidMount, instance);
- if (hasCaughtError()) {
- const mountError = clearCaughtError();
- captureCommitPhaseError(fiber, mountError);
- }
- break;
- }
- }
- }
-}
-
-function invokePassiveEffectMountInDEV(fiber: Fiber): void {
- if (__DEV__ && enableDoubleInvokingEffects) {
- switch (fiber.tag) {
- case FunctionComponent:
- case ForwardRef:
- case SimpleMemoComponent: {
- invokeGuardedCallback(
- null,
- commitHookEffectListMount,
- null,
- HookPassive | HookHasEffect,
- fiber,
- );
- if (hasCaughtError()) {
- const mountError = clearCaughtError();
- captureCommitPhaseError(fiber, mountError);
- }
- break;
- }
- }
- }
-}
-
-function invokeLayoutEffectUnmountInDEV(fiber: Fiber): void {
- if (__DEV__ && enableDoubleInvokingEffects) {
- switch (fiber.tag) {
- case FunctionComponent:
- case ForwardRef:
- case SimpleMemoComponent: {
- invokeGuardedCallback(
- null,
- commitHookEffectListUnmount,
- null,
- HookLayout | HookHasEffect,
- fiber,
- fiber.return,
- );
- if (hasCaughtError()) {
- const unmountError = clearCaughtError();
- captureCommitPhaseError(fiber, unmountError);
- }
- break;
- }
- case ClassComponent: {
- const instance = fiber.stateNode;
- if (typeof instance.componentWillUnmount === 'function') {
- safelyCallComponentWillUnmount(fiber, instance);
- }
- break;
- }
- }
- }
-}
-
-function invokePassiveEffectUnmountInDEV(fiber: Fiber): void {
- if (__DEV__ && enableDoubleInvokingEffects) {
- switch (fiber.tag) {
- case FunctionComponent:
- case ForwardRef:
- case SimpleMemoComponent: {
- invokeGuardedCallback(
- null,
- commitHookEffectListUnmount,
- null,
- HookPassive | HookHasEffect,
- fiber,
- fiber.return,
- );
- if (hasCaughtError()) {
- const unmountError = clearCaughtError();
- captureCommitPhaseError(fiber, unmountError);
- }
- break;
- }
- }
- }
-}
-
 export {
  commitBeforeMutationLifeCycles,
  commitResetTextContent,
@@ -1918,8 +1807,4 @@ export {
  commitLifeCycles,
  commitAttachRef,
  commitDetachRef,
- invokeLayoutEffectMountInDEV,
- invokeLayoutEffectUnmountInDEV,
- invokePassiveEffectMountInDEV,
- invokePassiveEffectUnmountInDEV,
 };