Skip to content

AI media harness for planning, generating, and editing locally

TypeScript

Image editor: title-free tree toolbar, selected node heads the inspector

Bitti2aa124f9f4c5
diff --git a/src/components/workspace/ImageEditor.test.tsx b/src/components/workspace/ImageEditor.test.tsx
index 6a6744a..23f723d 100644
--- a/src/components/workspace/ImageEditor.test.tsx
+++ b/src/components/workspace/ImageEditor.test.tsx
@@ -393,3 +393,11 @@ it("picks canvas tools from a radio group or their letter keys and zooms from th
fireEvent.keyDown(canvas, { key: "0", ctrlKey: true });
expect(zoom).toHaveValue("Fit");
});
+
+it("heads the inspector with the selected node rather than an Inspector title", () => {
+ setup();
+ const inspector = screen.getByRole("complementary", { name: "Image node inspector" });
+ expect(within(inspector).getByRole("heading", { name: "Image" })).toBeInTheDocument();
+ expect(within(inspector).getByText("Root")).toBeInTheDocument();
+ expect(screen.queryByRole("heading", { name: /^(Scene|Inspector)/ })).not.toBeInTheDocument();
+});
diff --git a/src/components/workspace/ImageEditor.tsx b/src/components/workspace/ImageEditor.tsx
index d1079a8..d89708a 100644
--- a/src/components/workspace/ImageEditor.tsx
+++ b/src/components/workspace/ImageEditor.tsx
@@ -19,7 +19,7 @@ import { applyImageCommand } from "../../lib/imageCommands";
import { copyImageNode, getImageNodeClipboard, pasteImageNode, subscribeImageNodeClipboard } from "../../lib/imageNodeClipboard";
import { HierarchyContextMenu } from "./HierarchyContextMenu";
import { useShortcut } from "../../lib/commands";
-import { ComboBox, InfoBar, PaneHeader, ProgressBar, PropRow, PropSection, Splitter, tooltipProps, usePaneSize } from "../ui";
+import { ComboBox, InfoBar, ItemHeader, PaneHeader, ProgressBar, PropRow, PropSection, Splitter, tooltipProps, usePaneSize } from "../ui";
import "../../styles/image-editor.css";
const MIN_IMAGE_ZOOM = 0.1;
@@ -442,7 +442,7 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene
const rootField = (field: string) => `${editorId}-${field}`;
return <div ref={editorRoot} className="image-editor" style={{ ...treePane.style, ...inspectorPane.style }}>
<aside ref={hierarchy} className="image-tree" aria-label="Image hierarchy" onContextMenu={(event) => { if ((event.target as HTMLElement).closest("input, textarea, [contenteditable=true]")) return; event.preventDefault(); setSelection(root.id); setContextMenu({ x: event.clientX, y: event.clientY }); }} onKeyDown={treeKeys}>
- <PaneHeader title="Scene" actions={<>
+ <PaneHeader actions={<>
<button className="icon-button image-pane-button" aria-label="Undo image edit" aria-keyshortcuts="Control+Z" {...tooltipProps("Undo", "Ctrl+Z")} disabled={!undo.current.length} onClick={() => history(true)}><Undo2 size={16} aria-hidden="true" /></button>
<button className="icon-button image-pane-button" aria-label="Redo image edit" aria-keyshortcuts="Control+Y" {...tooltipProps("Redo", "Ctrl+Y")} disabled={!redo.current.length} onClick={() => history(false)}><Redo2 size={16} aria-hidden="true" /></button>
</>} />
@@ -567,7 +567,8 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene
</section>
<Splitter {...inspectorPane.splitterProps} reverse aria-label="Resize inspector" />
<aside className="image-inspector" aria-label="Image node inspector">
- <PaneHeader title={<>Inspector <span className="image-inspector__kind">{selected.kind}</span></>} />
+ {/* The selected node heads the inspector, not an "Inspector" title. */}
+ <ItemHeader name={selected.name} meta={selected.kind[0].toUpperCase() + selected.kind.slice(1)} />
<div className="image-inspector__fields">
{selected.kind === "root" && <PropRow label="Type" htmlFor={rootField("type")}>
<ComboBox id={rootField("type")} aria-label="Type" value={imageRoot ? "image" : "prompt"} options={[{ value: "prompt", label: "Prompt" }, { value: "image", label: "Image" }]}
diff --git a/src/styles/image-editor.css b/src/styles/image-editor.css
index 37d393e..ce974c5 100644
--- a/src/styles/image-editor.css
+++ b/src/styles/image-editor.css
@@ -9,11 +9,10 @@
.image-editor { --pane-image-tree: 240px; --pane-image-inspector: 300px; display: grid; grid-template-columns: minmax(140px, var(--pane-image-tree)) auto minmax(160px, 1fr) auto minmax(220px, var(--pane-image-inspector)); height: 100%; min-height: 0; background: var(--layer); }
.image-tree, .image-inspector { min-width: 0; min-height: 0; overflow: auto; background: var(--panel); }
.image-tree { display: flex; flex-direction: column; }
-.image-tree > .ui-pane-header, .image-inspector > .ui-pane-header { flex-shrink: 0; border-bottom: 1px solid var(--line); }
+.image-tree > .ui-pane-header, .image-inspector > .ui-item-header { flex-shrink: 0; }
.image-tree > [role="tree"] { flex: 1; overflow: auto; padding: var(--space-1) 0; }
.image-inspector { display: flex; flex-direction: column; }
.image-inspector > .debug-prompt { margin-top: auto; }
-.image-inspector__kind { margin-left: var(--space-1); color: var(--text-muted); font-weight: var(--weight-regular); text-transform: capitalize; }
.image-pane-button.icon-button { width: var(--control-sm); height: var(--control-sm); }
/* --- Tree rows -----------------------------------------------------------------