Skip to content

AI media harness for planning, generating, and editing locally

TypeScript

Add image canvas context menu

Bitti55bc5be59654
diff --git a/src/components/workspace/ImageEditor.test.tsx b/src/components/workspace/ImageEditor.test.tsx
index d7f4833..69b17ce 100644
--- a/src/components/workspace/ImageEditor.test.tsx
+++ b/src/components/workspace/ImageEditor.test.tsx
@@ -64,12 +64,20 @@ it.each(["media/photo.png", "references/photo.webp", "references/frames/frame.pn
expect(parseProjectConfig(JSON.parse(JSON.stringify(current()))).imageScene).toEqual(current().imageScene);
});
-it.each(["Create Scene", "Create Reference"])("%s uses the right-clicked image without changing the viewed image", (action) => {
+it.each([
+ ["Create Scene", "bar"], ["Create Reference", "bar"],
+ ["Create Scene", "canvas"], ["Create Reference", "canvas"],
+])("%s uses the target image from the %s menu without changing the viewed image", (action, source) => {
const initial = parseProjectConfig(fixture);
initial.assets = ["Viewed", "Chosen"].map((name) => ({ id: name, name, kind: "image", relativePath: `media/generated/${name}.png`, mimeType: "image/png", createdAt: initial.createdAt }));
- initial.imageScene!.outputAssetId = "Viewed";
+ initial.imageScene!.outputAssetId = source === "canvas" ? "Chosen" : "Viewed";
const current = setup(initial);
- fireEvent.contextMenu(screen.getByRole("button", { name: "View Chosen" }));
+ fireEvent.contextMenu(source === "canvas" ? screen.getByLabelText("Image placement canvas") : screen.getByRole("button", { name: "View Chosen" }));
+ if (source === "canvas") {
+ expect(screen.queryByRole("menuitem", { name: "New empty image" })).not.toBeInTheDocument();
+ expect(screen.queryByRole("menuitem", { name: "Add image file" })).not.toBeInTheDocument();
+ expect(screen.getByRole("menuitem", { name: "Edit" })).toBeEnabled();
+ }
fireEvent.click(screen.getByRole("menuitem", { name: action }));
const reopened = parseProjectConfig(JSON.parse(JSON.stringify(current())));
expect(reopened.references).toHaveLength(initial.references.length + 1);
@@ -86,6 +94,43 @@ it.each(["Create Scene", "Create Reference"])("%s uses the right-clicked image w
} else expect(reopened.generationJobs).toEqual(initial.generationJobs);
});
+it("makes the viewed variant primary and removes it from the canvas menu", () => {
+ const initial = parseProjectConfig(fixture);
+ initial.assets = [
+ { id: "original", name: "Original", kind: "image", relativePath: "media/original.png", mimeType: "image/png", createdAt: initial.createdAt },
+ { id: "variant", name: "Variant", parentAssetId: "original", kind: "image", relativePath: "media/variant.png", mimeType: "image/png", createdAt: initial.createdAt },
+ ];
+ initial.imageScene!.outputAssetId = "variant";
+ const current = setup(initial);
+ const viewport = screen.getByLabelText("Image placement canvas").closest(".image-viewport")!;
+ expect(viewport).not.toHaveAttribute("data-tooltip");
+ fireEvent.contextMenu(viewport, { clientX: 80, clientY: 90 });
+ fireEvent.keyDown(window, { key: "Escape" });
+ expect(viewport).toHaveFocus();
+ fireEvent.keyDown(viewport, { key: "F10", shiftKey: true });
+ fireEvent.click(screen.getByRole("menuitem", { name: "Make Primary" }));
+ expect(current().assets.find((asset) => asset.id === "variant")?.parentAssetId).toBeUndefined();
+ expect(current().assets.find((asset) => asset.id === "original")?.parentAssetId).toBe("variant");
+ fireEvent.contextMenu(viewport);
+ expect(screen.getByRole("menuitem", { name: "Make Primary" })).toBeDisabled();
+ fireEvent.click(screen.getByRole("menuitem", { name: "Remove" }));
+ expect(current().assets.map((asset) => asset.id)).toEqual(["original"]);
+ expect(current().imageScene!.outputAssetId).toBe("original");
+});
+
+it("opens no canvas menu without an image and disables reuse for empty drafts", () => {
+ setup();
+ const viewport = screen.getByLabelText("Image placement canvas").closest(".image-viewport")!;
+ fireEvent.contextMenu(viewport);
+ expect(screen.queryByRole("menu")).not.toBeInTheDocument();
+ fireEvent.contextMenu(screen.getByLabelText("Generated images"));
+ fireEvent.click(screen.getByRole("menuitem", { name: "New empty image" }));
+ fireEvent.contextMenu(viewport);
+ expect(screen.getByRole("menuitem", { name: "Create Scene" })).toBeDisabled();
+ expect(screen.getByRole("menuitem", { name: "Create Reference" })).toBeDisabled();
+ expect(screen.getByRole("menuitem", { name: "Remove" })).toBeEnabled();
+});
+
it("creates a reference from an external image variant using the keyboard menu", () => {
const initial = parseProjectConfig(fixture);
initial.assets = [
diff --git a/src/components/workspace/ImageEditor.tsx b/src/components/workspace/ImageEditor.tsx
index b71d6ce..e716103 100644
--- a/src/components/workspace/ImageEditor.tsx
+++ b/src/components/workspace/ImageEditor.tsx
@@ -61,7 +61,7 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene
const [draggedNode, setDraggedNode] = useState<string | null>(null);
const [treeDrop, setTreeDrop] = useState<{ id: string; placement: "before" | "inside" | "after" } | null>(null);
const [contextMenu, setContextMenu] = useState<{ x: number; y: number } | null>(null);
- const [imageMenu, setImageMenu] = useState<{ id: string | null; x: number; y: number; inFamily: boolean } | null>(null);
+ const [imageMenu, setImageMenu] = useState<{ id: string | null; x: number; y: number; inFamily: boolean; source: "bar" | "canvas" } | null>(null);
const imageResults = useRef<HTMLDivElement>(null);
const [renaming, setRenaming] = useState<{ id: string; value: string } | null>(null);
const renameEnding = useRef(false);
@@ -178,7 +178,11 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene
const closeContextMenu = () => { setContextMenu(null); focusNode(selected.id); };
const closeImageMenu = () => {
const button = [...(imageResults.current?.querySelectorAll<HTMLButtonElement>("button") ?? [])].find((element) => element.dataset.imageAsset === imageMenu?.id);
- setImageMenu(null); (button ?? imageResults.current)?.focus();
+ setImageMenu(null); (imageMenu?.source === "canvas" ? viewport.current : button ?? imageResults.current)?.focus();
+ };
+ const openCanvasMenu = (x: number, y: number) => {
+ setContextMenu(null);
+ setImageMenu(output ? { id: output.id, x, y, inFamily: imageFamily(images, output.id).length > 1, source: "canvas" } : null);
};
const resetImageEditing = (id: string) => {
const snapshot = config.assets.find((asset) => asset.id === id)?.imageGeneration;
@@ -559,14 +563,16 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene
{ label: "Delete", icon: <Delete16 />, shortcut: "Delete", separator: true, danger: true, disabled: selected.kind === "root", action: removeSelected },
]} />}
{imageMenu && <HierarchyContextMenu {...imageMenu} label="Generated image actions" onClose={closeImageMenu} items={[
- { label: "New empty image", icon: <Add16 />, action: () => attempt(() => {
- undo.current = []; redo.current = []; pointer.current = null; setDraftBox(null); setDrawKind(null); setRenaming(null); setCollapsed(new Set()); setSelection("image-root");
- onChange((current) => createEmptyImage(current, template?.id));
- }) },
- { label: "Add image file", icon: <FolderOpen16 />, disabled: !isTauri(), action: () => attempt(async () => {
- const source = await invoke<ImageSource | null>("open_image_source", { folderPath });
- if (source) replaceScene(createImageEditScene(source, scene));
- }) },
+ ...(imageMenu.source === "bar" ? [
+ { label: "New empty image", icon: <Add16 />, action: () => attempt(() => {
+ undo.current = []; redo.current = []; pointer.current = null; setDraftBox(null); setDrawKind(null); setRenaming(null); setCollapsed(new Set()); setSelection("image-root");
+ onChange((current) => createEmptyImage(current, template?.id));
+ }) },
+ { label: "Add image file", icon: <FolderOpen16 />, disabled: !isTauri(), action: () => attempt(async () => {
+ const source = await invoke<ImageSource | null>("open_image_source", { folderPath });
+ if (source) replaceScene(createImageEditScene(source, scene));
+ }) },
+ ] : []),
...(imageMenu.id ? [
...(imageMenu.inFamily ? [{ label: "Make Primary", icon: <Image16 />, disabled: !canUseMenuImage || imageFamilyRoot(images, imageMenu.id) === imageMenu.id,
action: () => onChange((current) => ({ ...current, assets: makeImagePrimary(current.assets, imageMenu.id!) })) }] : []),
@@ -580,7 +586,14 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene
] : []),
]} />}
<section className="image-center" aria-label="Image panel">
- <div ref={viewport} tabIndex={-1} className={`image-viewport${panning ? " panning" : ""}`} data-tooltip="Scroll to zoom · drag with the middle button to pan"
+ <div ref={viewport} tabIndex={0} className={`image-viewport${panning ? " panning" : ""}`}
+ onContextMenu={(event) => { event.preventDefault(); openCanvasMenu(event.clientX, event.clientY); }}
+ onKeyDown={(event) => {
+ if (event.key !== "ContextMenu" && !(event.shiftKey && event.key === "F10")) return;
+ event.preventDefault(); event.stopPropagation();
+ const bounds = event.currentTarget.getBoundingClientRect();
+ openCanvasMenu(bounds.left, bounds.top);
+ }}
onPointerDownCapture={(event) => {
if (event.button !== 1 || pointer.current || pan.current) return;
event.preventDefault(); event.stopPropagation();
@@ -612,7 +625,7 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene
{(error || work?.error) && <InfoBar className="image-error" severity="error" title="Couldn’t update the image" message={error ?? work?.error ?? ""} onClose={error ? () => setError(null) : undefined} />}
<div className="image-status" role="status">{active && <ProgressBar value={work.progress * 100} aria-label="Image generation progress" />}<span>{active ? work.detail : imageRoot ? editPlan?.error ?? `${width} × ${height} · ${editPlan?.edits.length} edits in hierarchy order` : !isTauri() ? "Image generation is available in the desktop app." : `${width} × ${height}${isMiniMaxH3 ? "" : " · Placement boxes guide the prompt"}`}</span></div>
<ImageBar ref={imageResults} images={images} selectedId={scene.outputAssetId} folderPath={folderPath} onSelect={selectImage}
- onMenu={(id, x, y, inFamily) => { setContextMenu(null); setImageMenu({ id, x, y, inFamily }); }} />
+ onMenu={(id, x, y, inFamily) => { setContextMenu(null); setImageMenu({ id, x, y, inFamily, source: "bar" }); }} />
</section>
<Splitter {...inspectorPane.splitterProps} reverse aria-label="Resize inspector" />
<aside className="image-inspector" aria-label="Image node inspector">