Free open-source image editor for the browser
Simplify editor code
Rodrigo58c0694f6d7f
diff --git a/src/app/editor/index.tsx b/src/app/editor/index.tsxindex 157b7ae..6f7ef67 100644--- a/src/app/editor/index.tsx+++ b/src/app/editor/index.tsx@@ -26,38 +26,42 @@ function ImageCanvas({ image }: WorkspaceProps) {);}-function Workspace({ image }: WorkspaceProps) {+type EditorProps = { source: Source };++function LoadingStatus({ source }: EditorProps) {+ if (!source.error) {+ return <Spinner />;+ }return (- <RendererProvider source={image}>- <ImageCanvas image={image} />- <Sidebar />- </RendererProvider>+ <p className="max-w-md text-center text-neutral-400">+ Couldn't open {source.file.name}: {source.error}+ </p>);}-type EditorProps = { source: Source };+function EditorContent({ source }: EditorProps) {+ if (source.image) {+ return (+ <RendererProvider source={source.image}>+ <ImageCanvas image={source.image} />+ <Sidebar />+ </RendererProvider>+ );+ }+ return (+ <>+ <div className="grid flex-1 place-items-center">+ <LoadingStatus source={source} />+ </div>+ <ResizablePanel />+ </>+ );+}export default function Editor({ source }: EditorProps) {- const { image, error } = source;-return (<main className="flex h-dvh flex-col md:flex-row">- {image ? (- <Workspace image={image} />- ) : (- <>- <div className="grid flex-1 place-items-center">- {error ? (- <p className="max-w-md text-center text-neutral-400">- Couldn't open {source.file.name}: {error}- </p>- ) : (- <Spinner />- )}- </div>- <ResizablePanel />- </>- )}+ <EditorContent source={source} /></main>);}diff --git a/src/features/tone-curves/curve.ts b/src/features/tone-curves/curve.tsindex 8e28e63..7befe1e 100644--- a/src/features/tone-curves/curve.ts+++ b/src/features/tone-curves/curve.ts@@ -17,12 +17,9 @@ export function validateCurve(points: ToneCurve) {for (const [index, point] of points.entries()) {if (!point ||- !Number.isFinite(point.x) ||- !Number.isFinite(point.y) ||- point.x < 0 ||- point.x > 1 ||- point.y < 0 ||- point.y > 1+ ![point.x, point.y].every(+ (value) => Number.isFinite(value) && value >= 0 && value <= 1,+ )) {throw new Error("Curve coordinates must be finite numbers between 0 and 1.",diff --git a/src/features/tone-curves/graph.tsx b/src/features/tone-curves/graph.tsxindex d51e409..f12eb39 100644--- a/src/features/tone-curves/graph.tsx+++ b/src/features/tone-curves/graph.tsx@@ -118,10 +118,7 @@ export function Graph({ points, onChange }: GraphProps) {const direction = directions[event.key];if (direction) {event.preventDefault();- let step = 0.001;- if (event.shiftKey) {- step = 0.01;- }+ const step = event.shiftKey ? 0.01 : 0.001;move(selected, {x: points[selected].x + direction.x * step,y: points[selected].y + direction.y * step,diff --git a/src/hooks/use-pan-zoom.ts b/src/hooks/use-pan-zoom.tsindex 932856d..92637b6 100644--- a/src/hooks/use-pan-zoom.ts+++ b/src/hooks/use-pan-zoom.ts@@ -87,14 +87,15 @@ export function usePanZoom(content?: Size) {event.clientX - left - width / 2,event.clientY - top - height / 2,];- update((view) =>- event.ctrlKey || event.metaKey- ? zoomAt(view, focal, view.zoom * Math.exp(-event.deltaY / 100))- : {- ...view,- pan: [view.pan[0] - event.deltaX, view.pan[1] - event.deltaY],- },- );+ update((view) => {+ if (event.ctrlKey || event.metaKey) {+ return zoomAt(view, focal, view.zoom * Math.exp(-event.deltaY / 100));+ }+ return {+ ...view,+ pan: [view.pan[0] - event.deltaX, view.pan[1] - event.deltaY],+ };+ });};element.addEventListener("wheel", wheel, { passive: false });return () => {diff --git a/src/lib/decode/heic.ts b/src/lib/decode/heic.tsindex 9133894..4939e02 100644--- a/src/lib/decode/heic.ts+++ b/src/lib/decode/heic.ts@@ -88,9 +88,11 @@ function find(boxes: Box[], type: string) {/** iinf: item id → item type. */function itemTypes(reader: Reader, iinf: Box) {const types = new Map<number, string>();- const count = reader.uint(reader.open(iinf) === 0 ? 2 : 4);+ const version = reader.open(iinf);+ const count = reader.uint(version === 0 ? 2 : 4);for (const infe of reader.boxes(reader.at, iinf.end).slice(0, count)) {- const id = reader.uint(reader.open(infe) === 2 ? 2 : 4);+ const version = reader.open(infe);+ const id = reader.uint(version === 2 ? 2 : 4);reader.at += 2;types.set(id, reader.fourcc());}@@ -112,15 +114,18 @@ function itemData(reader: Reader, iloc: Box, idat?: Box) {for (let count = reader.uint(idSize); count > 0; count--) {const id = reader.uint(idSize);const method = version === 0 ? 0 : reader.uint(2) & 15;- check(method <= 1 && (method === 0 || idat) && reader.uint(2) === 0);+ check(method <= 1 && (method === 0 || idat));+ const dataReference = reader.uint(2);+ check(dataReference === 0);const base =reader.uint(baseSize) + (method === 1 ? (idat?.start ?? 0) : 0);const extents = Array.from({ length: reader.uint(2) }, () => {reader.uint(indexSize);const start = base + reader.uint(offsetSize);+ const length = reader.uint(lengthSize);return reader.slice(start,- start + reader.uint(lengthSize),+ start + length,method === 1 ? idat?.end : reader.bytes.length,);});@@ -221,7 +226,8 @@ export function parseHeic(bytes: Uint8Array) {const reader = new Reader(bytes);const meta = find(reader.boxes(0, reader.bytes.byteLength), "meta");const boxes = reader.boxes(meta.start + 4, meta.end);- const primary = reader.uint(reader.open(find(boxes, "pitm")) === 0 ? 2 : 4);+ const version = reader.open(find(boxes, "pitm"));+ const primary = reader.uint(version === 0 ? 2 : 4);const types = itemTypes(reader, find(boxes, "iinf"));const data = itemData(reader,diff --git a/tests/curves.e2e.ts b/tests/curves.e2e.tsindex 5b7a79a..e6681bd 100644--- a/tests/curves.e2e.ts+++ b/tests/curves.e2e.ts@@ -1,5 +1,6 @@-import { expect, type Page, test } from "@playwright/test";+import type { Page } from "@playwright/test";import { interpolatePchip } from "@/lib/math";+import { expect, test } from "./fixtures";async function centerPixel(page: Page) {const screenshot = await page.locator("canvas").screenshot();@@ -161,13 +162,6 @@ test("curve commands reject invalid edits, reset, and start fresh for another imtest("curves render after adjustments and resetting restores the preview", async ({page,}) => {- const errors: string[] = [];- page.on("pageerror", (error) => errors.push(error.message));- page.on("console", (message) => {- if (message.type() === "error") {- errors.push(message.text());- }- });await page.goto("/");await page.waitForFunction(() => window.openlight);await page.evaluate(() =>@@ -213,19 +207,11 @@ test("curves render after adjustments and resetting restores the preview", asyncawait expect.poll(() => page.locator("canvas").screenshot()).toEqual(original);- expect(errors).toEqual([]);});test("the curve panel edits points over a combined input histogram", async ({page,}) => {- const errors: string[] = [];- page.on("pageerror", (error) => errors.push(error.message));- page.on("console", (message) => {- if (message.type() === "error") {- errors.push(message.text());- }- });await page.goto("/");await page.waitForFunction(() => window.openlight);await page.evaluate(() =>@@ -339,7 +325,6 @@ test("the curve panel edits points over a combined input histogram", async ({await expect.poll(() => centerPixel(page)).toEqual([128, 128, 128, 255]);await page.evaluate(() => window.openlight.setAdjustments({ exposure: -1 }));await expect(input).not.toHaveAttribute("points", inputBefore ?? "");- expect(errors).toEqual([]);});test("endpoints follow the edges, remap black and white, and reset on double-click", async ({diff --git a/tests/endpoints.e2e.ts b/tests/endpoints.e2e.tsindex b1e3c1c..48fac21 100644--- a/tests/endpoints.e2e.ts+++ b/tests/endpoints.e2e.ts@@ -1,13 +1,8 @@-import { expect, test } from "@playwright/test";+import { expect, test } from "./fixtures";test("black and white points preserve midgray, clip or lift endpoints, and reset", async ({page,}) => {- const errors: string[] = [];- page.on("pageerror", (error) => errors.push(error.message));- page.on("console", (message) => {- if (message.type() === "error") errors.push(message.text());- });await page.goto("/");await page.waitForFunction(() => window.openlight);const outputs = await page.evaluate(async () => {@@ -100,5 +95,4 @@ test("black and white points preserve midgray, clip or lift endpoints, and resetexpect(output[255 * 4]).toBeLessThanOrEqual(230);}expect(reset).toEqual(original);- expect(errors).toEqual([]);});diff --git a/tests/export.e2e.ts b/tests/export.e2e.tsindex 14146ae..3ad1f4b 100644--- a/tests/export.e2e.ts+++ b/tests/export.e2e.ts@@ -1,14 +1,9 @@import { readFile } from "node:fs/promises";-import { expect, test } from "@playwright/test";+import { expect, test } from "./fixtures";test("exports full-resolution PNGs with current edits through the API and button", async ({page,}) => {- const errors: string[] = [];- page.on("pageerror", (error) => errors.push(error.message));- page.on("console", (message) => {- if (message.type() === "error") errors.push(message.text());- });await page.goto("/");await page.waitForFunction(() => window.openlight);await page.evaluate(async () => {@@ -86,7 +81,6 @@ test("exports full-resolution PNGs with current edits through the API and buttonexpect(pixels.center[0]).toBeLessThan(255);expect(pixels.center[3]).toBe(255);await expect(button).toBeEnabled();- expect(errors).toEqual([]);});test("export dialog selects JPEG quality, preserves settings, and dismisses", async ({diff --git a/tests/fixtures.ts b/tests/fixtures.tsnew file mode 100644index 0000000..176689d--- /dev/null+++ b/tests/fixtures.ts@@ -0,0 +1,20 @@+import { test as base, expect } from "@playwright/test";++export { expect };++export const test = base.extend<{ browserErrors: undefined }>({+ browserErrors: [+ async ({ page }, use) => {+ const errors: string[] = [];+ page.on("pageerror", (error) => errors.push(error.message));+ page.on("console", (message) => {+ if (message.type() === "error") {+ errors.push(message.text());+ }+ });+ await use(undefined);+ expect(errors).toEqual([]);+ },+ { auto: true },+ ],+});diff --git a/tests/highlights-shadows.e2e.ts b/tests/highlights-shadows.e2e.tsindex e13a23a..57a275a 100644--- a/tests/highlights-shadows.e2e.ts+++ b/tests/highlights-shadows.e2e.ts@@ -1,4 +1,4 @@-import { expect, test } from "@playwright/test";+import { expect, test } from "./fixtures";function linear(value: number) {const encoded = value / 255;@@ -10,11 +10,6 @@ function linear(value: number) {test("highlights preserve ramps, compose with preparation, and reset", async ({page,}) => {- const errors: string[] = [];- page.on("pageerror", (error) => errors.push(error.message));- page.on("console", (message) => {- if (message.type() === "error") errors.push(message.text());- });await page.goto("/");await page.waitForFunction(() => window.openlight);const result = await page.evaluate(async () => {@@ -163,5 +158,4 @@ test("highlights preserve ramps, compose with preparation, and reset", async ({),).toBeLessThan(0.01);}- expect(errors).toEqual([]);});diff --git a/tests/smoke.e2e.ts b/tests/smoke.e2e.tsindex d2e68d7..07c8bbb 100644--- a/tests/smoke.e2e.ts+++ b/tests/smoke.e2e.ts@@ -1,14 +1,6 @@-import { expect, test } from "@playwright/test";+import { expect, test } from "./fixtures";test("app opens without crashing", async ({ page }) => {- const errors: string[] = [];- page.on("pageerror", (error) => errors.push(error.message));- page.on("console", (message) => {- if (message.type() === "error") {- errors.push(message.text());- }- });-await page.goto("/");await expect(page.getByRole("button", { name: "Open image" })).toBeVisible();await page.evaluate(@@ -17,19 +9,11 @@ test("app opens without crashing", async ({ page }) => {requestAnimationFrame(() => requestAnimationFrame(() => resolve())),),);- expect(errors, errors.join("\n")).toEqual([]);});test("browser actions load, adjust, reset, and report failures", async ({page,}) => {- const errors: string[] = [];- page.on("pageerror", (error) => errors.push(error.message));- page.on("console", (message) => {- if (message.type() === "error") {- errors.push(message.text());- }- });await page.goto("/");await page.waitForFunction(() => window.openlight);await page.evaluate(() => {@@ -156,5 +140,4 @@ test("browser actions load, adjust, reset, and report failures", async ({blacks: 0,});await expect.poll(() => canvas.screenshot()).toEqual(before);- expect(errors).toEqual([]);});