Skip to content

Commit aed46ea

Browse files
lxsmnsycclaude
andcommitted
fix(devtools): keep panel rows between refreshes
Each refresh of the Ownership and Reactivity panels makes new row, node and edge objects, and the lists were keyed by object, so every refresh rebuilt all of them. An app that writes a signal every frame kept the page at 50 to 67ms frames while one of these panels was open. Key the lists by owner id, node id and edge endpoints instead. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 9794cf7 commit aed46ea

3 files changed

Lines changed: 41 additions & 32 deletions

File tree

‎.changeset/keyed-panel-rows.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@solidjs/start-devtools': patch
3+
---
4+
5+
The Ownership tree rows and the Reactivity graph nodes and edges are now matched by id between refreshes. Before, every refresh rebuilt all of them, so an app that writes a signal every frame kept the page at about 15 to 20 frames per second while one of these panels was open.

‎src/dev-toolbar/ownership/index.tsx‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -287,35 +287,37 @@ export default function OwnershipViewer(props: OwnershipViewerProps): JSX.Elemen
287287
</Placeholder>
288288
}
289289
>
290-
<For each={rows()}>
290+
<For each={rows()} keyed={(row) => row.node.id}>
291291
{(row) => (
292292
<div
293293
data-solid-ownership-row
294-
data-owner-id={row.node.id}
295-
data-selected={selected() === row.node.id ? '' : undefined}
294+
data-owner-id={row().node.id}
295+
data-selected={selected() === row().node.id ? '' : undefined}
296296
data-fresh={
297-
Date.now() - (firstSeen.get(row.node.id) ?? 0) < FRESH_MS ? '' : undefined
297+
Date.now() - (firstSeen.get(row().node.id) ?? 0) < FRESH_MS
298+
? ''
299+
: undefined
298300
}
299-
style={{ 'padding-left': `${row.indent * 0.875 + 0.25}rem` }}
301+
style={{ 'padding-left': `${row().indent * 0.875 + 0.25}rem` }}
300302
>
301303
<button
302304
type="button"
303305
data-solid-ownership-chevron
304-
data-leaf={row.expandable ? undefined : ''}
305-
data-expanded={row.expanded ? '' : undefined}
306-
aria-label={row.expanded ? 'Collapse' : 'Expand'}
307-
onClick={() => row.expandable && toggle(row.node.id)}
306+
data-leaf={row().expandable ? undefined : ''}
307+
data-expanded={row().expanded ? '' : undefined}
308+
aria-label={row().expanded ? 'Collapse' : 'Expand'}
309+
onClick={() => row().expandable && toggle(row().node.id)}
308310
/>
309311
<button
310312
type="button"
311313
data-solid-ownership-label
312314
onClick={() =>
313315
setSelected((current) =>
314-
current === row.node.id ? undefined : row.node.id,
316+
current === row().node.id ? undefined : row().node.id,
315317
)
316318
}
317319
>
318-
<span data-solid-ownership-kind={row.node.kind} />
320+
<span data-solid-ownership-kind={row().node.kind} />
319321
<Text
320322
data-solid-ownership-name
321323
options={{
@@ -325,9 +327,9 @@ export default function OwnershipViewer(props: OwnershipViewerProps): JSX.Elemen
325327
wrap: 'nowrap',
326328
}}
327329
>
328-
{row.node.name}
330+
{row().node.name}
329331
</Text>
330-
<Show when={row.node.disposed}>
332+
<Show when={row().node.disposed}>
331333
<Badge type="failure">disposed</Badge>
332334
</Show>
333335
</button>

‎src/dev-toolbar/reactivity/index.tsx‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -556,13 +556,13 @@ export default function ReactivityViewer(props: ReactivityViewerProps): JSX.Elem
556556
<path d="M 0 0 L 10 5 L 0 10 z" fill="context-stroke" />
557557
</marker>
558558
</defs>
559-
<For each={visibleEdges()}>
559+
<For each={visibleEdges()} keyed={(edge) => `${edge.from}>${edge.to}`}>
560560
{(edge) => {
561-
const role = () => edgeRoleOf(edge);
561+
const role = () => edgeRoleOf(edge());
562562
return (
563-
<Show when={layout().nodes.get(edge.from)}>
563+
<Show when={layout().nodes.get(edge().from)}>
564564
{(from) => (
565-
<Show when={layout().nodes.get(edge.to)}>
565+
<Show when={layout().nodes.get(edge().to)}>
566566
{(to) => (
567567
<path
568568
data-solid-reactivity-edge={role()}
@@ -582,39 +582,41 @@ export default function ReactivityViewer(props: ReactivityViewerProps): JSX.Elem
582582
</For>
583583
</svg>
584584

585-
<For each={visibleNodes()}>
585+
<For each={visibleNodes()} keyed={(node) => node.id}>
586586
{(node) => (
587-
<Show when={layout().nodes.get(node.id)}>
587+
<Show when={layout().nodes.get(node().id)}>
588588
{(position) => (
589589
<button
590590
type="button"
591-
data-solid-reactivity-node={roleOf(node.id)}
592-
data-kind={node.kind}
593-
data-state={node.state}
594-
data-pending={node.pending ? '' : undefined}
595-
data-errored={node.errored ? '' : undefined}
596-
data-fresh={Date.now() - node.updatedAt < 700 ? '' : undefined}
591+
data-solid-reactivity-node={roleOf(node().id)}
592+
data-kind={node().kind}
593+
data-state={node().state}
594+
data-pending={node().pending ? '' : undefined}
595+
data-errored={node().errored ? '' : undefined}
596+
data-fresh={Date.now() - node().updatedAt < 700 ? '' : undefined}
597597
style={{
598598
transform: `translate(${position().x}px, ${position().y}px)`,
599599
width: `${NODE_WIDTH}px`,
600600
height: `${NODE_HEIGHT}px`,
601601
}}
602-
onPointerEnter={() => setHovered(node.id)}
602+
onPointerEnter={() => setHovered(node().id)}
603603
onPointerLeave={() =>
604-
setHovered((current) => (current === node.id ? undefined : current))
604+
setHovered((current) =>
605+
current === node().id ? undefined : current,
606+
)
605607
}
606608
onClick={() =>
607609
setSelected((current) =>
608-
current === node.id ? undefined : node.id,
610+
current === node().id ? undefined : node().id,
609611
)
610612
}
611613
>
612-
<span data-solid-reactivity-node-name>{node.name}</span>
614+
<span data-solid-reactivity-node-name>{node().name}</span>
613615
<span data-solid-reactivity-node-value>
614-
{formatValue(node.value)}
616+
{formatValue(node().value)}
615617
</span>
616-
<Show when={node.updates > 0}>
617-
<span data-solid-reactivity-node-updates>{node.updates}</span>
618+
<Show when={node().updates > 0}>
619+
<span data-solid-reactivity-node-updates>{node().updates}</span>
618620
</Show>
619621
</button>
620622
)}

0 commit comments

Comments
 (0)