Skip to content
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

fix(dev-tools): fix show correct displayName with forwardRef in Dev Tools #17613

Merged
merged 3 commits into from
Dec 17, 2019
Merged

fix(dev-tools): fix show correct displayName with forwardRef in Dev Tools #17613

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5118d44
fix(dev-tools): fix show correct displayName with forwardRef in Dev T…
zthxxx Dec 10, 2019
d1becea
Removed a little unnecessary/redundant code.
bvaughn Dec 17, 2019
6a398bb
Fixed lint error (removed unused var)
bvaughn Dec 17, 2019
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
12 changes: 5 additions & 7 deletions packages/react-devtools-shared/src/backend/renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ export function getInternalReactConstants(

// NOTICE Keep in sync with shouldFilterFiber() and other get*ForFiber methods
function getDisplayNameForFiber(fiber: Fiber): string | null {
const {elementType, type, tag} = fiber;
const {type, tag} = fiber;

let resolvedType = type;
if (typeof type === 'object' && type !== null) {
Expand All @@ -364,8 +364,10 @@ export function getInternalReactConstants(
case IndeterminateComponent:
return getDisplayName(resolvedType);
case ForwardRef:
// Mirror https://github.com/facebook/react/blob/7c21bf72ace77094fd1910cc350a548287ef8350/packages/shared/getComponentName.js#L27-L37
return (
resolvedType.displayName || getDisplayName(resolvedType, 'Anonymous')
(type && type.displayName) ||
getDisplayName(resolvedType, 'Anonymous')
);
case HostRoot:
return null;
Expand All @@ -377,11 +379,7 @@ export function getInternalReactConstants(
return null;
case MemoComponent:
case SimpleMemoComponent:
if (elementType.displayName) {
return elementType.displayName;
} else {
return getDisplayName(resolvedType, 'Anonymous');
}
return getDisplayName(resolvedType, 'Anonymous');
case SuspenseComponent:
return 'Suspense';
case SuspenseListComponent:
Expand Down