Skip to content

[DevTools] Make a non-editable name of KeyValue clickable #34095

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 1 commit into from
Aug 4, 2025
Merged

[DevTools] Make a non-editable name of KeyValue clickable #34095

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 32 additions & 19 deletions packages/react-devtools-shared/src/devtools/views/Components/KeyValue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,13 @@ export default function KeyValue({
canRenameTheCurrentPath = canRenamePathsAtDepth(depth);
}

const hasChildren =
typeof value === 'object' &&
value !== null &&
(canEditValues ||
(isArray(value) && value.length > 0) ||
Object.entries(value).length > 0);

let renderedName;
if (isDirectChildOfAnArray) {
if (canDeletePaths) {
Expand All @@ -218,27 +225,37 @@ export default function KeyValue({
);
} else {
renderedName = (
<span className={styles.Name}>
<span
className={styles.Name}
onClick={isInspectable || hasChildren ? toggleIsOpen : null}>
{name}
{!!hookName && <span className={styles.HookName}>({hookName})</span>}
<span className={styles.AfterName}>:</span>
</span>
);
}
} else if (canRenameTheCurrentPath) {
renderedName = (
<EditableName
allowEmpty={canDeletePaths}
className={styles.EditableName}
initialValue={name}
overrideName={renamePath}
path={path}
/>
<>
<EditableName
allowEmpty={canDeletePaths}
className={styles.EditableName}
initialValue={name}
overrideName={renamePath}
path={path}
/>
<span className={styles.AfterName}>:</span>
</>
);
} else {
renderedName = (
<span className={styles.Name} data-testname="NonEditableName">
<span
className={styles.Name}
data-testname="NonEditableName"
onClick={isInspectable || hasChildren ? toggleIsOpen : null}>
{name}
{!!hookName && <span className={styles.HookName}>({hookName})</span>}
<span className={styles.AfterName}>:</span>
</span>
);
}
Expand Down Expand Up @@ -286,7 +303,6 @@ export default function KeyValue({
style={style}>
<div className={styles.ExpandCollapseToggleSpacer} />
{renderedName}
<div className={styles.AfterName}>:</div>
{canEditValues ? (
<EditableValue
overrideValue={overrideValue}
Expand Down Expand Up @@ -328,7 +344,6 @@ export default function KeyValue({
style={style}>
<div className={styles.ExpandCollapseToggleSpacer} />
{renderedName}
<div className={styles.AfterName}>:</div>
<span
className={styles.Link}
onClick={() => {
Expand Down Expand Up @@ -365,7 +380,6 @@ export default function KeyValue({
<div className={styles.ExpandCollapseToggleSpacer} />
)}
{renderedName}
<div className={styles.AfterName}>:</div>
<span
className={styles.Value}
onClick={isInspectable ? toggleIsOpen : undefined}>
Expand All @@ -388,7 +402,6 @@ export default function KeyValue({
}
} else {
if (isArray(value)) {
const hasChildren = value.length > 0 || canEditValues;
const displayName = getMetaValueLabel(value);

children = value.map((innerValue, index) => (
Expand Down Expand Up @@ -449,12 +462,11 @@ export default function KeyValue({
ref={contextMenuTriggerRef}
style={style}>
{hasChildren ? (
<ExpandCollapseToggle isOpen={isOpen} setIsOpen={setIsOpen} />
<ExpandCollapseToggle isOpen={isOpen} setIsOpen={toggleIsOpen} />
) : (
<div className={styles.ExpandCollapseToggleSpacer} />
)}
{renderedName}
<div className={styles.AfterName}>:</div>
<span
className={styles.Value}
onClick={hasChildren ? toggleIsOpen : undefined}>
Expand All @@ -472,7 +484,6 @@ export default function KeyValue({
entries.sort(alphaSortEntries);
}

const hasChildren = entries.length > 0 || canEditValues;
const displayName = getMetaValueLabel(value);

children = entries.map(([key, keyValue]): ReactElement<any> => (
Expand Down Expand Up @@ -531,12 +542,11 @@ export default function KeyValue({
ref={contextMenuTriggerRef}
style={style}>
{hasChildren ? (
<ExpandCollapseToggle isOpen={isOpen} setIsOpen={setIsOpen} />
<ExpandCollapseToggle isOpen={isOpen} setIsOpen={toggleIsOpen} />
) : (
<div className={styles.ExpandCollapseToggleSpacer} />
)}
{renderedName}
<div className={styles.AfterName}>:</div>
<span
className={styles.Value}
onClick={hasChildren ? toggleIsOpen : undefined}>
Expand Down Expand Up @@ -567,7 +577,10 @@ function DeleteToggle({deletePath, name, path}) {
title="Delete entry">
<ButtonIcon type="delete" />
</Button>
<span className={styles.Name}>{name}</span>
<span className={styles.Name}>
{name}
<span className={styles.AfterName}>:</span>
</span>
</>
);
}
Loading