Skip to content

DevTools: Read context values from context dependencies #28467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 20, 2024
Merged

DevTools: Read context values from context dependencies #28467

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4a69a70
DevTools: Read context values from context dependencies
Feb 28, 2024
e9eaac1
Make it explicit that reading from context directly is only supported…
Feb 29, 2024
2c0bdc8
Remove special context
Mar 5, 2024
0775186
if-else
Mar 5, 2024
0df1e46
Ensure backwards compatibility with older reconciler versions
eps1lon Mar 13, 2024
2f5faa4
No memoizedValue before React 18
eps1lon Mar 13, 2024
4c2a435
Keep old control flow
eps1lon Mar 13, 2024
088fb2c
Not all versions of `fiber.dependencies` have `contextDependency.memo…
eps1lon Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Keep old control flow
  • Loading branch information
@eps1lon
eps1lon committed Mar 13, 2024
commit 4c2a4353400daa907b9eeed6878df7b43499a3cb
56 changes: 28 additions & 28 deletions packages/react-debug-tools/src/ReactDebugHooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1109,41 +1109,41 @@ export function inspectHooksOfFiber(
currentHook = (fiber.memoizedState: Hook);
currentFiber = fiber;

// Only used for versions of React without memoized context value in context dependencies.
const contextMap = new Map<ReactContext<any>, any>();
if (hasOwnProperty.call(currentFiber, 'dependencies')) {
// $FlowFixMe[incompatible-use]: Flow thinks hasOwnProperty might have nulled `currentFiber`
const dependencies = currentFiber.dependencies;
currentContextDependency =
dependencies !== null ? dependencies.firstContext : null;
} else if (hasOwnProperty.call(currentFiber, 'dependencies_old')) {
const dependencies: Dependencies = (currentFiber: any).dependencies_old;
currentContextDependency =
dependencies !== null ? dependencies.firstContext : null;
setupContexts(contextMap, fiber);
} else if (hasOwnProperty.call(currentFiber, 'dependencies_new')) {
const dependencies: Dependencies = (currentFiber: any).dependencies_new;
currentContextDependency =
dependencies !== null ? dependencies.firstContext : null;
setupContexts(contextMap, fiber);
} else if (hasOwnProperty.call(currentFiber, 'contextDependencies')) {
const contextDependencies = (currentFiber: any).contextDependencies;
currentContextDependency =
contextDependencies !== null ? contextDependencies.first : null;
setupContexts(contextMap, fiber);
} else {
throw new Error(
'Unsupported React version. This is a bug in React Debug Tools.',
);
}

const type = fiber.type;
let props = fiber.memoizedProps;
if (type !== fiber.elementType) {
props = resolveDefaultProps(type, props);
}

// Only used for versions of React without memoized context value in context dependencies.
const contextMap = new Map<ReactContext<any>, any>();
try {
if (hasOwnProperty.call(currentFiber, 'dependencies')) {
// $FlowFixMe[incompatible-use]: Flow thinks hasOwnProperty might have nulled `currentFiber`
const dependencies = currentFiber.dependencies;
currentContextDependency =
dependencies !== null ? dependencies.firstContext : null;
} else if (hasOwnProperty.call(currentFiber, 'dependencies_old')) {
const dependencies: Dependencies = (currentFiber: any).dependencies_old;
currentContextDependency =
dependencies !== null ? dependencies.firstContext : null;
setupContexts(contextMap, fiber);
} else if (hasOwnProperty.call(currentFiber, 'dependencies_new')) {
const dependencies: Dependencies = (currentFiber: any).dependencies_new;
currentContextDependency =
dependencies !== null ? dependencies.firstContext : null;
setupContexts(contextMap, fiber);
} else if (hasOwnProperty.call(currentFiber, 'contextDependencies')) {
const contextDependencies = (currentFiber: any).contextDependencies;
currentContextDependency =
contextDependencies !== null ? contextDependencies.first : null;
setupContexts(contextMap, fiber);
} else {
throw new Error(
'Unsupported React version. This is a bug in React Debug Tools.',
);
}

if (fiber.tag === ForwardRef) {
return inspectHooksOfForwardRef(
type.render,
Expand Down