Skip to content

AI media harness for planning, generating, and editing locally

TypeScript

Drop the image editor's duplicate Undo/Redo; centre Settings content in wide windows

Bittie99ebb5cf8e2
diff --git a/src/components/workspace/ImageEditor.test.tsx b/src/components/workspace/ImageEditor.test.tsx
index 52527a3..39d0275 100644
--- a/src/components/workspace/ImageEditor.test.tsx
+++ b/src/components/workspace/ImageEditor.test.tsx
@@ -24,6 +24,9 @@ function setup(initial = parseProjectConfig(fixture)) {
return () => latest;
}
+/* Undo lives in the title bar; inside the editor it is Ctrl+Z. */
+const undoImageEdit = () => fireEvent.keyDown(screen.getByRole("tree", { name: "Image nodes" }), { key: "z", code: "KeyZ", ctrlKey: true });
+
it("starts an image root from the thumbnail Edit menu and hides root text controls", () => {
const initial = parseProjectConfig(fixture);
initial.assets = [{ id: "saved", name: "Saved", kind: "image", relativePath: "media/generated/saved.jpg", mimeType: "image/jpeg", width: 101, height: 77, createdAt: initial.createdAt }];
@@ -61,7 +64,6 @@ it("restores the hierarchy, prompts, settings and generator when selecting a sav
initial.imageScene!.outputAssetId = "result-0";
const current = setup(initial);
fireEvent.change(screen.getByLabelText("Prompt (high-level description)"), { target: { value: "Unsaved edit" } });
- expect(screen.getByRole("button", { name: "Undo image edit" })).toBeEnabled();
fireEvent.click(screen.getByRole("button", { name: "View Result 1" }));
expect(screen.getByLabelText("Prompt (high-level description)")).toHaveValue(saved.scene.nodes[0].description);
expect(screen.getByLabelText("Steps")).toHaveValue(30);
@@ -70,7 +72,9 @@ it("restores the hierarchy, prompts, settings and generator when selecting a sav
expect(screen.getByRole("button", { name: "Lettering" })).toBeInTheDocument();
expect(current().references).toEqual(saved.references);
expect(current().settings).toMatchObject({ resolution: "1088p", aspectRatio: "4:5" });
- expect(screen.getByRole("button", { name: "Undo image edit" })).toBeDisabled();
+ // Viewing a result starts a fresh history: Ctrl+Z has nothing to undo.
+ undoImageEdit();
+ expect(screen.getByLabelText("Prompt (high-level description)")).toHaveValue(saved.scene.nodes[0].description);
fireEvent.change(screen.getByLabelText("Prompt (high-level description)"), { target: { value: "Another edit" } });
fireEvent.click(screen.getByRole("button", { name: "View Result 0" }));
expect(current().imageScene).toEqual({ ...original.scene, outputAssetId: "result-0" });
@@ -187,7 +191,7 @@ it("edits ordered style tokens with suggestions, custom tags, removal, undo, and
fireEvent.click(screen.getByRole("button", { name: "Remove vibrant from Aesthetics" }));
fireEvent.keyDown(screen.getByRole("button", { name: "Aesthetics tag: intricate" }), { key: "ArrowLeft", altKey: true });
expect(current().imageScene!.style.aesthetics).toBe("intricate, Minimal poster, custom finish");
- fireEvent.click(screen.getByRole("button", { name: "Undo image edit" }));
+ undoImageEdit();
expect(current().imageScene!.style.aesthetics).toBe("Minimal poster, intricate, custom finish");
choose("Mode", "Photo");
const lighting = screen.getByRole("combobox", { name: "Add Lighting tag" });
@@ -236,7 +240,7 @@ it("drags whole hierarchy branches to nest or reorder, preserves placement, and
expect(current().imageScene).toBe(nested);
drop("Rocket", "Rocket");
expect(current().imageScene).toBe(nested);
- fireEvent.click(screen.getByRole("button", { name: "Undo image edit" }));
+ undoImageEdit();
expect(current().imageScene).toEqual(scene);
drop("Rocket", "Cloud", 99);
expect(current().imageScene!.nodes.filter((node) => node.parentId === "image-root").map((node) => node.id)).toEqual(["cloud", "group-rocket"]);
@@ -278,7 +282,7 @@ it("uses the context menu for creation, inline rename, and independent subtree c
expect(child.box).toEqual(fixture.imageScene.nodes[2].box);
actionAfterOpen("Rocket", "Delete");
expect(current().imageScene!.nodes.some((node) => node.id === child.id)).toBe(false);
- fireEvent.click(screen.getByRole("button", { name: "Undo image edit" }));
+ undoImageEdit();
expect(current().imageScene!.nodes.some((node) => node.id === child.id)).toBe(true);
actionAfterOpen("Launch vehicle", "New Text");
const text = current().imageScene!.nodes.at(-1)!;
diff --git a/src/components/workspace/ImageEditor.tsx b/src/components/workspace/ImageEditor.tsx
index 08e9e8d..644d0ed 100644
--- a/src/components/workspace/ImageEditor.tsx
+++ b/src/components/workspace/ImageEditor.tsx
@@ -1,5 +1,5 @@
import { useEffect, useId, useLayoutEffect, useMemo, useRef, useState, useSyncExternalStore, type CSSProperties, type DragEvent, type KeyboardEvent as ReactKeyboardEvent, type PointerEvent } from "react";
-import { Add14, Add16, Boxes16, Boxes16Filled, ChevronDown14, ChevronRight14, Copy16, Cube16, Cube16Filled, Cursor16, Cursor16Filled, Delete14, Delete16, Edit11, Edit16, FolderAdd16, FolderOpen16, Group16, Group16Filled, Image16, Image24, Image32, Paste16, Redo16, Rename16, Sparkle16, Stop14, Text16, Text16Filled, Undo16 } from "../ui/icons";
+import { Add14, Add16, Boxes16, Boxes16Filled, ChevronDown14, ChevronRight14, Copy16, Cube16, Cube16Filled, Cursor16, Cursor16Filled, Delete14, Delete16, Edit11, Edit16, FolderAdd16, FolderOpen16, Group16, Group16Filled, Image16, Image24, Image32, Paste16, Rename16, Sparkle16, Stop14, Text16, Text16Filled } from "../ui/icons";
import { invoke } from "@tauri-apps/api/core";
import { addImageNode, createImageEditScene, createImageScene, duplicateImageNode, imageDescendants, imageScenePrompt, removeImageNode, resizeImageNode, type ImageBox, type ImageNode, type ImageScene, type ImageSource } from "../../lib/imageScene";
import { compileImageEdits, editGeneratedImage, imageEditDebugPrompt } from "../../lib/imageEditing";
@@ -442,10 +442,8 @@ 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={<>
- <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)}><Undo16 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)}><Redo16 aria-hidden="true" /></button>
- </>} />
+ {/* Undo and Redo live in the title bar; Ctrl+Z / Ctrl+Y still step the image edits here. */}
+ <PaneHeader title="Scene" />
<div role="tree" aria-label="Image nodes">{tree(root, 0)}</div>
</aside>
<Splitter {...treePane.splitterProps} aria-label="Resize hierarchy" />
diff --git a/src/styles/settings.css b/src/styles/settings.css
index 7f2e1ef..5ace15f 100644
--- a/src/styles/settings.css
+++ b/src/styles/settings.css
@@ -47,7 +47,9 @@
}
.settings-page {
+ width: 100%;
max-width: calc(1000px + 2 * var(--space-6));
+ margin-inline: auto; /* centred once the window is wider */
display: flex;
flex-direction: column;
gap: var(--space-2);