Skip to content

[DevTools] Support FunctionComponent.contextTypes #19028

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

Closed
bl00mber wants to merge 18 commits into from
Closed

[DevTools] Support FunctionComponent.contextTypes #19028

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4eaa1c1
add fixture to InspectableElements/Contexts.js
bl00mber May 28, 2020
33a86ec
support FunctionComponent.contextTypes
bl00mber May 28, 2020
51b3c89
fix babel/babel#11216
bl00mber May 28, 2020
bede31a
enable up to 17 version
bl00mber May 28, 2020
882d0df
enable contextTypes on FunctionComponent only
bl00mber May 29, 2020
16d99ca
add check on second block
bl00mber May 29, 2020
edf95a9
do not access context to prevent errors if legacyContext is disabled
bl00mber May 29, 2020
6821a8d
Merge branch 'master' into devtools/support-contextTypes
bl00mber Jun 30, 2020
fcb10ef
lint
bl00mber Jun 30, 2020
b3c4023
Merge branch 'master' into devtools/support-contextTypes
bl00mber Jul 10, 2020
42e39b8
Merge branch 'master' into devtools/support-contextTypes
bl00mber Sep 3, 2020
3fd54f0
revert 51b3c89
bl00mber Sep 3, 2020
bef507b
retract versionFlags
bl00mber Sep 4, 2020
96b75d6
Update packages/react-devtools-shared/src/backend/renderer.js
bl00mber Sep 4, 2020
3b5d739
Update packages/react-debug-tools/src/ReactDebugHooks.js
bl00mber Sep 4, 2020
87339c3
fix
bl00mber Sep 4, 2020
bc8cddd
add test
bl00mber Sep 4, 2020
745204b
update test
bl00mber Sep 8, 2020
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
Update packages/react-debug-tools/src/ReactDebugHooks.js 
Co-authored-by: Brian Vaughn <brian.david.vaughn@gmail.com>
  • Loading branch information
@bl00mber @bvaughn
bl00mber and bvaughn authored Sep 4, 2020
commit 3b5d73904b47551c408833f0885f375d39ae05ab
14 changes: 8 additions & 6 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 @@ -707,12 +707,14 @@ export function inspectHooksOfFiber(
const contextMap = new Map();
try {
if (fiber.tag === FunctionComponent) {
const legacyContext = setupContexts(
contextMap,
fiber,
enableLegacyContext,
);
return inspectHooks(type, props, currentDispatcher, legacyContext);
const hasLegacyContext = !!fiber.elementType.contextTypes;
if (hasLegacyContext) {
const legacyContext = getLegacyContext(fiber);
return inspectHooks(type, props, currentDispatcher, legacyContext);
} else {
setupContext(contextMap, fiber);
return inspectHooks(type, props, currentDispatcher);
}
} else if (fiber.tag === ForwardRef) {
setupContexts(contextMap, fiber);
return inspectHooksOfForwardRef(
Expand Down