{"commit":{"revision":"66855b96378daedb1405e83f2365e0d90966ea0e","authorEmail":"git@sophiebits.com","authoredAt":"2024-11-06T07:35:23-08:00","authorName":"Sophie Alpert","subject":"Remove unused lastFullyObservedContext (#31435)","shortRevision":"66855b9637"},"body":"","parents":["314968561b547957c76c9d7be3620e38f87770d4"],"files":[{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberNewContext.js"}],"patch":"diff --git a\/packages\/react-reconciler\/src\/ReactFiberNewContext.js b\/packages\/react-reconciler\/src\/ReactFiberNewContext.js\nindex bf28da19ce..2e8d01e99e 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberNewContext.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberNewContext.js\n@@ -74,7 +74,6 @@ let lastContextDependency:\n | ContextDependency\n | ContextDependencyWithSelect\n | null = null;\n-let lastFullyObservedContext: ReactContext | null = null;\n \n let isDisallowedContextReadInDEV: boolean = false;\n \n@@ -83,7 +82,6 @@ export function resetContextDependencies(): void {\n \/\/ cannot be called outside the render phase.\n currentlyRenderingFiber = null;\n lastContextDependency = null;\n- lastFullyObservedContext = null;\n if (__DEV__) {\n isDisallowedContextReadInDEV = false;\n }\n@@ -730,7 +728,6 @@ export function prepareToReadContext(\n ): void {\n currentlyRenderingFiber = workInProgress;\n lastContextDependency = null;\n- lastFullyObservedContext = null;\n \n const dependencies = workInProgress.dependencies;\n if (dependencies !== null) {\n@@ -802,46 +799,42 @@ function readContextForConsumer_withSelect(\n ? context._currentValue\n : context._currentValue2;\n \n- if (lastFullyObservedContext === context) {\n- \/\/ Nothing to do. We already observe everything in this context.\n- } else {\n- const contextItem = {\n- context: ((context: any): ReactContext),\n- memoizedValue: value,\n- next: null,\n- select: ((select: any): (context: mixed) => Array),\n- lastSelectedValue: select(value),\n- };\n-\n- if (lastContextDependency === null) {\n- if (consumer === null) {\n- throw new Error(\n- 'Context can only be read while React is rendering. ' +\n- 'In classes, you can read it in the render method or getDerivedStateFromProps. ' +\n- 'In function components, you can read it directly in the function body, but not ' +\n- 'inside Hooks like useReducer() or useMemo().',\n- );\n- }\n+ const contextItem = {\n+ context: ((context: any): ReactContext),\n+ memoizedValue: value,\n+ next: null,\n+ select: ((select: any): (context: mixed) => Array),\n+ lastSelectedValue: select(value),\n+ };\n+\n+ if (lastContextDependency === null) {\n+ if (consumer === null) {\n+ throw new Error(\n+ 'Context can only be read while React is rendering. ' +\n+ 'In classes, you can read it in the render method or getDerivedStateFromProps. ' +\n+ 'In function components, you can read it directly in the function body, but not ' +\n+ 'inside Hooks like useReducer() or useMemo().',\n+ );\n+ }\n \n- \/\/ This is the first dependency for this component. Create a new list.\n- lastContextDependency = contextItem;\n- consumer.dependencies = __DEV__\n- ? {\n- lanes: NoLanes,\n- firstContext: contextItem,\n- _debugThenableState: null,\n- }\n- : {\n- lanes: NoLanes,\n- firstContext: contextItem,\n- };\n- if (enableLazyContextPropagation) {\n- consumer.flags |= NeedsPropagation;\n- }\n- } else {\n- \/\/ Append a new context item.\n- lastContextDependency = lastContextDependency.next = contextItem;\n+ \/\/ This is the first dependency for this component. Create a new list.\n+ lastContextDependency = contextItem;\n+ consumer.dependencies = __DEV__\n+ ? {\n+ lanes: NoLanes,\n+ firstContext: contextItem,\n+ _debugThenableState: null,\n+ }\n+ : {\n+ lanes: NoLanes,\n+ firstContext: contextItem,\n+ };\n+ if (enableLazyContextPropagation) {\n+ consumer.flags |= NeedsPropagation;\n }\n+ } else {\n+ \/\/ Append a new context item.\n+ lastContextDependency = lastContextDependency.next = contextItem;\n }\n return value;\n }\n@@ -854,44 +847,40 @@ function readContextForConsumer(\n ? context._currentValue\n : context._currentValue2;\n \n- if (lastFullyObservedContext === context) {\n- \/\/ Nothing to do. We already observe everything in this context.\n- } else {\n- const contextItem = {\n- context: ((context: any): ReactContext),\n- memoizedValue: value,\n- next: null,\n- };\n-\n- if (lastContextDependency === null) {\n- if (consumer === null) {\n- throw new Error(\n- 'Context can only be read while React is rendering. ' +\n- 'In classes, you can read it in the render method or getDerivedStateFromProps. ' +\n- 'In function components, you can read it directly in the function body, but not ' +\n- 'inside Hooks like useReducer() or useMemo().',\n- );\n- }\n+ const contextItem = {\n+ context: ((context: any): ReactContext),\n+ memoizedValue: value,\n+ next: null,\n+ };\n \n- \/\/ This is the first dependency for this component. Create a new list.\n- lastContextDependency = contextItem;\n- consumer.dependencies = __DEV__\n- ? {\n- lanes: NoLanes,\n- firstContext: contextItem,\n- _debugThenableState: null,\n- }\n- : {\n- lanes: NoLanes,\n- firstContext: contextItem,\n- };\n- if (enableLazyContextPropagation) {\n- consumer.flags |= NeedsPropagation;\n- }\n- } else {\n- \/\/ Append a new context item.\n- lastContextDependency = lastContextDependency.next = contextItem;\n+ if (lastContextDependency === null) {\n+ if (consumer === null) {\n+ throw new Error(\n+ 'Context can only be read while React is rendering. ' +\n+ 'In classes, you can read it in the render method or getDerivedStateFromProps. ' +\n+ 'In function components, you can read it directly in the function body, but not ' +\n+ 'inside Hooks like useReducer() or useMemo().',\n+ );\n+ }\n+\n+ \/\/ This is the first dependency for this component. Create a new list.\n+ lastContextDependency = contextItem;\n+ consumer.dependencies = __DEV__\n+ ? {\n+ lanes: NoLanes,\n+ firstContext: contextItem,\n+ _debugThenableState: null,\n+ }\n+ : {\n+ lanes: NoLanes,\n+ firstContext: contextItem,\n+ };\n+ if (enableLazyContextPropagation) {\n+ consumer.flags |= NeedsPropagation;\n }\n+ } else {\n+ \/\/ Append a new context item.\n+ lastContextDependency = lastContextDependency.next = contextItem;\n }\n return value;\n }\n"}

dillon1000/react

Files changed