{"parents":["d42872588282b9eef56b8fa02441b33d596fd197"],"commit":{"authorEmail":"jackpope1@gmail.com","authorName":"Jack Pope","authoredAt":"2024-12-17T11:56:00-05:00","shortRevision":"34ee3919c3","revision":"34ee3919c39bc9b149462322713a9811db4b8498","subject":"Clean up enableLazyContextPropagation (#31810)"},"body":"This flag has shipped everywhere, let's clean it up.","files":[{"path":"packages\/react-dom\/src\/__tests__\/ReactLegacyContextDisabled-test.internal.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberBeginWork.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberClassComponent.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberHooks.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberNewContext.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberThrow.js","status":"M"},{"path":"packages\/react-reconciler\/src\/__tests__\/ReactContextPropagation-test.js","status":"M"},{"path":"packages\/react\/src\/__tests__\/ReactContextValidator-test.js","status":"M"},{"path":"packages\/shared\/ReactFeatureFlags.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.native-fb.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.native-oss.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.www.js","status":"M"}],"patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/ReactLegacyContextDisabled-test.internal.js b\/packages\/react-dom\/src\/__tests__\/ReactLegacyContextDisabled-test.internal.js\nindex 7c68b275c2..257c061fb4 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactLegacyContextDisabled-test.internal.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactLegacyContextDisabled-test.internal.js\n@@ -233,15 +233,7 @@ describe('ReactLegacyContextDisabled', () => {\n );\n });\n expect(container.textContent).toBe('bbb');\n- if (gate(flags => flags.enableLazyContextPropagation)) {\n- \/\/ In the lazy propagation implementation, we don't check if context\n- \/\/ changed until after shouldComponentUpdate is run.\n- expect(lifecycleContextLog).toEqual(['b', 'b', 'b']);\n- } else {\n- \/\/ In the eager implementation, a dirty flag was set when the parent\n- \/\/ changed, so we skipped sCU.\n- expect(lifecycleContextLog).toEqual(['b', 'b']);\n- }\n+ expect(lifecycleContextLog).toEqual(['b', 'b', 'b']);\n root.unmount();\n });\n });\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\nindex 2d3e3c04c4..632b2df70c 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\n@@ -37,8 +37,6 @@ import type {\n import type {UpdateQueue} from '.\/ReactFiberClassUpdateQueue';\n import type {RootState} from '.\/ReactFiberRoot';\n import type {TracingMarkerInstance} from '.\/ReactFiberTracingMarkerComponent';\n-import type {TransitionStatus} from '.\/ReactFiberConfig';\n-import type {Hook} from '.\/ReactFiberHooks';\n \n import {\n markComponentRenderStarted,\n@@ -100,7 +98,6 @@ import {\n enableProfilerCommitHooks,\n enableProfilerTimer,\n enableScopeAPI,\n- enableLazyContextPropagation,\n enableSchedulingProfiler,\n enableTransitionTracing,\n enableLegacyHidden,\n@@ -272,7 +269,6 @@ import {\n createClassErrorUpdate,\n initializeClassErrorUpdate,\n } from '.\/ReactFiberThrow';\n-import is from 'shared\/objectIs';\n import {\n getForksAtLevel,\n isForkedChild,\n@@ -843,7 +839,7 @@ function deferHiddenOffscreenComponent(\n \n pushOffscreenSuspenseHandler(workInProgress);\n \n- if (enableLazyContextPropagation && current !== null) {\n+ if (current !== null) {\n \/\/ Since this tree will resume rendering in a separate render, we need\n \/\/ to propagate parent contexts now so we don't lose track of which\n \/\/ ones changed.\n@@ -1636,26 +1632,6 @@ function updateHostComponent(\n } else {\n HostTransitionContext._currentValue2 = newState;\n }\n- if (enableLazyContextPropagation) {\n- \/\/ In the lazy propagation implementation, we don't scan for matching\n- \/\/ consumers until something bails out.\n- } else {\n- if (didReceiveUpdate) {\n- if (current !== null) {\n- const oldStateHook: Hook = current.memoizedState;\n- const oldState: TransitionStatus = oldStateHook.memoizedState;\n- \/\/ This uses regular equality instead of Object.is because we assume\n- \/\/ that host transition state doesn't include NaN as a valid type.\n- if (oldState !== newState) {\n- propagateContextChange(\n- workInProgress,\n- HostTransitionContext,\n- renderLanes,\n- );\n- }\n- }\n- }\n- }\n }\n \n markRef(current, workInProgress);\n@@ -2706,10 +2682,7 @@ function updateDehydratedSuspenseComponent(\n }\n \n if (\n- enableLazyContextPropagation &&\n \/\/ TODO: Factoring is a little weird, since we check this right below, too.\n- \/\/ But don't want to re-arrange the if-else chain until\/unless this\n- \/\/ feature lands.\n !didReceiveUpdate\n ) {\n \/\/ We need to check if any children have context before we decide to bail\n@@ -3300,8 +3273,6 @@ function updateContextProvider(\n context = workInProgress.type._context;\n }\n const newProps = workInProgress.pendingProps;\n- const oldProps = workInProgress.memoizedProps;\n-\n const newValue = newProps.value;\n \n if (__DEV__) {\n@@ -3317,34 +3288,6 @@ function updateContextProvider(\n \n pushProvider(workInProgress, context, newValue);\n \n- if (enableLazyContextPropagation) {\n- \/\/ In the lazy propagation implementation, we don't scan for matching\n- \/\/ consumers until something bails out, because until something bails out\n- \/\/ we're going to visit those nodes, anyway. The trade-off is that it shifts\n- \/\/ responsibility to the consumer to track whether something has changed.\n- } else {\n- if (oldProps !== null) {\n- const oldValue = oldProps.value;\n- if (is(oldValue, newValue)) {\n- \/\/ No change. Bailout early if children are the same.\n- if (\n- oldProps.children === newProps.children &&\n- !hasLegacyContextChanged()\n- ) {\n- return bailoutOnAlreadyFinishedWork(\n- current,\n- workInProgress,\n- renderLanes,\n- );\n- }\n- } else {\n- \/\/ The context value changed. Search for matching consumers and schedule\n- \/\/ them to update.\n- propagateContextChange(workInProgress, context, renderLanes);\n- }\n- }\n- }\n-\n const newChildren = newProps.children;\n reconcileChildren(current, workInProgress, newChildren, renderLanes);\n return workInProgress.child;\n@@ -3463,7 +3406,7 @@ function bailoutOnAlreadyFinishedWork(\n \/\/ TODO: Once we add back resuming, we should check if the children are\n \/\/ a work-in-progress set. If so, we need to transfer their effects.\n \n- if (enableLazyContextPropagation && current !== null) {\n+ if (current !== null) {\n \/\/ Before bailing out, check if there are any context changes in\n \/\/ the children.\n lazilyPropagateParentContextChanges(current, workInProgress, renderLanes);\n@@ -3564,11 +3507,9 @@ function checkScheduledUpdateOrContext(\n }\n \/\/ No pending update, but because context is propagated lazily, we need\n \/\/ to check for a context change before we bail out.\n- if (enableLazyContextPropagation) {\n- const dependencies = current.dependencies;\n- if (dependencies !== null && checkIfContextChanged(dependencies)) {\n- return true;\n- }\n+ const dependencies = current.dependencies;\n+ if (dependencies !== null && checkIfContextChanged(dependencies)) {\n+ return true;\n }\n return false;\n }\n@@ -3706,7 +3647,7 @@ function attemptEarlyBailoutIfNoScheduledUpdate(\n workInProgress.childLanes,\n );\n \n- if (enableLazyContextPropagation && !hasChildWork) {\n+ if (!hasChildWork) {\n \/\/ Context changes may not have been propagated yet. We need to do\n \/\/ that now, before we can decide whether to bail out.\n \/\/ TODO: We use `childLanes` as a heuristic for whether there is\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberClassComponent.js b\/packages\/react-reconciler\/src\/ReactFiberClassComponent.js\nindex f5d5c96a2a..7ebf0fb9f4 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberClassComponent.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberClassComponent.js\n@@ -21,7 +21,6 @@ import {\n debugRenderPhaseSideEffectsForStrictMode,\n disableLegacyContext,\n enableSchedulingProfiler,\n- enableLazyContextPropagation,\n disableDefaultPropsExceptForClasses,\n } from 'shared\/ReactFeatureFlags';\n import ReactStrictModeWarnings from '.\/ReactStrictModeWarnings';\n@@ -1092,7 +1091,6 @@ function updateClassInstance(\n !hasContextChanged() &&\n !checkHasForceUpdateAfterProcessing() &&\n !(\n- enableLazyContextPropagation &&\n current !== null &&\n current.dependencies !== null &&\n checkIfContextChanged(current.dependencies)\n@@ -1144,8 +1142,7 @@ function updateClassInstance(\n \/\/ both before and after `shouldComponentUpdate` has been called. Not ideal,\n \/\/ but I'm loath to refactor this function. This only happens for memoized\n \/\/ components so it's not that common.\n- (enableLazyContextPropagation &&\n- current !== null &&\n+ (current !== null &&\n current.dependencies !== null &&\n checkIfContextChanged(current.dependencies));\n \ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberHooks.js b\/packages\/react-reconciler\/src\/ReactFiberHooks.js\nindex 771b60cbb0..12b110b16d 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberHooks.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberHooks.js\n@@ -36,7 +36,6 @@ import {\n import ReactSharedInternals from 'shared\/ReactSharedInternals';\n import {\n enableSchedulingProfiler,\n- enableLazyContextPropagation,\n enableTransitionTracing,\n enableUseEffectEventHook,\n enableUseResourceEffectHook,\n@@ -743,23 +742,21 @@ function finishRenderingHooks(\n );\n }\n \n- if (enableLazyContextPropagation) {\n- if (current !== null) {\n- if (!checkIfWorkInProgressReceivedUpdate()) {\n- \/\/ If there were no changes to props or state, we need to check if there\n- \/\/ was a context change. We didn't already do this because there's no\n- \/\/ 1:1 correspondence between dependencies and hooks. Although, because\n- \/\/ there almost always is in the common case (`readContext` is an\n- \/\/ internal API), we could compare in there. OTOH, we only hit this case\n- \/\/ if everything else bails out, so on the whole it might be better to\n- \/\/ keep the comparison out of the common path.\n- const currentDependencies = current.dependencies;\n- if (\n- currentDependencies !== null &&\n- checkIfContextChanged(currentDependencies)\n- ) {\n- markWorkInProgressReceivedUpdate();\n- }\n+ if (current !== null) {\n+ if (!checkIfWorkInProgressReceivedUpdate()) {\n+ \/\/ If there were no changes to props or state, we need to check if there\n+ \/\/ was a context change. We didn't already do this because there's no\n+ \/\/ 1:1 correspondence between dependencies and hooks. Although, because\n+ \/\/ there almost always is in the common case (`readContext` is an\n+ \/\/ internal API), we could compare in there. OTOH, we only hit this case\n+ \/\/ if everything else bails out, so on the whole it might be better to\n+ \/\/ keep the comparison out of the common path.\n+ const currentDependencies = current.dependencies;\n+ if (\n+ currentDependencies !== null &&\n+ checkIfContextChanged(currentDependencies)\n+ ) {\n+ markWorkInProgressReceivedUpdate();\n }\n }\n }\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberNewContext.js b\/packages\/react-reconciler\/src\/ReactFiberNewContext.js\nindex 6a779cfd4a..b10dc5ce54 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberNewContext.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberNewContext.js\n@@ -15,24 +15,13 @@ import type {\n } from '.\/ReactInternalTypes';\n import type {StackCursor} from '.\/ReactFiberStack';\n import type {Lanes} from '.\/ReactFiberLane';\n-import type {SharedQueue} from '.\/ReactFiberClassUpdateQueue';\n import type {TransitionStatus} from '.\/ReactFiberConfig';\n import type {Hook} from '.\/ReactFiberHooks';\n \n import {isPrimaryRenderer, HostTransitionContext} from '.\/ReactFiberConfig';\n import {createCursor, push, pop} from '.\/ReactFiberStack';\n-import {\n- ContextProvider,\n- ClassComponent,\n- DehydratedFragment,\n-} from '.\/ReactWorkTags';\n-import {\n- NoLanes,\n- isSubsetOfLanes,\n- includesSomeLane,\n- mergeLanes,\n- pickArbitraryLane,\n-} from '.\/ReactFiberLane';\n+import {ContextProvider, DehydratedFragment} from '.\/ReactWorkTags';\n+import {NoLanes, isSubsetOfLanes, mergeLanes} from '.\/ReactFiberLane';\n import {\n NoFlags,\n DidPropagateContext,\n@@ -40,12 +29,7 @@ import {\n } from '.\/ReactFiberFlags';\n \n import is from 'shared\/objectIs';\n-import {createUpdate, ForceUpdate} from '.\/ReactFiberClassUpdateQueue';\n-import {markWorkInProgressReceivedUpdate} from '.\/ReactFiberBeginWork';\n-import {\n- enableLazyContextPropagation,\n- enableRenderableContext,\n-} from 'shared\/ReactFeatureFlags';\n+import {enableRenderableContext} from 'shared\/ReactFeatureFlags';\n import {getHostTransitionProvider} from '.\/ReactFiberHostContext';\n \n const valueCursor: StackCursor = createCursor(null);\n@@ -210,157 +194,16 @@ export function propagateContextChange(\n context: ReactContext,\n renderLanes: Lanes,\n ): void {\n- if (enableLazyContextPropagation) {\n- \/\/ TODO: This path is only used by Cache components. Update\n- \/\/ lazilyPropagateParentContextChanges to look for Cache components so they\n- \/\/ can take advantage of lazy propagation.\n- const forcePropagateEntireTree = true;\n- propagateContextChanges(\n- workInProgress,\n- [context],\n- renderLanes,\n- forcePropagateEntireTree,\n- );\n- } else {\n- propagateContextChange_eager(workInProgress, context, renderLanes);\n- }\n-}\n-\n-function propagateContextChange_eager(\n- workInProgress: Fiber,\n- context: ReactContext,\n- renderLanes: Lanes,\n-): void {\n- \/\/ Only used by eager implementation\n- if (enableLazyContextPropagation) {\n- return;\n- }\n- let fiber = workInProgress.child;\n- if (fiber !== null) {\n- \/\/ Set the return pointer of the child to the work-in-progress fiber.\n- fiber.return = workInProgress;\n- }\n- while (fiber !== null) {\n- let nextFiber;\n-\n- \/\/ Visit this fiber.\n- const list = fiber.dependencies;\n- if (list !== null) {\n- nextFiber = fiber.child;\n-\n- let dependency = list.firstContext;\n- while (dependency !== null) {\n- \/\/ Check if the context matches.\n- if (dependency.context === context) {\n- \/\/ Match! Schedule an update on this fiber.\n- if (fiber.tag === ClassComponent) {\n- \/\/ Schedule a force update on the work-in-progress.\n- const lane = pickArbitraryLane(renderLanes);\n- const update = createUpdate(lane);\n- update.tag = ForceUpdate;\n- \/\/ TODO: Because we don't have a work-in-progress, this will add the\n- \/\/ update to the current fiber, too, which means it will persist even if\n- \/\/ this render is thrown away. Since it's a race condition, not sure it's\n- \/\/ worth fixing.\n-\n- \/\/ Inlined `enqueueUpdate` to remove interleaved update check\n- const updateQueue = fiber.updateQueue;\n- if (updateQueue === null) {\n- \/\/ Only occurs if the fiber has been unmounted.\n- } else {\n- const sharedQueue: SharedQueue = (updateQueue: any).shared;\n- const pending = sharedQueue.pending;\n- if (pending === null) {\n- \/\/ This is the first update. Create a circular list.\n- update.next = update;\n- } else {\n- update.next = pending.next;\n- pending.next = update;\n- }\n- sharedQueue.pending = update;\n- }\n- }\n-\n- fiber.lanes = mergeLanes(fiber.lanes, renderLanes);\n- const alternate = fiber.alternate;\n- if (alternate !== null) {\n- alternate.lanes = mergeLanes(alternate.lanes, renderLanes);\n- }\n- scheduleContextWorkOnParentPath(\n- fiber.return,\n- renderLanes,\n- workInProgress,\n- );\n-\n- \/\/ Mark the updated lanes on the list, too.\n- list.lanes = mergeLanes(list.lanes, renderLanes);\n-\n- \/\/ Since we already found a match, we can stop traversing the\n- \/\/ dependency list.\n- break;\n- }\n- dependency = dependency.next;\n- }\n- } else if (fiber.tag === ContextProvider) {\n- \/\/ Don't scan deeper if this is a matching provider\n- nextFiber = fiber.type === workInProgress.type ? null : fiber.child;\n- } else if (fiber.tag === DehydratedFragment) {\n- \/\/ If a dehydrated suspense boundary is in this subtree, we don't know\n- \/\/ if it will have any context consumers in it. The best we can do is\n- \/\/ mark it as having updates.\n- const parentSuspense = fiber.return;\n-\n- if (parentSuspense === null) {\n- throw new Error(\n- 'We just came from a parent so we must have had a parent. This is a bug in React.',\n- );\n- }\n-\n- parentSuspense.lanes = mergeLanes(parentSuspense.lanes, renderLanes);\n- const alternate = parentSuspense.alternate;\n- if (alternate !== null) {\n- alternate.lanes = mergeLanes(alternate.lanes, renderLanes);\n- }\n- \/\/ This is intentionally passing this fiber as the parent\n- \/\/ because we want to schedule this fiber as having work\n- \/\/ on its children. We'll use the childLanes on\n- \/\/ this fiber to indicate that a context has changed.\n- scheduleContextWorkOnParentPath(\n- parentSuspense,\n- renderLanes,\n- workInProgress,\n- );\n- nextFiber = fiber.sibling;\n- } else {\n- \/\/ Traverse down.\n- nextFiber = fiber.child;\n- }\n-\n- if (nextFiber !== null) {\n- \/\/ Set the return pointer of the child to the work-in-progress fiber.\n- nextFiber.return = fiber;\n- } else {\n- \/\/ No child. Traverse to next sibling.\n- nextFiber = fiber;\n- while (nextFiber !== null) {\n- if (nextFiber === workInProgress) {\n- \/\/ We're back to the root of this subtree. Exit.\n- nextFiber = null;\n- break;\n- }\n- const sibling = nextFiber.sibling;\n- if (sibling !== null) {\n- \/\/ Set the return pointer of the sibling to the work-in-progress fiber.\n- sibling.return = nextFiber.return;\n- nextFiber = sibling;\n- break;\n- }\n- \/\/ No more siblings. Traverse up.\n- nextFiber = nextFiber.return;\n- }\n- }\n- fiber = nextFiber;\n- }\n+ \/\/ TODO: This path is only used by Cache components. Update\n+ \/\/ lazilyPropagateParentContextChanges to look for Cache components so they\n+ \/\/ can take advantage of lazy propagation.\n+ const forcePropagateEntireTree = true;\n+ propagateContextChanges(\n+ workInProgress,\n+ [context],\n+ renderLanes,\n+ forcePropagateEntireTree,\n+ );\n }\n \n function propagateContextChanges(\n@@ -369,10 +212,6 @@ function propagateContextChanges(\n renderLanes: Lanes,\n forcePropagateEntireTree: boolean,\n ): void {\n- \/\/ Only used by lazy implementation\n- if (!enableLazyContextPropagation) {\n- return;\n- }\n let fiber = workInProgress.child;\n if (fiber !== null) {\n \/\/ Set the return pointer of the child to the work-in-progress fiber.\n@@ -527,10 +366,6 @@ function propagateParentContextChanges(\n renderLanes: Lanes,\n forcePropagateEntireTree: boolean,\n ) {\n- if (!enableLazyContextPropagation) {\n- return;\n- }\n-\n \/\/ Collect all the parent providers that changed. Since this is usually small\n \/\/ number, we use an Array instead of Set.\n let contexts = null;\n@@ -637,9 +472,6 @@ function propagateParentContextChanges(\n export function checkIfContextChanged(\n currentDependencies: Dependencies,\n ): boolean {\n- if (!enableLazyContextPropagation) {\n- return false;\n- }\n \/\/ Iterate over the current dependencies to see if something changed. This\n \/\/ only gets called if props and state has already bailed out, so it's a\n \/\/ relatively uncommon path, except at the root of a changed subtree.\n@@ -669,20 +501,8 @@ export function prepareToReadContext(\n \n const dependencies = workInProgress.dependencies;\n if (dependencies !== null) {\n- if (enableLazyContextPropagation) {\n- \/\/ Reset the work-in-progress list\n- dependencies.firstContext = null;\n- } else {\n- const firstContext = dependencies.firstContext;\n- if (firstContext !== null) {\n- if (includesSomeLane(dependencies.lanes, renderLanes)) {\n- \/\/ Context list has a pending update. Mark that this fiber performed work.\n- markWorkInProgressReceivedUpdate();\n- }\n- \/\/ Reset the work-in-progress list\n- dependencies.firstContext = null;\n- }\n- }\n+ \/\/ Reset the work-in-progress list\n+ dependencies.firstContext = null;\n }\n }\n \n@@ -749,9 +569,7 @@ function readContextForConsumer(\n lanes: NoLanes,\n firstContext: contextItem,\n };\n- if (enableLazyContextPropagation) {\n- consumer.flags |= NeedsPropagation;\n- }\n+ consumer.flags |= NeedsPropagation;\n } else {\n \/\/ Append a new context item.\n lastContextDependency = lastContextDependency.next = contextItem;\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberThrow.js b\/packages\/react-reconciler\/src\/ReactFiberThrow.js\nindex a4bdb84e6c..a777331699 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberThrow.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberThrow.js\n@@ -39,7 +39,6 @@ import {\n } from '.\/ReactFiberFlags';\n import {NoMode, ConcurrentMode} from '.\/ReactTypeOfMode';\n import {\n- enableLazyContextPropagation,\n enableUpdaterTracking,\n enablePostpone,\n disableLegacyMode,\n@@ -199,21 +198,19 @@ function initializeClassErrorUpdate(\n }\n \n function resetSuspendedComponent(sourceFiber: Fiber, rootRenderLanes: Lanes) {\n- if (enableLazyContextPropagation) {\n- const currentSourceFiber = sourceFiber.alternate;\n- if (currentSourceFiber !== null) {\n- \/\/ Since we never visited the children of the suspended component, we\n- \/\/ need to propagate the context change now, to ensure that we visit\n- \/\/ them during the retry.\n- \/\/\n- \/\/ We don't have to do this for errors because we retry errors without\n- \/\/ committing in between. So this is specific to Suspense.\n- propagateParentContextChangesToDeferredTree(\n- currentSourceFiber,\n- sourceFiber,\n- rootRenderLanes,\n- );\n- }\n+ const currentSourceFiber = sourceFiber.alternate;\n+ if (currentSourceFiber !== null) {\n+ \/\/ Since we never visited the children of the suspended component, we\n+ \/\/ need to propagate the context change now, to ensure that we visit\n+ \/\/ them during the retry.\n+ \/\/\n+ \/\/ We don't have to do this for errors because we retry errors without\n+ \/\/ committing in between. So this is specific to Suspense.\n+ propagateParentContextChangesToDeferredTree(\n+ currentSourceFiber,\n+ sourceFiber,\n+ rootRenderLanes,\n+ );\n }\n \n \/\/ Reset the memoizedState to what it was before we attempted to render it.\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactContextPropagation-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactContextPropagation-test.js\nindex 340e973b2f..019119edf7 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactContextPropagation-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactContextPropagation-test.js\n@@ -35,11 +35,6 @@ describe('ReactLazyContextPropagation', () => {\n seededCache = null;\n });\n \n- \/\/ NOTE: These tests are not specific to the lazy propagation (as opposed to\n- \/\/ eager propagation). The behavior should be the same in both\n- \/\/ implementations. These are tests that are more relevant to the lazy\n- \/\/ propagation implementation, though.\n-\n function createTextCache() {\n if (seededCache !== null) {\n \/\/ Trick to seed a cache before it exists.\ndiff --git a\/packages\/react\/src\/__tests__\/ReactContextValidator-test.js b\/packages\/react\/src\/__tests__\/ReactContextValidator-test.js\nindex 3f24e5bed8..359857af15 100644\n--- a\/packages\/react\/src\/__tests__\/ReactContextValidator-test.js\n+++ b\/packages\/react\/src\/__tests__\/ReactContextValidator-test.js\n@@ -350,13 +350,7 @@ describe('ReactContextValidator', () => {\n expect(componentWillUpdateNextContext).toBe(secondContext);\n expect(renderContext).toBe(secondContext);\n expect(componentDidUpdateContext).toBe(secondContext);\n-\n- if (gate(flags => flags.enableLazyContextPropagation)) {\n- expect(shouldComponentUpdateWasCalled).toBe(true);\n- } else {\n- \/\/ sCU is not called in this case because React force updates when a provider re-renders\n- expect(shouldComponentUpdateWasCalled).toBe(false);\n- }\n+ expect(shouldComponentUpdateWasCalled).toBe(true);\n });\n \n it('should re-render PureComponents when context Provider updates', async () => {\ndiff --git a\/packages\/shared\/ReactFeatureFlags.js b\/packages\/shared\/ReactFeatureFlags.js\nindex 8caf79fbf2..fff1dcf4d9 100644\n--- a\/packages\/shared\/ReactFeatureFlags.js\n+++ b\/packages\/shared\/ReactFeatureFlags.js\n@@ -99,8 +99,6 @@ export const enableObjectFiber = false;\n \n export const enableTransitionTracing = false;\n \n-export const enableLazyContextPropagation = true;\n-\n \/\/ FB-only usage. The new API has different semantics.\n export const enableLegacyHidden = false;\n \ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\nindex 6c14a9ece3..2e37d9aeee 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n@@ -53,7 +53,6 @@ export const enableFizzExternalRuntime = true;\n export const enableGetInspectorDataForInstanceInProduction = true;\n export const enableHalt = false;\n export const enableInfiniteRenderLoopDetection = false;\n-export const enableLazyContextPropagation = true;\n export const enableLegacyCache = false;\n export const enableLegacyFBSupport = false;\n export const enableLegacyHidden = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\nindex 6dce24e57f..6c86d9f60d 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n@@ -42,7 +42,6 @@ export const enableGetInspectorDataForInstanceInProduction = false;\n export const enableHalt = false;\n export const enableHiddenSubtreeInsertionEffectCleanup = false;\n export const enableInfiniteRenderLoopDetection = false;\n-export const enableLazyContextPropagation = true;\n export const enableLegacyCache = false;\n export const enableLegacyFBSupport = false;\n export const enableLegacyHidden = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\nindex 53057d78d7..6ba73ae150 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n@@ -48,7 +48,6 @@ export const syncLaneExpirationMs = 250;\n export const transitionLaneExpirationMs = 5000;\n \n export const disableSchedulerTimeoutInWorkLoop = false;\n-export const enableLazyContextPropagation = true;\n export const enableLegacyHidden = false;\n \n export const enableTransitionTracing = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\nindex 66e4329cb8..14e351fb2f 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\n@@ -32,8 +32,6 @@ export const enableFizzExternalRuntime = true;\n export const enableGetInspectorDataForInstanceInProduction = false;\n export const enableHalt = false;\n export const enableInfiniteRenderLoopDetection = false;\n-export const enableLazyContextPropagation = true;\n-export const enableContextProfiling = false;\n export const enableHiddenSubtreeInsertionEffectCleanup = true;\n export const enableLegacyCache = false;\n export const enableLegacyFBSupport = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\nindex b71ff7a266..91eab54c31 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n@@ -50,7 +50,6 @@ export const syncLaneExpirationMs = 250;\n export const transitionLaneExpirationMs = 5000;\n \n export const disableSchedulerTimeoutInWorkLoop = false;\n-export const enableLazyContextPropagation = true;\n export const enableLegacyHidden = false;\n \n export const enableTransitionTracing = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\nindex 8054a14bbc..a0efa66cb3 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n@@ -56,7 +56,6 @@ export const enableUseEffectEventHook = true;\n export const enableMoveBefore = false;\n export const disableInputAttributeSyncing = false;\n export const enableLegacyFBSupport = true;\n-export const enableLazyContextPropagation = true;\n \n export const enableHydrationLaneScheduling = true;\n \n"}

dillon1000/react

Files changed