diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js index ecacb0c1585..91e68f4764d 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.js @@ -60,7 +60,6 @@ import { enableComponentPerformanceTrack, enableViewTransition, enableFragmentRefs, - enableEagerAlternateStateNodeCleanup, enableDefaultTransitionIndicator, } from 'shared/ReactFeatureFlags'; import { @@ -2235,17 +2234,15 @@ function commitMutationEffectsOnFiber( } } } else { - if (enableEagerAlternateStateNodeCleanup) { - if (supportsPersistence) { - if (finishedWork.alternate !== null) { - // `finishedWork.alternate.stateNode` is pointing to a stale shadow - // node at this point, retaining it and its subtree. To reclaim - // memory, point `alternate.stateNode` to new shadow node. This - // prevents shadow node from staying in memory longer than it - // needs to. The correct behaviour of this is checked by test in - // React Native: ShadowNodeReferenceCounter-itest.js#L150 - finishedWork.alternate.stateNode = finishedWork.stateNode; - } + if (supportsPersistence) { + if (finishedWork.alternate !== null) { + // `finishedWork.alternate.stateNode` is pointing to a stale shadow + // node at this point, retaining it and its subtree. To reclaim + // memory, point `alternate.stateNode` to new shadow node. This + // prevents shadow node from staying in memory longer than it + // needs to. The correct behaviour of this is checked by test in + // React Native: ShadowNodeReferenceCounter-itest.js#L150 + finishedWork.alternate.stateNode = finishedWork.stateNode; } } } diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js index ebb287568af..9f50740d1a0 100644 --- a/packages/shared/ReactFeatureFlags.js +++ b/packages/shared/ReactFeatureFlags.js @@ -129,8 +129,6 @@ export const alwaysThrottleRetries: boolean = true; export const passChildrenWhenCloningPersistedNodes: boolean = false; -export const enableEagerAlternateStateNodeCleanup: boolean = true; - /** * Enables an expiration time for retry lanes to avoid starvation. */ diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb-dynamic.js b/packages/shared/forks/ReactFeatureFlags.native-fb-dynamic.js index f139a3fcf28..5afa8c2ecb0 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-fb-dynamic.js +++ b/packages/shared/forks/ReactFeatureFlags.native-fb-dynamic.js @@ -20,7 +20,6 @@ export const alwaysThrottleRetries = __VARIANT__; export const enableObjectFiber = __VARIANT__; export const enableHiddenSubtreeInsertionEffectCleanup = __VARIANT__; -export const enableEagerAlternateStateNodeCleanup = __VARIANT__; export const passChildrenWhenCloningPersistedNodes = __VARIANT__; export const renameElementSymbol = __VARIANT__; export const enableFragmentRefs = __VARIANT__; diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js index d9a91f8a808..72f534252af 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js @@ -22,7 +22,6 @@ export const { alwaysThrottleRetries, enableHiddenSubtreeInsertionEffectCleanup, enableObjectFiber, - enableEagerAlternateStateNodeCleanup, passChildrenWhenCloningPersistedNodes, renameElementSymbol, enableFragmentRefs, diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js index fa8f336c03f..7b3d658d734 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-oss.js +++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js @@ -45,7 +45,6 @@ export const enablePerformanceIssueReporting: boolean = false; export const enableSchedulingProfiler: boolean = !enableComponentPerformanceTrack && __PROFILE__; export const enableScopeAPI: boolean = false; -export const enableEagerAlternateStateNodeCleanup: boolean = true; export const enableSuspenseAvoidThisFallback: boolean = false; export const enableSuspenseCallback: boolean = false; export const enableTaint: boolean = true; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js index acf3847bd06..ba5c415cdd3 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.js @@ -58,7 +58,6 @@ export const disableClientCache: boolean = true; export const enableInfiniteRenderLoopDetection: boolean = false; export const renameElementSymbol: boolean = true; -export const enableEagerAlternateStateNodeCleanup: boolean = true; export const enableYieldingBeforePassive: boolean = true; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js index 5d3a5513018..6fcd750a5b1 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js @@ -42,7 +42,6 @@ export const enableSchedulingProfiler = __PROFILE__; export const enableComponentPerformanceTrack = false; export const enablePerformanceIssueReporting = false; export const enableScopeAPI = false; -export const enableEagerAlternateStateNodeCleanup = true; export const enableSuspenseAvoidThisFallback = false; export const enableSuspenseCallback = false; export const enableTaint = true; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js index 553be202c45..fbeccb115b5 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js @@ -64,7 +64,6 @@ export const disableLegacyMode: boolean = true; export const renameElementSymbol: boolean = false; export const enableObjectFiber: boolean = false; -export const enableEagerAlternateStateNodeCleanup: boolean = true; export const enableHydrationLaneScheduling: boolean = true; diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js index 87801a9658f..5c59c40215f 100644 --- a/packages/shared/forks/ReactFeatureFlags.www.js +++ b/packages/shared/forks/ReactFeatureFlags.www.js @@ -100,8 +100,6 @@ export const enableReactTestRendererWarning: boolean = false; export const disableLegacyMode: boolean = true; -export const enableEagerAlternateStateNodeCleanup: boolean = true; - export const enableGestureTransition: boolean = false; export const enableSuspenseyImages: boolean = false;