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

Jump to bottom

Devtools: Show inspectedElement key in right pane #18737

Merged
merged 9 commits into from
May 11, 2020
Merged

Devtools: Show inspectedElement key in right pane #18737

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4e302d6
Start MVP for showing inspected element key
karlhorky Apr 25, 2020
13566be
Add key in other places
karlhorky Apr 25, 2020
8fcd520
Add key from backend
karlhorky Apr 26, 2020
0d2b474
Remove unnecessary hydrateHelper call
karlhorky Apr 26, 2020
dcffc43
Hide copy button when no label
karlhorky Apr 26, 2020
1122194
Move above props
karlhorky Apr 26, 2020
932fba4
Revert changes to InspectedElementTree.js
bvaughn May 11, 2020
d61fbdc
Move key to left of component name
bvaughn May 11, 2020
299b2cf
Updated CSS
bvaughn May 11, 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
4 changes: 3 additions & 1 deletion packages/react-devtools-shared/src/backend/legacy/renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ export function attach(
return null;
}

const {displayName} = getData(internalInstance);
const {displayName, key} = getData(internalInstance);
const type = getElementType(internalInstance);

let context = null;
Expand Down Expand Up @@ -789,6 +789,8 @@ export function attach(

type: type,

key: key != null ? key : null,

// Inspectable properties.
context,
hooks: null,
Expand Down
3 changes: 3 additions & 0 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 @@ -2143,6 +2143,7 @@ export function attach(
_debugOwner,
_debugSource,
stateNode,
key,
memoizedProps,
memoizedState,
tag,
Expand Down Expand Up @@ -2300,6 +2301,8 @@ export function attach(
// Does the component have legacy context attached to it.
hasLegacyContext,

key: key != null ? key : null,

displayName: getDisplayNameForFiber(fiber),
type: elementType,

Expand Down
1 change: 1 addition & 0 deletions packages/react-devtools-shared/src/backend/types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ export type InspectedElement = {|
hooks: Object | null,
props: Object | null,
state: Object | null,
key: number | string | null,

// List of owners
owners: Array<Owner> | null,
Expand Down
2 changes: 2 additions & 0 deletions packages/react-devtools-shared/src/devtools/views/Components/InspectedElementContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ function InspectedElementContextController({children}: Props) {
hooks,
props,
state,
key,
} = ((data.value: any): InspectedElementBackend);

const inspectedElement: InspectedElementFrontend = {
Expand All @@ -218,6 +219,7 @@ function InspectedElementContextController({children}: Props) {
canViewSource,
hasLegacyContext,
id,
key,
source,
type,
owners:
Expand Down
18 changes: 10 additions & 8 deletions packages/react-devtools-shared/src/devtools/views/Components/InspectedElementTree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,16 @@ export default function InspectedElementTree({
} else {
return (
<div className={styles.InspectedElementTree}>
<div className={styles.HeaderRow}>
<div className={styles.Header}>{label}</div>
{!isEmpty && (
<Button onClick={handleCopy} title="Copy to clipboard">
<ButtonIcon type="copy" />
</Button>
)}
</div>
{label && (
<div className={styles.HeaderRow}>
<div className={styles.Header}>{label}</div>
{!isEmpty && (
<Button onClick={handleCopy} title="Copy to clipboard">
<ButtonIcon type="copy" />
</Button>
)}
</div>
)}
{isEmpty && !canAddEntries && <div className={styles.Empty}>None</div>}
{!isEmpty &&
(entries: any).map(([name, value]) => (
Expand Down
15 changes: 15 additions & 0 deletions packages/react-devtools-shared/src/devtools/views/Components/SelectedElement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ function InspectedElementView({
props,
source,
state,
key,
} = inspectedElement;

const {ownerID} = useContext(TreeStateContext);
Expand All @@ -301,6 +302,12 @@ function InspectedElementView({
},
[getInspectedElementPath, id],
);
const inspectKeyPath = useCallback(
(path: Array<string | number>) => {
getInspectedElementPath(id, ['key', ...path]);
},
[getInspectedElementPath, id],
);
const inspectPropsPath = useCallback(
(path: Array<string | number>) => {
getInspectedElementPath(id, ['props', ...path]);
Expand Down Expand Up @@ -369,6 +376,14 @@ function InspectedElementView({
<Fragment>
<div className={styles.InspectedElement}>
<HocBadges element={element} />
{key && (
<InspectedElementTree
label=""
data={{key: key}}
inspectPath={inspectKeyPath}
pathRoot="key"
/>
)}
<InspectedElementTree
label="props"
data={props}
Expand Down
1 change: 1 addition & 0 deletions packages/react-devtools-shared/src/devtools/views/Components/types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ export type InspectedElement = {|
hooks: Object | null,
props: Object | null,
state: Object | null,
key: number | string | null,

// List of owners
owners: Array<Owner> | null,
Expand Down