Free open-source image editor for the browser
Trim the layer feature after review (#29)
Rodrigo Belfiored593fbff6d9c
diff --git a/API.md b/API.mdindex 77247a4..b32f506 100644--- a/API.md+++ b/API.md@@ -50,7 +50,7 @@ Commands take explicit layer IDs rather than using UI selection. Without an ID,`setColorMixer(color, change, id?)` updates one of `red`, `orange`, `yellow`, `green`, `aqua`, `blue`, `purple`, or `magenta`. Supply any of `hue`, `saturation`, and `luminance`, each a finite number from -100 to 100. Other colors and unspecified channels keep their values. `resetColorMixer(id?)` resets every color in the matching layer as one undoable edit; without a matching layer it does nothing. A full shift of 100 rotates hue by 30°, scales saturation from zero to double, or moves luminance by one stop, weighted by each pixel's distance to the color's Oklab hue. Hue and saturation edits preserve luminance, and neutrals are unaffected.-`setVignette({ intensity, softness }, id?)` updates a vignette layer. Values are finite numbers from 0 to 100; defaults are intensity 0 and softness 50. Without an ID, it updates the first vignette or creates one. Intensity 0 bypasses the effect; increasing softness spreads the transition toward the center. The falloff stays centered on the source image before crop and rotation, independently of viewport zoom and pan. Its position among the effect layers determines processing order. It multiplies linear RGB equally and preserves alpha and HDR headroom.+`setVignette({ intensity, softness }, id?)` updates a vignette layer. Values are finite numbers from 0 to 100; defaults are intensity 0 and softness 50. Without an ID, it updates the first vignette or creates one, which starts at intensity 50 unless the change sets it. Intensity 0 bypasses the effect; increasing softness spreads the transition toward the center. The falloff stays centered on the source image before crop and rotation, independently of viewport zoom and pan. Its position among the effect layers determines processing order. It multiplies linear RGB equally and preserves alpha and HDR headroom.For RAW sources, `setWhiteBalance({ temperature, tint })` sets absolute Kelvin and DNG tint, preserving unspecified values. Temperature accepts 2000–25000 K and tint accepts -150–150, extending either range to include the file's As Shot value. `setWhiteBalance()` restores that value (the decoder's daylight fallback if camera multipliers are unavailable). Non-RAW sources and invalid values throw. Incremental temperature/tint remain separate RGB adjustments.diff --git a/src/app/controls.ts b/src/app/controls.tsindex 853752d..6441997 100644--- a/src/app/controls.ts+++ b/src/app/controls.ts@@ -19,18 +19,14 @@ import type { WhiteBalance } from "@/core/image";import type { ImageFrame } from "@/core/image/frame";import { setAdjustments } from "@/features/adjustments/edits";import { defaultAdjustments } from "@/features/adjustments/model";-import {- changeColorMixer,- resetColorMixer,- setColorMixer,-} from "@/features/color-mixer/edits";+import { resetColorMixer, setColorMixer } from "@/features/color-mixer/edits";import {defaultMixer,type MixerChange,type MixerColor,} from "@/features/color-mixer/model";import { setDetails } from "@/features/details/edits";-import { defaultDetails, validateDetails } from "@/features/details/model";+import { defaultDetails } from "@/features/details/model";import {addLayer,deleteLayer,@@ -45,10 +41,15 @@ import {import { defaultGradient } from "@/features/layers/gradient";import { defaultCurve } from "@/features/tone-curves/curve";import { setToneCurve } from "@/features/tone-curves/edits";-import { setVignette, validateVignette } from "@/features/vignette/edits";+import { setVignette } from "@/features/vignette/edits";import { defaultVignette } from "@/features/vignette/model";import { setWhiteBalance } from "@/features/white-balance/edits";-import { createLayer, createMask, editEffect } from "./editor/layers";+import {+ createLayer,+ createMask,+ editEffect,+ findEffect,+} from "./editor/layers";import type { Workspace } from "./workspace";/** Imperative commands bound to an explicit workspace, usable without React. */@@ -66,17 +67,9 @@ export function createControls(gpu: Gpu, workspace: Workspace) {loadImage: (file: File) => files.loadFile(image, file),importXmp: (file: File) => files.loadFile(xmp, file),setDetails(change: Partial<Details>, id?: string) {- validateDetails(change);const document = workspace.getDocument();- editEffect(- document,- "details",- id,- (id) => setDetails(document, change, id),- () => ({- ...createLayer("details"),- details: { ...defaultDetails, ...change },- }),+ editEffect(document, "details", id, (id) =>+ setDetails(document, change, id),);},setAdjustments: (change: Partial<Adjustments>, id?: string) =>@@ -87,42 +80,22 @@ export function createControls(gpu: Gpu, workspace: Workspace) {setToneCurve(workspace.getDocument(), curve, id),setColorMixer(color: MixerColor, change: MixerChange, id?: string) {const document = workspace.getDocument();- editEffect(- document,- "color-mixer",- id,- (id) => setColorMixer(document, color, change, id),- () => ({- ...createLayer("color-mixer"),- colorMixer: changeColorMixer(defaultMixer, color, change),- }),+ editEffect(document, "color-mixer", id, (id) =>+ setColorMixer(document, color, change, id),);},resetColorMixer(id?: string) {const document = workspace.getDocument();const existing =- id ??- document.scene- .getState()- .layers.find((layer) => layer.kind === "color-mixer")?.id;+ id ?? findEffect(document.scene.getState().layers, "color-mixer")?.id;if (existing) {resetColorMixer(document, existing);}},setVignette(change: Partial<Vignette>, id?: string) {const document = workspace.getDocument();- editEffect(- document,- "vignette",- id,- (id) => setVignette(document, change, id),- () => {- validateVignette(change);- return {- ...createLayer("vignette"),- vignette: { ...defaultVignette, ...change },- };- },+ editEffect(document, "vignette", id, (id) =>+ setVignette(document, change, id),);},addLayer(kind: ProcessingLayer["kind"], placement?: LayerPlacement) {@@ -168,6 +141,7 @@ export function createControls(gpu: Gpu, workspace: Workspace) {getState() {const { file, document } = workspace.state.getState();const scene = document?.scene.getState();+ const layers = scene?.layers ?? [];return structuredClone({file,preview: document?.preview.getState(),@@ -178,16 +152,11 @@ export function createControls(gpu: Gpu, workspace: Workspace) {frame: scene?.frame,adjustments: scene?.layers[0].adjustments ?? defaultAdjustments,whiteBalance: scene?.layers[0].whiteBalance,- details:- scene?.layers.find((layer) => layer.kind === "details")?.details ??- defaultDetails,+ details: findEffect(layers, "details")?.details ?? defaultDetails,toneCurve: scene?.layers[0].toneCurve ?? defaultCurve,colorMixer:- scene?.layers.find((layer) => layer.kind === "color-mixer")- ?.colorMixer ?? defaultMixer,- vignette:- scene?.layers.find((layer) => layer.kind === "vignette")?.vignette ??- defaultVignette,+ findEffect(layers, "color-mixer")?.colorMixer ?? defaultMixer,+ vignette: findEffect(layers, "vignette")?.vignette ?? defaultVignette,history: document?.history.status.getState() ?? {undoCount: 0,redoCount: 0,diff --git a/src/app/editor/canvas.tsx b/src/app/editor/canvas.tsxindex 66919b3..5b7ae4b 100644--- a/src/app/editor/canvas.tsx+++ b/src/app/editor/canvas.tsx@@ -9,7 +9,7 @@ import { ComparisonDivider } from "./comparison-divider";export function EditorCanvas() {const tool = useGradientTool();let gradientKey = "selection";- if (tool.target?.kind === "new") {+ if (tool.target) {gradientKey = `new/${tool.target.shape}/${tool.target.parentId ?? "root"}/${tool.target.operation}`;}const size = useScene((scene) => scene.frame.size);diff --git a/src/app/editor/clipping-controls.tsx b/src/app/editor/clipping-controls.tsxindex 6023fa2..10e27f1 100644--- a/src/app/editor/clipping-controls.tsx+++ b/src/app/editor/clipping-controls.tsx@@ -4,7 +4,9 @@ import Button from "@/components/ui/button";export function ClippingControls() {const { preview } = useDocument();- const state = useStore(preview);+ const shadows = useStore(preview, (state) => state.shadows);+ const highlights = useStore(preview, (state) => state.highlights);+ const state = { shadows, highlights };return (<div className="pointer-events-none absolute inset-x-1 top-1 z-10 flex justify-between">{(["shadows", "highlights"] as const).map((range) => (diff --git a/src/app/editor/comparison-divider.tsx b/src/app/editor/comparison-divider.tsxindex f15e6c7..e84e0aa 100644--- a/src/app/editor/comparison-divider.tsx+++ b/src/app/editor/comparison-divider.tsx@@ -4,7 +4,8 @@ import { useDocument } from "@/components/editor/session";export function ComparisonDivider() {const { preview } = useDocument();- const { comparison, split } = useStore(preview);+ const comparison = useStore(preview, (state) => state.comparison);+ const split = useStore(preview, (state) => state.split);if (comparison !== "split") {return null;}diff --git a/src/app/editor/export/export-image.ts b/src/app/editor/export/export-image.tsindex 53d6421..b4ae0a2 100644--- a/src/app/editor/export/export-image.ts+++ b/src/app/editor/export/export-image.ts@@ -1,8 +1,8 @@-import { frame, type Gpu, surface, type Target } from "vgpu";+import type { Gpu, Target } from "vgpu";import { createEditorRenderer } from "@/app/editor/renderer";import type { EditorDocument } from "@/core/document";import type { Point } from "@/core/image/frame";-import { createDisplay } from "@/core/renderer";+import { renderBitmap } from "@/core/renderer";const encodings = {png: { type: "image/png", extension: "png" },@@ -32,33 +32,6 @@ export function exportSize(];}-const displays = new WeakMap<Gpu, ReturnType<typeof createDisplay>>();--/** One display pipeline per GPU, shared by exports and size estimates. */-function displayFor(gpu: Gpu) {- let display = displays.get(gpu);- if (!display) {- display = createDisplay(gpu);- displays.set(gpu, display);- }- return display;-}--/** Takes the rendered pixels as a bitmap; drawing the GPU canvas itself would wait for a frame that never comes off-screen. */-function resample(source: OffscreenCanvas, [width, height]: Point) {- const bitmap = source.transferToImageBitmap();- const canvas = new OffscreenCanvas(width, height);- const context = canvas.getContext("2d");- if (!context) {- bitmap.close();- throw new Error("Couldn't resize the image.");- }- context.imageSmoothingQuality = "high";- context.drawImage(bitmap, 0, 0, width, height);- bitmap.close();- return canvas;-}-/** Encodes a rendered image, downsampled to `longEdge` with high-quality smoothing. */export async function encodeImage(gpu: Gpu,@@ -79,29 +52,26 @@ export async function encodeImage() {throw new Error(`Long edge must be between 1 and ${maxEdge} pixels.`);}- const canvas = new OffscreenCanvas(size[0], size[1]);- const output = surface(gpu, canvas, { size, dpr: 1 });- try {- const draw = displayFor(gpu);- frame(gpu, (frame) =>- draw(frame, output, image, { view: { zoom: 1, pan: [0, 0] } }),- );- const target = exportSize(size, longEdge);- const resized = target[0] !== size[0] || target[1] !== size[1];- const encoding = encodings[format];- // Finish the draw before the 2D canvas reads it; otherwise Chrome waits a full second for the sync.- await gpu.gpu.queue.onSubmittedWorkDone();- const blob = await (resized- ? resample(canvas, target)- : canvas- ).convertToBlob({ type: encoding.type, quality: quality / 100 });- if (blob.type !== encoding.type) {- throw new Error(`This browser can't encode ${format.toUpperCase()}.`);- }- return blob;- } finally {- output.dispose();+ const [width, height] = exportSize(size, longEdge);+ const bitmap = await renderBitmap(gpu, image, size);+ const canvas = new OffscreenCanvas(width, height);+ const context = canvas.getContext("2d");+ if (!context) {+ bitmap.close();+ throw new Error("Couldn't resize the image.");+ }+ context.imageSmoothingQuality = "high";+ context.drawImage(bitmap, 0, 0, width, height);+ bitmap.close();+ const encoding = encodings[format];+ const blob = await canvas.convertToBlob({+ type: encoding.type,+ quality: quality / 100,+ });+ if (blob.type !== encoding.type) {+ throw new Error(`This browser can't encode ${format.toUpperCase()}.`);}+ return blob;}/** Renders a snapshot of the current edits, named after the source file. */diff --git a/src/app/editor/layers.ts b/src/app/editor/layers.tsindex cc19250..ef56286 100644--- a/src/app/editor/layers.ts+++ b/src/app/editor/layers.ts@@ -2,9 +2,11 @@ import type {EditorDocument,EffectLayer,Gradient,+ ImageLayer,+ Layer,MaskLayer,- ProcessingLayer,} from "@/core/document";+import type { WhiteBalance } from "@/core/image";import { defaultAdjustments } from "@/features/adjustments/model";import { defaultMixer } from "@/features/color-mixer/model";import { defaultDetails } from "@/features/details/model";@@ -14,6 +16,23 @@ function baseLayer() {return { id: crypto.randomUUID(), visible: true, opacity: 1, children: [] };}+export function createImageLayer(+ source: string,+ name: string,+ whiteBalance?: WhiteBalance,+): ImageLayer {+ return {+ kind: "image",+ id: crypto.randomUUID(),+ name,+ source,+ whiteBalance,+ adjustments: { ...defaultAdjustments },+ toneCurve: defaultCurve,+ children: [],+ };+}+export function createLayer<K extends EffectLayer["kind"]>(kind: K,): Extract<EffectLayer, { kind: K }>;@@ -53,19 +72,41 @@ export function createMask(};}-/** Convenience commands address the first root effect of a kind or create one on top of the stack. */+/** The first root effect of a kind. */+export function findEffect<K extends EffectLayer["kind"]>(+ layers: readonly Layer[],+ kind: K,+) {+ return layers.find(+ (layer): layer is Extract<EffectLayer, { kind: K }> => layer.kind === kind,+ );+}++/** Convenience commands address the first root effect of a kind or create one on top of the stack as one entry. */export function editEffect(document: EditorDocument,- kind: ProcessingLayer["kind"],+ kind: EffectLayer["kind"],id: string | undefined,edit: (id: string) => void,- create: () => ProcessingLayer,) {const scene = document.scene.getState();- const existing = id ?? scene.layers.find((layer) => layer.kind === kind)?.id;+ const existing = id ?? findEffect(scene.layers, kind)?.id;if (existing) {edit(existing);return;}- document.edit({ ...scene, layers: [...scene.layers, create()] });+ const layer = createLayer(kind);+ const opened = document.history.begin();+ try {+ document.edit({ ...scene, layers: [...scene.layers, layer] });+ edit(layer.id);+ if (opened) {+ document.history.commit();+ }+ } catch (error) {+ if (opened) {+ document.history.cancel();+ }+ throw error;+ }}diff --git a/src/app/editor/renderer.ts b/src/app/editor/renderer.tsindex a47ba7e..3d546b6 100644--- a/src/app/editor/renderer.ts+++ b/src/app/editor/renderer.ts@@ -1,5 +1,5 @@import type { Gpu, Timer } from "vgpu";-import type { MaskLayer, ProcessingLayer } from "@/core/document";+import { maskModifiers, type ProcessingLayer } from "@/core/document";import type { ImageSource } from "@/core/image";import {createRenderer,@@ -10,26 +10,12 @@ import {transformImages,} from "@/core/renderer";import { exposure } from "@/features/adjustments/exposure";-import { defaultAdjustments } from "@/features/adjustments/model";import { adjustments } from "@/features/adjustments/pass";import { colorMixer } from "@/features/color-mixer/pass";import { unsharpMask } from "@/features/details/unsharp-mask";import { toneCurves } from "@/features/tone-curves/pass";import { vignette } from "@/features/vignette/pass";-function maskAdjustments(layer: MaskLayer) {- const name = `layer/${layer.id}`;- const values = layer.adjustments;- const hasOtherAdjustments = Object.entries(values).some(- ([key, value]) =>- key !== "exposure" && value !== Reflect.get(defaultAdjustments, key),- );- if (hasOtherAdjustments) {- return adjustments(values, `${name}/adjustments`);- }- return exposure(`${name}/exposure`, values.exposure);-}-type Composition = {image: RenderImage;input?: RenderImage;@@ -58,7 +44,7 @@ function composeLayer(]);break;case "mask": {- const adjusted = pipeline(below, [maskAdjustments(layer)]);+ const adjusted = pipeline(below, [adjustments(layer.adjustments, name)]);if (layer.id === inputId) {input = adjusted;}@@ -79,29 +65,23 @@ function composeLayer(]);break;}- const masks: MaskLayer[] = [];- for (const child of layer.children) {- if (layer.kind === "mask" && child.kind === "mask") {- if (child.visible && child.opacity > 0) {- masks.push(child);- }- } else {- const childComposition = composeLayer(edited, child, inputId);- edited = childComposition.image;- input ??= childComposition.input;- }- }-+ // Child masks of a mask shape its coverage; every other child processes the image.+ const masks = layer.kind === "mask" ? maskModifiers(layer) : [];+ const effects =+ layer.kind === "mask"+ ? layer.children.filter((child) => child.kind !== "mask")+ : layer.children;+ const children = composeLayers(edited, effects, inputId);return {image: mixAdjustment(`${name}/mix`,below,- edited,+ children.image,layer.opacity,layer.kind === "mask" ? layer.mask : undefined,masks,),- input,+ input: input ?? children.input,};}@@ -139,7 +119,7 @@ export function createEditorRenderer(const children = composeLayers(image, sourceLayer.children, inputId);const composition = composeLayers(children.image, layers, inputId);const adjusted = pipeline(composition.image, [- adjustments(sourceLayer.adjustments, `${name}/adjustments`),+ adjustments(sourceLayer.adjustments, name),]);const full = pipeline(adjusted, [toneCurves(sourceLayer.toneCurve, `${name}/curves`),diff --git a/src/app/loaders/camera-raw-xmp.ts b/src/app/loaders/camera-raw-xmp.tsindex dd0313f..b2f1fe9 100644--- a/src/app/loaders/camera-raw-xmp.ts+++ b/src/app/loaders/camera-raw-xmp.ts@@ -1,4 +1,4 @@-import { createLayer, editEffect } from "@/app/editor/layers";+import { editEffect } from "@/app/editor/layers";import type { Workspace } from "@/app/workspace";import type { Adjustments, EditorDocument } from "@/core/document";import { setAdjustments } from "@/features/adjustments/edits";@@ -8,7 +8,7 @@ import {readCameraRawXmp,} from "@/features/camera-raw-xmp/xmp";import { setDetails } from "@/features/details/edits";-import { defaultDetails, validateDetails } from "@/features/details/model";+import { validateDetails } from "@/features/details/model";import type { FileLoader } from "./registry";function toAdjustments(xmp: CameraRawXmp): Partial<Adjustments> {@@ -36,15 +36,8 @@ function applyClarity(document: EditorDocument, clarity: number) {) {return;}- editEffect(- document,- "details",- undefined,- (id) => setDetails(document, { clarity }, id),- () => ({- ...createLayer("details"),- details: { ...defaultDetails, clarity },- }),+ editEffect(document, "details", undefined, (id) =>+ setDetails(document, { clarity }, id),);}diff --git a/src/app/loaders/image.ts b/src/app/loaders/image.tsindex 8451718..c02bbcd 100644--- a/src/app/loaders/image.ts+++ b/src/app/loaders/image.ts@@ -1,10 +1,9 @@import type { Gpu } from "vgpu";+import { createImageLayer } from "@/app/editor/layers";import type { Workspace } from "@/app/workspace";import { createDocument, createResources } from "@/core/document";import decode, { canDecode } from "@/core/image/decode";import { imageFrame } from "@/core/image/frame";-import { defaultAdjustments } from "@/features/adjustments/model";-import { defaultCurve } from "@/features/tone-curves/curve";import type { FileLoader } from "./registry";export function createImageLoader(gpu: Gpu, workspace: Workspace): FileLoader {@@ -22,18 +21,7 @@ export function createImageLoader(gpu: Gpu, workspace: Workspace): FileLoader {return createDocument({frame: imageFrame(decoded.image.size),- layers: [- {- kind: "image",- name: file.name,- children: [],- id: crypto.randomUUID(),- whiteBalance: decoded.raw?.asShot,- source,- adjustments: { ...defaultAdjustments },- toneCurve: defaultCurve,- },- ],+ layers: [createImageLayer(source, file.name, decoded.raw?.asShot)],},resources,);diff --git a/src/components/editor/pipeline.tsx b/src/components/editor/pipeline.tsxindex c48012a..9aaeaa1 100644--- a/src/components/editor/pipeline.tsx+++ b/src/components/editor/pipeline.tsx@@ -69,7 +69,8 @@ export function RendererProvider({document.selection.getState().layerId,);const input = target && "toneCurve" in target ? target.id : undefined;- if (scene === requestedScene && input === requestedInput) {+ // A dropped input can stay live; only a new one needs a render.+ if (scene === requestedScene && (input === requestedInput || !input)) {return;}requestedScene = scene;diff --git a/src/components/icons/rotate-cursor.ts b/src/components/icons/rotate-cursor.tsnew file mode 100644index 0000000..ed671e5--- /dev/null+++ b/src/components/icons/rotate-cursor.ts@@ -0,0 +1,9 @@+import svg from "./rotate-cursor.svg?raw";++/** A rotation cursor turned by `angle` degrees, with a crosshair fallback. */+export function rotateCursor(angle = 0) {+ const turned = angle+ ? svg.replace('transform="', `transform="rotate(${angle} 12 12) `)+ : svg;+ return `url("data:image/svg+xml,${encodeURIComponent(turned)}") 12 12, crosshair`;+}diff --git a/src/components/ui/scroll-area.tsx b/src/components/ui/scroll-area.tsxindex c63fb3d..ea2fdd1 100644--- a/src/components/ui/scroll-area.tsx+++ b/src/components/ui/scroll-area.tsx@@ -3,7 +3,6 @@ import { cn } from "cn";import type { ComponentProps } from "react";type ScrollAreaProps = ComponentProps<"div"> & {- viewportClassName?: string;/** Shade an edge while content is clipped beyond it. */fade?: boolean;};@@ -11,7 +10,6 @@ type ScrollAreaProps = ComponentProps<"div"> & {export function ScrollArea({children,className,- viewportClassName,fade = false,...props}: ScrollAreaProps) {@@ -25,7 +23,6 @@ export function ScrollArea({"h-full overscroll-contain focus-visible:outline focus-visible:outline-neutral-500 focus-visible:-outline-offset-1",fade &&"before:pointer-events-none before:sticky before:top-0 before:z-10 before:-mb-6 before:block before:h-6 before:bg-linear-to-b before:from-black/40 before:opacity-0 before:transition-opacity data-overflow-y-start:before:opacity-100 after:pointer-events-none after:sticky after:bottom-0 after:z-10 after:-mt-6 after:block after:h-6 after:bg-linear-to-t after:from-black/40 after:opacity-0 after:transition-opacity data-overflow-y-end:after:opacity-100",- viewportClassName,)}><Primitive.Content style={{ minWidth: 0 }}>diff --git a/src/components/ui/slider.tsx b/src/components/ui/slider.tsxindex 349df3e..bbc0ec6 100644--- a/src/components/ui/slider.tsx+++ b/src/components/ui/slider.tsx@@ -1,5 +1,4 @@import { cva } from "class-variance-authority";-import { cn } from "cn";import { ScrubInput } from "./scrub-input";type SliderProps = {@@ -16,7 +15,6 @@ type SliderProps = {unit?: string;/** "panel" stacks the bar under its label; "toolbar" keeps one row and drops the bar in a narrow container. */variant?: "panel" | "toolbar";- className?: string;};const root = cva("items-center text-neutral-400", {@@ -55,7 +53,6 @@ export function Slider({stops,unit,variant = "panel",- className,}: SliderProps) {const gradient = stops && {background: `linear-gradient(to right, ${stops.join()})`,@@ -63,7 +60,7 @@ export function Slider({const reset = () => defaultValue !== undefined && onChange(defaultValue);return (- <div className={cn(root({ variant }), className)}>+ <div className={root({ variant })}><span>{label}</span><div className={field({ variant })}><ScrubInputdiff --git a/src/components/ui/tree-drag.tsx b/src/components/ui/tree-drag.tsxindex 429d4fe..1be8733 100644--- a/src/components/ui/tree-drag.tsx+++ b/src/components/ui/tree-drag.tsx@@ -11,7 +11,14 @@ import {useSensor,useSensors,} from "@dnd-kit/core";-import { createContext, type ReactNode, useContext, useState } from "react";+import {+ createContext,+ type ReactNode,+ useCallback,+ useContext,+ useMemo,+ useState,+} from "react";export type TreeDrop = {id: string;@@ -73,10 +80,21 @@ export function TreeDrag({ children, canDrop, onDrop, label }: TreeDragProps) {const next = { id: event.active.id, target: event.over.id, position };return canDrop(next) ? next : null;}+ function move(event: DragMoveEvent) {+ const next = locate(event);+ setDrop((current) =>+ current?.id === next?.id &&+ current?.target === next?.target &&+ current?.position === next?.position+ ? current+ : next,+ );+ }function clear() {setActive(null);setDrop(null);}+ const context = useMemo(() => ({ active, drop }), [active, drop]);return (<DndContextsensors={sensors}@@ -86,8 +104,7 @@ export function TreeDrag({ children, canDrop, onDrop, label }: TreeDragProps) {setActive(active.id);}}}- onDragMove={(event) => setDrop(locate(event))}- onDragOver={(event) => setDrop(locate(event))}+ onDragMove={move}onDragCancel={clear}onDragEnd={() => {if (drop) {@@ -102,7 +119,7 @@ export function TreeDrag({ children, canDrop, onDrop, label }: TreeDragProps) {},}}>- <Context value={{ active, drop }}>{children}</Context>+ <Context value={context}>{children}</Context><DragOverlay dropAnimation={null}>{active && (<div className="max-w-64 rounded border border-neutral-500 bg-neutral-700 px-3 py-2 shadow-lg">@@ -121,11 +138,17 @@ export function useTreeDragItem(const { active, drop } = useContext(Context);const draggable = useDraggable({ id, disabled });const droppable = useDroppable({ id, data: { expanded } });- return {- ref: (element: HTMLDivElement | null) => {- draggable.setNodeRef(element);- droppable.setNodeRef(element);+ const { setNodeRef: setDraggable } = draggable;+ const { setNodeRef: setDroppable } = droppable;+ const ref = useCallback(+ (element: HTMLDivElement | null) => {+ setDraggable(element);+ setDroppable(element);},+ [setDraggable, setDroppable],+ );+ return {+ ref,handle: { ...draggable.attributes, ...draggable.listeners },dragging: active === id,drop: drop?.target === id ? drop.position : undefined,diff --git a/src/core/document/history.ts b/src/core/document/history.tsindex dbcdecf..11099b2 100644--- a/src/core/document/history.ts+++ b/src/core/document/history.ts@@ -73,8 +73,11 @@ export function createHistory<T extends object>(}publish();},+ /** Returns whether this call opened the group; nested callers leave it to the opener. */begin() {+ const opened = group === undefined;group ??= state.getState();+ return opened;},commit,cancel,diff --git a/src/core/document/index.ts b/src/core/document/index.tsindex 1c518f8..046d3d3 100644--- a/src/core/document/index.ts+++ b/src/core/document/index.ts@@ -28,23 +28,22 @@ export {editLayer,findLayer,locateLayer,+ maskModifiers,updateLayer,walkLayers,} from "./tree";export { createResources };-export type MaskPreview = {- readonly mask: Gradient;- readonly modifiers: readonly MaskModifier[];-};-export type Preview = {comparison: "edited" | "original" | "split";split: number;shadows: boolean;highlights: boolean;/** The mask whose coverage the display tints red. */- maskOverlay?: MaskPreview;+ maskOverlay?: {+ readonly mask: Gradient;+ readonly modifiers: readonly MaskModifier[];+ };};/** Scenes contain only plain values; unchanged branches keep their identity. */diff --git a/src/core/document/tree.ts b/src/core/document/tree.tsindex 58f8d42..2ae6446 100644--- a/src/core/document/tree.ts+++ b/src/core/document/tree.ts@@ -1,5 +1,5 @@import type { EditorDocument } from "./index";-import type { Layer, ProcessingLayer, Scene } from "./scene";+import type { Layer, MaskLayer, ProcessingLayer, Scene } from "./scene";export function walkLayers(layers: readonly Layer[]): Layer[] {return layers.flatMap((layer) => [layer, ...walkLayers(layer.children)]);@@ -42,24 +42,21 @@ export function adjustmentTarget(layers: readonly Layer[], id: string) {return layer.kind === "mask" && parent?.kind === "mask" ? parent : layer;}-function updateChildren(- layers: readonly ProcessingLayer[],- id: string,- update: (layer: Layer) => Layer,-): readonly ProcessingLayer[] {- return layers.map((layer) => {- if (layer.id === id) {- const next = update(layer);- if (next.kind === "image") {- throw Error("An image cannot replace a processing layer.");- }- return next;- }- const children = updateChildren(layer.children, id, update);- return children.every((child, index) => child === layer.children[index])- ? layer- : { ...layer, children };- });+/** The child masks that currently add to or subtract from a mask's coverage. */+export function maskModifiers(layer: MaskLayer) {+ return layer.children.filter(+ (child): child is MaskLayer =>+ child.kind === "mask" && child.visible && child.opacity > 0,+ );+}++function withChildren<L extends Layer>(+ layer: L,+ children: readonly ProcessingLayer[],+): L {+ return children.every((child, index) => child === layer.children[index])+ ? layer+ : { ...layer, children };}export function updateLayer(@@ -67,24 +64,36 @@ export function updateLayer(id: string,update: (layer: Layer) => Layer,): Scene {- if (!findLayer(scene.layers, id)) {- throw Error("Layer is unavailable.");- }const [image, ...layers] = scene.layers;- const children = updateChildren(image.children, id, update);+ let matched = image.id === id;+ function updateChildren(+ items: readonly ProcessingLayer[],+ ): readonly ProcessingLayer[] {+ return items.map((layer) => {+ if (layer.id !== id) {+ return withChildren(layer, updateChildren(layer.children));+ }+ matched = true;+ const next = update(layer);+ if (next.kind === "image") {+ throw Error("An image cannot replace a processing layer.");+ }+ return next;+ });+ }+ const children = updateChildren(image.children);const base = image.id === id ? update(image) : image;if (base.kind !== "image") {throw Error("The image layer is pinned.");}- return {- ...scene,- layers: [- children.every((child, index) => child === image.children[index])- ? base- : { ...base, children },- ...updateChildren(layers, id, update),- ],- };+ const next: Scene["layers"] = [+ withChildren(base, children),+ ...updateChildren(layers),+ ];+ if (!matched) {+ throw Error("Layer is unavailable.");+ }+ return { ...scene, layers: next };}export function editLayer(diff --git a/src/core/renderer/display/index.ts b/src/core/renderer/display/index.tsindex a22d755..911148a 100644--- a/src/core/renderer/display/index.ts+++ b/src/core/renderer/display/index.ts@@ -2,8 +2,10 @@ import {type Buffer,effect,type Frame,+ frame,type Gpu,sampler,+ surface,type Target,} from "vgpu";import type { Gradient, MaskModifier } from "@/core/document";@@ -11,6 +13,7 @@ import {frameTransform,type ImageFrame,imageFrame,+ type Point,} from "@/core/image/frame";import { gradientParams, modifierData } from "@/core/renderer/blend";import shader from "./image.wgsl";@@ -102,3 +105,26 @@ export function createDisplay(gpu: Gpu) {},});}++const displays = new WeakMap<Gpu, ReturnType<typeof createDisplay>>();++/** Draws an image into an off-screen canvas of `size` and takes its pixels; one display serves each GPU. */+export async function renderBitmap(gpu: Gpu, image: Target, size: Point) {+ let display = displays.get(gpu);+ if (!display) {+ display = createDisplay(gpu);+ displays.set(gpu, display);+ }+ const canvas = new OffscreenCanvas(size[0], size[1]);+ const output = surface(gpu, canvas, { size, dpr: 1 });+ try {+ frame(gpu, (frame) =>+ display(frame, output, image, { view: { zoom: 1, pan: [0, 0] } }),+ );+ // Finish the draw before the 2D canvas reads it; otherwise Chrome waits a full second for the sync.+ await gpu.gpu.queue.onSubmittedWorkDone();+ return canvas.transferToImageBitmap();+ } finally {+ output.dispose();+ }+}diff --git a/src/core/renderer/index.ts b/src/core/renderer/index.tsindex 92e7d7d..d1733b9 100644--- a/src/core/renderer/index.ts+++ b/src/core/renderer/index.ts@@ -9,6 +9,7 @@ export {type Clipping,createDisplay,type MaskOverlay,+ renderBitmap,type View,} from "./display";export {diff --git a/src/features/adjustments/pass.ts b/src/features/adjustments/pass.tsindex 626ff62..b52882b 100644--- a/src/features/adjustments/pass.ts+++ b/src/features/adjustments/pass.ts@@ -1,9 +1,19 @@import type { Adjustments } from "@/core/document";import { node } from "@/core/renderer";import shader from "./adjustments.wgsl";+import { exposure } from "./exposure";+import { defaultAdjustments } from "./model";-export function adjustments(values: Adjustments, name = "adjustments") {- return node(name, shader, {+/** Exposure alone takes the lighter pass; the full shader runs under its own name once another value moves. */+export function adjustments(values: Adjustments, name = "layer") {+ const exposureOnly = Object.entries(values).every(+ ([key, value]) =>+ key === "exposure" || value === Reflect.get(defaultAdjustments, key),+ );+ if (exposureOnly) {+ return exposure(`${name}/exposure`, values.exposure);+ }+ return node(`${name}/adjustments`, shader, {set: { adjustments: values },samplers: { sourceSampler: { minFilter: "linear", magFilter: "linear" } },});diff --git a/src/features/crop/overlay.tsx b/src/features/crop/overlay.tsxindex a6baa36..b0f039a 100644--- a/src/features/crop/overlay.tsx+++ b/src/features/crop/overlay.tsx@@ -1,6 +1,6 @@import { type PointerEvent, useRef } from "react";import { useViewport } from "@/components/editor/viewport";-import rotateCursor from "@/components/icons/rotate-cursor.svg?raw";+import { rotateCursor } from "@/components/icons/rotate-cursor";import type { ImageFrame, Point } from "@/core/image/frame";import { clamp } from "@/lib/math";import { move, resize, rotate } from "./geometry";@@ -112,11 +112,9 @@ export function CropOverlay({box.y + box.height / 2 - event.clientY,box.x + box.width / 2 - event.clientX,);- const svg = rotateCursor.replace(- 'transform="',- `transform="rotate(${Math.round((angle * 180) / Math.PI)} 12 12) `,+ event.currentTarget.style.cursor = rotateCursor(+ Math.round((angle * 180) / Math.PI),);- event.currentTarget.style.cursor = `url("data:image/svg+xml,${encodeURIComponent(svg)}") 12 12, crosshair`;}}><divdiff --git a/src/features/details/model.ts b/src/features/details/model.tsindex a2a76fb..46f3611 100644--- a/src/features/details/model.ts+++ b/src/features/details/model.ts@@ -13,11 +13,9 @@ export const detailLimits = {export function validateDetails(change: Partial<Details>) {for (const [name, value] of Object.entries(change)) {- const limits = Object.entries(detailLimits).find(- ([key]) => key === name,- )?.[1];+ const limits = Reflect.get(detailLimits, name);if (- !limits ||+ !Array.isArray(limits) ||typeof value !== "number" ||!Number.isFinite(value) ||value < limits[0] ||diff --git a/src/features/histogram/index.tsx b/src/features/histogram/index.tsxindex 0cd3baa..3269637 100644--- a/src/features/histogram/index.tsx+++ b/src/features/histogram/index.tsx@@ -22,6 +22,7 @@ export function Histogram({(svg: SVGSVGElement | null) => {if (svg) {const plot = histogram.attach(svg, image, colors, working);+ plot.update();const unsubscribe = subscribe(plot.update);return () => {unsubscribe();diff --git a/src/features/layers/controls.tsx b/src/features/layers/controls.tsxindex aac0a4f..990dc07 100644--- a/src/features/layers/controls.tsx+++ b/src/features/layers/controls.tsx@@ -1,4 +1,10 @@-import { type ComponentProps, useEffect, useState } from "react";+import {+ type ComponentProps,+ memo,+ useCallback,+ useEffect,+ useState,+} from "react";import { useStore } from "zustand";import { PanelHeader } from "@/components/editor/panel";import { useDocument, useScene } from "@/components/editor/session";@@ -15,7 +21,6 @@ import {type Layer,type ProcessingLayer,} from "@/core/document";-import type { Point } from "@/core/image/frame";import { layerDrop } from "./drop";import { moveLayer, setLayer } from "./edits";import { useGradientTool } from "./gradient-tool";@@ -51,12 +56,12 @@ function EffectSymbol({ kind }: { kind: ProcessingLayer["kind"] }) {}}-function LayerThumbnail({ layer, size }: { layer: Layer; size: Point }) {+function LayerThumbnail({ layer }: { layer: Layer }) {if (layer.kind === "image") {return <ImageThumbnail />;}if (layer.kind === "mask") {- return <MaskThumbnail mask={layer.mask} size={size} />;+ return <MaskThumbnail mask={layer.mask} />;}return (<span className="grid size-8 shrink-0 place-items-center rounded border border-black/50 bg-neutral-950/40 text-neutral-400">@@ -124,24 +129,20 @@ function LayerName({);}-function LayerRow({+/** Rows subscribe to selection themselves, so unchanged branches skip when a sibling edits. */+const LayerRow = memo(function LayerRow({layer,- siblings,parent,depth,- selected,- size,onSelect,}: {layer: Layer;- siblings: readonly Layer[];parent?: Layer;depth: number;- selected: string;- size: Point;onSelect: (id: string) => void;}) {const document = useDocument();+ const selected = useStore(document.selection, (state) => state.layerId);const [collapsed, setCollapsed] = useState(false);const isImage = layer.kind === "image";const visible = isImage || layer.visible;@@ -160,10 +161,7 @@ function LayerRow({const isSubmask = layer.kind === "mask" && parent?.kind === "mask";const maskSign =layer.kind === "mask" && layer.operation === "subtract" ? "−" : "+";- let expandLabel = `Expand ${layer.name}`;- if (expanded) {- expandLabel = `Collapse ${layer.name}`;- }+ const expandLabel = `${expanded ? "Collapse" : "Expand"} ${layer.name}`;return (<><div@@ -198,7 +196,7 @@ function LayerRow({onClick={() => onSelect(layer.id)}className="mr-2 shrink-0">- <LayerThumbnail layer={layer} size={size} />+ <LayerThumbnail layer={layer} /></button><LayerNamelayer={layer}@@ -238,12 +236,7 @@ function LayerRow({</span>)}{layer.kind !== "image" && (- <LayerActions- layer={layer}- siblings={siblings}- parent={parent}- onSelect={onSelect}- />+ <LayerActions layer={layer} onSelect={onSelect} />)}</div>{expanded &&@@ -253,17 +246,14 @@ function LayerRow({<LayerRowkey={child.id}layer={child}- siblings={layer.children}parent={layer}depth={depth + 1}- selected={selected}- size={size}onSelect={onSelect}/>))}</>);-}+});export function LayersControls({onAdd,@@ -271,14 +261,16 @@ export function LayersControls({onAdd: (kind: EffectLayer["kind"]) => void;}) {const document = useDocument();- const scene = useScene((scene) => scene);- const selected = useStore(document.selection, (state) => state.layerId);- const size = document.resources.get(scene.layers[0].source).image.size;+ const layers = useScene((scene) => scene.layers);const tool = useGradientTool();- function select(id: string) {- tool.close();- document.selectLayer(id);- }+ const { close } = tool;+ const select = useCallback(+ (id: string) => {+ close();+ document.selectLayer(id);+ },+ [close, document],+ );function drop(target: TreeDrop) {const position = layerDrop(document.scene.getState(), target);if (position) {@@ -291,16 +283,6 @@ export function LayersControls({<sectionaria-label="Layers"className="grid max-h-1/2 min-h-30 shrink-0 grid-rows-[auto_minmax(0,1fr)] border-t border-black bg-panel"- onKeyDown={(event) => {- // Escape closes an open menu before the mask shortcuts see it.- const menu = event.currentTarget.querySelector<HTMLElement>(- "[popover]:popover-open",- );- if (event.key === "Escape" && menu) {- menu.hidePopover();- event.stopPropagation();- }- }}><PanelHeader title="Layers"><button@@ -351,18 +333,17 @@ export function LayersControls({</PanelHeader><ScrollArea fade><TreeDrag- canDrop={(target) => Boolean(layerDrop(scene, target))}+ canDrop={(target) =>+ Boolean(layerDrop(document.scene.getState(), target))+ }onDrop={drop}- label={(id) => findLayer(scene.layers, id)?.name ?? id}+ label={(id) => findLayer(layers, id)?.name ?? id}>- {scene.layers.toReversed().map((layer) => (+ {layers.toReversed().map((layer) => (<LayerRowkey={layer.id}layer={layer}- siblings={scene.layers}depth={0}- selected={selected}- size={[size[0], size[1]]}onSelect={select}/>))}diff --git a/src/features/layers/gradient-guides.tsx b/src/features/layers/gradient-guides.tsxindex 5cd0c32..01f2e05 100644--- a/src/features/layers/gradient-guides.tsx+++ b/src/features/layers/gradient-guides.tsx@@ -1,9 +1,9 @@-import rotateCursor from "@/components/icons/rotate-cursor.svg?raw";+import { rotateCursor } from "@/components/icons/rotate-cursor";import type { Gradient, RadialGradient } from "@/core/document";import type { Point } from "@/core/image/frame";import { type GradientHandle, radialPoint } from "./gradient";-const rotationCursor = `url("data:image/svg+xml,${encodeURIComponent(rotateCursor)}") 12 12, crosshair`;+const rotationCursor = rotateCursor();function resizeCursor(from: Point, to: Point) {const angle = Math.atan2(to[1] - from[1], to[0] - from[0]);diff --git a/src/features/layers/gradient-overlay.tsx b/src/features/layers/gradient-overlay.tsxindex de886f9..b70e8f7 100644--- a/src/features/layers/gradient-overlay.tsx+++ b/src/features/layers/gradient-overlay.tsx@@ -2,7 +2,12 @@ import { type PointerEvent, useEffect, useMemo, useRef, useState } from "react";import { useStore } from "zustand";import { useDocument, useScene } from "@/components/editor/session";import { useViewport } from "@/components/editor/viewport";-import { findLayer, type Gradient, type MaskLayer } from "@/core/document";+import {+ type EditorDocument,+ findLayer,+ type Gradient,+ maskModifiers,+} from "@/core/document";import { outputOffset, type Point, sourceOffset } from "@/core/image/frame";import { useShortcuts } from "@/hooks/use-shortcuts";import { deleteLayer, setLayerMask } from "./edits";@@ -17,6 +22,8 @@ import { useGradientTool } from "./gradient-tool";type Drag = {pointer: number;+ /** The viewport bounds measured once; pointer capture keeps them valid for the drag. */+ box: DOMRect | undefined;from: Point;to: Point;mask: Gradient;@@ -24,6 +31,12 @@ type Drag = {id: string;};+function hideOverlay(document: EditorDocument) {+ if (document.preview.getState().maskOverlay) {+ document.preview.setState({ maskOverlay: undefined });+ }+}+export function GradientOverlay() {const document = useDocument();const tool = useGradientTool();@@ -38,7 +51,8 @@ export function GradientOverlay() {const [draft, setDraft] = useState<Gradient | null>(null);const dragging = useRef<Drag | null>(null);const [dragCursor, setDragCursor] = useState<string>();- function cancel() {+ /** Ends any drag, restoring the scene unless it was committed. */+ function reset() {if (dragging.current && dragging.current.handle !== "new") {document.history.cancel();}@@ -56,14 +70,14 @@ export function GradientOverlay() {[document],);function remove() {- cancel();+ reset();if (mask) {deleteLayer(document, selected);}}function dismiss() {if (dragging.current || tool.target) {- cancel();+ reset();return;}if (tool.overlay === "new" && mask) {@@ -71,18 +85,16 @@ export function GradientOverlay() {}tool.setOverlay("hidden");}- function toggleOverlay() {- tool.setOverlay(tool.overlay === "hidden" ? "shown" : "hidden");- }useShortcuts({escape: dismiss,...(tool.overlay === "hidden"? {}: { enter: () => tool.setOverlay("hidden") }),- ...(mask ? { o: toggleOverlay, delete: remove, backspace: remove } : {}),+ ...(mask+ ? { o: tool.toggleOverlay, delete: remove, backspace: remove }+ : {}),});- function documentPoint(event: PointerEvent): Point {- const box = camera.ref.current?.getBoundingClientRect();+ function documentPoint(event: PointerEvent, box: DOMRect | undefined): Point {if (!box) {return frame.center;}@@ -120,10 +132,12 @@ export function GradientOverlay() {if (!tool.target && (!mask || !handle)) {return;}- const from = documentPoint(event);+ const box = camera.ref.current?.getBoundingClientRect();+ const from = documentPoint(event, box);if (tool.target) {dragging.current = {pointer: event.pointerId,+ box,from,to: from,mask: drawGradient(tool.target.shape, from, from),@@ -136,6 +150,7 @@ export function GradientOverlay() {document.history.begin();dragging.current = {pointer: event.pointerId,+ box,from,to: from,mask,@@ -152,13 +167,17 @@ export function GradientOverlay() {event.preventDefault();event.stopPropagation();event.currentTarget.setPointerCapture(event.pointerId);+ // Keys after a drag belong to the mask, not to the button that started the tool.+ if (window.document.activeElement instanceof HTMLElement) {+ window.document.activeElement.blur();+ }}function move(event: PointerEvent<HTMLDivElement>) {const drag = dragging.current;if (!drag || drag.pointer !== event.pointerId) {return;}- const point = documentPoint(event);+ const point = documentPoint(event, drag.box);drag.to = point;if (drag.handle === "new") {const next = drawGradient(@@ -194,36 +213,25 @@ export function GradientOverlay() {} else {document.history.commit();}- dragging.current = null;- setDraft(null);- setDragCursor(undefined);- tool.close();+ reset();event.currentTarget.releasePointerCapture(event.pointerId);}const visible = draft ?? mask;const preview =!!draft || dragCursor !== undefined || tool.overlay !== "hidden";- const children = layer?.children;const modifiers = useMemo(- () =>- draft- ? []- : (children?.filter(- (child): child is MaskLayer =>- child.kind === "mask" && child.visible && child.opacity > 0,- ) ?? []),- [draft, children],+ () => (draft || !layer ? [] : maskModifiers(layer)),+ [draft, layer],);const shown = visible && preview && !camera.panMode;useEffect(() => {- document.preview.setState({- maskOverlay: shown ? { mask: visible, modifiers } : undefined,- });+ if (shown) {+ document.preview.setState({ maskOverlay: { mask: visible, modifiers } });+ return;+ }+ hideOverlay(document);}, [document, shown, visible, modifiers]);- useEffect(- () => () => document.preview.setState({ maskOverlay: undefined }),- [document],- );+ useEffect(() => () => hideOverlay(document), [document]);const cursor = dragCursor ?? (tool.target ? "crosshair" : undefined);const pointerEvents =(tool.target || dragCursor) && !camera.panMode ? "auto" : "none";@@ -238,10 +246,10 @@ export function GradientOverlay() {onPointerDown={start}onPointerMove={move}onPointerUp={finish}- onPointerCancel={cancel}+ onPointerCancel={reset}onLostPointerCapture={() => {if (dragging.current) {- cancel();+ reset();}}}>diff --git a/src/features/layers/gradient-tool.tsx b/src/features/layers/gradient-tool.tsxindex 5cc1782..53af6d3 100644--- a/src/features/layers/gradient-tool.tsx+++ b/src/features/layers/gradient-tool.tsx@@ -1,6 +1,7 @@import {createContext,type ReactNode,+ useCallback,useContext,useEffect,useState,@@ -9,7 +10,6 @@ import { useDocument } from "@/components/editor/session";import { findLayer, type Gradient, type MaskLayer } from "@/core/document";type NewMask = {- kind: "new";shape: Gradient["kind"];parentId?: string;operation: "add" | "subtract";@@ -30,6 +30,7 @@ const GradientTool = createContext<{close: () => void;create: (mask: Gradient, target: NewMask) => void;setOverlay: (overlay: Overlay) => void;+ toggleOverlay: () => void;} | null>(null);export function useGradientTool() {@@ -59,6 +60,7 @@ export function GradientProvider({}) {const [target, setTarget] = useState<NewMask | null>(null);const [overlay, setOverlay] = useState<Overlay>("hidden");+ const close = useCallback(() => setTarget(null), []);const document = useDocument();useEffect(() =>@@ -89,16 +91,17 @@ export function GradientProvider({value={{target,overlay,- draw: (shape = "linear") =>- setTarget({ kind: "new", shape, operation: "add" }),+ draw: (shape = "linear") => setTarget({ shape, operation: "add" }),add: (parentId, operation, shape) =>- setTarget({ kind: "new", shape, parentId, operation }),- close: () => setTarget(null),+ setTarget({ shape, parentId, operation }),+ close,create: (mask, target) => {onCreate(mask, target);setOverlay("new");},setOverlay,+ toggleOverlay: () =>+ setOverlay((overlay) => (overlay === "hidden" ? "shown" : "hidden")),}}>{children}diff --git a/src/features/layers/gradient.ts b/src/features/layers/gradient.tsindex 504f44b..975e149 100644--- a/src/features/layers/gradient.ts+++ b/src/features/layers/gradient.ts@@ -1,5 +1,6 @@import type { Gradient, LinearGradient, RadialGradient } from "@/core/document";import type { Point } from "@/core/image/frame";+import { clamp } from "@/lib/math";export const gradientHandles = ["move",@@ -21,18 +22,9 @@ export function drawGradient(const dx = to[0] - from[0];const dy = to[1] - from[1];if (kind === "radial") {- const radius: Point = [- Math.max(1, Math.abs(dx)),- Math.max(1, Math.abs(dy)),- ];+ let radius: Point = [Math.max(1, Math.abs(dx)), Math.max(1, Math.abs(dy))];if (constrain) {- return {- kind,- center: from,- radius: [Math.max(...radius), Math.max(...radius)],- angle: 0,- feather: 0.5,- };+ radius = [Math.max(...radius), Math.max(...radius)];}return { kind, center: from, radius, angle: 0, feather: 0.5 };}@@ -134,31 +126,19 @@ export function moveGradient([from[0] - mask.center[0], from[1] - mask.center[1]],angle,);- if (handle === "radius-x") {- return {- ...mask,- radius: [- Math.max(1, mask.radius[0] + delta[0] * Math.sign(origin[0])),- mask.radius[1],- ],- };- }- if (handle === "radius-y") {- return {- ...mask,- radius: [- mask.radius[0],- Math.max(1, mask.radius[1] + delta[1] * Math.sign(origin[1])),- ],- };+ if (handle === "radius-x" || handle === "radius-y") {+ const axis = handle === "radius-x" ? 0 : 1;+ const radius: [number, number] = [...mask.radius];+ radius[axis] = Math.max(+ 1,+ mask.radius[axis] + delta[axis] * Math.sign(origin[axis]),+ );+ return { ...mask, radius };}if (handle === "feather") {return {...mask,- feather: Math.max(- 0,- Math.min(1, mask.feather - delta[0] / mask.radius[0]),- ),+ feather: clamp(mask.feather - delta[0] / mask.radius[0]),};}return mask;diff --git a/src/features/layers/menu.tsx b/src/features/layers/menu.tsxindex 1004742..a985181 100644--- a/src/features/layers/menu.tsx+++ b/src/features/layers/menu.tsx@@ -1,8 +1,8 @@import { cva } from "class-variance-authority";-import { type ReactNode, useId, useRef } from "react";+import { type ReactNode, useId, useRef, useState } from "react";import { useDocument, useScene } from "@/components/editor/session";import { Icon } from "@/components/icons/icon";-import { findLayer, type Layer, type ProcessingLayer } from "@/core/document";+import { findLayer, locateLayer, type ProcessingLayer } from "@/core/document";import { deleteLayer, duplicateLayer, moveLayer } from "./edits";const trigger = cva(@@ -30,6 +30,7 @@ export function LayerMenu({}) {const id = useId();const popover = useRef<HTMLDivElement>(null);+ const [open, setOpen] = useState(false);return (<><button@@ -45,6 +46,7 @@ export function LayerMenu({id={id}ref={popover}popover="auto"+ onBeforeToggle={(event) => setOpen(event.newState === "open")}className="fixed inset-auto z-50 m-0 [position-area:bottom_span-left] max-h-[calc(100dvh-1rem)] min-w-40 overflow-y-auto rounded-md [position-try-fallbacks:flip-block] border border-neutral-600 bg-neutral-800 p-1 text-neutral-200 shadow-xl [&_button]:block [&_button]:w-full [&_button]:rounded [&_button]:px-2 [&_button]:py-1.5 [&_button]:text-left [&_button:hover]:bg-neutral-700 [&_button:disabled]:text-neutral-600"><form@@ -53,26 +55,24 @@ export function LayerMenu({popover.current?.hidePopover();}}>- {children}+ {open && children}</form></div></>);}-export function LayerActions({+/** Mounted only while the menu is open, so rows do not track siblings and containers. */+function LayerActionItems({layer,- siblings,- parent,onSelect,}: {layer: ProcessingLayer;- siblings: readonly Layer[];- parent?: Layer;onSelect: (id: string) => void;}) {const document = useDocument();const layers = useScene((scene) => scene.layers);+ const { siblings = [], parent } = locateLayer(layers, layer.id) ?? {};const index = siblings.findIndex((item) => item.id === layer.id);const containers = layers.filter((item) =>@@ -90,18 +90,7 @@ export function LayerActions({moveLayer(document, layer.id, index + 1);}return (- <LayerMenu- label={`${layer.name} actions`}- icon={- <Icon className="size-4">- <path- d="M5 12h.01M12 12h.01M19 12h.01"- strokeWidth="3"- strokeLinecap="round"- />- </Icon>- }- >+ <><buttontype="submit"disabled={index === siblings.length - 1}@@ -161,6 +150,28 @@ export function LayerActions({<button type="submit" onClick={() => deleteLayer(document, layer.id)}>Delete</button>+ </>+ );+}++export function LayerActions(props: {+ layer: ProcessingLayer;+ onSelect: (id: string) => void;+}) {+ return (+ <LayerMenu+ label={`${props.layer.name} actions`}+ icon={+ <Icon className="size-4">+ <path+ d="M5 12h.01M12 12h.01M19 12h.01"+ strokeWidth="3"+ strokeLinecap="round"+ />+ </Icon>+ }+ >+ <LayerActionItems {...props} /></LayerMenu>);}diff --git a/src/features/layers/thumbnails.tsx b/src/features/layers/thumbnails.tsxindex 5f43d70..694f5ad 100644--- a/src/features/layers/thumbnails.tsx+++ b/src/features/layers/thumbnails.tsx@@ -1,10 +1,8 @@-import { useEffect, useId, useMemo, useRef, useState } from "react";-import { frame, surface } from "vgpu";+import { useEffect, useId, useRef, useState } from "react";import { useGpu } from "vgpu-react";import { useDocument, useScene } from "@/components/editor/session";import type { Gradient } from "@/core/document";-import type { Point } from "@/core/image/frame";-import { createDisplay } from "@/core/renderer";+import { renderBitmap } from "@/core/renderer";import { MaskFill } from "./mask-fill";/** A small original-image snapshot, rendered once when the source changes. */@@ -13,38 +11,25 @@ export function ImageThumbnail() {const document = useDocument();const sourceId = useScene((scene) => scene.layers[0].source);const source = document.resources.get(sourceId);- const display = useMemo(() => createDisplay(gpu), [gpu]);- useEffect(() => () => display.dispose(), [display]);const canvas = useRef<HTMLCanvasElement>(null);const [error, setError] = useState<string>();useEffect(() => {- const image = new OffscreenCanvas(64, 64);- const output = surface(gpu, image, { size: [64, 64], dpr: 1 });const release = source.retain();let active = true;async function draw() {try {- frame(gpu, (frame) =>- display(frame, output, source.image, {- view: { zoom: 1, pan: [0, 0] },- }),- );- await gpu.gpu.queue.onSubmittedWorkDone();- if (active) {- const context = canvas.current?.getContext("2d");- if (!context) {- throw Error("Cannot draw image thumbnail.");- }- const bitmap = image.transferToImageBitmap();- context.drawImage(bitmap, 0, 0);- bitmap.close();+ const bitmap = await renderBitmap(gpu, source.image, [64, 64]);+ const context = canvas.current?.getContext("2d");+ if (active && !context) {+ throw Error("Cannot draw image thumbnail.");}+ context?.drawImage(bitmap, 0, 0);+ bitmap.close();} catch (error) {if (active) {setError(String(error));}} finally {- output.dispose();release();}}@@ -52,7 +37,7 @@ export function ImageThumbnail() {return () => {active = false;};- }, [gpu, source, display]);+ }, [gpu, source]);return (<canvasref={canvas}@@ -65,8 +50,11 @@ export function ImageThumbnail() {);}-export function MaskThumbnail({ mask, size }: { mask: Gradient; size: Point }) {+export function MaskThumbnail({ mask }: { mask: Gradient }) {const id = useId();+ const document = useDocument();+ const sourceId = useScene((scene) => scene.layers[0].source);+ const size = document.resources.get(sourceId).image.size;return (<svgaria-label="Gradient mask thumbnail"diff --git a/src/features/layers/toolbar.tsx b/src/features/layers/toolbar.tsxindex c2ea54c..df737bc 100644--- a/src/features/layers/toolbar.tsx+++ b/src/features/layers/toolbar.tsx@@ -7,6 +7,11 @@ import { setLayer, setLayerMask, setMaskOperation } from "./edits";import { useGradientTool } from "./gradient-tool";import { LayerMenu } from "./menu";+const maskOperations = [+ ["add", "Add", "Add to mask"],+ ["subtract", "Subtract", "Subtract from mask"],+] as const;+function MaskOptions({ layer }: { layer: MaskLayer }) {const document = useDocument();const tool = useGradientTool();@@ -24,9 +29,7 @@ function MaskOptions({ layer }: { layer: MaskLayer }) {type="button"aria-pressed={tool.overlay !== "hidden"}title="Show mask overlay (O)"- onClick={() =>- tool.setOverlay(tool.overlay === "hidden" ? "shown" : "hidden")- }+ onClick={tool.toggleOverlay}className="h-7 rounded-full px-2.5 text-neutral-400 hover:bg-white/10 hover:text-neutral-100 aria-pressed:bg-white/15 aria-pressed:text-neutral-100 pointer-coarse:h-9">Overlay@@ -68,32 +71,27 @@ function MaskOptions({ layer }: { layer: MaskLayer }) {</select>)}{!parent &&- (["add", "subtract"] as const).map((operation) => {- const label =- operation === "add" ? "Add to mask" : "Subtract from mask";- const text = operation === "add" ? "Add" : "Subtract";- return (- <LayerMenu- variant="pill"- key={operation}- label={label}- icon={<span>{text}</span>}+ maskOperations.map(([operation, text, label]) => (+ <LayerMenu+ variant="pill"+ key={operation}+ label={label}+ icon={<span>{text}</span>}+ >+ <button+ type="submit"+ onClick={() => tool.add(layer.id, operation, "linear")}+ >+ Linear gradient+ </button>+ <button+ type="submit"+ onClick={() => tool.add(layer.id, operation, "radial")}>- <button- type="submit"- onClick={() => tool.add(layer.id, operation, "linear")}- >- Linear gradient- </button>- <button- type="submit"- onClick={() => tool.add(layer.id, operation, "radial")}- >- Radial gradient- </button>- </LayerMenu>- );- })}+ Radial gradient+ </button>+ </LayerMenu>+ ))}</>);}diff --git a/src/hooks/use-shortcuts.ts b/src/hooks/use-shortcuts.tsindex 1f05e27..a1a4d37 100644--- a/src/hooks/use-shortcuts.ts+++ b/src/hooks/use-shortcuts.ts@@ -12,6 +12,9 @@ export function useShortcuts(return;}const target = event.target;+ if (window.document.querySelector(":popover-open")) {+ return;+ }if (!inputs &&target instanceof HTMLElement &&diff --git a/tests/color-mixer.test.ts b/tests/color-mixer.test.tsindex 2a73afb..cf595b8 100644--- a/tests/color-mixer.test.ts+++ b/tests/color-mixer.test.ts@@ -1,13 +1,12 @@import { expect, test } from "bun:test";import { getMockGPUDeviceInstrumentation, init, target } from "vgpu/mock";+import { createImageLayer, createLayer } from "@/app/editor/layers";import { createEditorRenderer } from "@/app/editor/renderer";import { createDocument } from "@/core/document";import { createImageSource } from "@/core/image";import { imageFrame } from "@/core/image/frame";-import { defaultAdjustments } from "@/features/adjustments/model";import { resetColorMixer, setColorMixer } from "@/features/color-mixer/edits";import { defaultMixer } from "@/features/color-mixer/model";-import { defaultCurve } from "@/features/tone-curves/curve";test("color edits validate, group, cancel and reset while renderers reuse and release their outputs", async () => {const gpu = await init();@@ -17,23 +16,9 @@ test("color edits validate, group, cancel and reset while renderers reuse and reframe: imageFrame(image.size),layers: [{- kind: "image",- name: "Photo",- children: [- {- id: "mixer",- kind: "color-mixer",- name: "Color Mixer",- opacity: 1,- visible: true,- children: [],- colorMixer: defaultMixer,- },- ],+ ...createImageLayer("photo", "Photo"),id: "base",- source: "photo",- adjustments: defaultAdjustments,- toneCurve: defaultCurve,+ children: [{ ...createLayer("color-mixer"), id: "mixer" }],},],});@@ -55,10 +40,7 @@ test("color edits validate, group, cancel and reset while renderers reuse and remixer?.kind === "color-mixer" && mixer.colorMixer.saturation[5],).toBe(-20);await renderer.update(scene);- expect(renderer.inspect().passes).toEqual([- "layer/mixer/color-mixer",- "layer/base/adjustments",- ]);+ expect(renderer.inspect().passes).toEqual(["layer/mixer/color-mixer"]);const edited = renderer.outputImage();expect(edited.format).toBe("rgba16float");const calls = getMockGPUDeviceInstrumentation(gpu.gpu).calls;@@ -71,13 +53,10 @@ test("color edits validate, group, cancel and reset while renderers reuse and reexpect(document.scene.getState()).toEqual(scene);document.history.undo();await renderer.update(document.scene.getState());- expect(renderer.inspect().passes).toEqual(["layer/base/adjustments"]);+ expect(renderer.inspect().passes).toEqual([]);document.history.redo();await renderer.update(document.scene.getState());- expect(renderer.inspect().passes).toEqual([- "layer/mixer/color-mixer",- "layer/base/adjustments",- ]);+ expect(renderer.inspect().passes).toEqual(["layer/mixer/color-mixer"]);expect(calls.createRenderPipeline).toBe(pipelines);for (const value of [NaN, Infinity, -101, 101]) {expect(() =>diff --git a/tests/documents.test.ts b/tests/documents.test.tsindex 088724c..f2cae55 100644--- a/tests/documents.test.ts+++ b/tests/documents.test.ts@@ -1,11 +1,11 @@import { expect, test } from "bun:test";import { init, target } from "vgpu/mock";+import { createImageLayer } from "@/app/editor/layers";import { createWorkspace } from "@/app/workspace";import { createDocument, createResources } from "@/core/document";import { createImageSource } from "@/core/image";import { imageFrame } from "@/core/image/frame";import { setAdjustments } from "@/features/adjustments/edits";-import { defaultAdjustments } from "@/features/adjustments/model";import { validateDetails } from "@/features/details/model";import { defaultCurve } from "@/features/tone-curves/curve";import { setToneCurve } from "@/features/tone-curves/edits";@@ -13,17 +13,7 @@ import { setToneCurve } from "@/features/tone-curves/edits";function document() {return createDocument({frame: imageFrame([32, 32]),- layers: [- {- kind: "image",- name: "Photo",- children: [],- id: "base",- source: "image-1",- adjustments: { ...defaultAdjustments },- toneCurve: defaultCurve,- },- ],+ layers: [{ ...createImageLayer("image-1", "Photo"), id: "base" }],});}diff --git a/tests/images.ts b/tests/images.tsindex d7e3dde..e14927f 100644--- a/tests/images.ts+++ b/tests/images.ts@@ -1,9 +1,13 @@import type { Page } from "@playwright/test";-/** Read actual exported or downloaded pixels, independently of the renderer. */-export async function readImage(page: Page, bytes?: Uint8Array) {+/** Read actual exported or downloaded pixels, independently of the renderer; `points` adds samples at those pixels. */+export async function readImage(+ page: Page,+ bytes?: Uint8Array,+ points?: readonly (readonly [number, number])[],+) {return page.evaluate(- async (bytes) => {+ async ([bytes, points]) => {const file = bytes? new Blob([new Uint8Array(bytes)]): await window.openlight.exportImage();@@ -20,9 +24,12 @@ export async function readImage(page: Page, bytes?: Uint8Array) {.data,],corner: [...context.getImageData(10, 10, 1, 1).data],+ samples: points?.map(([x, y]) => [+ ...context.getImageData(x, y, 1, 1).data,+ ]),};},- bytes ? [...bytes] : null,+ [bytes ? [...bytes] : null, points] as const,);}diff --git a/tests/layer-drop.test.ts b/tests/layer-drop.test.tsindex 14f2805..d9e129d 100644--- a/tests/layer-drop.test.ts+++ b/tests/layer-drop.test.ts@@ -1,11 +1,9 @@import { expect, test } from "bun:test";-import { createLayer, createMask } from "@/app/editor/layers";+import { createImageLayer, createLayer, createMask } from "@/app/editor/layers";import type { Scene } from "@/core/document";import { imageFrame } from "@/core/image/frame";-import { defaultAdjustments } from "@/features/adjustments/model";import { type LayerDrop, layerDrop } from "@/features/layers/drop";import { defaultGradient } from "@/features/layers/gradient";-import { defaultCurve } from "@/features/tone-curves/curve";const gradient = defaultGradient([32, 16]);const exposure = { ...createLayer("exposure"), id: "exposure" };@@ -21,15 +19,7 @@ const top = { ...createLayer("exposure"), id: "top" };const scene: Scene = {frame: imageFrame([32, 16]),layers: [- {- kind: "image",- id: "image",- name: "Photo",- source: "photo",- adjustments: defaultAdjustments,- toneCurve: defaultCurve,- children: [],- },+ { ...createImageLayer("photo", "Photo"), id: "image" },mask,other,top,diff --git a/tests/layers.e2e.ts b/tests/layers.e2e.tsindex 76a00d5..86fda40 100644--- a/tests/layers.e2e.ts+++ b/tests/layers.e2e.ts@@ -5,17 +5,11 @@ import { readImage, readPreview } from "./images";import { box, drag } from "./pointer";async function samples(page: Page) {- return page.evaluate(async () => {- const image = await createImageBitmap(await window.openlight.exportImage());- const canvas = new OffscreenCanvas(image.width, image.height);- const context = canvas.getContext("2d");- if (!context) {- throw new Error("Cannot read layer output.");- }- context.drawImage(image, 0, 0);- image.close();- return [100, 700].map((y) => [...context.getImageData(600, y, 1, 1).data]);- });+ const { samples } = await readImage(page, undefined, [+ [600, 100],+ [600, 700],+ ]);+ return samples ?? [];}test("draw a mask, edit its child effects, reorder layers and undo", async ({@@ -90,20 +84,13 @@ test("draw a mask, edit its child effects, reorder layers and undo", async ({const original = await samples(page);await test.step("a local exposure recovers light the global exposure pushed past white", async () => {// Export pixels at the gray field and the light band, both inside the radial mask below.- const tones = () =>- page.evaluate(async () => {- const image = await createImageBitmap(- await window.openlight.exportImage(),- );- const canvas = new OffscreenCanvas(image.width, image.height);- const context = canvas.getContext("2d");- if (!context) throw new Error("Cannot read layer output.");- context.drawImage(image, 0, 0);- image.close();- return [600, 1100].map(- (x) => context.getImageData(x, 700, 1, 1).data[0],- );- });+ const tones = async () => {+ const { samples } = await readImage(page, undefined, [+ [600, 700],+ [1100, 700],+ ]);+ return samples?.map((pixel) => pixel[0]) ?? [];+ };const [gray, band] = await tones();expect([gray, band]).toEqual([128, 224]);await page.evaluate(() => window.openlight.setAdjustments({ exposure: 2 }));diff --git a/tests/layers.test.ts b/tests/layers.test.tsindex 2ebdd3f..e8986c1 100644--- a/tests/layers.test.ts+++ b/tests/layers.test.ts@@ -1,7 +1,7 @@import { expect, test } from "bun:test";import { getMockGPUDeviceInstrumentation, init, target } from "vgpu/mock";import { createControls } from "@/app/controls";-import { createLayer, createMask } from "@/app/editor/layers";+import { createImageLayer, createLayer, createMask } from "@/app/editor/layers";import { createEditorRenderer } from "@/app/editor/renderer";import { createWorkspace } from "@/app/workspace";import {@@ -12,7 +12,6 @@ import {} from "@/core/document";import { createImageSource } from "@/core/image";import { imageFrame } from "@/core/image/frame";-import { defaultAdjustments } from "@/features/adjustments/model";import { layerDrop } from "@/features/layers/drop";import {addLayer,@@ -24,7 +23,6 @@ import {setLayerMask,} from "@/features/layers/edits";import { defaultGradient } from "@/features/layers/gradient";-import { defaultCurve } from "@/features/tone-curves/curve";test("nested layers compose in order, move atomically, and duplicate with independent IDs", async () => {const gpu = await init();@@ -36,17 +34,7 @@ test("nested layers compose in order, move atomically, and duplicate with indepeconst document = createDocument({frame: imageFrame(source.image.size),- layers: [- {- kind: "image",- id: "base",- name: "Photo",- source: sourceId,- adjustments: defaultAdjustments,- toneCurve: defaultCurve,- children: [],- },- ],+ layers: [{ ...createImageLayer(sourceId, "Photo"), id: "base" }],},resources,);@@ -69,7 +57,7 @@ test("nested layers compose in order, move atomically, and duplicate with indepeexpect(document.selection.getState().layerId).toBe("base");controls.setVignette({ softness: 75 });expect(document.scene.getState().layers[1]).toMatchObject({- vignette: { intensity: 0, softness: 75 },+ vignette: { intensity: 50, softness: 75 },});controls.undo();for (const field of ["center", "size", "scale"]) {@@ -120,13 +108,12 @@ test("nested layers compose in order, move atomically, and duplicate with indepe`layer/${exposure}/exposure`,`layer/${vignette}/vignette`,`layer/${mask}/mix`,- "layer/base/adjustments",]);const calls = getMockGPUDeviceInstrumentation(gpu.gpu).calls;const compiled = calls.createRenderPipeline;setLayer(document, mask, { visible: false });await renderer.update(document.scene.getState());- expect(renderer.inspect().passes).toEqual(["layer/base/adjustments"]);+ expect(renderer.inspect().passes).toEqual([]);setLayer(document, mask, { visible: true, opacity: 0.5 });await renderer.update(document.scene.getState());expect(calls.createRenderPipeline).toBe(compiled);diff --git a/tests/loaders.test.ts b/tests/loaders.test.tsindex 298a75a..c17c9f7 100644--- a/tests/loaders.test.ts+++ b/tests/loaders.test.ts@@ -1,5 +1,5 @@import { expect, test } from "bun:test";-import { createLayer, createMask } from "@/app/editor/layers";+import { createImageLayer, createLayer, createMask } from "@/app/editor/layers";import { createCameraRawXmpLoader } from "@/app/loaders/camera-raw-xmp";import { createLoaderRegistry, type FileLoader } from "@/app/loaders/registry";import { createWorkspace } from "@/app/workspace";@@ -10,7 +10,6 @@ import { setAdjustments } from "@/features/adjustments/edits";import { defaultAdjustments } from "@/features/adjustments/model";import { addLayer } from "@/features/layers/edits";import { defaultGradient } from "@/features/layers/gradient";-import { defaultCurve } from "@/features/tone-curves/curve";function settings(attributes: string, name = "photo.xmp") {return new File(@@ -35,17 +34,7 @@ test("file batches preserve ordering, group imports, recover from failures, andif (file.name === "broken.png") throw new Error("Decode failed");return createDocument({frame: imageFrame([32, 32]),- layers: [- {- kind: "image",- name: "Photo",- children: [],- id: "base",- source: file.name,- adjustments: { ...defaultAdjustments },- toneCurve: defaultCurve,- },- ],+ layers: [{ ...createImageLayer(file.name, "Photo"), id: "base" }],});}),};diff --git a/tests/renderer.test.ts b/tests/renderer.test.tsindex d44c5ff..278ce77 100644--- a/tests/renderer.test.ts+++ b/tests/renderer.test.ts@@ -6,7 +6,7 @@ import {init,target,} from "vgpu/mock";-import { createLayer } from "@/app/editor/layers";+import { createImageLayer, createLayer } from "@/app/editor/layers";import { createEditorRenderer as createRenderer } from "@/app/editor/renderer";import { createDocument, createResources } from "@/core/document";import { createImageSource } from "@/core/image";@@ -20,7 +20,6 @@ import {import { setAdjustments } from "@/features/adjustments/edits";import { defaultAdjustments } from "@/features/adjustments/model";import { unsharpMask } from "@/features/details/unsharp-mask";-import { defaultCurve } from "@/features/tone-curves/curve";import { setToneCurve } from "@/features/tone-curves/edits";import { setWhiteBalance } from "@/features/white-balance/edits";@@ -60,18 +59,7 @@ test("RAW edits coalesce, recover from failure, and retain an exporting source aconst document = createDocument({frame: imageFrame(image.size),- layers: [- {- kind: "image",- name: "Photo",- children: [],- id: "base",- source: id,- adjustments: { ...defaultAdjustments },- toneCurve: defaultCurve,- whiteBalance: asShot,- },- ],+ layers: [{ ...createImageLayer(id, "Photo", asShot), id: "base" }],},resources,);@@ -193,13 +181,9 @@ test("rendering follows grouped edits and undo, reuses pipelines, and releases oframe: imageFrame([32, 16]),layers: [{- kind: "image",- name: "Photo",- children: [],+ ...createImageLayer("photo", "Photo"),id: "base",- source: "photo",- adjustments: { ...defaultAdjustments },- toneCurve: defaultCurve,+ adjustments: { ...defaultAdjustments, exposure: 0.25 },},],});@@ -258,10 +242,10 @@ test("rendering follows grouped edits and undo, reuses pipelines, and releases odetachLate();document.history.undo();expect(renderer.outputImage()).toBe(adjusted);- expect(document.scene.getState().layers[0].adjustments.exposure).toBe(0);+ expect(document.scene.getState().layers[0].adjustments.exposure).toBe(0.25);document.history.redo();expect(renderer.inspect().passes).toEqual([- "layer/base/adjustments",+ "layer/base/exposure","layer/base/curves",]);document.history.begin();@@ -269,7 +253,7 @@ test("rendering follows grouped edits and undo, reuses pipelines, and releases oexpect(renderer.outputImage()).toBe(adjusted);document.history.cancel();expect(renderer.inspect().passes).toEqual([- "layer/base/adjustments",+ "layer/base/exposure","layer/base/curves",]);draw();@@ -297,7 +281,7 @@ test("rendering follows grouped edits and undo, reuses pipelines, and releases oexpect(renderer.inputImage("exposure")).toBeUndefined();expect(renderer.inspect().passes).toEqual(["layer/exposure/exposure",- "layer/base/adjustments",+ "layer/base/exposure","layer/base/curves",]);document.edit(beforeInput);diff --git a/tests/rendering-benchmark.ts b/tests/rendering-benchmark.tsindex e78ecde..ca3e982 100644--- a/tests/rendering-benchmark.ts+++ b/tests/rendering-benchmark.ts@@ -1,5 +1,6 @@import { effect, frame, init, target, timer } from "vgpu";import { encodeImage } from "@/app/editor/export/export-image";+import { createImageLayer } from "@/app/editor/layers";import { createEditorRenderer } from "@/app/editor/renderer";import type { Gradient, ProcessingLayer, Scene } from "@/core/document";import { createImageSource } from "@/core/image";@@ -139,11 +140,8 @@ export async function benchmarkRendering(frame: imageFrame(size),layers: [{- kind: "image",+ ...createImageLayer("benchmark", "Benchmark"),id: "benchmark-image",- name: "Benchmark",- source: "benchmark",- children: [],adjustments: {...defaultAdjustments,exposure: 0.25,