Free open-source image editor for the browser
Move to @roprgm/ui 0.7.0 (#50)
Rodrigo Belfioree64d89e68733
diff --git a/DESIGN.md b/DESIGN.mdindex 98ffd2c..4586450 100644--- a/DESIGN.md+++ b/DESIGN.md@@ -6,11 +6,11 @@ OpenLight uses a small set of shared UI primitives so the editor reads as one ap| --- | --- || `Button`, `IconButton` | Actions. `IconButton` is a ghost icon button whose `label` names it and shows as its tooltip, with an optional `shortcut`; use `size="icon-sm"` in headers, rows, and bars. || `Chip` | Pill buttons in the bar over the canvas; `aria-pressed` shows a toggle on. A segmented group is a `fieldset` of chips. |-| `Tooltip` | A hint on hover or focus for any control, with an optional shortcut written as `Mod Z` (⌘ or Ctrl). |-| `Menu`, `MenuItem`, `MenuSeparator`, `Submenu` | Commands such as Duplicate, Move, or Delete, opened from a `trigger` such as an `IconButton`. |+| `Tooltip` | A hint on hover or focus for any control: a `TooltipTrigger` renders the control and `TooltipContent` holds the hint, with an optional shortcut written as `Mod Z` (⌘ or Ctrl). |+| `Menu`, `MenuItem`, `MenuSeparator`, `Submenu` | Commands such as Duplicate, Move, or Delete, in a `MenuContent` opened by a `MenuTrigger` that renders a control such as an `IconButton`; a `Submenu` holds a `SubmenuTrigger` and a `SubmenuContent`. || `Select` | A choice that replaces a current value, with `field` or `pill` trigger. |-| `Popover` | Settings that open beside a `trigger`, such as bar controls that no longer fit. |-| `Slider`, `ScrubInput`, `VerticalSlider` | Numbers. A `Slider` is `panel`, `toolbar`, or `compact`; `format` writes the value and whatever follows its digits reads as the unit. |+| `Popover` | Settings that open beside a `PopoverTrigger`, such as bar controls that no longer fit; its `PopoverContent` holds `CardSection`s. |+| `Slider`, `ScrubInput` | Numbers. A `Slider` is `panel`, `toolbar`, or `compact`, or stands upright with `orientation="vertical"`; `format` writes the value and whatever follows its digits reads as the unit. |## Selection and menus@@ -21,7 +21,7 @@ OpenLight uses a small set of shared UI primitives so the editor reads as one ap## Tooltips-- Every icon-only control has a tooltip; use `IconButton` or wrap the control in `Tooltip`. Do not use the native `title` attribute.+- Every icon-only control has a tooltip; use `IconButton` or give the control a `Tooltip`. Do not use the native `title` attribute.- A tooltip names the control in a few words and adds the shortcut beside it; longer guidance belongs in the panel. The canvas shows only brief status, such as an error or a stroke finishing.- A tooltip is not the accessible name. Keep `aria-label` on icon-only controls; `IconButton` sets it from `label`.- Text that may be cut short, such as a layer name, shows its tooltip only when truncated.@@ -42,7 +42,7 @@ OpenLight uses a small set of shared UI primitives so the editor reads as one ap- Use shared components for repeated interaction and surface behavior. Keep feature-specific composition in the feature.- Use Tailwind tokens already present in the shared primitive for color, borders, shadows, focus, and pointer-coarse sizing. A caller chooses a documented variant instead of recreating the surface.- Anchor viewport-corner controls and messages 12 px from both edges. Tool overlays cover the full viewport; the camera preserves a 24 px margin around fitted content without shrinking that coordinate space.-- Use `Notice` for a message floating over the viewport that must not block editing, such as a storage failure or an offer to recover a draft. Choose its `tone` (status or alert, which sets the ARIA role) and position it with classes, `fixed` over the window or `absolute` inside the editor viewport; pass `actions` for buttons under the message and `onDismiss` when the user may close it.+- Use `Notice` for a message floating over the viewport that must not block editing, such as a storage failure or an offer to recover a draft. Choose its `tone` (status or alert, which sets the ARIA role) and position it with classes, `fixed` over the window or `absolute` inside the editor viewport. Its message and buttons are `CardSection`s; when the user may close it, a `NoticeClose` goes in a `CardAction` beside the message.- Use `TextLink` for an underlined link inside running text. It renders an anchor with `href` and a button otherwise; the `muted` variant stays in the sentence's color for secondary actions such as Forget.- Use `ScrubInput` for numbers that read as inline text, drag sideways, and accept typing. It hugs its digits and unit and shows a subtly rounded background only while text editing is active.- Give toolbar slider values an explicit minimum character width (`valueWidth`) when their expected range changes digit count. It counts digits, with the unit after them: percentages reserve three tabular characters, while brush size uses the actual maximum's digit count. Do not guess a global maximum.diff --git a/bun.lock b/bun.lockindex a4bf87f..7d2529c 100644--- a/bun.lock+++ b/bun.lock@@ -8,7 +8,7 @@"@base-ui/react": "^1.8.0","@dnd-kit/core": "^6.3.1","@fontsource-variable/geist": "^5.3.0",- "@roprgm/ui": "^0.6.0",+ "@roprgm/ui": "^0.7.0","@tailwindcss/vite": "^4.3.3","@vercel/analytics": "^2.0.1","@vercel/speed-insights": "^2.0.0",@@ -129,7 +129,7 @@"@rolldown/pluginutils": ["@rolldown/[email protected]", "", {}, "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw=="],- "@roprgm/ui": ["@roprgm/[email protected]", "", { "dependencies": { "@base-ui/react": "^1.8.0", "class-variance-authority": "^0.7.1", "cn": "^0.4.0" }, "peerDependencies": { "react": ">=19" } }, "sha512-4FYKD35zz2TgKLqL5rxjCD5GPoIYSNPWb2py/zABB4vwGmqA+oDrXlX/H13/5pyPPhR9Ff6/pZhIlj7AtA75eA=="],+ "@roprgm/ui": ["@roprgm/[email protected]", "", { "dependencies": { "@base-ui/react": "^1.8.0", "class-variance-authority": "^0.7.1", "cn": "^0.4.0" }, "peerDependencies": { "react": ">=19" } }, "sha512-UoR9Vf0VdzBpdQvEydw4b8Ew0nCP3Webu+dhFXb+3mKvDGJFt0MqbGRnJqhsGP121Xo8z5R8IPmh/ID8wTmNOg=="],"@tailwindcss/node": ["@tailwindcss/[email protected]", "", { "dependencies": { "@jridgewell/remapping": "^2.3.5", "enhanced-resolve": "^5.24.1", "jiti": "^2.7.0", "lightningcss": "1.32.0", "magic-string": "^0.30.21", "source-map-js": "^1.2.1", "tailwindcss": "4.3.3" } }, "sha512-/T8IKEsf9VTU6tLjgC7+sv2mOPtQxzE2jMw7u4Tt40Tx+QSZxpzh95/H6cMKoja9XuW7iMdLJYBB0o9G1CaAgg=="],diff --git a/package.json b/package.jsonindex cc73126..bc1a6d1 100644--- a/package.json+++ b/package.json@@ -15,7 +15,7 @@"@base-ui/react": "^1.8.0","@dnd-kit/core": "^6.3.1","@fontsource-variable/geist": "^5.3.0",- "@roprgm/ui": "^0.6.0",+ "@roprgm/ui": "^0.7.0","@tailwindcss/vite": "^4.3.3","@vercel/analytics": "^2.0.1","@vercel/speed-insights": "^2.0.0",diff --git a/src/app/draft/notice.tsx b/src/app/draft/notice.tsxindex 9eebbc3..eae4ba3 100644--- a/src/app/draft/notice.tsx+++ b/src/app/draft/notice.tsx@@ -1,4 +1,5 @@-import { Notice } from "@roprgm/ui/notice";+import { Notice, NoticeClose } from "@roprgm/ui/notice";+import { Section, SectionAction } from "@roprgm/ui/section";/** Draft storage failures stay out of the way: the editor keeps working and a scene file still saves the work. */export function DraftNotice({@@ -9,12 +10,16 @@ export function DraftNotice({onDismiss: () => void;}) {return (- <Notice- onDismiss={onDismiss}- className="fixed bottom-3 left-1/2 z-50 -translate-x-1/2"- >- Drafts can't be kept in this browser: {error} Save a scene from Export to- keep your edits.+ <Notice className="fixed bottom-3 left-1/2 z-50 -translate-x-1/2">+ <Section className="flex-row items-start">+ <p className="flex-1">+ Drafts can't be kept in this browser: {error} Save a scene from Export+ to keep your edits.+ </p>+ <SectionAction>+ <NoticeClose onClick={onDismiss} />+ </SectionAction>+ </Section></Notice>);}diff --git a/src/app/editor/adjust/index.tsx b/src/app/editor/adjust/index.tsxindex b45073f..11ad3d8 100644--- a/src/app/editor/adjust/index.tsx+++ b/src/app/editor/adjust/index.tsx@@ -53,7 +53,7 @@ function CurveInputHistogram({ id }: { id: string }) {function LayerCurve({ id, toneCurve }: { id: string; toneCurve: ToneCurve }) {const document = useDocument();return (- <div className="px-(--padding) pb-(--padding)">+ <div className="px-3.5 pb-3.5"><ToneCurvespoints={toneCurve}onChange={(points) => setToneCurve(document, points, id)}@@ -94,7 +94,7 @@ function SelectedControls({ layer }: { layer: Layer }) {return <HealControls id={layer.id} patches={layer.patches} />;case "exposure":return (- <section className="p-(--padding)">+ <section className="p-3.5"><Sliderlabel="Exposure"value={layer.exposure}diff --git a/src/app/editor/clipping-controls.tsx b/src/app/editor/clipping-controls.tsxindex 2ebc2d3..a31a333 100644--- a/src/app/editor/clipping-controls.tsx+++ b/src/app/editor/clipping-controls.tsx@@ -14,7 +14,7 @@ export function ClippingControls() {key={range}label={`Show clipped ${range}`}aria-pressed={state[range]}- className="pointer-events-auto flex size-6 items-center justify-center rounded-sm bg-neutral-900/80 p-0 opacity-0 transition-opacity group-hover:opacity-100 focus-visible:opacity-100 aria-pressed:bg-neutral-700 aria-pressed:text-white aria-pressed:opacity-100 pointer-coarse:opacity-100"+ className="pointer-events-auto flex size-6 items-center justify-center rounded-sm bg-level-2/80 p-0 opacity-0 transition-opacity group-hover:opacity-100 focus-visible:opacity-100 aria-pressed:bg-pressed aria-pressed:text-foreground aria-pressed:opacity-100 pointer-coarse:opacity-100"onClick={() => preview.setState({ [range]: !state[range] })}><svgdiff --git a/src/app/editor/comparison-control.tsx b/src/app/editor/comparison-control.tsxindex d06016f..8c502d3 100644--- a/src/app/editor/comparison-control.tsx+++ b/src/app/editor/comparison-control.tsx@@ -55,7 +55,7 @@ export function ComparisonControl() {shortcut="Hold \"size="icon"aria-pressed={comparison !== "edited"}- className="aria-pressed:bg-neutral-700 aria-pressed:text-neutral-100"+ className="aria-pressed:bg-pressed aria-pressed:text-foreground"onClick={() =>preview.setState({comparison: comparison === "split" ? "edited" : "split",diff --git a/src/app/editor/comparison-divider.tsx b/src/app/editor/comparison-divider.tsxindex cc3e3e1..3a03c04 100644--- a/src/app/editor/comparison-divider.tsx+++ b/src/app/editor/comparison-divider.tsx@@ -63,14 +63,14 @@ export function ComparisonDivider() {move(positions[event.key]);}}>- <div className="absolute inset-y-0 w-px bg-white/90 shadow-[0_0_3px_#000]" />- <span className="absolute right-6 bottom-4 rounded bg-black/50 px-1.5 py-0.5 text-white">+ <div className="absolute inset-y-0 w-px bg-foreground/90 shadow-[0_0_3px_var(--color-level-1)]" />+ <span className="absolute right-6 bottom-4 rounded bg-backdrop px-1.5 py-0.5 text-foreground">Before</span>- <span className="absolute bottom-4 left-6 rounded bg-black/50 px-1.5 py-0.5 text-white">+ <span className="absolute bottom-4 left-6 rounded bg-backdrop px-1.5 py-0.5 text-foreground">After</span>- <span className="relative flex size-7 items-center justify-center rounded-full border border-white/80 bg-neutral-900 text-white shadow-md group-focus-visible:ring-2 group-focus-visible:ring-white">+ <span className="relative flex size-7 items-center justify-center rounded-full surface-float text-foreground group-focus-visible:ring-2 group-focus-visible:ring-foreground"><svgaria-hidden="true"viewBox="0 0 20 20"diff --git a/src/app/editor/empty.tsx b/src/app/editor/empty.tsxindex 0aeb5bd..6f9153e 100644--- a/src/app/editor/empty.tsx+++ b/src/app/editor/empty.tsx@@ -1,5 +1,6 @@import { Button } from "@roprgm/ui/button";import { Notice } from "@roprgm/ui/notice";+import { Section } from "@roprgm/ui/section";import { Spinner } from "@roprgm/ui/spinner";import { useRef } from "react";import { type Gpu, target } from "vgpu";@@ -29,7 +30,7 @@ type OpenProps = { onOpen: (files: File[]) => void };function OpenImage({ onOpen }: OpenProps) {const input = useRef<HTMLInputElement>(null);return (- <p className="mt-4 text-neutral-500">+ <p className="mt-4 text-muted">Drop an image here or{" "}<TextLink onClick={() => input.current?.click()}>choose a file</TextLink><input@@ -63,18 +64,16 @@ export type Recovery = {/** Offered away from the welcome copy, since returning users see it on every visit. */function RecoverDraft({ onRecover, onForget }: Recovery) {return (- <Notice- className="absolute bottom-3 left-3 z-50"- actions={- <>- <Button onClick={onRecover}>Recover</Button>- <Button variant="ghost" onClick={onForget}>- Forget- </Button>- </>- }- >- Your last scene is still here from a previous visit.+ <Notice className="absolute bottom-3 left-3 z-50">+ <Section>Your last scene is still here from a previous visit.</Section>+ <Section className="flex-row gap-1.5 px-2.5">+ <Button size="sm" onClick={onRecover}>+ Recover+ </Button>+ <Button size="sm" variant="ghost" onClick={onForget}>+ Forget+ </Button>+ </Section></Notice>);}@@ -86,7 +85,7 @@ function Status({ state, onOpen }: { state: EmptyState } & OpenProps) {if (state.status === "error") {return (<>- <p className="max-w-md text-center text-neutral-400">+ <p className="max-w-md text-center text-muted">Couldn't open {state.file}: {state.error}</p><OpenImage onOpen={onOpen} />@@ -103,7 +102,7 @@ function Status({ state, onOpen }: { state: EmptyState } & OpenProps) {width="64"/><h1 className="text-2xl font-bold">OpenLight</h1>- <p className="text-neutral-400">Edit photos in your browser.</p>+ <p className="text-muted">Edit photos in your browser.</p><OpenImage onOpen={onOpen} /></>);diff --git a/src/app/editor/export/index.tsx b/src/app/editor/export/index.tsxindex 11b8d7d..5990d86 100644--- a/src/app/editor/export/index.tsx+++ b/src/app/editor/export/index.tsx@@ -71,9 +71,10 @@ function FormatSelect({}) {return (<div className="space-y-2">- <div className="flex items-center justify-between text-neutral-400">+ <div className="flex items-center justify-between text-muted">Format<Select+ raisedaria-label="Format"value={value.id}items={formats.map((format) => ({@@ -87,7 +88,7 @@ function FormatSelect({}}/></div>- <p className="text-neutral-500">{value.description}</p>+ <p className="text-muted">{value.description}</p></div>);}@@ -115,7 +116,7 @@ function SizeFields({onChange(Math.max(1, Math.round(maxEdge * fraction)));return (// Units follow their digits, as in a slider; the values' 4px padding reaches past the file size's edge.- <div className="grid grid-cols-[auto_1fr] items-center gap-x-3 gap-y-2 text-neutral-400">+ <div className="grid grid-cols-[auto_1fr] items-center gap-x-3 gap-y-2 text-muted"><span>Width</span><ScrubInputaria-label="Width"@@ -181,16 +182,16 @@ function SaveScene() {return (<sectionaria-label="Scene export"- className="flex flex-col gap-3 border-black border-t p-(--padding)"+ className="flex flex-col gap-3 p-3.5 shadow-[inset_0_1px_0_var(--color-edge)]">- <p className="text-neutral-500">+ <p className="text-muted">Saves the photo and every edit in one file. Open it to continue editing.</p><Button size="lg" className="w-full" onClick={save}>Save scene</Button>{error && (- <p className="text-red-400" role="alert">+ <p className="text-danger" role="alert">{error}</p>)}@@ -201,7 +202,7 @@ function SaveScene() {function LoadingOverlay() {return (<div className="pointer-events-none absolute inset-0 grid place-items-center">- <Spinner className="size-8 border-neutral-500 border-t-white" />+ <Spinner className="size-8" /></div>);}@@ -251,7 +252,7 @@ export function ExportMode({ onClose }: { onClose: () => void }) {<PanelBody header={<PanelHeader title="Export" onClose={onClose} />}><sectionaria-label="Image export"- className="flex flex-col gap-5 p-(--padding)"+ className="flex flex-col gap-5 p-3.5"><FormatSelect value={format} onChange={setFormat} />{format.lossy && (@@ -268,8 +269,8 @@ export function ExportMode({ onClose }: { onClose: () => void }) {<span>File size</span><spanclassName={cn(- "flex items-center justify-end gap-1.5 text-neutral-100 tabular-nums",- pending && "text-neutral-500",+ "flex items-center justify-end gap-1.5 text-foreground tabular-nums",+ pending && "text-muted",)}>{encoded ? formatBytes(encoded.bytes) : "…"}@@ -280,7 +281,7 @@ export function ExportMode({ onClose }: { onClose: () => void }) {Save image</Button>{error && (- <p className="text-red-400" role="alert">+ <p className="text-danger" role="alert">{error}</p>)}diff --git a/src/app/editor/header.tsx b/src/app/editor/header.tsxindex 2cf0a0e..0fb5479 100644--- a/src/app/editor/header.tsx+++ b/src/app/editor/header.tsx@@ -1,4 +1,4 @@-import { Tooltip } from "@roprgm/ui/tooltip";+import { Tooltip, TooltipContent, TooltipTrigger } from "@roprgm/ui/tooltip";import type { ReactNode } from "react";/** Identity on the left, document actions on the right; present in every editor state. */@@ -10,14 +10,17 @@ export function EditorHeader({children?: ReactNode;}) {return (- <header className="flex h-11 shrink-0 items-center gap-3 border-black border-b layer-panel px-3">+ <header className="flex h-11 shrink-0 items-center gap-3 border-edge border-b surface-panel px-3"><span className="flex items-center gap-2"><img src="/logo.svg" alt="" className="size-5" />- <span className="font-medium text-neutral-200">OpenLight</span>+ <span className="font-medium text-foreground">OpenLight</span></span>{file && (- <Tooltip content={file}>- <span className="min-w-0 truncate text-neutral-500">{file}</span>+ <Tooltip>+ <TooltipTrigger+ render={<span className="min-w-0 truncate text-muted">{file}</span>}+ />+ <TooltipContent>{file}</TooltipContent></Tooltip>)}<div className="ml-auto flex items-center gap-1">{children}</div>diff --git a/src/app/editor/histogram.tsx b/src/app/editor/histogram.tsxindex 05687bc..7fce910 100644--- a/src/app/editor/histogram.tsx+++ b/src/app/editor/histogram.tsx@@ -11,7 +11,7 @@ export function ImageHistogram({ className }: { className?: string }) {<sectionaria-label="Image histogram"className={cn(- "group relative shrink-0 bg-neutral-900 max-md:absolute max-md:bottom-full max-md:left-3 max-md:z-10 max-md:mb-3 max-md:h-14 max-md:w-44 max-md:overflow-hidden max-md:border-0 max-md:bg-neutral-800/80 max-md:backdrop-blur-sm",+ "group relative shrink-0 bg-level-2 max-md:absolute max-md:bottom-full max-md:left-3 max-md:z-10 max-md:mb-3 max-md:h-14 max-md:w-44 max-md:overflow-hidden max-md:bg-level-4/80 max-md:backdrop-blur-sm",className,)}>diff --git a/src/app/editor/index.tsx b/src/app/editor/index.tsxindex 831fc84..1ed743f 100644--- a/src/app/editor/index.tsx+++ b/src/app/editor/index.tsx@@ -1,5 +1,5 @@import { Button } from "@roprgm/ui/button";-import { Tooltip } from "@roprgm/ui/tooltip";+import { Tooltip, TooltipContent, TooltipTrigger } from "@roprgm/ui/tooltip";import type { ReactNode } from "react";import type { Workspace } from "@/app/workspace";import { BrushProvider } from "@/components/editor/brush-tool";@@ -74,14 +74,21 @@ function ExportButton() {const { tool, setTool } = useTool();const exporting = tool === exportTool;return (- <Tooltip content="Export the photo or save a scene" shortcut="E">- <Button- aria-pressed={exporting}- className="ml-1 px-4 aria-pressed:bg-raised-hover"- onClick={() => setTool(exporting ? tools[0] : exportTool)}- >- Export- </Button>+ <Tooltip>+ <TooltipTrigger+ render={+ <Button+ aria-pressed={exporting}+ className="ml-1 px-4 aria-pressed:bg-raised-hover"+ onClick={() => setTool(exporting ? tools[0] : exportTool)}+ >+ Export+ </Button>+ }+ />+ <TooltipContent shortcut="E">+ Export the photo or save a scene+ </TooltipContent></Tooltip>);}@@ -140,7 +147,7 @@ function DocumentEditor({ file }: { file: string }) {<HistoryControls /><hraria-orientation="vertical"- className="mx-1 h-4 w-px border-0 bg-neutral-600"+ className="mx-1 h-4 w-px border-0 separator"/><ComparisonControl /><ExportButton />diff --git a/src/app/editor/tool-rail.tsx b/src/app/editor/tool-rail.tsxindex 19c92c5..710bee5 100644--- a/src/app/editor/tool-rail.tsx+++ b/src/app/editor/tool-rail.tsx@@ -1,5 +1,5 @@-import { Tab, TabList } from "@roprgm/ui/tabs";-import { Tooltip } from "@roprgm/ui/tooltip";+import { Tab, TabList, Tabs } from "@roprgm/ui/tabs";+import { Tooltip, TooltipContent, TooltipTrigger } from "@roprgm/ui/tooltip";import { GithubIcon } from "@/components/icons/github";import { useShortcuts } from "@/hooks/use-shortcuts";import { type Tool, tools, useTool } from "./tools";@@ -14,39 +14,49 @@ export function ToolTabList({}) {const editing = tools.filter((entry) => entry.group === "edit");return (- <div className="flex shrink-0 gap-1 overflow-auto border-black border-b layer-panel p-1.5 md:w-11 md:flex-col md:border-r md:border-b-0">+ <Tabs+ value={selected}+ onValueChange={onSelect}+ className="flex shrink-0 gap-1 overflow-auto border-edge border-b surface-panel p-1.5 md:w-11 md:flex-col md:border-r md:border-b-0"+ ><TabList aria-label="Tools" className="md:flex-col">{editing.map((entry) => (- <Tooltip- key={entry.id}- content={entry.label}- shortcut={entry.key.toUpperCase()}- side="right"- >- <Tab- selected={entry === selected}- disabled={!onSelect}- size="icon-lg"- aria-label={entry.label}- onClick={() => onSelect?.(entry)}+ <Tooltip key={entry.id}>+ <TooltipTrigger+ render={+ <Tab+ value={entry}+ disabled={!onSelect}+ size="icon-lg"+ aria-label={entry.label}+ />+ }><entry.Icon className="size-5" />- </Tab>+ </TooltipTrigger>+ <TooltipContent side="right" shortcut={entry.key.toUpperCase()}>+ {entry.label}+ </TooltipContent></Tooltip>))}</TabList>- <Tooltip content="OpenLight on GitHub" side="right">- <a- href="https://github.com/roprgm/openlight"- target="_blank"- rel="noreferrer"- aria-label="OpenLight on GitHub"- className="ml-auto grid place-items-center rounded-md p-1.5 text-neutral-500 transition-colors hover:bg-neutral-700/50 hover:text-neutral-100 md:mt-auto md:ml-0"+ <Tooltip>+ <TooltipTrigger+ render={+ <a+ href="https://github.com/roprgm/openlight"+ target="_blank"+ rel="noreferrer"+ aria-label="OpenLight on GitHub"+ className="ml-auto grid place-items-center rounded-md p-1.5 text-muted transition-colors hover:bg-hover hover:text-foreground md:mt-auto md:ml-0"+ />+ }><GithubIcon className="size-5" />- </a>+ </TooltipTrigger>+ <TooltipContent side="right">OpenLight on GitHub</TooltipContent></Tooltip>- </div>+ </Tabs>);}diff --git a/src/components/editor/canvas-hint.tsx b/src/components/editor/canvas-hint.tsxindex 27aed0e..e6bfbe4 100644--- a/src/components/editor/canvas-hint.tsx+++ b/src/components/editor/canvas-hint.tsx@@ -3,7 +3,7 @@ import type { ReactNode } from "react";/** A short instruction in the canvas corner that never takes the pointer. */export function CanvasHint({ children }: { children: ReactNode }) {return (- <p className="pointer-events-none absolute bottom-3 left-3 rounded-full bg-neutral-800/80 px-3 py-1.5 text-white backdrop-blur-sm">+ <p className="pointer-events-none absolute bottom-3 left-3 rounded-full bg-level-4/80 px-3 py-1.5 text-foreground backdrop-blur-sm">{children}</p>);diff --git a/src/components/editor/coverage-thumbnail.tsx b/src/components/editor/coverage-thumbnail.tsxindex be2147d..57ce0d9 100644--- a/src/components/editor/coverage-thumbnail.tsx+++ b/src/components/editor/coverage-thumbnail.tsx@@ -66,7 +66,7 @@ export function CoverageThumbnail({width={64}height={64}aria-label={label}- className="size-8 shrink-0 rounded-sm border border-neutral-600 bg-neutral-950"+ className="size-8 shrink-0 rounded-sm border border-level-8 bg-level-1"/>);}diff --git a/src/components/editor/panel.tsx b/src/components/editor/panel.tsxindex 4646131..1a933ba 100644--- a/src/components/editor/panel.tsx+++ b/src/components/editor/panel.tsx@@ -1,31 +1,58 @@import { IconButton } from "@roprgm/ui/icon-button";-import {- PanelBody as Body,- PanelHeader as Header,- Panel,-} from "@roprgm/ui/panel";-import type { ComponentProps, ReactNode } from "react";+import { ScrollArea } from "@roprgm/ui/scroll-area";+import { Section, SectionAction } from "@roprgm/ui/section";+import { cn } from "cn";+import type {+ ComponentProps,+ CSSProperties,+ PointerEvent,+ ReactNode,+} from "react";import { CloseIcon } from "@/components/icons/close";import { useEditorSession } from "./session";/*** The resizable side panel, a bottom sheet on mobile. Its sections stack in the order written,- * with a divider between each; give one a PanelBody to scroll. An inert panel dims its contents.+ * with a line between each; give one a PanelBody to scroll. An inert panel dims its contents.*/-export function EditorPanel({ inert, ...props }: ComponentProps<"aside">) {+export function EditorPanel({+ inert,+ children,+ className,+ ...props+}: ComponentProps<"aside">) {const { width, onWidthChange } = useEditorSession();+ function resize(event: PointerEvent) {+ if (event.buttons !== 1) {+ return;+ }+ onWidthChange(Math.min(400, Math.max(240, width - event.movementX)));+ }return (- <Panel- width={width}- onWidthChange={onWidthChange}+ <asideinert={inert}// Inert content is already hidden from assistive technology; say so for tools that read ARIA only.aria-hidden={inert}data-inert={inert}- // A black edge parts it from the canvas: along the top as a bottom sheet, on the left beside it.- className="layer-panel h-[45%] divide-black border-black max-md:w-full! max-md:border-t md:h-auto md:border-l data-[inert=true]:*:opacity-50"+ // An edge parts it from the canvas: along the top as a bottom sheet, on the left beside it.+ className={cn(+ "relative flex h-[45%] min-h-0 w-full shrink-0 flex-col md:w-(--width) border-edge surface-panel max-md:border-t md:h-auto md:border-l data-[inert=true]:*:opacity-50",+ className,+ )}+ style={{ "--width": `${width}px` } as CSSProperties}{...props}- />+ >+ <div+ className="absolute inset-y-0 -left-1 z-20 w-2 cursor-col-resize touch-none after:absolute after:inset-y-0 after:left-1 after:w-px after:transition-colors hover:after:bg-raised"+ onPointerDown={(event) =>+ event.currentTarget.setPointerCapture(event.pointerId)+ }+ onPointerMove={resize}+ />+ <div className="flex min-h-0 flex-1 flex-col *:not-last:shadow-[inset_0_-1px_0_var(--color-edge)]">+ {children}+ </div>+ </aside>);}@@ -43,7 +70,9 @@ export function PanelBody({className="flex min-h-0 flex-1 flex-col">{header}- <Body>{children}</Body>+ <ScrollArea fade className="flex-1">+ {children}+ </ScrollArea></section>);}@@ -59,13 +88,28 @@ export function PanelHeader({onClose?: () => void;}) {return (- <Header title={title} className="border-black/50 border-b">- {children}- {onClose && (- <IconButton label="Close" shortcut="Esc" size="icon" onClick={onClose}>- <CloseIcon className="size-4" />- </IconButton>+ <Section className="shrink-0 flex-row items-center shadow-[inset_0_-1px_0_var(--color-edge)]">+ <h2+ tabIndex={-1}+ className="flex-1 overflow-fade-x whitespace-nowrap font-medium text-foreground"+ >+ {title}+ </h2>+ {(children || onClose) && (+ <SectionAction>+ {children}+ {onClose && (+ <IconButton+ label="Close"+ shortcut="Esc"+ size="icon"+ onClick={onClose}+ >+ <CloseIcon className="size-4" />+ </IconButton>+ )}+ </SectionAction>)}- </Header>+ </Section>);}diff --git a/src/components/editor/viewport.tsx b/src/components/editor/viewport.tsxindex 0a8c200..fcf67e4 100644--- a/src/components/editor/viewport.tsx+++ b/src/components/editor/viewport.tsx@@ -1,6 +1,6 @@import { Button } from "@roprgm/ui/button";import { IconButton } from "@roprgm/ui/icon-button";-import { Tooltip } from "@roprgm/ui/tooltip";+import { Tooltip, TooltipContent, TooltipTrigger } from "@roprgm/ui/tooltip";import { createContext, type ReactNode, useContext } from "react";import { Canvas } from "vgpu-react";import { Icon } from "@/components/icons/icon";@@ -25,7 +25,7 @@ function ZoomControl() {const fitted = view.zoom === 1;return (<div className="absolute right-3 bottom-3">- <div className="flex items-center rounded-full bg-neutral-800/80 p-0.5 backdrop-blur-sm">+ <div className="flex items-center rounded-full surface-panel bg-level-4/80 p-0.5 backdrop-blur-sm"><IconButtonlabel="Zoom out"side="top"@@ -36,16 +36,23 @@ function ZoomControl() {<path d="M5 10h10" /></Icon></IconButton>- <Tooltip content={fitted ? "Zoom to 100%" : "Fit to view"} side="top">- <Button- variant="ghost"- className="h-6 min-w-14 rounded-full px-1 text-neutral-200 tabular-nums"- onClick={() =>- fitted ? zoomTo(1 / (scale * devicePixelRatio)) : resetView()+ <Tooltip>+ <TooltipTrigger+ render={+ <Button+ variant="ghost"+ className="h-6 min-w-14 rounded-full px-1 text-foreground tabular-nums"+ onClick={() =>+ fitted ? zoomTo(1 / (scale * devicePixelRatio)) : resetView()+ }+ >+ {percent}%+ </Button>}- >- {percent}%- </Button>+ />+ <TooltipContent side="top">+ {fitted ? "Zoom to 100%" : "Fit to view"}+ </TooltipContent></Tooltip><IconButtonlabel="Zoom in"diff --git a/src/components/ui/text-link.tsx b/src/components/ui/text-link.tsxindex 97a0892..64fdba0 100644--- a/src/components/ui/text-link.tsx+++ b/src/components/ui/text-link.tsx@@ -3,15 +3,15 @@ import { cn } from "cn";import type { ComponentProps } from "react";const link = cva(- "cursor-pointer underline underline-offset-4 transition-colors focus-visible:outline-1 focus-visible:outline-offset-2 focus-visible:outline-neutral-400/80",+ "cursor-pointer rounded-xs underline underline-offset-4 transition-colors focus-ring",{variants: {/** Default links stand out from their sentence; muted ones stay in its color until hovered. */variant: {default:- "text-neutral-200 decoration-neutral-600 hover:decoration-neutral-200",+ "text-foreground decoration-disabled hover:decoration-foreground",muted:- "decoration-neutral-700 hover:text-neutral-300 hover:decoration-neutral-400",+ "decoration-level-6 hover:text-foreground hover:decoration-muted",},},defaultVariants: { variant: "default" },diff --git a/src/components/ui/tree-drag.tsx b/src/components/ui/tree-drag.tsxindex ed0e667..9d8cb55 100644--- a/src/components/ui/tree-drag.tsx+++ b/src/components/ui/tree-drag.tsx@@ -122,7 +122,7 @@ export function TreeDrag({ children, canDrop, onDrop, label }: TreeDragProps) {<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">+ <div className="max-w-64 rounded-md surface-float px-3 py-2">{label(active)}</div>)}diff --git a/src/features/adjustments/controls.tsx b/src/features/adjustments/controls.tsxindex b375ee3..aca1474 100644--- a/src/features/adjustments/controls.tsx+++ b/src/features/adjustments/controls.tsx@@ -73,7 +73,7 @@ export function AdjustmentControls({temperature?: ReactNode;}) {return (- <section className="flex flex-col gap-1.5 p-(--padding)">+ <section className="flex flex-col gap-1.5 p-3.5"><AdjustmentSliders id={id} adjustments={adjustments} controls={tone} />{temperature}<AdjustmentSlidersdiff --git a/src/features/color-mixer/controls.tsx b/src/features/color-mixer/controls.tsxindex f57a078..c7bc520 100644--- a/src/features/color-mixer/controls.tsx+++ b/src/features/color-mixer/controls.tsx@@ -1,8 +1,8 @@import { ScrubInput } from "@roprgm/ui/scrub-input";-import { Tab, TabList } from "@roprgm/ui/tabs";-import { Tooltip } from "@roprgm/ui/tooltip";-import { VerticalSlider } from "@roprgm/ui/vertical-slider";-import { useId, useState } from "react";+import { Slider } from "@roprgm/ui/slider";+import { Tab, TabList, TabPanel, Tabs } from "@roprgm/ui/tabs";+import { Tooltip, TooltipContent, TooltipTrigger } from "@roprgm/ui/tooltip";+import { useState } from "react";import { useDocument } from "@/components/editor/session";import type { ColorMixer } from "@/core/document";import { setColorMixer } from "./edits";@@ -35,28 +35,34 @@ function ColorSlider({const change = (value: number) =>setColorMixer(document, color.id, { [channel]: value }, layerId);return (- <Tooltip content={color.label}>- <div className="flex min-w-0 flex-col items-center gap-1">- <ScrubInput- aria-label={`${label} value`}- className="w-full justify-center px-0 tracking-tight"- value={value}- defaultValue={0}- onChange={change}- min={-100}- max={100}- />- <VerticalSlider- label={label}- value={value}- onChange={change}- min={-100}- max={100}- defaultValue={0}- stops={gradient(color.hue, channel)}- color={`hsl(${color.hue} 65% 55%)`}- />- </div>+ <Tooltip>+ <TooltipTrigger+ render={+ <div className="flex min-w-0 flex-col items-center gap-1">+ <ScrubInput+ aria-label={`${label} value`}+ className="w-full justify-center px-0 tracking-tight"+ value={value}+ defaultValue={0}+ onChange={change}+ min={-100}+ max={100}+ />+ <Slider+ orientation="vertical"+ label={label}+ value={value}+ onChange={change}+ min={-100}+ max={100}+ defaultValue={0}+ stops={gradient(color.hue, channel)}+ color={`hsl(${color.hue} 65% 55%)`}+ />+ </div>+ }+ />+ <TooltipContent>{color.label}</TooltipContent></Tooltip>);}@@ -69,33 +75,26 @@ export function ColorMixerControls({mixer: ColorMixer;}) {const [channel, setChannel] = useState<MixerChannel>("hue");- const id = useId();return (- <section className="p-(--padding)">+ <Tabs+ value={channel}+ onValueChange={setChannel}+ render={<section />}+ className="p-3.5"+ ><TabListaria-label="Color Mixer adjustment"variant="segmented"className="mb-3">- {channels.map(({ id: value, label }) => (- <Tab- key={value}- id={`${id}-${value}`}- aria-controls={`${id}-sliders`}- selected={channel === value}- onClick={() => setChannel(value)}- className="min-w-0 flex-1 px-1"- >+ {channels.map(({ id, label }) => (+ <Tab key={id} value={id} className="min-w-0 flex-1 px-1">{label}</Tab>))}</TabList>- <div- id={`${id}-sliders`}- role="tabpanel"- aria-labelledby={`${id}-${channel}`}- className="grid grid-cols-8"- >+ {/* One panel shows every channel, so it follows the tab that's selected. */}+ <TabPanel value={channel} className="grid grid-cols-8">{colors.map((color, index) => (<ColorSliderkey={color.id}@@ -105,7 +104,7 @@ export function ColorMixerControls({layerId={layerId}/>))}- </div>- </section>+ </TabPanel>+ </Tabs>);}diff --git a/src/features/crop/overlay.tsx b/src/features/crop/overlay.tsxindex be59cf0..a43522f 100644--- a/src/features/crop/overlay.tsx+++ b/src/features/crop/overlay.tsx@@ -123,7 +123,7 @@ export function CropOverlay({aria-label="Crop selection"data-handle="move"style={style}- className="absolute top-1/2 left-1/2 -translate-1/2 cursor-grab border border-white bg-[linear-gradient(to_right,#fff3_1px,transparent_1px),linear-gradient(to_bottom,#fff3_1px,transparent_1px)] bg-size-[33.333%_33.333%] shadow-[0_0_0_9999px_#0009] active:cursor-grabbing"+ className="absolute top-1/2 left-1/2 -translate-1/2 cursor-grab border border-foreground bg-[linear-gradient(to_right,#fff3_1px,transparent_1px),linear-gradient(to_bottom,#fff3_1px,transparent_1px)] bg-size-[33.333%_33.333%] shadow-[0_0_0_9999px_#0009] active:cursor-grabbing"onKeyDown={(event) => {const delta = arrows[event.key];if (!delta || !(event.target instanceof HTMLElement)) {@@ -141,7 +141,7 @@ export function CropOverlay({<buttontype="button"aria-label="Move crop"- className="absolute inset-0 cursor-[inherit] focus-visible:outline-2 focus-visible:outline-white"+ className="absolute inset-0 cursor-[inherit] focus-visible:outline-2 focus-visible:outline-foreground"/>{handles.map(([handle, label, left, top, cursor]) => (@@ -153,7 +153,7 @@ export function CropOverlay({className="group absolute flex size-11 min-h-11 min-w-11 -translate-1/2 items-center justify-center outline-none data-[handle=n]:w-full data-[handle=s]:w-full data-[handle=e]:h-full data-[handle=w]:h-full"style={{ left: `${left}%`, top: `${top}%`, cursor }}>- <span className="pointer-events-none size-2.5 border border-neutral-900 bg-white group-focus-visible:ring-2 group-focus-visible:ring-neutral-400/50" />+ <span className="pointer-events-none size-2.5 surface-primary group-focus-visible:ring-2 group-focus-visible:ring-focus" /></button>))}</div>diff --git a/src/features/crop/view.tsx b/src/features/crop/view.tsxindex d03102f..0ea6c69 100644--- a/src/features/crop/view.tsx+++ b/src/features/crop/view.tsx@@ -1,7 +1,7 @@import { Button } from "@roprgm/ui/button";import { Select } from "@roprgm/ui/select";import { Slider } from "@roprgm/ui/slider";-import { Tooltip } from "@roprgm/ui/tooltip";+import { Tooltip, TooltipContent, TooltipTrigger } from "@roprgm/ui/tooltip";import { useState } from "react";import { Image } from "@/components/editor/image";import { EditorPanel, PanelBody, PanelHeader } from "@/components/editor/panel";@@ -116,10 +116,11 @@ export function CropEditor({ onClose }: { onClose: () => void }) {}}><PanelBody header={<PanelHeader title="Crop" onClose={onClose} />}>- <section aria-label="Crop tool" className="space-y-5 p-(--padding)">- <div className="flex items-center justify-between text-neutral-400">+ <section aria-label="Crop tool" className="space-y-5 p-3.5">+ <div className="flex items-center justify-between text-muted">Aspect ratio<Select+ raisedaria-label="Aspect ratio"value={ratio === null ? "free" : `${ratio}`}items={ratioOptions}@@ -131,7 +132,7 @@ export function CropEditor({ onClose }: { onClose: () => void }) {aria-label="Rotate and flip image"className="grid grid-cols-4 items-center gap-2">- <h3 className="col-span-3 text-neutral-400">Rotate & flip</h3>+ <h3 className="col-span-3 text-muted">Rotate & flip</h3><Buttonvariant="ghost"size="sm"@@ -143,16 +144,21 @@ export function CropEditor({ onClose }: { onClose: () => void }) {{actions.map((action) => {const Icon = "turn" in action ? RotateIcon : FlipIcon;return (- <Tooltip key={action.label} content={action.label}>- <Button- variant="ghost"- aria-label={action.label}- className="flex h-9 items-center justify-center gap-1 rounded-md px-1"- onClick={() => applyAction(action)}- >- <Icon style={{ transform: action.transform }} />- {"turn" in action && <span>90°</span>}- </Button>+ <Tooltip key={action.label}>+ <TooltipTrigger+ render={+ <Button+ variant="ghost"+ aria-label={action.label}+ className="flex h-9 items-center justify-center gap-1 rounded-md px-1"+ onClick={() => applyAction(action)}+ >+ <Icon style={{ transform: action.transform }} />+ {"turn" in action && <span>90°</span>}+ </Button>+ }+ />+ <TooltipContent>{action.label}</TooltipContent></Tooltip>);})}@@ -166,16 +172,16 @@ export function CropEditor({ onClose }: { onClose: () => void }) {defaultValue={0}onChange={(angle) => setFrame(rotate(frame, angle, source))}/>- <p className="text-neutral-500">+ <p className="text-muted">Drag edges or corners to crop, inside to move, outside to rotate.Space + drag to pan; Ctrl/⌘ + scroll to zoom.</p>- <p className="tabular-nums text-neutral-400">+ <p className="tabular-nums text-muted">{frame.size.map(Math.round).join(" × ")} px</p></section></PanelBody>- <div className="p-(--padding-optical)">+ <div className="p-3"><Button size="lg" className="w-full" onClick={apply}>Apply crop</Button>diff --git a/src/features/details/controls.tsx b/src/features/details/controls.tsxindex e7ef0f9..e87dc5a 100644--- a/src/features/details/controls.tsx+++ b/src/features/details/controls.tsx@@ -18,7 +18,7 @@ export function DetailsControls({["sharpenRadius", "Radius", 0.1],] as const;return (- <section className="flex flex-col gap-1.5 p-(--padding)">+ <section className="flex flex-col gap-1.5 p-3.5">{controls.map(([name, label, step]) => (<Sliderkey={name}diff --git a/src/features/fill/controls.tsx b/src/features/fill/controls.tsxindex b2ba74f..1620e70 100644--- a/src/features/fill/controls.tsx+++ b/src/features/fill/controls.tsx@@ -16,11 +16,11 @@ export function FillControls({ id, fill }: { id: string; fill: Fill }) {return () => input?.removeEventListener("change", commit);}, [document]);return (- <section className="flex flex-col gap-3 p-(--padding)">- <label className="flex items-center justify-between text-neutral-400">+ <section className="flex flex-col gap-3 p-3.5">+ <label className="flex items-center justify-between text-muted">Color<span className="flex items-center gap-2">- <span className="text-neutral-100 uppercase tabular-nums">+ <span className="text-foreground uppercase tabular-nums">{fill.color}</span><input@@ -28,7 +28,7 @@ export function FillControls({ id, fill }: { id: string; fill: Fill }) {type="color"aria-label="Color"value={fill.color}- className="h-6 w-9 cursor-pointer rounded border border-black bg-transparent p-0.5"+ className="h-6 w-9 cursor-pointer rounded surface-sunken p-0.5"onChange={(event) => {document.history.begin();setFill(document, { color: event.currentTarget.value }, id);@@ -36,9 +36,10 @@ export function FillControls({ id, fill }: { id: string; fill: Fill }) {/></span></label>- <div className="flex items-center justify-between text-neutral-400">+ <div className="flex items-center justify-between text-muted">Blend<Select+ raisedaria-label="Blend"value={fill.blend}items={blends.map(([value, label]) => ({ value, label }))}diff --git a/src/features/heal/controls.tsx b/src/features/heal/controls.tsxindex a5690ec..53e4b1b 100644--- a/src/features/heal/controls.tsx+++ b/src/features/heal/controls.tsx@@ -1,6 +1,6 @@import { IconButton } from "@roprgm/ui/icon-button";-import { ListItem } from "@roprgm/ui/list-item";-import { Menu, MenuItem } from "@roprgm/ui/menu";+import { ListItem, ListItemAction } from "@roprgm/ui/list-item";+import { Menu, MenuContent, MenuItem, MenuTrigger } from "@roprgm/ui/menu";import { CoverageThumbnail } from "@/components/editor/coverage-thumbnail";import { useDocument } from "@/components/editor/session";import { HealIcon } from "@/components/icons/heal";@@ -16,7 +16,7 @@ function PendingThumbnail() {<spanrole="img"aria-label="Patch pending"- className="grid size-8 shrink-0 place-items-center rounded-sm border border-neutral-600 bg-neutral-950 text-neutral-500"+ className="grid size-8 shrink-0 place-items-center rounded-sm border border-level-8 bg-level-1 text-muted"><HealIcon className="size-4" /></span>@@ -35,38 +35,41 @@ function PatchActions({const document = useDocument();const { selectPatch } = useHealing();return (- <Menu- trigger={- <IconButton- label="Patch actions"- size="icon"- className="pointer-coarse:size-10"- >- <Icon className="size-4">- <path- d="M5 12h.01M12 12h.01M19 12h.01"- strokeWidth="3"- strokeLinecap="round"- />- </Icon>- </IconButton>- }- >- <MenuItem- onClick={() =>- selectPatch(duplicateHealPatch(document, layer, patch.id))+ <Menu>+ <MenuTrigger+ render={+ <IconButton+ label="Patch actions"+ size="icon"+ className="pointer-coarse:size-10"+ >+ <Icon className="size-4">+ <path+ d="M5 12h.01M12 12h.01M19 12h.01"+ strokeWidth="3"+ strokeLinecap="round"+ />+ </Icon>+ </IconButton>}- >- Duplicate- </MenuItem>- <MenuItem- onClick={() => {- deleteHealPatch(document, layer, patch.id);- selectPatch(next);- }}- >- Delete- </MenuItem>+ />+ <MenuContent raised>+ <MenuItem+ onClick={() =>+ selectPatch(duplicateHealPatch(document, layer, patch.id))+ }+ >+ Duplicate+ </MenuItem>+ <MenuItem+ onClick={() => {+ deleteHealPatch(document, layer, patch.id);+ selectPatch(next);+ }}+ >+ Delete+ </MenuItem>+ </MenuContent></Menu>);}@@ -94,7 +97,7 @@ export function HealControls({);if (!patches.length) {return (- <p className="p-4 text-center text-neutral-500">+ <p className="p-4 text-center text-muted">Paint over a spot or object to create the first patch.</p>);@@ -105,7 +108,7 @@ export function HealControls({<li key={patch.id}><ListItemselected={selectedPatch === patch.id}- className="gap-0 pr-1 pl-0 pointer-coarse:h-12"+ className="gap-0 pl-0 pointer-coarse:h-12"onPointerEnter={() => hoverPatch(patch.id)}onPointerLeave={() => hoverPatch()}>@@ -124,15 +127,17 @@ export function HealControls({fallback={<PendingThumbnail />}/><span className="min-w-0 flex-1 truncate">Patch {index + 1}</span>- <span className="shrink-0 text-neutral-500 tabular-nums">+ <span className="shrink-0 text-muted tabular-nums">{patchSummary(patch)}</span></button>- <PatchActions- layer={id}- patch={patch}- next={patches[index - 1]?.id ?? patches[index + 1]?.id}- />+ <ListItemAction>+ <PatchActions+ layer={id}+ patch={patch}+ next={patches[index - 1]?.id ?? patches[index + 1]?.id}+ />+ </ListItemAction></ListItem></li>))}diff --git a/src/features/heal/options.tsx b/src/features/heal/options.tsxindex 9ee5f59..7546ce4 100644--- a/src/features/heal/options.tsx+++ b/src/features/heal/options.tsx@@ -1,6 +1,6 @@import { Chip } from "@roprgm/ui/chip";import { Slider } from "@roprgm/ui/slider";-import { Tooltip } from "@roprgm/ui/tooltip";+import { Tooltip, TooltipContent, TooltipTrigger } from "@roprgm/ui/tooltip";import { useBrushTool } from "@/components/editor/brush-tool";import { useDocument, useSelectedLayer } from "@/components/editor/session";import { barSlider, useBarDensity } from "@/components/editor/toolbar-density";@@ -71,8 +71,15 @@ export function HealOptions() {/>)}{source && (- <Tooltip content="Find each stroke's donor again; Alt-click sets one">- <Chip onClick={() => setSource(undefined)}>Automatic source</Chip>+ <Tooltip>+ <TooltipTrigger+ render={+ <Chip onClick={() => setSource(undefined)}>Automatic source</Chip>+ }+ />+ <TooltipContent>+ Find each stroke's donor again; Alt-click sets one+ </TooltipContent></Tooltip>)}</>diff --git a/src/features/layers/brush-options.tsx b/src/features/layers/brush-options.tsxindex 8bdf0fb..5b73463 100644--- a/src/features/layers/brush-options.tsx+++ b/src/features/layers/brush-options.tsx@@ -1,6 +1,6 @@import { Chip } from "@roprgm/ui/chip";import { Slider } from "@roprgm/ui/slider";-import { Tooltip } from "@roprgm/ui/tooltip";+import { Tooltip, TooltipContent, TooltipTrigger } from "@roprgm/ui/tooltip";import { cn } from "cn";import { useBrushTool } from "@/components/editor/brush-tool";import { barSlider, useBarDensity } from "@/components/editor/toolbar-density";@@ -21,17 +21,22 @@ export function BrushOptions() {<><fieldsetaria-label="Brush mode"- className="flex gap-0.5 rounded-full bg-white/5 p-0.5"+ className="flex gap-0.5 rounded-full bg-hover p-0.5">{modes.map(([mode, label, hint, shortcut]) => (- <Tooltip key={mode} content={hint} shortcut={shortcut}>- <Chip- aria-pressed={erase === (mode === "erase")}- className={cn("h-6", menu && "flex-1 justify-center")}- onClick={() => update({ erase: mode === "erase" })}- >- {label}- </Chip>+ <Tooltip key={mode}>+ <TooltipTrigger+ render={+ <Chip+ aria-pressed={erase === (mode === "erase")}+ className={cn("h-6", menu && "flex-1 justify-center")}+ onClick={() => update({ erase: mode === "erase" })}+ >+ {label}+ </Chip>+ }+ />+ <TooltipContent shortcut={shortcut}>{hint}</TooltipContent></Tooltip>))}</fieldset>diff --git a/src/features/layers/controls.tsx b/src/features/layers/controls.tsxindex 873f8d6..eb92163 100644--- a/src/features/layers/controls.tsx+++ b/src/features/layers/controls.tsx@@ -1,8 +1,8 @@import { IconButton } from "@roprgm/ui/icon-button";-import { ListItem } from "@roprgm/ui/list-item";-import { Menu, MenuItem } from "@roprgm/ui/menu";+import { ListItem, ListItemAction } from "@roprgm/ui/list-item";+import { Menu, MenuContent, MenuItem, MenuTrigger } from "@roprgm/ui/menu";import { ScrollArea } from "@roprgm/ui/scroll-area";-import { Tooltip } from "@roprgm/ui/tooltip";+import { Tooltip, TooltipContent, TooltipTrigger } from "@roprgm/ui/tooltip";import {type ComponentType,memo,@@ -56,14 +56,14 @@ function LayerThumbnail({<spanrole="img"aria-label="Color thumbnail"- className="block size-8 shrink-0 rounded-sm border border-neutral-600"+ className="block size-8 shrink-0 rounded-sm border border-level-8"style={{ background: layer.fill.color }}/>);}const Icon = effects.find(({ kind }) => kind === layer.kind)?.Icon;return (- <span className="grid size-8 shrink-0 place-items-center rounded border border-black/50 bg-neutral-950/40 text-neutral-400">+ <span className="grid size-8 shrink-0 place-items-center rounded border border-edge/50 bg-level-1/40 text-muted">{Icon && <Icon className="size-4" />}</span>);@@ -114,29 +114,33 @@ const LayerRow = memo(function LayerRow({selected={selected === layer.id}muted={!visible}style={{ paddingLeft: depth * 12 }}- className="gap-0 pr-1 pointer-coarse:h-12 data-[dragging=true]:opacity-40 data-[drop=inside]:ring-1 data-[drop=inside]:ring-blue-400 data-[drop=inside]:ring-inset data-[drop=before]:before:absolute data-[drop=before]:before:inset-x-0 data-[drop=before]:before:-top-px data-[drop=before]:before:border-t-2 data-[drop=before]:before:border-blue-400 data-[drop=after]:after:absolute data-[drop=after]:after:inset-x-0 data-[drop=after]:after:-bottom-px data-[drop=after]:after:border-b-2 data-[drop=after]:after:border-blue-400"+ className="gap-0 pointer-coarse:h-12 data-[dragging=true]:opacity-40 data-[drop=inside]:ring-1 data-[drop=inside]:ring-primary data-[drop=inside]:ring-inset data-[drop=before]:before:absolute data-[drop=before]:before:inset-x-0 data-[drop=before]:before:-top-px data-[drop=before]:before:border-t-2 data-[drop=before]:before:border-primary data-[drop=after]:after:absolute data-[drop=after]:after:inset-x-0 data-[drop=after]:after:-bottom-px data-[drop=after]:after:border-b-2 data-[drop=after]:after:border-primary">- <Tooltip- content={visible ? "Hide layer" : "Show layer"}- disabled={isImage}- >- <button- type="button"- aria-label={`Show ${layer.name}`}- aria-pressed={visible}- disabled={isImage}- onClick={() => {- if (!isImage) {- setLayer(document, layer.id, { visible: !visible });- }- }}- className="grid h-full w-8 shrink-0 place-items-center text-neutral-400 hover:text-neutral-100 disabled:text-neutral-600 aria-[pressed=false]:text-neutral-600 pointer-coarse:w-11"- >- <Icon className="size-3.5">- <path d="M2 12s3.5-6 10-6 10 6 10 6-3.5 6-10 6S2 12 2 12Z" />- <circle cx="12" cy="12" r="3" />- </Icon>- </button>+ <Tooltip disabled={isImage}>+ <TooltipTrigger+ render={+ <button+ type="button"+ aria-label={`Show ${layer.name}`}+ aria-pressed={visible}+ disabled={isImage}+ onClick={() => {+ if (!isImage) {+ setLayer(document, layer.id, { visible: !visible });+ }+ }}+ className="grid h-full w-8 shrink-0 place-items-center text-muted hover:text-foreground disabled:text-disabled aria-[pressed=false]:text-disabled pointer-coarse:w-11"+ >+ <Icon className="size-3.5">+ <path d="M2 12s3.5-6 10-6 10 6 10 6-3.5 6-10 6S2 12 2 12Z" />+ <circle cx="12" cy="12" r="3" />+ </Icon>+ </button>+ }+ />+ <TooltipContent>+ {visible ? "Hide layer" : "Show layer"}+ </TooltipContent></Tooltip><buttontype="button"@@ -152,16 +156,19 @@ const LayerRow = memo(function LayerRow({dragHandle={dragHandle}/>{isSubmask && (- <Tooltip- content={- maskSign === "+"+ <Tooltip>+ <TooltipTrigger+ render={+ <span className="grid size-6 shrink-0 place-items-center text-muted">+ {maskSign}+ </span>+ }+ />+ <TooltipContent>+ {maskSign === "+"? `Adds to ${parent?.name}`- : `Subtracts from ${parent?.name}`- }- >- <span className="grid size-6 shrink-0 place-items-center text-neutral-500">- {maskSign}- </span>+ : `Subtracts from ${parent?.name}`}+ </TooltipContent></Tooltip>)}{layer.children.length > 0 && (@@ -170,26 +177,35 @@ const LayerRow = memo(function LayerRow({aria-label={expandLabel}aria-expanded={expanded}onClick={() => setCollapsed(expanded)}- className="grid size-6 shrink-0 place-items-center text-neutral-500 hover:text-neutral-200"+ className="grid size-6 shrink-0 place-items-center text-muted hover:text-foreground"><Icon className="size-3 transition-transform" style={chevronStyle}><path d="m9 5 7 7-7 7" /></Icon></button>)}- {layer.kind === "image" && (- <Tooltip content="The base image stays at the bottom">- <span className="grid size-7 shrink-0 place-items-center text-neutral-500">- <Icon className="size-3.5">- <rect x="6" y="10" width="12" height="10" rx="2" />- <path d="M8 10V7a4 4 0 0 1 8 0v3" />- </Icon>- </span>- </Tooltip>- )}- {layer.kind !== "image" && (- <LayerActions layer={layer} onSelect={onSelect} />- )}+ <ListItemAction>+ {isImage && (+ <Tooltip>+ <TooltipTrigger+ render={+ <span className="grid size-7 shrink-0 place-items-center text-muted">+ <Icon className="size-3.5">+ <rect x="6" y="10" width="12" height="10" rx="2" />+ <path d="M8 10V7a4 4 0 0 1 8 0v3" />+ </Icon>+ </span>+ }+ />+ <TooltipContent>+ The base image stays at the bottom+ </TooltipContent>+ </Tooltip>+ )}+ {layer.kind !== "image" && (+ <LayerActions layer={layer} onSelect={onSelect} />+ )}+ </ListItemAction></ListItem>{expanded &&layer.children@@ -223,12 +239,10 @@ export function LayersSection({return (<sectionaria-label="Layers"- className="grid max-h-1/2 min-h-41 shrink-0 grid-rows-[auto_minmax(0,1fr)] layer-panel"+ className="grid max-h-1/2 min-h-41 shrink-0 grid-rows-[auto_minmax(0,1fr)]"><PanelHeader title="Layers">{actions}</PanelHeader>- <ScrollArea fade className="-mb-px">- {children}- </ScrollArea>+ <ScrollArea fade>{children}</ScrollArea></section>);}@@ -271,26 +285,29 @@ export function LayersControls({return (<LayersSectionactions={- <Menu- trigger={- <IconButton- label="Add effect"- size="icon"- className="pointer-coarse:size-10"- >- <Icon className="size-4">- <path d="M12 4v16M4 12h16" />- </Icon>- </IconButton>- }- >- {effects- .filter(({ addable }) => addable)- .map(({ kind, label }) => (- <MenuItem key={kind} onClick={() => onAdd(kind)}>- {label}- </MenuItem>- ))}+ <Menu>+ <MenuTrigger+ render={+ <IconButton+ label="Add effect"+ size="icon"+ className="pointer-coarse:size-10"+ >+ <Icon className="size-4">+ <path d="M12 4v16M4 12h16" />+ </Icon>+ </IconButton>+ }+ />+ <MenuContent raised>+ {effects+ .filter(({ addable }) => addable)+ .map(({ kind, label }) => (+ <MenuItem key={kind} onClick={() => onAdd(kind)}>+ {label}+ </MenuItem>+ ))}+ </MenuContent></Menu>}>diff --git a/src/features/layers/gradient-guides.tsx b/src/features/layers/gradient-guides.tsxindex cbf8808..873c68c 100644--- a/src/features/layers/gradient-guides.tsx+++ b/src/features/layers/gradient-guides.tsx@@ -153,7 +153,7 @@ function RadialGuides({stroke="none"data-gradient-handle="move"aria-label="Move radial gradient"- className="pointer-events-auto cursor-grab hover:fill-white/5"+ className="pointer-events-auto cursor-grab hover:fill-hover"/><circler="1"diff --git a/src/features/layers/layer-name.tsx b/src/features/layers/layer-name.tsxindex dbe1518..00f3935 100644--- a/src/features/layers/layer-name.tsx+++ b/src/features/layers/layer-name.tsx@@ -1,4 +1,4 @@-import { Tooltip } from "@roprgm/ui/tooltip";+import { Tooltip, TooltipContent, TooltipTrigger } from "@roprgm/ui/tooltip";import { type ComponentProps, useState } from "react";import { useDocument } from "@/components/editor/session";import type { Layer } from "@/core/document";@@ -23,7 +23,7 @@ export function LayerName({aria-label="Layer name"ref={(input) => input?.select()}defaultValue={layer.name}- className="min-w-0 flex-1 rounded border border-neutral-500 bg-neutral-900 px-1 text-neutral-100 outline-none"+ className="min-w-0 flex-1 rounded surface-sunken px-1 text-foreground outline-none"onKeyDown={(event) => {if (event.key === "Enter") {event.currentTarget.blur();@@ -50,22 +50,28 @@ export function LayerName({}// Only a name cut short needs its tooltip.return (- <Tooltip content={layer.name} disabled={!truncated}>- <button- {...dragHandle}- type="button"- aria-label={layer.name}- onClick={onSelect}- onDoubleClick={rename}- onPointerEnter={(event) =>- setTruncated(- event.currentTarget.scrollWidth > event.currentTarget.clientWidth,- )+ <Tooltip disabled={!truncated}>+ <TooltipTrigger+ render={+ <button+ {...dragHandle}+ type="button"+ aria-label={layer.name}+ onClick={onSelect}+ onDoubleClick={rename}+ onPointerEnter={(event) =>+ setTruncated(+ event.currentTarget.scrollWidth >+ event.currentTarget.clientWidth,+ )+ }+ className="min-w-0 flex-1 self-stretch truncate text-left touch-manipulation cursor-grab active:cursor-grabbing"+ >+ {layer.name}+ </button>}- className="min-w-0 flex-1 self-stretch truncate text-left touch-manipulation cursor-grab active:cursor-grabbing"- >- {layer.name}- </button>+ />+ <TooltipContent>{layer.name}</TooltipContent></Tooltip>);}diff --git a/src/features/layers/mask-options.tsx b/src/features/layers/mask-options.tsxindex 848462f..58a1827 100644--- a/src/features/layers/mask-options.tsx+++ b/src/features/layers/mask-options.tsx@@ -22,7 +22,7 @@ export function MaskOptions({ layer }: { layer: MaskLayer }) {{density !== "menu" && (<hraria-orientation="vertical"- className="h-4 w-px border-0 bg-white/15"+ className="h-4 w-px border-0 separator"/>)}{layer.mask.kind === "radial" && (@@ -47,6 +47,7 @@ export function MaskOptions({ layer }: { layer: MaskLayer }) {)}{child && (<Select+ raisedvariant="pill"aria-label="Mask operation"tooltip="Combine with the parent mask"diff --git a/src/features/layers/menu.tsx b/src/features/layers/menu.tsxindex b6cb0b9..5c50bf2 100644--- a/src/features/layers/menu.tsx+++ b/src/features/layers/menu.tsx@@ -1,5 +1,14 @@import { IconButton } from "@roprgm/ui/icon-button";-import { Menu, MenuItem, MenuSeparator, Submenu } from "@roprgm/ui/menu";+import {+ Menu,+ MenuContent,+ MenuItem,+ MenuSeparator,+ MenuTrigger,+ Submenu,+ SubmenuContent,+ SubmenuTrigger,+} from "@roprgm/ui/menu";import { useDocument, useScene } from "@/components/editor/session";import { Icon } from "@/components/icons/icon";import {@@ -60,17 +69,25 @@ function LayerActionItems({</MenuItem>{parent && <MenuItem onClick={moveOut}>Move out</MenuItem>}{containers.length > 0 && (- <Submenu label="Move into">- {containers.map((target) => (- <MenuItem- key={target.id}- onClick={() =>- moveLayer(document, layer.id, target.children.length, target.id)- }- >- {target.name}- </MenuItem>- ))}+ <Submenu>+ <SubmenuTrigger>Move into</SubmenuTrigger>+ <SubmenuContent>+ {containers.map((target) => (+ <MenuItem+ key={target.id}+ onClick={() =>+ moveLayer(+ document,+ layer.id,+ target.children.length,+ target.id,+ )+ }+ >+ {target.name}+ </MenuItem>+ ))}+ </SubmenuContent></Submenu>)}<MenuSeparator />@@ -99,18 +116,21 @@ function NestingItems({ layer }: { layer: MaskLayer }) {const document = useDocument();const tool = useMaskTool();return nestings.map(([operation, label]) => (- <Submenu key={operation} label={label}>- {shapes.map(([shape, name]) => (- <MenuItem- key={shape}- onClick={() => {- document.selectLayer(layer.id);- tool.add(layer.id, operation, shape);- }}- >- {name}- </MenuItem>- ))}+ <Submenu key={operation}>+ <SubmenuTrigger>{label}</SubmenuTrigger>+ <SubmenuContent>+ {shapes.map(([shape, name]) => (+ <MenuItem+ key={shape}+ onClick={() => {+ document.selectLayer(layer.id);+ tool.add(layer.id, operation, shape);+ }}+ >+ {name}+ </MenuItem>+ ))}+ </SubmenuContent></Submenu>));}@@ -120,24 +140,27 @@ export function LayerActions(props: {onSelect: (id: string) => void;}) {return (- <Menu- trigger={- <IconButton- label={`${props.layer.name} actions`}- size="icon"- className="pointer-coarse:size-10"- >- <Icon className="size-4">- <path- d="M5 12h.01M12 12h.01M19 12h.01"- strokeWidth="3"- strokeLinecap="round"- />- </Icon>- </IconButton>- }- >- <LayerActionItems {...props} />+ <Menu>+ <MenuTrigger+ render={+ <IconButton+ label={`${props.layer.name} actions`}+ size="icon"+ className="pointer-coarse:size-10"+ >+ <Icon className="size-4">+ <path+ d="M5 12h.01M12 12h.01M19 12h.01"+ strokeWidth="3"+ strokeLinecap="round"+ />+ </Icon>+ </IconButton>+ }+ />+ <MenuContent raised>+ <LayerActionItems {...props} />+ </MenuContent></Menu>);}diff --git a/src/features/layers/thumbnails.tsx b/src/features/layers/thumbnails.tsxindex b0bf017..09dde82 100644--- a/src/features/layers/thumbnails.tsx+++ b/src/features/layers/thumbnails.tsx@@ -1,4 +1,4 @@-import { Tooltip } from "@roprgm/ui/tooltip";+import { Tooltip, TooltipContent, TooltipTrigger } from "@roprgm/ui/tooltip";import { useEffect, useId, useRef, useState } from "react";import { useGpu } from "vgpu-react";import { CoverageThumbnail } from "@/components/editor/coverage-thumbnail";@@ -8,8 +8,7 @@ import type { MaskLayer } from "@/core/document";import { renderBitmap } from "@/core/renderer";import { MaskFill } from "./mask-fill";-const frame =- "size-8 shrink-0 rounded-sm border border-neutral-600 bg-neutral-950";+const frame = "size-8 shrink-0 rounded-sm border border-level-8 bg-level-1";/** A small original-image snapshot, rendered once when the source changes. */export function ImageThumbnail() {@@ -45,14 +44,19 @@ export function ImageThumbnail() {};}, [gpu, source]);return (- <Tooltip content={error ?? "Original image"}>- <canvas- ref={canvas}- width={64}- height={64}- aria-label="Original image thumbnail"- className={frame}+ <Tooltip>+ <TooltipTrigger+ render={+ <canvas+ ref={canvas}+ width={64}+ height={64}+ aria-label="Original image thumbnail"+ className={frame}+ />+ }/>+ <TooltipContent>{error ?? "Original image"}</TooltipContent></Tooltip>);}@@ -68,7 +72,7 @@ export function MaskThumbnail({ layer }: { layer: MaskLayer }) {<spanrole="img"aria-label="Empty brush thumbnail"- className={`grid place-items-center text-neutral-400 ${frame}`}+ className={`grid place-items-center text-muted ${frame}`}><Icon className="size-4"><path d="M10 14a3 3 0 0 1-3 3c-1.5 0-3-1-3-1s2-1 2-2.5c0-1.5 1-2.5 2.5-2.5M11 13l7-7a1.4 1.4 0 0 0-2-2l-7 7" />diff --git a/src/features/layers/toolbar.tsx b/src/features/layers/toolbar.tsxindex 05f7c01..9477742 100644--- a/src/features/layers/toolbar.tsx+++ b/src/features/layers/toolbar.tsx@@ -1,5 +1,6 @@import { IconButton } from "@roprgm/ui/icon-button";-import { Popover } from "@roprgm/ui/popover";+import { Popover, PopoverContent, PopoverTrigger } from "@roprgm/ui/popover";+import { Section } from "@roprgm/ui/section";import { Slider } from "@roprgm/ui/slider";import { type ReactNode, useLayoutEffect, useRef, useState } from "react";import { useStore } from "zustand";@@ -96,36 +97,39 @@ export function CanvasToolbar({ children }: { children?: ReactNode }) {// No wrapping, so running out of room overflows, which is what the steps above measure. A button or// group at either end nests its corners 4px in; a text label first, such as a slider's, needs 8px// more, and a slider last 6px more, since a compact slider's value pulls 4px past its cell.- className="absolute top-3 left-3 flex min-w-0 max-w-[calc(100%-1.5rem)] items-center gap-x-2.5 overflow-hidden whitespace-nowrap rounded-full bg-neutral-800/80 p-1 backdrop-blur-sm [&>:first-child:not(button,fieldset)]:ml-2 [&>:last-child:not(button,fieldset)]:mr-1.5"+ className="absolute top-3 left-3 flex min-w-0 max-w-[calc(100%-1.5rem)] items-center gap-x-2.5 overflow-hidden whitespace-nowrap rounded-full surface-panel bg-level-4/80 p-1 backdrop-blur-sm [&>:first-child:not(button,fieldset)]:ml-2 [&>:last-child:not(button,fieldset)]:mr-1.5"><Density value={step === 0 ? "full" : "compact"}>{inlineTool}{inlineLayer && <LayerOptions layer={layer} />}</Density>{(menuTool || menuLayer) && (- <Popover- trigger={- <IconButton- label="More options"- size="icon"- className="rounded-full"- >- <Icon className="size-4">- <path- d="M12 5h.01M12 12h.01M12 19h.01"- strokeWidth="3"- strokeLinecap="round"- />- </Icon>- </IconButton>- }- >- <Density value="menu">- <div className="flex w-56 flex-col gap-3">- {menuTool}- {menuLayer && <LayerOptions layer={layer} />}- </div>- </Density>+ <Popover>+ <PopoverTrigger+ render={+ <IconButton+ label="More options"+ size="icon"+ className="rounded-full"+ >+ <Icon className="size-4">+ <path+ d="M12 5h.01M12 12h.01M12 19h.01"+ strokeWidth="3"+ strokeLinecap="round"+ />+ </Icon>+ </IconButton>+ }+ />+ <PopoverContent raised className="w-63">+ <Density value="menu">+ <Section>+ {menuTool}+ {menuLayer && <LayerOptions layer={layer} />}+ </Section>+ </Density>+ </PopoverContent></Popover>)}</fieldset>diff --git a/src/features/tone-curves/graph.tsx b/src/features/tone-curves/graph.tsxindex 635750d..196e246 100644--- a/src/features/tone-curves/graph.tsx+++ b/src/features/tone-curves/graph.tsx@@ -189,6 +189,14 @@ export function Graph({ points, onChange }: GraphProps) {strokeDasharray="3 4"strokeOpacity="0.2"/>+ {/* A soft dark edge inside the box, over the histogram and guides and under the curve. */}+ <foreignObject+ width={width}+ height={height}+ className="pointer-events-none"+ >+ <div className="size-full rounded shadow-[inset_0_0_1px_1px_var(--color-edge)] shadow-edge/50" />+ </foreignObject><polylineclassName="drop-shadow-[0_1px_1px_rgb(0_0_0/0.25)]"fill="none"@@ -198,7 +206,7 @@ export function Graph({ points, onChange }: GraphProps) {/>{points.map((point, index) => (<circle- className="fill-neutral-800 stroke-neutral-200 data-[selected=true]:fill-neutral-100"+ className="fill-level-4 stroke-foreground data-[selected=true]:fill-foreground"cx={point.x * width}cy={(1 - point.y) * height}data-selected={selected === index}diff --git a/src/features/tone-curves/tone-curves.tsx b/src/features/tone-curves/tone-curves.tsxindex 3185aff..9729695 100644--- a/src/features/tone-curves/tone-curves.tsx+++ b/src/features/tone-curves/tone-curves.tsx@@ -14,7 +14,7 @@ export function ToneCurves({ points, onChange, children }: ToneCurvesProps) {return (<section aria-label="Curves" className="space-y-2.5"><div className="flex items-center justify-between">- <h2 className="text-neutral-400">Curves</h2>+ <h2 className="text-muted">Curves</h2><Buttonvariant="ghost"aria-label="Reset curve"@@ -25,7 +25,7 @@ export function ToneCurves({ points, onChange, children }: ToneCurvesProps) {</Button></div><div className="px-0.5">- <div className="relative aspect-square max-h-55 w-full rounded border border-black bg-neutral-900 shadow-sunken md:max-h-45">+ <div className="relative aspect-square max-h-55 w-full rounded bg-field md:max-h-45">{children}<Graph onChange={onChange} points={points} /></div>diff --git a/src/features/vignette/controls.tsx b/src/features/vignette/controls.tsxindex 1cfc487..f829fe7 100644--- a/src/features/vignette/controls.tsx+++ b/src/features/vignette/controls.tsx@@ -13,7 +13,7 @@ export function VignetteControls({}) {const document = useDocument();return (- <section className="flex flex-col gap-1.5 p-(--padding)">+ <section className="flex flex-col gap-1.5 p-3.5"><Sliderlabel="Intensity"value={vignette.intensity}diff --git a/src/features/white-balance/controls.tsx b/src/features/white-balance/controls.tsxindex 77b89d4..cd0fb76 100644--- a/src/features/white-balance/controls.tsx+++ b/src/features/white-balance/controls.tsx@@ -23,13 +23,13 @@ export function WhiteBalanceControls() {onChange={(temperature) => setWhiteBalance(document, { temperature })}/>{/* The slider's label row again, its text hidden, so As Shot follows the label without a row of its own. */}- <div className="pointer-events-none absolute inset-x-0 top-0 flex items-center gap-2 py-0.5">+ <div className="pointer-events-none absolute inset-x-0 top-0 z-20 flex items-center gap-2 py-0.5"><span aria-hidden className="invisible">Temperature (K)</span><buttontype="button"- className="pointer-events-auto cursor-pointer text-faint hover:text-foreground"+ className="pointer-events-auto cursor-pointer text-muted hover:text-foreground"onClick={() => setWhiteBalance(document)}>As Shotdiff --git a/src/index.css b/src/index.cssindex 31a77a3..55c5e86 100644--- a/src/index.css+++ b/src/index.css@@ -4,12 +4,8 @@@theme {--font-sans: "Geist Variable", system-ui, sans-serif;-}--/* The editor's panels, header, and rail. Controls inside mix their fills from it. */-@utility layer-panel {- --layer: var(--color-neutral-800);- background-color: var(--layer);+ /* Around and between the editor's panels, darker than the lines in a list. */+ --color-edge: oklch(0% 0 0);}/* `optional` never swaps after first paint, so the font can't cause layout shift. */@@ -36,9 +32,4 @@line-height: var(--text-xs--line-height);color: var(--color-foreground);}-- /* The page is a layer too, so controls on the canvas mix their fills from its color. */- :root {- --layer: var(--color-neutral-900);- }}diff --git a/src/main.tsx b/src/main.tsxindex 91c4583..bf69b7c 100644--- a/src/main.tsx+++ b/src/main.tsx@@ -25,11 +25,11 @@ class GpuBoundary extends Component<<main className="grid h-dvh place-content-center justify-items-center gap-3 p-6 text-center"><img alt="" className="w-16" height="64" src="/logo.svg" width="64" /><h1 className="text-2xl font-bold">OpenLight</h1>- <p className="max-w-md text-neutral-400">+ <p className="max-w-md text-muted">OpenLight needs WebGPU, which this browser does not provide. Open itin a recent Chrome, Edge, Safari, or Firefox.</p>- <p className="text-neutral-500">{String(this.state.error)}</p>+ <p className="text-muted">{String(this.state.error)}</p><TextLink href="https://github.com/roprgm/openlight">github.com/roprgm/openlight</TextLink>diff --git a/tests/color-mixer-editing.ts b/tests/color-mixer-editing.tsindex b342d44..3155fa9 100644--- a/tests/color-mixer-editing.ts+++ b/tests/color-mixer-editing.ts@@ -1,9 +1,12 @@-import type { Page } from "@playwright/test";+import type { Locator, Page } from "@playwright/test";import { expect, test } from "./fixtures";import { box, drag } from "./pointer";export async function colorMixerEditing(page: Page) {const state = () => page.evaluate(() => window.openlight.getState());+ // Base UI keeps a slider's range input inside its thumb, on the bar a person drags.+ const bar = (slider: Locator) =>+ slider.locator('xpath=ancestor::*[@data-slot="slider-track"]');await test.step("color mixer switches channels, groups vertical drags, exports selected colors and resets", async () => {await page.getByRole("button", { name: "Add effect", exact: true }).click();await page@@ -13,7 +16,7 @@ export async function colorMixerEditing(page: Page) {const hue = page.getByRole("slider", { name: "Blue hue", exact: true });await hue.scrollIntoViewIfNeeded();await expect(hue).toHaveAttribute("aria-orientation", "vertical");- const bounds = await box(hue);+ const bounds = await box(bar(hue));expect(bounds.height).toBeGreaterThan(bounds.width * 3);await hue.press("ArrowUp");await expect(hue).toHaveValue("1");@@ -32,7 +35,7 @@ export async function colorMixerEditing(page: Page) {name: "Blue saturation",exact: true,});- const track = await box(saturation);+ const track = await box(bar(saturation));await drag(page,[track.x + track.width / 2, track.y + track.height / 2],@@ -73,7 +76,7 @@ export async function colorMixerEditing(page: Page) {).toHaveValue("0");await page.getByRole("tab", { name: "Saturation", exact: true }).click();await expect(saturation).toHaveValue("-100");- await saturation.dblclick();+ await saturation.locator("..").dblclick();await expect(saturation).toHaveValue("0");await page.keyboard.press("ControlOrMeta+z");await expect(saturation).toHaveValue("-100");diff --git a/tests/editing.e2e.ts b/tests/editing.e2e.tsindex ac630e9..41ac43e 100644--- a/tests/editing.e2e.ts+++ b/tests/editing.e2e.ts@@ -143,8 +143,10 @@ test("edit a photo, inspect the preview and histograms, undo changes, and exportexpect((await state()).history.undoCount).toBe(1);await page.getByRole("button", { name: "Undo", exact: true }).click();await expect(exposure).toHaveValue("0");- const bounds = await exposure.boundingBox();- if (!bounds) throw new Error("Exposure slider is missing.");+ // Base UI keeps the range input inside the thumb, on the bar a person drags.+ const bounds = await box(+ exposure.locator('xpath=ancestor::*[@data-slot="slider-track"]'),+ );await drag(page,[bounds.x + bounds.width / 2, bounds.y + bounds.height / 2],@@ -159,7 +161,7 @@ test("edit a photo, inspect the preview and histograms, undo changes, and exportawait expect.poll(() => canvas.screenshot()).toEqual(original);await page.keyboard.press("ControlOrMeta+Shift+z");await expect.poll(() => canvas.screenshot()).not.toEqual(original);- await exposure.dblclick();+ await exposure.locator("..").dblclick();await expect(exposure).toHaveValue("0");await expect(output).toHaveAttribute("points", histogram ?? "");await expect.poll(() => canvas.screenshot()).toEqual(original);@@ -328,7 +330,7 @@ test("edit a photo, inspect the preview and histograms, undo changes, and exportawait field.press("Enter");expect((await readImage(page)).center).toEqual([128, 128, 128, 255]);expect((await readImage(page)).corner[0]).toBeGreaterThan(0);- await slider.dblclick();+ await slider.locator("..").dblclick();await expect(slider).toHaveValue("0");await expect(output).toHaveAttribute("points", histogram ?? "");});@@ -354,6 +356,7 @@ test("edit a photo, inspect the preview and histograms, undo changes, and exportawait amount.press("Enter");await page.getByRole("slider", { name: "Sharpening", exact: true })+ .locator("..").dblclick();await expect(amount).toHaveValue("0");});@@ -1071,19 +1074,33 @@ test("edit a photo, inspect the preview and histograms, undo changes, and exportexact: true,});await exposure.scrollIntoViewIfNeeded();+ // The bar around each track takes the touch.for (const slider of await mobile.getByRole("slider").all()) {- const bounds = await box(slider);+ const bounds = await box(+ slider+ .locator('xpath=ancestor::*[@data-slot="slider-track"]')+ .locator(".."),+ );expect(bounds.width).toBeGreaterThanOrEqual(44);expect(bounds.height).toBeGreaterThanOrEqual(44);- const track = await box(slider.locator(".."));+ const track = await box(+ slider.locator('xpath=ancestor::*[@data-slot="slider-track"]'),+ );expect(track.height).toBe(4);expectCentered(bounds, track);}- const bounds = await box(exposure);- await mobile.touchscreen.tap(bounds.x + bounds.width - 2, bounds.y + 16);+ const bounds = await box(+ exposure+ .locator('xpath=ancestor::*[@data-slot="slider-track"]')+ .locator(".."),+ );+ await mobile.touchscreen.tap(+ bounds.x + bounds.width - 2,+ bounds.y + bounds.height / 2,+ );await expect(exposure).toHaveValue("5");expect((await readImage(mobile)).center).toEqual([255, 255, 255, 255]);- await mobile.touchscreen.tap(bounds.x + 2, bounds.y + bounds.height - 3);+ await mobile.touchscreen.tap(bounds.x + 2, bounds.y + bounds.height / 2);await expect(exposure).toHaveValue("-5");const undo = mobile.getByRole("button", { name: "Undo", exact: true });await undo.tap();diff --git a/tests/heal.e2e.ts b/tests/heal.e2e.tsindex c8e14b3..4bc257e 100644--- a/tests/heal.e2e.ts+++ b/tests/heal.e2e.ts@@ -354,7 +354,7 @@ test("Healing paints patches, edits them, and undoes", async ({ page }) => {Math.floor(canvas.width / 2),Math.floor(canvas.height / 2),),- edge: sample(Math.floor(canvas.width / 2), 2),+ edge: sample(Math.floor(canvas.width / 2), 1),};},[...thumbnailBytes],