Free open-source image editor for the browser
Code formatting (#30)
Rodrigo Belfioref65f40cb152a
diff --git a/biome.json b/biome.jsonindex 40d33cd..3286a5a 100644--- a/biome.json+++ b/biome.json@@ -1,28 +1,32 @@{- "$schema": "./node_modules/@biomejs/biome/configuration_schema.json",- "files": {- "includes": ["**", "!dist", "!.cache", "!.claude"]- },- "css": {- "parser": {- "tailwindDirectives": true- }- },- "linter": {- "rules": {- "style": {- "noRestrictedImports": {- "level": "error",- "options": {- "patterns": [- {- "group": ["../**"],- "message": "Import from @/ instead of a parent directory."- }- ]- }- }- }- }- }+ "$schema": "./node_modules/@biomejs/biome/configuration_schema.json",+ "files": {+ "includes": ["**", "!dist", "!.cache", "!.claude"]+ },+ "formatter": {+ "indentStyle": "space",+ "indentWidth": 2+ },+ "css": {+ "parser": {+ "tailwindDirectives": true+ }+ },+ "linter": {+ "rules": {+ "style": {+ "noRestrictedImports": {+ "level": "error",+ "options": {+ "patterns": [+ {+ "group": ["../**"],+ "message": "Import from @/ instead of a parent directory."+ }+ ]+ }+ }+ }+ }+ }}diff --git a/docs/benchmarks/color-mixer.json b/docs/benchmarks/color-mixer.jsonindex cf3f027..fe01cc5 100644--- a/docs/benchmarks/color-mixer.json+++ b/docs/benchmarks/color-mixer.json@@ -1,736 +1,736 @@{- "method": "Same harness and Chromium/Vulkan/SwiftShader flags in each checkout. 8 warmups and 40 samples per workload. CPU preparation and completed-render latency exclude display/readback/encoding; isolated active GPU durations use timestamp-query. Software-adapter measurements are not hardware GPU estimates.",- "revisions": {- "base": "fccc4ca",- "before": "50f889f",- "after": "50f889f plus validation changes; src/ is byte-identical to before"- },- "sourceTreeBeforeAndAfter": "3ce5232a552a5e7beac11f8e4f01c2146c60a065",- "lineCounts": {- "scope": "JavaScript/TypeScript under src and tests; declarations excluded",- "before": {- "physical": 8623,- "nonblank": 8276- },- "after": {- "physical": 8868,- "nonblank": 8516- },- "productionDelta": 0,- "editingSessionPhysical": {- "before": 1095,- "after": 1013- },- "additionalConfigPhysical": 18,- "newHtmlPhysical": 9- },- "runs": {- "base": {- "baseline": {- "revision": "fccc4caba12acae556dd218cdccb6b3be3c6fa77",- "browser": "151.0.7922.34",- "platform": "linux",- "kernel": "7.0.0-22-generic",- "cpu": "AMD Ryzen 5 3600 6-Core Processor",- "logicalCpus": 12,- "flags": [- "--enable-unsafe-webgpu",- "--use-webgpu-adapter=swiftshader",- "--enable-features=Vulkan",- "--use-angle=vulkan",- "--use-vulkan=swiftshader",- "--disable-vulkan-surface"- ],- "workload": "baseline",- "size": [2400, 1600],- "warmup": 8,- "samples": 40,- "timestamps": true,- "adapter": {- "vendor": "google",- "architecture": "swiftshader",- "device": "",- "description": ""- },- "rendererSetupMs": 45.59999942779541,- "firstRenderMs": 315.80000019073486,- "rendering": {- "cpuEncodeMs": {- "samples": [- 0.20000076293945312, 0.10000038146972656, 0.19999980926513672,- 0.3000001907348633, 0.2999992370605469, 0.20000076293945312,- 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,- 0.19999980926513672, 0.19999980926513672, 0.09999942779541016,- 0.19999980926513672, 0.10000038146972656, 0.3000001907348633,- 0.19999980926513672, 0.19999980926513672, 0.10000038146972656,- 0.20000076293945312, 0.19999980926513672, 0.10000038146972656,- 0.20000076293945312, 0.19999980926513672, 0.3000001907348633,- 0.20000076293945312, 0.3000001907348633, 0.19999980926513672,- 0.3000001907348633, 0.19999980926513672, 0.20000076293945312,- 0.20000076293945312, 0.3000001907348633, 0.19999980926513672,- 0.19999980926513672, 0.19999980926513672, 0.19999980926513672,- 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,- 0.19999980926513672- ],- "median": 0.19999980926513672,- "p95": 0.3000001907348633- },- "completedMs": {- "samples": [- 244.20000076293945, 238.5, 243.19999980926514, 238.20000076293945,- 233.79999923706055, 244.5, 235.20000076293945, 237,- 243.89999961853027, 236.19999980926514, 243.5, 236.19999980926514,- 247.69999980926514, 232.10000038146973, 236.5, 234.5,- 234.19999980926514, 240.39999961853027, 242.70000076293945,- 231.0999994277954, 237.69999980926514, 237.70000076293945,- 232.79999923706055, 236.5, 234, 241.9000005722046,- 235.69999980926514, 244.5, 233.89999961853027, 239.5,- 232.60000038146973, 237.19999980926514, 236.4000005722046,- 232.69999980926514, 234.30000019073486, 234.69999980926514,- 235.89999961853027, 232, 238, 248.69999980926514- ],- "median": 236.5,- "p95": 244.5- },- "gpuMs": null,- "missingGpuSamples": null- },- "isolated": null,- "outputBytes": 0,- "imageSha256": "9440cf1efcde5d423d22ba1620c50c25db5a21412a28a319807f1b8140eea29a"- }- },- "before": {- "active": {- "revision": "50f889f6012223c1d9514417e826b460ad154569",- "browser": "151.0.7922.34",- "platform": "linux",- "kernel": "7.0.0-22-generic",- "cpu": "AMD Ryzen 5 3600 6-Core Processor",- "logicalCpus": 12,- "flags": [- "--enable-unsafe-webgpu",- "--use-webgpu-adapter=swiftshader",- "--enable-features=Vulkan",- "--use-angle=vulkan",- "--use-vulkan=swiftshader",- "--disable-vulkan-surface"- ],- "workload": "active",- "size": [2400, 1600],- "warmup": 8,- "samples": 40,- "timestamps": true,- "adapter": {- "vendor": "google",- "architecture": "swiftshader",- "device": "",- "description": ""- },- "rendererSetupMs": 45.5,- "firstRenderMs": 569.6000003814697,- "rendering": {- "cpuEncodeMs": {- "samples": [- 0.3000001907348633, 0.3000001907348633, 0.3000001907348633,- 0.19999980926513672, 0.2999992370605469, 0.19999980926513672,- 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,- 0.39999961853027344, 0.3000001907348633, 0.20000076293945312,- 0.20000076293945312, 0.20000076293945312, 0.3000001907348633,- 0.20000076293945312, 0.3000001907348633, 0.3000001907348633,- 0.19999980926513672, 0.19999980926513672, 0.19999980926513672,- 0.19999980926513672, 0.3000001907348633, 0.19999980926513672,- 0.19999980926513672, 0.20000076293945312, 0.3000001907348633,- 0.2999992370605469, 0.19999980926513672, 0.19999980926513672,- 0.2999992370605469, 0.19999980926513672, 0.3000001907348633,- 0.20000076293945312, 0.19999980926513672, 0.3000001907348633,- 0.2999992370605469, 0.19999980926513672, 0.19999980926513672,- 0.19999980926513672- ],- "median": 0.20000076293945312,- "p95": 0.3000001907348633- },- "completedMs": {- "samples": [- 440, 440.0999994277954, 446.70000076293945, 449.5,- 451.19999980926514, 438, 439.80000019073486, 443.5999994277954,- 444.4000005722046, 441.69999980926514, 449, 440, 433.5,- 450.6000003814697, 460.8999996185303, 437.9000005722046,- 439.8999996185303, 445.5, 443.80000019073486, 440.5999994277954,- 448.4000005722046, 456.0999994277954, 447.9000005722046,- 457.5999994277954, 460.69999980926514, 451.1000003814697,- 452.6000003814697, 454.0999994277954, 455, 449.9000005722046,- 454.79999923706055, 458.5, 453.8999996185303, 457.20000076293945,- 458.0999994277954, 455.4000005722046, 455, 458.19999980926514,- 458.30000019073486, 457.6000003814697- ],- "median": 450.25000047683716,- "p95": 458.5- },- "gpuMs": null,- "missingGpuSamples": null- },- "isolated": {- "cpuEncodeMs": {- "samples": [- 0.3000001907348633, 0.39999961853027344, 0.19999980926513672,- 0.20000076293945312, 0.19999980926513672, 0.19999980926513672,- 0.20000076293945312, 0.10000038146972656, 0.20000076293945312,- 0.19999980926513672, 0.19999980926513672, 0.09999942779541016,- 0.2999992370605469, 0.19999980926513672, 0.3000001907348633,- 0.09999942779541016, 0.3000001907348633, 0.19999980926513672,- 0.19999980926513672, 0.20000076293945312, 0.19999980926513672,- 0.19999980926513672, 0.19999980926513672, 0.19999980926513672,- 0.19999980926513672, 0.3000001907348633, 0.10000038146972656,- 0.19999980926513672, 0.3000001907348633, 0.19999980926513672,- 0.3000001907348633, 0.10000038146972656, 0.09999942779541016,- 0.20000076293945312, 0.19999980926513672, 0.3000001907348633,- 0.10000038146972656, 0.3000001907348633, 0.3000001907348633,- 0.3000001907348633- ],- "median": 0.19999980926513672,- "p95": 0.3000001907348633- },- "completedMs": {- "samples": [- 209.69999980926514, 208.30000019073486, 208.5999994277954,- 204.10000038146973, 203.19999980926514, 198.69999980926514,- 201.9000005722046, 205, 202.9000005722046, 199.89999961853027,- 204.10000038146973, 209.30000019073486, 199.5, 203.19999980926514,- 202, 199.39999961853027, 209.9000005722046, 200.5,- 212.69999980926514, 201.4000005722046, 213.5, 202.5, 212.5,- 206.69999980926514, 208, 204.89999961853027, 201.80000019073486,- 213.60000038146973, 204.39999961853027, 209.69999980926514,- 208.80000019073486, 205.9000005722046, 199.29999923706055,- 205.60000038146973, 205.89999961853027, 203.10000038146973,- 213.39999961853027, 210.30000019073486, 213.60000038146973,- 209.30000019073486- ],- "median": 205.30000019073486,- "p95": 213.5- },- "gpuMs": {- "samples": [- 208.752435, 207.079435, 206.96791399999998, 203.08783, 201.949274,- 197.37588699999998, 200.24505399999998, 204.306288, 201.933333,- 199.171177, 203.226101, 208.0626, 198.255302, 202.21149499999999,- 200.33637399999998, 198.825085, 208.54652299999998, 199.63619,- 212.174735, 200.570756, 211.997515, 201.668992, 211.147349,- 205.70174699999998, 206.512621, 203.210782, 201.141369,- 212.073904, 202.93762999999998, 208.65427499999998,- 207.04537399999998, 205.292924, 197.68402799999998,- 204.07582599999998, 204.961572, 201.95278399999998, 211.906884,- 209.10155699999999, 212.35833599999998, 208.536294- ],- "median": 204.191057,- "p95": 212.073904- },- "missingGpuSamples": 0- },- "outputBytes": 30720000,- "imageSha256": "c4633367c9482c4939135ba829ad1bee4d8235023f4e6ae9c32199b768ceed3f"- },- "baseline": {- "revision": "50f889f6012223c1d9514417e826b460ad154569",- "browser": "151.0.7922.34",- "platform": "linux",- "kernel": "7.0.0-22-generic",- "cpu": "AMD Ryzen 5 3600 6-Core Processor",- "logicalCpus": 12,- "flags": [- "--enable-unsafe-webgpu",- "--use-webgpu-adapter=swiftshader",- "--enable-features=Vulkan",- "--use-angle=vulkan",- "--use-vulkan=swiftshader",- "--disable-vulkan-surface"- ],- "workload": "baseline",- "size": [2400, 1600],- "warmup": 8,- "samples": 40,- "timestamps": true,- "adapter": {- "vendor": "google",- "architecture": "swiftshader",- "device": "",- "description": ""- },- "rendererSetupMs": 44.80000019073486,- "firstRenderMs": 315.4000005722046,- "rendering": {- "cpuEncodeMs": {- "samples": [- 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,- 0.19999980926513672, 0.20000076293945312, 0.20000076293945312,- 0.20000076293945312, 0.10000038146972656, 0.19999980926513672,- 0.10000038146972656, 0.19999980926513672, 0.19999980926513672,- 0.3000001907348633, 0.19999980926513672, 0.3000001907348633,- 0.20000076293945312, 0.3000001907348633, 0.19999980926513672,- 0.10000038146972656, 0.19999980926513672, 0.19999980926513672,- 0.10000038146972656, 0.19999980926513672, 0.2999992370605469,- 0.19999980926513672, 0.2999992370605469, 0.20000076293945312,- 0.19999980926513672, 0.3000001907348633, 0.19999980926513672,- 0.10000038146972656, 0.20000076293945312, 0.2999992370605469,- 0.10000038146972656, 0.3000001907348633, 0.19999980926513672,- 0.20000076293945312, 0.20000076293945312, 0.3000001907348633,- 0.3000001907348633- ],- "median": 0.19999980926513672,- "p95": 0.3000001907348633- },- "completedMs": {- "samples": [- 243, 241.80000019073486, 236.39999961853027, 231.5999994277954,- 237, 246, 240.5, 232.80000019073486, 241, 238.80000019073486,- 232.9000005722046, 229.79999923706055, 243.10000038146973, 236,- 230.89999961853027, 235, 229.80000019073486, 242.80000019073486,- 231.60000038146973, 237, 236.0999994277954, 237.9000005722046,- 249.5, 244.19999980926514, 242.80000019073486, 242.79999923706055,- 235.60000038146973, 241.69999980926514, 235, 240.69999980926514,- 238, 250.70000076293945, 240.29999923706055, 237.80000019073486,- 236.80000019073486, 232.89999961853027, 234, 236.30000019073486,- 234.80000019073486, 241.39999961853027- ],- "median": 237.40000009536743,- "p95": 246- },- "gpuMs": null,- "missingGpuSamples": null- },- "isolated": null,- "outputBytes": 0,- "imageSha256": "9440cf1efcde5d423d22ba1620c50c25db5a21412a28a319807f1b8140eea29a"- },- "neutral": {- "revision": "50f889f6012223c1d9514417e826b460ad154569",- "browser": "151.0.7922.34",- "platform": "linux",- "kernel": "7.0.0-22-generic",- "cpu": "AMD Ryzen 5 3600 6-Core Processor",- "logicalCpus": 12,- "flags": [- "--enable-unsafe-webgpu",- "--use-webgpu-adapter=swiftshader",- "--enable-features=Vulkan",- "--use-angle=vulkan",- "--use-vulkan=swiftshader",- "--disable-vulkan-surface"- ],- "workload": "neutral",- "size": [2400, 1600],- "warmup": 8,- "samples": 40,- "timestamps": true,- "adapter": {- "vendor": "google",- "architecture": "swiftshader",- "device": "",- "description": ""- },- "rendererSetupMs": 52,- "firstRenderMs": 344,- "rendering": {- "cpuEncodeMs": {- "samples": [- 0.3000001907348633, 0.19999980926513672, 0.3000001907348633,- 0.19999980926513672, 0.20000076293945312, 0.19999980926513672,- 0.19999980926513672, 0.39999961853027344, 0.3000001907348633,- 0.19999980926513672, 0.19999980926513672, 0.10000038146972656,- 0.19999980926513672, 0.19999980926513672, 0.20000076293945312,- 0.19999980926513672, 0.19999980926513672, 0.09999942779541016,- 0.19999980926513672, 0.20000076293945312, 0.19999980926513672,- 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,- 0.19999980926513672, 0.19999980926513672, 0.09999942779541016,- 0.09999942779541016, 0.19999980926513672, 0.2999992370605469,- 0.19999980926513672, 0.2999992370605469, 0.10000038146972656,- 0.19999980926513672, 0.19999980926513672, 0.20000076293945312,- 0.2999992370605469, 0.19999980926513672, 0.19999980926513672,- 0.19999980926513672- ],- "median": 0.19999980926513672,- "p95": 0.3000001907348633- },- "completedMs": {- "samples": [- 244.20000076293945, 249, 238.5, 241.19999980926514,- 241.20000076293945, 250.19999980926514, 259.69999980926514,- 257.19999980926514, 241.80000019073486, 253.69999980926514,- 240.60000038146973, 238.9000005722046, 239.5, 241.0999994277954,- 244.10000038146973, 246.19999980926514, 246.30000019073486,- 257.69999980926514, 248.0999994277954, 243.70000076293945,- 242.0999994277954, 238.60000038146973, 242.19999980926514,- 241.89999961853027, 237.80000019073486, 245.5, 245.69999980926514,- 254.5999994277954, 243.4000005722046, 249.19999980926514,- 243.80000019073486, 246.0999994277954, 252.10000038146973, 247,- 248.0999994277954, 237.70000076293945, 246.19999980926514,- 242.89999961853027, 248.10000038146973, 242.69999980926514- ],- "median": 244.1500005722046,- "p95": 257.19999980926514- },- "gpuMs": null,- "missingGpuSamples": null- },- "isolated": {- "cpuEncodeMs": {- "samples": [- 0.09999942779541016, 0.10000038146972656, 0, 0, 0,- 0.09999942779541016, 0, 0, 0, 0, 0, 0.10000038146972656, 0, 0, 0,- 0, 0, 0.10000038146972656, 0, 0, 0, 0, 0, 0, 0, 0,- 0.10000038146972656, 0.10000038146972656, 0, 0, 0, 0,- 0.09999942779541016, 0, 0, 0.10000038146972656, 0,- 0.10000038146972656, 0.09999942779541016, 0- ],- "median": 0,- "p95": 0.10000038146972656- },- "completedMs": {- "samples": [- 0.09999942779541016, 0.20000076293945312, 0, 0.19999980926513672,- 0, 0.19999980926513672, 0.10000038146972656, 0,- 0.19999980926513672, 0.09999942779541016, 0, 0.20000076293945312,- 0, 0.19999980926513672, 0, 0.19999980926513672, 0,- 0.10000038146972656, 0.09999942779541016, 0.10000038146972656,- 0.09999942779541016, 0.10000038146972656, 0.10000038146972656,- 0.09999942779541016, 0.10000038146972656, 0.09999942779541016,- 0.10000038146972656, 0.19999980926513672, 0.10000038146972656,- 0.10000038146972656, 0.10000038146972656, 0, 0.19999980926513672,- 0.09999942779541016, 0.10000038146972656, 0.10000038146972656,- 0.09999942779541016, 0.10000038146972656, 0.19999980926513672,- 0.10000038146972656- ],- "median": 0.10000038146972656,- "p95": 0.19999980926513672- },- "gpuMs": null,- "missingGpuSamples": null- },- "outputBytes": 0,- "imageSha256": "9440cf1efcde5d423d22ba1620c50c25db5a21412a28a319807f1b8140eea29a"- }- },- "after": {- "active": {- "revision": "50f889f6012223c1d9514417e826b460ad154569",- "browser": "151.0.7922.34",- "platform": "linux",- "kernel": "7.0.0-22-generic",- "cpu": "AMD Ryzen 5 3600 6-Core Processor",- "logicalCpus": 12,- "flags": [- "--enable-unsafe-webgpu",- "--use-webgpu-adapter=swiftshader",- "--enable-features=Vulkan",- "--use-angle=vulkan",- "--use-vulkan=swiftshader",- "--disable-vulkan-surface"- ],- "workload": "active",- "size": [2400, 1600],- "warmup": 8,- "samples": 40,- "timestamps": true,- "adapter": {- "vendor": "google",- "architecture": "swiftshader",- "device": "",- "description": ""- },- "rendererSetupMs": 44.59999942779541,- "firstRenderMs": 565,- "rendering": {- "cpuEncodeMs": {- "samples": [- 0.3000001907348633, 0.19999980926513672, 0.3000001907348633,- 0.09999942779541016, 0.3000001907348633, 0.19999980926513672,- 0.19999980926513672, 0.3000001907348633, 0.3000001907348633,- 0.3000001907348633, 0.19999980926513672, 0.3000001907348633,- 0.20000076293945312, 0.3000001907348633, 0.19999980926513672,- 0.3000001907348633, 0.3000001907348633, 0.3000001907348633,- 0.3000001907348633, 0.3000001907348633, 0.3000001907348633,- 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,- 0.19999980926513672, 0.3000001907348633, 0.2999992370605469,- 0.3000001907348633, 0.20000076293945312, 0.3000001907348633,- 0.3000001907348633, 0.19999980926513672, 0.2999992370605469,- 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,- 0.19999980926513672, 0.3000001907348633, 0.19999980926513672,- 0.39999961853027344- ],- "median": 0.3000001907348633,- "p95": 0.3000001907348633- },- "completedMs": {- "samples": [- 455.80000019073486, 449.5, 441.5, 437.79999923706055,- 445.20000076293945, 444.3999996185303, 449.69999980926514,- 443.1000003814697, 440.5, 443.9000005722046, 442.19999980926514,- 449.8999996185303, 440.80000019073486, 445.1000003814697,- 445.5999994277954, 457.19999980926514, 460.5, 452.5,- 464.80000019073486, 450, 439.19999980926514, 447.4000005722046,- 434.0999994277954, 435.9000005722046, 448.1000003814697,- 438.30000019073486, 460.79999923706055, 437, 441.30000019073486,- 439.5, 441.5, 444.4000005722046, 459.19999980926514,- 455.8999996185303, 451.69999980926514, 455.6000003814697,- 445.19999980926514, 456.30000019073486, 452.8999996185303,- 452.1000003814697- ],- "median": 445.40000009536743,- "p95": 460.5- },- "gpuMs": null,- "missingGpuSamples": null- },- "isolated": {- "cpuEncodeMs": {- "samples": [- 0.3000001907348633, 0.3000001907348633, 0.3000001907348633,- 0.19999980926513672, 0.10000038146972656, 0.19999980926513672,- 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,- 0.2999992370605469, 0.19999980926513672, 0.3000001907348633,- 0.19999980926513672, 0.3000001907348633, 0.19999980926513672,- 0.09999942779541016, 0.19999980926513672, 0.3000001907348633,- 0.20000076293945312, 0.3000001907348633, 0.19999980926513672,- 0.3000001907348633, 0.3000001907348633, 0.10000038146972656,- 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,- 0.20000076293945312, 0.19999980926513672, 0.10000038146972656,- 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,- 0.20000076293945312, 0.3000001907348633, 0.20000076293945312,- 0.3000001907348633, 0.3000001907348633, 0.19999980926513672,- 0.19999980926513672- ],- "median": 0.20000028610229492,- "p95": 0.3000001907348633- },- "completedMs": {- "samples": [- 212.30000019073486, 208.4000005722046, 210.89999961853027,- 208.19999980926514, 209.20000076293945, 212.39999961853027,- 208.30000019073486, 208.89999961853027, 208.80000019073486,- 208.0999994277954, 206.80000019073486, 209.19999980926514,- 208.10000038146973, 211.80000019073486, 200.0999994277954,- 198.19999980926514, 198.89999961853027, 200.5, 203,- 206.20000076293945, 201.79999923706055, 205.9000005722046,- 208.5999994277954, 206.5, 221.30000019073486, 207.89999961853027,- 210, 203.4000005722046, 205.80000019073486, 202.10000038146973,- 210.5, 214.5, 203.0999994277954, 205.10000038146973,- 207.39999961853027, 203.9000005722046, 217.5999994277954,- 202.9000005722046, 201.69999980926514, 208.69999980926514- ],- "median": 207.99999952316284,- "p95": 214.5- },- "gpuMs": {- "samples": [- 211.35441, 207.26082499999998, 210.036193, 206.62772199999998,- 208.268992, 211.02247799999998, 206.897754, 207.99319, 207.685598,- 206.964214, 205.671876, 208.337422, 207.33130599999998,- 210.237904, 199.270838, 196.73511299999998, 197.87704, 199.467618,- 202.023484, 204.95017199999998, 201.25691, 204.877752, 207.670698,- 205.355844, 219.834251, 207.134095, 208.732485, 202.298646,- 204.27480799999998, 200.714776, 209.262287, 213.00317099999998,- 202.009405, 204.222567, 206.14659999999998, 202.98926,- 216.07173799999998, 201.488991, 200.262373, 207.93025- ],- "median": 206.76273799999998,- "p95": 213.00317099999998- },- "missingGpuSamples": 0- },- "outputBytes": 30720000,- "imageSha256": "c4633367c9482c4939135ba829ad1bee4d8235023f4e6ae9c32199b768ceed3f"- },- "baseline": {- "revision": "50f889f6012223c1d9514417e826b460ad154569",- "browser": "151.0.7922.34",- "platform": "linux",- "kernel": "7.0.0-22-generic",- "cpu": "AMD Ryzen 5 3600 6-Core Processor",- "logicalCpus": 12,- "flags": [- "--enable-unsafe-webgpu",- "--use-webgpu-adapter=swiftshader",- "--enable-features=Vulkan",- "--use-angle=vulkan",- "--use-vulkan=swiftshader",- "--disable-vulkan-surface"- ],- "workload": "baseline",- "size": [2400, 1600],- "warmup": 8,- "samples": 40,- "timestamps": true,- "adapter": {- "vendor": "google",- "architecture": "swiftshader",- "device": "",- "description": ""- },- "rendererSetupMs": 43.89999961853027,- "firstRenderMs": 315.1000003814697,- "rendering": {- "cpuEncodeMs": {- "samples": [- 0.19999980926513672, 0.19999980926513672, 0.19999980926513672,- 0.19999980926513672, 0.3000001907348633, 0.3000001907348633,- 0.19999980926513672, 0.3000001907348633, 0.19999980926513672,- 0.20000076293945312, 0.20000076293945312, 0.3000001907348633,- 0.19999980926513672, 0.19999980926513672, 0.19999980926513672,- 0.10000038146972656, 0.09999942779541016, 0.19999980926513672,- 0.19999980926513672, 0.19999980926513672, 0.20000076293945312,- 0.10000038146972656, 0.20000076293945312, 0.20000076293945312,- 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,- 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,- 0.09999942779541016, 0.19999980926513672, 0.10000038146972656,- 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,- 0.19999980926513672, 0.3000001907348633, 0.3000001907348633,- 0.3000001907348633- ],- "median": 0.19999980926513672,- "p95": 0.3000001907348633- },- "completedMs": {- "samples": [- 242.89999961853027, 239.60000038146973, 248.10000038146973,- 239.89999961853027, 243.5, 244.80000019073486, 239.19999980926514,- 237.5, 240.69999980926514, 241.5, 238.9000005722046,- 234.0999994277954, 236.30000019073486, 238.89999961853027,- 232.69999980926514, 235.60000038146973, 241.5, 239.39999961853027,- 243, 238.60000038146973, 243.20000076293945, 244.19999980926514,- 241, 241.80000019073486, 245.30000019073486, 240.19999980926514,- 238, 234.9000005722046, 231.79999923706055, 234.30000019073486,- 243.5, 235.19999980926514, 236.69999980926514, 234.5,- 238.30000019073486, 241, 238.39999961853027, 238.5,- 238.80000019073486, 237.5- ],- "median": 239.05000019073486,- "p95": 244.80000019073486- },- "gpuMs": null,- "missingGpuSamples": null- },- "isolated": null,- "outputBytes": 0,- "imageSha256": "9440cf1efcde5d423d22ba1620c50c25db5a21412a28a319807f1b8140eea29a"- },- "neutral": {- "revision": "50f889f6012223c1d9514417e826b460ad154569",- "browser": "151.0.7922.34",- "platform": "linux",- "kernel": "7.0.0-22-generic",- "cpu": "AMD Ryzen 5 3600 6-Core Processor",- "logicalCpus": 12,- "flags": [- "--enable-unsafe-webgpu",- "--use-webgpu-adapter=swiftshader",- "--enable-features=Vulkan",- "--use-angle=vulkan",- "--use-vulkan=swiftshader",- "--disable-vulkan-surface"- ],- "workload": "neutral",- "size": [2400, 1600],- "warmup": 8,- "samples": 40,- "timestamps": true,- "adapter": {- "vendor": "google",- "architecture": "swiftshader",- "device": "",- "description": ""- },- "rendererSetupMs": 47.59999942779541,- "firstRenderMs": 315.20000076293945,- "rendering": {- "cpuEncodeMs": {- "samples": [- 0.19999980926513672, 0.19999980926513672, 0.2999992370605469,- 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,- 0.20000076293945312, 0.19999980926513672, 0.19999980926513672,- 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,- 0.20000076293945312, 0.19999980926513672, 0.10000038146972656,- 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,- 0.10000038146972656, 0.09999942779541016, 0.09999942779541016,- 0.2999992370605469, 0.3000001907348633, 0.09999942779541016,- 0.19999980926513672, 0.3000001907348633, 0.3000001907348633,- 0.19999980926513672, 0.19999980926513672, 0.19999980926513672,- 0.3000001907348633, 0.3000001907348633, 0.19999980926513672,- 0.3000001907348633, 0.3000001907348633, 0.19999980926513672,- 0.2999992370605469, 0.3000001907348633, 0.19999980926513672,- 0.3000001907348633- ],- "median": 0.19999980926513672,- "p95": 0.3000001907348633- },- "completedMs": {- "samples": [- 246.30000019073486, 244.30000019073486, 241.69999980926514,- 243.30000019073486, 237.39999961853027, 248.39999961853027,- 244.80000019073486, 244.19999980926514, 237.80000019073486,- 243.30000019073486, 237.69999980926514, 231.5, 246.4000005722046,- 241.0999994277954, 243.4000005722046, 241.19999980926514,- 246.30000019073486, 235.10000038146973, 233.10000038146973,- 235.39999961853027, 234, 237.69999980926514, 244.19999980926514,- 246.0999994277954, 239.5, 243.0999994277954, 233.9000005722046,- 232.69999980926514, 236.0999994277954, 242.60000038146973,- 234.0999994277954, 233.9000005722046, 234.19999980926514,- 231.80000019073486, 235.19999980926514, 233.60000038146973,- 234.5999994277954, 230.9000005722046, 236.89999961853027,- 240.60000038146973- ],- "median": 237.75,- "p95": 246.30000019073486- },- "gpuMs": null,- "missingGpuSamples": null- },- "isolated": {- "cpuEncodeMs": {- "samples": [- 0.10000038146972656, 0, 0, 0, 0.09999942779541016, 0, 0, 0,- 0.10000038146972656, 0.09999942779541016, 0, 0, 0, 0, 0, 0, 0, 0,- 0, 0, 0.09999942779541016, 0, 0, 0, 0, 0, 0, 0, 0, 0,- 0.10000038146972656, 0.09999942779541016, 0, 0, 0, 0,- 0.09999942779541016, 0, 0, 0- ],- "median": 0,- "p95": 0.10000038146972656- },- "completedMs": {- "samples": [- 0.10000038146972656, 0.19999980926513672, 0, 0.10000038146972656,- 0.09999942779541016, 0.20000076293945312, 0.09999942779541016, 0,- 0.10000038146972656, 0.09999942779541016, 0.10000038146972656, 0,- 0.09999942779541016, 0.10000038146972656, 0.09999942779541016,- 0.10000038146972656, 0, 0.19999980926513672, 0, 0,- 0.09999942779541016, 0, 0.10000038146972656, 0.09999942779541016,- 0.10000038146972656, 0.09999942779541016, 0.10000038146972656,- 0.10000038146972656, 0.09999942779541016, 0, 0.10000038146972656,- 0.09999942779541016, 0.10000038146972656, 0.10000038146972656,- 0.19999980926513672, 0, 0.09999942779541016, 0.10000038146972656,- 0.10000038146972656, 0.09999942779541016- ],- "median": 0.09999942779541016,- "p95": 0.19999980926513672- },- "gpuMs": null,- "missingGpuSamples": null- },- "outputBytes": 0,- "imageSha256": "9440cf1efcde5d423d22ba1620c50c25db5a21412a28a319807f1b8140eea29a"- }- }- },- "pixelTestDuration": {- "before": {- "milliseconds": [2745, 2733, 2788, 2687, 2783],- "median": 2745,- "runs": 5- },- "after": {- "milliseconds": [1739, 1775, 1757, 1744, 1711],- "median": 1744,- "runs": 5- }- }+ "method": "Same harness and Chromium/Vulkan/SwiftShader flags in each checkout. 8 warmups and 40 samples per workload. CPU preparation and completed-render latency exclude display/readback/encoding; isolated active GPU durations use timestamp-query. Software-adapter measurements are not hardware GPU estimates.",+ "revisions": {+ "base": "fccc4ca",+ "before": "50f889f",+ "after": "50f889f plus validation changes; src/ is byte-identical to before"+ },+ "sourceTreeBeforeAndAfter": "3ce5232a552a5e7beac11f8e4f01c2146c60a065",+ "lineCounts": {+ "scope": "JavaScript/TypeScript under src and tests; declarations excluded",+ "before": {+ "physical": 8623,+ "nonblank": 8276+ },+ "after": {+ "physical": 8868,+ "nonblank": 8516+ },+ "productionDelta": 0,+ "editingSessionPhysical": {+ "before": 1095,+ "after": 1013+ },+ "additionalConfigPhysical": 18,+ "newHtmlPhysical": 9+ },+ "runs": {+ "base": {+ "baseline": {+ "revision": "fccc4caba12acae556dd218cdccb6b3be3c6fa77",+ "browser": "151.0.7922.34",+ "platform": "linux",+ "kernel": "7.0.0-22-generic",+ "cpu": "AMD Ryzen 5 3600 6-Core Processor",+ "logicalCpus": 12,+ "flags": [+ "--enable-unsafe-webgpu",+ "--use-webgpu-adapter=swiftshader",+ "--enable-features=Vulkan",+ "--use-angle=vulkan",+ "--use-vulkan=swiftshader",+ "--disable-vulkan-surface"+ ],+ "workload": "baseline",+ "size": [2400, 1600],+ "warmup": 8,+ "samples": 40,+ "timestamps": true,+ "adapter": {+ "vendor": "google",+ "architecture": "swiftshader",+ "device": "",+ "description": ""+ },+ "rendererSetupMs": 45.59999942779541,+ "firstRenderMs": 315.80000019073486,+ "rendering": {+ "cpuEncodeMs": {+ "samples": [+ 0.20000076293945312, 0.10000038146972656, 0.19999980926513672,+ 0.3000001907348633, 0.2999992370605469, 0.20000076293945312,+ 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672, 0.19999980926513672, 0.09999942779541016,+ 0.19999980926513672, 0.10000038146972656, 0.3000001907348633,+ 0.19999980926513672, 0.19999980926513672, 0.10000038146972656,+ 0.20000076293945312, 0.19999980926513672, 0.10000038146972656,+ 0.20000076293945312, 0.19999980926513672, 0.3000001907348633,+ 0.20000076293945312, 0.3000001907348633, 0.19999980926513672,+ 0.3000001907348633, 0.19999980926513672, 0.20000076293945312,+ 0.20000076293945312, 0.3000001907348633, 0.19999980926513672,+ 0.19999980926513672, 0.19999980926513672, 0.19999980926513672,+ 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672+ ],+ "median": 0.19999980926513672,+ "p95": 0.3000001907348633+ },+ "completedMs": {+ "samples": [+ 244.20000076293945, 238.5, 243.19999980926514, 238.20000076293945,+ 233.79999923706055, 244.5, 235.20000076293945, 237,+ 243.89999961853027, 236.19999980926514, 243.5, 236.19999980926514,+ 247.69999980926514, 232.10000038146973, 236.5, 234.5,+ 234.19999980926514, 240.39999961853027, 242.70000076293945,+ 231.0999994277954, 237.69999980926514, 237.70000076293945,+ 232.79999923706055, 236.5, 234, 241.9000005722046,+ 235.69999980926514, 244.5, 233.89999961853027, 239.5,+ 232.60000038146973, 237.19999980926514, 236.4000005722046,+ 232.69999980926514, 234.30000019073486, 234.69999980926514,+ 235.89999961853027, 232, 238, 248.69999980926514+ ],+ "median": 236.5,+ "p95": 244.5+ },+ "gpuMs": null,+ "missingGpuSamples": null+ },+ "isolated": null,+ "outputBytes": 0,+ "imageSha256": "9440cf1efcde5d423d22ba1620c50c25db5a21412a28a319807f1b8140eea29a"+ }+ },+ "before": {+ "active": {+ "revision": "50f889f6012223c1d9514417e826b460ad154569",+ "browser": "151.0.7922.34",+ "platform": "linux",+ "kernel": "7.0.0-22-generic",+ "cpu": "AMD Ryzen 5 3600 6-Core Processor",+ "logicalCpus": 12,+ "flags": [+ "--enable-unsafe-webgpu",+ "--use-webgpu-adapter=swiftshader",+ "--enable-features=Vulkan",+ "--use-angle=vulkan",+ "--use-vulkan=swiftshader",+ "--disable-vulkan-surface"+ ],+ "workload": "active",+ "size": [2400, 1600],+ "warmup": 8,+ "samples": 40,+ "timestamps": true,+ "adapter": {+ "vendor": "google",+ "architecture": "swiftshader",+ "device": "",+ "description": ""+ },+ "rendererSetupMs": 45.5,+ "firstRenderMs": 569.6000003814697,+ "rendering": {+ "cpuEncodeMs": {+ "samples": [+ 0.3000001907348633, 0.3000001907348633, 0.3000001907348633,+ 0.19999980926513672, 0.2999992370605469, 0.19999980926513672,+ 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,+ 0.39999961853027344, 0.3000001907348633, 0.20000076293945312,+ 0.20000076293945312, 0.20000076293945312, 0.3000001907348633,+ 0.20000076293945312, 0.3000001907348633, 0.3000001907348633,+ 0.19999980926513672, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672, 0.3000001907348633, 0.19999980926513672,+ 0.19999980926513672, 0.20000076293945312, 0.3000001907348633,+ 0.2999992370605469, 0.19999980926513672, 0.19999980926513672,+ 0.2999992370605469, 0.19999980926513672, 0.3000001907348633,+ 0.20000076293945312, 0.19999980926513672, 0.3000001907348633,+ 0.2999992370605469, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672+ ],+ "median": 0.20000076293945312,+ "p95": 0.3000001907348633+ },+ "completedMs": {+ "samples": [+ 440, 440.0999994277954, 446.70000076293945, 449.5,+ 451.19999980926514, 438, 439.80000019073486, 443.5999994277954,+ 444.4000005722046, 441.69999980926514, 449, 440, 433.5,+ 450.6000003814697, 460.8999996185303, 437.9000005722046,+ 439.8999996185303, 445.5, 443.80000019073486, 440.5999994277954,+ 448.4000005722046, 456.0999994277954, 447.9000005722046,+ 457.5999994277954, 460.69999980926514, 451.1000003814697,+ 452.6000003814697, 454.0999994277954, 455, 449.9000005722046,+ 454.79999923706055, 458.5, 453.8999996185303, 457.20000076293945,+ 458.0999994277954, 455.4000005722046, 455, 458.19999980926514,+ 458.30000019073486, 457.6000003814697+ ],+ "median": 450.25000047683716,+ "p95": 458.5+ },+ "gpuMs": null,+ "missingGpuSamples": null+ },+ "isolated": {+ "cpuEncodeMs": {+ "samples": [+ 0.3000001907348633, 0.39999961853027344, 0.19999980926513672,+ 0.20000076293945312, 0.19999980926513672, 0.19999980926513672,+ 0.20000076293945312, 0.10000038146972656, 0.20000076293945312,+ 0.19999980926513672, 0.19999980926513672, 0.09999942779541016,+ 0.2999992370605469, 0.19999980926513672, 0.3000001907348633,+ 0.09999942779541016, 0.3000001907348633, 0.19999980926513672,+ 0.19999980926513672, 0.20000076293945312, 0.19999980926513672,+ 0.19999980926513672, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672, 0.3000001907348633, 0.10000038146972656,+ 0.19999980926513672, 0.3000001907348633, 0.19999980926513672,+ 0.3000001907348633, 0.10000038146972656, 0.09999942779541016,+ 0.20000076293945312, 0.19999980926513672, 0.3000001907348633,+ 0.10000038146972656, 0.3000001907348633, 0.3000001907348633,+ 0.3000001907348633+ ],+ "median": 0.19999980926513672,+ "p95": 0.3000001907348633+ },+ "completedMs": {+ "samples": [+ 209.69999980926514, 208.30000019073486, 208.5999994277954,+ 204.10000038146973, 203.19999980926514, 198.69999980926514,+ 201.9000005722046, 205, 202.9000005722046, 199.89999961853027,+ 204.10000038146973, 209.30000019073486, 199.5, 203.19999980926514,+ 202, 199.39999961853027, 209.9000005722046, 200.5,+ 212.69999980926514, 201.4000005722046, 213.5, 202.5, 212.5,+ 206.69999980926514, 208, 204.89999961853027, 201.80000019073486,+ 213.60000038146973, 204.39999961853027, 209.69999980926514,+ 208.80000019073486, 205.9000005722046, 199.29999923706055,+ 205.60000038146973, 205.89999961853027, 203.10000038146973,+ 213.39999961853027, 210.30000019073486, 213.60000038146973,+ 209.30000019073486+ ],+ "median": 205.30000019073486,+ "p95": 213.5+ },+ "gpuMs": {+ "samples": [+ 208.752435, 207.079435, 206.96791399999998, 203.08783, 201.949274,+ 197.37588699999998, 200.24505399999998, 204.306288, 201.933333,+ 199.171177, 203.226101, 208.0626, 198.255302, 202.21149499999999,+ 200.33637399999998, 198.825085, 208.54652299999998, 199.63619,+ 212.174735, 200.570756, 211.997515, 201.668992, 211.147349,+ 205.70174699999998, 206.512621, 203.210782, 201.141369,+ 212.073904, 202.93762999999998, 208.65427499999998,+ 207.04537399999998, 205.292924, 197.68402799999998,+ 204.07582599999998, 204.961572, 201.95278399999998, 211.906884,+ 209.10155699999999, 212.35833599999998, 208.536294+ ],+ "median": 204.191057,+ "p95": 212.073904+ },+ "missingGpuSamples": 0+ },+ "outputBytes": 30720000,+ "imageSha256": "c4633367c9482c4939135ba829ad1bee4d8235023f4e6ae9c32199b768ceed3f"+ },+ "baseline": {+ "revision": "50f889f6012223c1d9514417e826b460ad154569",+ "browser": "151.0.7922.34",+ "platform": "linux",+ "kernel": "7.0.0-22-generic",+ "cpu": "AMD Ryzen 5 3600 6-Core Processor",+ "logicalCpus": 12,+ "flags": [+ "--enable-unsafe-webgpu",+ "--use-webgpu-adapter=swiftshader",+ "--enable-features=Vulkan",+ "--use-angle=vulkan",+ "--use-vulkan=swiftshader",+ "--disable-vulkan-surface"+ ],+ "workload": "baseline",+ "size": [2400, 1600],+ "warmup": 8,+ "samples": 40,+ "timestamps": true,+ "adapter": {+ "vendor": "google",+ "architecture": "swiftshader",+ "device": "",+ "description": ""+ },+ "rendererSetupMs": 44.80000019073486,+ "firstRenderMs": 315.4000005722046,+ "rendering": {+ "cpuEncodeMs": {+ "samples": [+ 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672, 0.20000076293945312, 0.20000076293945312,+ 0.20000076293945312, 0.10000038146972656, 0.19999980926513672,+ 0.10000038146972656, 0.19999980926513672, 0.19999980926513672,+ 0.3000001907348633, 0.19999980926513672, 0.3000001907348633,+ 0.20000076293945312, 0.3000001907348633, 0.19999980926513672,+ 0.10000038146972656, 0.19999980926513672, 0.19999980926513672,+ 0.10000038146972656, 0.19999980926513672, 0.2999992370605469,+ 0.19999980926513672, 0.2999992370605469, 0.20000076293945312,+ 0.19999980926513672, 0.3000001907348633, 0.19999980926513672,+ 0.10000038146972656, 0.20000076293945312, 0.2999992370605469,+ 0.10000038146972656, 0.3000001907348633, 0.19999980926513672,+ 0.20000076293945312, 0.20000076293945312, 0.3000001907348633,+ 0.3000001907348633+ ],+ "median": 0.19999980926513672,+ "p95": 0.3000001907348633+ },+ "completedMs": {+ "samples": [+ 243, 241.80000019073486, 236.39999961853027, 231.5999994277954,+ 237, 246, 240.5, 232.80000019073486, 241, 238.80000019073486,+ 232.9000005722046, 229.79999923706055, 243.10000038146973, 236,+ 230.89999961853027, 235, 229.80000019073486, 242.80000019073486,+ 231.60000038146973, 237, 236.0999994277954, 237.9000005722046,+ 249.5, 244.19999980926514, 242.80000019073486, 242.79999923706055,+ 235.60000038146973, 241.69999980926514, 235, 240.69999980926514,+ 238, 250.70000076293945, 240.29999923706055, 237.80000019073486,+ 236.80000019073486, 232.89999961853027, 234, 236.30000019073486,+ 234.80000019073486, 241.39999961853027+ ],+ "median": 237.40000009536743,+ "p95": 246+ },+ "gpuMs": null,+ "missingGpuSamples": null+ },+ "isolated": null,+ "outputBytes": 0,+ "imageSha256": "9440cf1efcde5d423d22ba1620c50c25db5a21412a28a319807f1b8140eea29a"+ },+ "neutral": {+ "revision": "50f889f6012223c1d9514417e826b460ad154569",+ "browser": "151.0.7922.34",+ "platform": "linux",+ "kernel": "7.0.0-22-generic",+ "cpu": "AMD Ryzen 5 3600 6-Core Processor",+ "logicalCpus": 12,+ "flags": [+ "--enable-unsafe-webgpu",+ "--use-webgpu-adapter=swiftshader",+ "--enable-features=Vulkan",+ "--use-angle=vulkan",+ "--use-vulkan=swiftshader",+ "--disable-vulkan-surface"+ ],+ "workload": "neutral",+ "size": [2400, 1600],+ "warmup": 8,+ "samples": 40,+ "timestamps": true,+ "adapter": {+ "vendor": "google",+ "architecture": "swiftshader",+ "device": "",+ "description": ""+ },+ "rendererSetupMs": 52,+ "firstRenderMs": 344,+ "rendering": {+ "cpuEncodeMs": {+ "samples": [+ 0.3000001907348633, 0.19999980926513672, 0.3000001907348633,+ 0.19999980926513672, 0.20000076293945312, 0.19999980926513672,+ 0.19999980926513672, 0.39999961853027344, 0.3000001907348633,+ 0.19999980926513672, 0.19999980926513672, 0.10000038146972656,+ 0.19999980926513672, 0.19999980926513672, 0.20000076293945312,+ 0.19999980926513672, 0.19999980926513672, 0.09999942779541016,+ 0.19999980926513672, 0.20000076293945312, 0.19999980926513672,+ 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672, 0.19999980926513672, 0.09999942779541016,+ 0.09999942779541016, 0.19999980926513672, 0.2999992370605469,+ 0.19999980926513672, 0.2999992370605469, 0.10000038146972656,+ 0.19999980926513672, 0.19999980926513672, 0.20000076293945312,+ 0.2999992370605469, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672+ ],+ "median": 0.19999980926513672,+ "p95": 0.3000001907348633+ },+ "completedMs": {+ "samples": [+ 244.20000076293945, 249, 238.5, 241.19999980926514,+ 241.20000076293945, 250.19999980926514, 259.69999980926514,+ 257.19999980926514, 241.80000019073486, 253.69999980926514,+ 240.60000038146973, 238.9000005722046, 239.5, 241.0999994277954,+ 244.10000038146973, 246.19999980926514, 246.30000019073486,+ 257.69999980926514, 248.0999994277954, 243.70000076293945,+ 242.0999994277954, 238.60000038146973, 242.19999980926514,+ 241.89999961853027, 237.80000019073486, 245.5, 245.69999980926514,+ 254.5999994277954, 243.4000005722046, 249.19999980926514,+ 243.80000019073486, 246.0999994277954, 252.10000038146973, 247,+ 248.0999994277954, 237.70000076293945, 246.19999980926514,+ 242.89999961853027, 248.10000038146973, 242.69999980926514+ ],+ "median": 244.1500005722046,+ "p95": 257.19999980926514+ },+ "gpuMs": null,+ "missingGpuSamples": null+ },+ "isolated": {+ "cpuEncodeMs": {+ "samples": [+ 0.09999942779541016, 0.10000038146972656, 0, 0, 0,+ 0.09999942779541016, 0, 0, 0, 0, 0, 0.10000038146972656, 0, 0, 0,+ 0, 0, 0.10000038146972656, 0, 0, 0, 0, 0, 0, 0, 0,+ 0.10000038146972656, 0.10000038146972656, 0, 0, 0, 0,+ 0.09999942779541016, 0, 0, 0.10000038146972656, 0,+ 0.10000038146972656, 0.09999942779541016, 0+ ],+ "median": 0,+ "p95": 0.10000038146972656+ },+ "completedMs": {+ "samples": [+ 0.09999942779541016, 0.20000076293945312, 0, 0.19999980926513672,+ 0, 0.19999980926513672, 0.10000038146972656, 0,+ 0.19999980926513672, 0.09999942779541016, 0, 0.20000076293945312,+ 0, 0.19999980926513672, 0, 0.19999980926513672, 0,+ 0.10000038146972656, 0.09999942779541016, 0.10000038146972656,+ 0.09999942779541016, 0.10000038146972656, 0.10000038146972656,+ 0.09999942779541016, 0.10000038146972656, 0.09999942779541016,+ 0.10000038146972656, 0.19999980926513672, 0.10000038146972656,+ 0.10000038146972656, 0.10000038146972656, 0, 0.19999980926513672,+ 0.09999942779541016, 0.10000038146972656, 0.10000038146972656,+ 0.09999942779541016, 0.10000038146972656, 0.19999980926513672,+ 0.10000038146972656+ ],+ "median": 0.10000038146972656,+ "p95": 0.19999980926513672+ },+ "gpuMs": null,+ "missingGpuSamples": null+ },+ "outputBytes": 0,+ "imageSha256": "9440cf1efcde5d423d22ba1620c50c25db5a21412a28a319807f1b8140eea29a"+ }+ },+ "after": {+ "active": {+ "revision": "50f889f6012223c1d9514417e826b460ad154569",+ "browser": "151.0.7922.34",+ "platform": "linux",+ "kernel": "7.0.0-22-generic",+ "cpu": "AMD Ryzen 5 3600 6-Core Processor",+ "logicalCpus": 12,+ "flags": [+ "--enable-unsafe-webgpu",+ "--use-webgpu-adapter=swiftshader",+ "--enable-features=Vulkan",+ "--use-angle=vulkan",+ "--use-vulkan=swiftshader",+ "--disable-vulkan-surface"+ ],+ "workload": "active",+ "size": [2400, 1600],+ "warmup": 8,+ "samples": 40,+ "timestamps": true,+ "adapter": {+ "vendor": "google",+ "architecture": "swiftshader",+ "device": "",+ "description": ""+ },+ "rendererSetupMs": 44.59999942779541,+ "firstRenderMs": 565,+ "rendering": {+ "cpuEncodeMs": {+ "samples": [+ 0.3000001907348633, 0.19999980926513672, 0.3000001907348633,+ 0.09999942779541016, 0.3000001907348633, 0.19999980926513672,+ 0.19999980926513672, 0.3000001907348633, 0.3000001907348633,+ 0.3000001907348633, 0.19999980926513672, 0.3000001907348633,+ 0.20000076293945312, 0.3000001907348633, 0.19999980926513672,+ 0.3000001907348633, 0.3000001907348633, 0.3000001907348633,+ 0.3000001907348633, 0.3000001907348633, 0.3000001907348633,+ 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,+ 0.19999980926513672, 0.3000001907348633, 0.2999992370605469,+ 0.3000001907348633, 0.20000076293945312, 0.3000001907348633,+ 0.3000001907348633, 0.19999980926513672, 0.2999992370605469,+ 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,+ 0.19999980926513672, 0.3000001907348633, 0.19999980926513672,+ 0.39999961853027344+ ],+ "median": 0.3000001907348633,+ "p95": 0.3000001907348633+ },+ "completedMs": {+ "samples": [+ 455.80000019073486, 449.5, 441.5, 437.79999923706055,+ 445.20000076293945, 444.3999996185303, 449.69999980926514,+ 443.1000003814697, 440.5, 443.9000005722046, 442.19999980926514,+ 449.8999996185303, 440.80000019073486, 445.1000003814697,+ 445.5999994277954, 457.19999980926514, 460.5, 452.5,+ 464.80000019073486, 450, 439.19999980926514, 447.4000005722046,+ 434.0999994277954, 435.9000005722046, 448.1000003814697,+ 438.30000019073486, 460.79999923706055, 437, 441.30000019073486,+ 439.5, 441.5, 444.4000005722046, 459.19999980926514,+ 455.8999996185303, 451.69999980926514, 455.6000003814697,+ 445.19999980926514, 456.30000019073486, 452.8999996185303,+ 452.1000003814697+ ],+ "median": 445.40000009536743,+ "p95": 460.5+ },+ "gpuMs": null,+ "missingGpuSamples": null+ },+ "isolated": {+ "cpuEncodeMs": {+ "samples": [+ 0.3000001907348633, 0.3000001907348633, 0.3000001907348633,+ 0.19999980926513672, 0.10000038146972656, 0.19999980926513672,+ 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,+ 0.2999992370605469, 0.19999980926513672, 0.3000001907348633,+ 0.19999980926513672, 0.3000001907348633, 0.19999980926513672,+ 0.09999942779541016, 0.19999980926513672, 0.3000001907348633,+ 0.20000076293945312, 0.3000001907348633, 0.19999980926513672,+ 0.3000001907348633, 0.3000001907348633, 0.10000038146972656,+ 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,+ 0.20000076293945312, 0.19999980926513672, 0.10000038146972656,+ 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,+ 0.20000076293945312, 0.3000001907348633, 0.20000076293945312,+ 0.3000001907348633, 0.3000001907348633, 0.19999980926513672,+ 0.19999980926513672+ ],+ "median": 0.20000028610229492,+ "p95": 0.3000001907348633+ },+ "completedMs": {+ "samples": [+ 212.30000019073486, 208.4000005722046, 210.89999961853027,+ 208.19999980926514, 209.20000076293945, 212.39999961853027,+ 208.30000019073486, 208.89999961853027, 208.80000019073486,+ 208.0999994277954, 206.80000019073486, 209.19999980926514,+ 208.10000038146973, 211.80000019073486, 200.0999994277954,+ 198.19999980926514, 198.89999961853027, 200.5, 203,+ 206.20000076293945, 201.79999923706055, 205.9000005722046,+ 208.5999994277954, 206.5, 221.30000019073486, 207.89999961853027,+ 210, 203.4000005722046, 205.80000019073486, 202.10000038146973,+ 210.5, 214.5, 203.0999994277954, 205.10000038146973,+ 207.39999961853027, 203.9000005722046, 217.5999994277954,+ 202.9000005722046, 201.69999980926514, 208.69999980926514+ ],+ "median": 207.99999952316284,+ "p95": 214.5+ },+ "gpuMs": {+ "samples": [+ 211.35441, 207.26082499999998, 210.036193, 206.62772199999998,+ 208.268992, 211.02247799999998, 206.897754, 207.99319, 207.685598,+ 206.964214, 205.671876, 208.337422, 207.33130599999998,+ 210.237904, 199.270838, 196.73511299999998, 197.87704, 199.467618,+ 202.023484, 204.95017199999998, 201.25691, 204.877752, 207.670698,+ 205.355844, 219.834251, 207.134095, 208.732485, 202.298646,+ 204.27480799999998, 200.714776, 209.262287, 213.00317099999998,+ 202.009405, 204.222567, 206.14659999999998, 202.98926,+ 216.07173799999998, 201.488991, 200.262373, 207.93025+ ],+ "median": 206.76273799999998,+ "p95": 213.00317099999998+ },+ "missingGpuSamples": 0+ },+ "outputBytes": 30720000,+ "imageSha256": "c4633367c9482c4939135ba829ad1bee4d8235023f4e6ae9c32199b768ceed3f"+ },+ "baseline": {+ "revision": "50f889f6012223c1d9514417e826b460ad154569",+ "browser": "151.0.7922.34",+ "platform": "linux",+ "kernel": "7.0.0-22-generic",+ "cpu": "AMD Ryzen 5 3600 6-Core Processor",+ "logicalCpus": 12,+ "flags": [+ "--enable-unsafe-webgpu",+ "--use-webgpu-adapter=swiftshader",+ "--enable-features=Vulkan",+ "--use-angle=vulkan",+ "--use-vulkan=swiftshader",+ "--disable-vulkan-surface"+ ],+ "workload": "baseline",+ "size": [2400, 1600],+ "warmup": 8,+ "samples": 40,+ "timestamps": true,+ "adapter": {+ "vendor": "google",+ "architecture": "swiftshader",+ "device": "",+ "description": ""+ },+ "rendererSetupMs": 43.89999961853027,+ "firstRenderMs": 315.1000003814697,+ "rendering": {+ "cpuEncodeMs": {+ "samples": [+ 0.19999980926513672, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672, 0.3000001907348633, 0.3000001907348633,+ 0.19999980926513672, 0.3000001907348633, 0.19999980926513672,+ 0.20000076293945312, 0.20000076293945312, 0.3000001907348633,+ 0.19999980926513672, 0.19999980926513672, 0.19999980926513672,+ 0.10000038146972656, 0.09999942779541016, 0.19999980926513672,+ 0.19999980926513672, 0.19999980926513672, 0.20000076293945312,+ 0.10000038146972656, 0.20000076293945312, 0.20000076293945312,+ 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,+ 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,+ 0.09999942779541016, 0.19999980926513672, 0.10000038146972656,+ 0.3000001907348633, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672, 0.3000001907348633, 0.3000001907348633,+ 0.3000001907348633+ ],+ "median": 0.19999980926513672,+ "p95": 0.3000001907348633+ },+ "completedMs": {+ "samples": [+ 242.89999961853027, 239.60000038146973, 248.10000038146973,+ 239.89999961853027, 243.5, 244.80000019073486, 239.19999980926514,+ 237.5, 240.69999980926514, 241.5, 238.9000005722046,+ 234.0999994277954, 236.30000019073486, 238.89999961853027,+ 232.69999980926514, 235.60000038146973, 241.5, 239.39999961853027,+ 243, 238.60000038146973, 243.20000076293945, 244.19999980926514,+ 241, 241.80000019073486, 245.30000019073486, 240.19999980926514,+ 238, 234.9000005722046, 231.79999923706055, 234.30000019073486,+ 243.5, 235.19999980926514, 236.69999980926514, 234.5,+ 238.30000019073486, 241, 238.39999961853027, 238.5,+ 238.80000019073486, 237.5+ ],+ "median": 239.05000019073486,+ "p95": 244.80000019073486+ },+ "gpuMs": null,+ "missingGpuSamples": null+ },+ "isolated": null,+ "outputBytes": 0,+ "imageSha256": "9440cf1efcde5d423d22ba1620c50c25db5a21412a28a319807f1b8140eea29a"+ },+ "neutral": {+ "revision": "50f889f6012223c1d9514417e826b460ad154569",+ "browser": "151.0.7922.34",+ "platform": "linux",+ "kernel": "7.0.0-22-generic",+ "cpu": "AMD Ryzen 5 3600 6-Core Processor",+ "logicalCpus": 12,+ "flags": [+ "--enable-unsafe-webgpu",+ "--use-webgpu-adapter=swiftshader",+ "--enable-features=Vulkan",+ "--use-angle=vulkan",+ "--use-vulkan=swiftshader",+ "--disable-vulkan-surface"+ ],+ "workload": "neutral",+ "size": [2400, 1600],+ "warmup": 8,+ "samples": 40,+ "timestamps": true,+ "adapter": {+ "vendor": "google",+ "architecture": "swiftshader",+ "device": "",+ "description": ""+ },+ "rendererSetupMs": 47.59999942779541,+ "firstRenderMs": 315.20000076293945,+ "rendering": {+ "cpuEncodeMs": {+ "samples": [+ 0.19999980926513672, 0.19999980926513672, 0.2999992370605469,+ 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,+ 0.20000076293945312, 0.19999980926513672, 0.19999980926513672,+ 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,+ 0.20000076293945312, 0.19999980926513672, 0.10000038146972656,+ 0.19999980926513672, 0.19999980926513672, 0.3000001907348633,+ 0.10000038146972656, 0.09999942779541016, 0.09999942779541016,+ 0.2999992370605469, 0.3000001907348633, 0.09999942779541016,+ 0.19999980926513672, 0.3000001907348633, 0.3000001907348633,+ 0.19999980926513672, 0.19999980926513672, 0.19999980926513672,+ 0.3000001907348633, 0.3000001907348633, 0.19999980926513672,+ 0.3000001907348633, 0.3000001907348633, 0.19999980926513672,+ 0.2999992370605469, 0.3000001907348633, 0.19999980926513672,+ 0.3000001907348633+ ],+ "median": 0.19999980926513672,+ "p95": 0.3000001907348633+ },+ "completedMs": {+ "samples": [+ 246.30000019073486, 244.30000019073486, 241.69999980926514,+ 243.30000019073486, 237.39999961853027, 248.39999961853027,+ 244.80000019073486, 244.19999980926514, 237.80000019073486,+ 243.30000019073486, 237.69999980926514, 231.5, 246.4000005722046,+ 241.0999994277954, 243.4000005722046, 241.19999980926514,+ 246.30000019073486, 235.10000038146973, 233.10000038146973,+ 235.39999961853027, 234, 237.69999980926514, 244.19999980926514,+ 246.0999994277954, 239.5, 243.0999994277954, 233.9000005722046,+ 232.69999980926514, 236.0999994277954, 242.60000038146973,+ 234.0999994277954, 233.9000005722046, 234.19999980926514,+ 231.80000019073486, 235.19999980926514, 233.60000038146973,+ 234.5999994277954, 230.9000005722046, 236.89999961853027,+ 240.60000038146973+ ],+ "median": 237.75,+ "p95": 246.30000019073486+ },+ "gpuMs": null,+ "missingGpuSamples": null+ },+ "isolated": {+ "cpuEncodeMs": {+ "samples": [+ 0.10000038146972656, 0, 0, 0, 0.09999942779541016, 0, 0, 0,+ 0.10000038146972656, 0.09999942779541016, 0, 0, 0, 0, 0, 0, 0, 0,+ 0, 0, 0.09999942779541016, 0, 0, 0, 0, 0, 0, 0, 0, 0,+ 0.10000038146972656, 0.09999942779541016, 0, 0, 0, 0,+ 0.09999942779541016, 0, 0, 0+ ],+ "median": 0,+ "p95": 0.10000038146972656+ },+ "completedMs": {+ "samples": [+ 0.10000038146972656, 0.19999980926513672, 0, 0.10000038146972656,+ 0.09999942779541016, 0.20000076293945312, 0.09999942779541016, 0,+ 0.10000038146972656, 0.09999942779541016, 0.10000038146972656, 0,+ 0.09999942779541016, 0.10000038146972656, 0.09999942779541016,+ 0.10000038146972656, 0, 0.19999980926513672, 0, 0,+ 0.09999942779541016, 0, 0.10000038146972656, 0.09999942779541016,+ 0.10000038146972656, 0.09999942779541016, 0.10000038146972656,+ 0.10000038146972656, 0.09999942779541016, 0, 0.10000038146972656,+ 0.09999942779541016, 0.10000038146972656, 0.10000038146972656,+ 0.19999980926513672, 0, 0.09999942779541016, 0.10000038146972656,+ 0.10000038146972656, 0.09999942779541016+ ],+ "median": 0.09999942779541016,+ "p95": 0.19999980926513672+ },+ "gpuMs": null,+ "missingGpuSamples": null+ },+ "outputBytes": 0,+ "imageSha256": "9440cf1efcde5d423d22ba1620c50c25db5a21412a28a319807f1b8140eea29a"+ }+ }+ },+ "pixelTestDuration": {+ "before": {+ "milliseconds": [2745, 2733, 2788, 2687, 2783],+ "median": 2745,+ "runs": 5+ },+ "after": {+ "milliseconds": [1739, 1775, 1757, 1744, 1711],+ "median": 1744,+ "runs": 5+ }+ }}diff --git a/index.html b/index.htmlindex 921fa16..463ff94 100644--- a/index.html+++ b/index.html@@ -1,13 +1,13 @@<!doctype html><html lang="en">- <head>- <meta charset="utf-8" />- <meta name="viewport" content="width=device-width, initial-scale=1" />- <link rel="icon" href="/logo.svg" type="image/svg+xml" />- <title>OpenLight</title>- </head>- <body>- <div id="root"></div>- <script type="module" src="/src/main.tsx"></script>- </body>+ <head>+ <meta charset="utf-8" />+ <meta name="viewport" content="width=device-width, initial-scale=1" />+ <link rel="icon" href="/logo.svg" type="image/svg+xml" />+ <title>OpenLight</title>+ </head>+ <body>+ <div id="root"></div>+ <script type="module" src="/src/main.tsx"></script>+ </body></html>diff --git a/package.json b/package.jsonindex dabf5d2..a3ee486 100644--- a/package.json+++ b/package.json@@ -1,41 +1,41 @@{- "name": "openlight",- "private": true,- "type": "module",- "scripts": {- "dev": "vite",- "build": "tsc && vite build",- "check": "biome check --write",- "test": "bun test",- "test:browser": "playwright test"- },- "dependencies": {- "@base-ui/react": "^1.8.0",- "@dnd-kit/core": "^6.3.1",- "@fontsource-variable/geist": "^5.3.0",- "@tailwindcss/vite": "^4.3.3",- "@vercel/analytics": "^2.0.1",- "@vercel/speed-insights": "^2.0.0",- "class-variance-authority": "^0.7.1",- "cn": "^0.2.4",- "raw-webgpu": "0.1.0-alpha.2",- "react": "^19.2.8",- "react-dom": "^19.2.8",- "tailwindcss": "^4.3.3",- "vgpu": "^0.3.1",- "vgpu-react": "^0.3.0",- "zustand": "^5.0.15"- },- "devDependencies": {- "@biomejs/biome": "2.5.11",- "@playwright/test": "^1.62.1",- "@types/bun": "^1.4.1",- "@types/node": "^26.4.1",- "@types/react": "^19.2.18",- "@types/react-dom": "^19.2.5",- "@vitejs/plugin-react": "^6.1.1",- "@xmldom/xmldom": "^0.9.12",- "typescript": "^7.0.2",- "vite": "^8.2.2"- }+ "name": "openlight",+ "private": true,+ "type": "module",+ "scripts": {+ "dev": "vite",+ "build": "tsc && vite build",+ "check": "biome check --write",+ "test": "bun test",+ "test:browser": "playwright test"+ },+ "dependencies": {+ "@base-ui/react": "^1.8.0",+ "@dnd-kit/core": "^6.3.1",+ "@fontsource-variable/geist": "^5.3.0",+ "@tailwindcss/vite": "^4.3.3",+ "@vercel/analytics": "^2.0.1",+ "@vercel/speed-insights": "^2.0.0",+ "class-variance-authority": "^0.7.1",+ "cn": "^0.2.4",+ "raw-webgpu": "0.1.0-alpha.2",+ "react": "^19.2.8",+ "react-dom": "^19.2.8",+ "tailwindcss": "^4.3.3",+ "vgpu": "^0.3.1",+ "vgpu-react": "^0.3.0",+ "zustand": "^5.0.15"+ },+ "devDependencies": {+ "@biomejs/biome": "2.5.11",+ "@playwright/test": "^1.62.1",+ "@types/bun": "^1.4.1",+ "@types/node": "^26.4.1",+ "@types/react": "^19.2.18",+ "@types/react-dom": "^19.2.5",+ "@vitejs/plugin-react": "^6.1.1",+ "@xmldom/xmldom": "^0.9.12",+ "typescript": "^7.0.2",+ "vite": "^8.2.2"+ }}diff --git a/playwright.bench.config.ts b/playwright.bench.config.tsindex 49be3c6..2547334 100644--- a/playwright.bench.config.ts+++ b/playwright.bench.config.ts@@ -2,8 +2,8 @@ import { defineConfig } from "@playwright/test";import config from "./playwright.config";export default defineConfig(config, {- testMatch: "**/*.bench.ts",- workers: 1,- timeout: 180_000,- outputDir: "test-results/benchmarks",+ testMatch: "**/*.bench.ts",+ workers: 1,+ timeout: 180_000,+ outputDir: "test-results/benchmarks",});diff --git a/playwright.config.ts b/playwright.config.tsindex 0509c7a..cf14fb4 100644--- a/playwright.config.ts+++ b/playwright.config.ts@@ -2,28 +2,28 @@ import { defineConfig } from "@playwright/test";const args = ["--enable-unsafe-webgpu"];if (process.platform !== "darwin") {- args.push("--use-webgpu-adapter=swiftshader");+ args.push("--use-webgpu-adapter=swiftshader");}if (process.platform === "linux") {- // Vulkan enables image transfers; ANGLE's SwiftShader path presents canvases in headless Chromium.- args.push(- "--enable-features=Vulkan",- "--use-angle=swiftshader",- "--use-vulkan=swiftshader",- );+ // Vulkan enables image transfers; ANGLE's SwiftShader path presents canvases in headless Chromium.+ args.push(+ "--enable-features=Vulkan",+ "--use-angle=swiftshader",+ "--use-vulkan=swiftshader",+ );}export default defineConfig({- testDir: "./tests",- testMatch: "**/*.e2e.ts",- use: {- channel: "chromium",- baseURL: "http://127.0.0.1:4173",- launchOptions: { args },- },- webServer: {- command: "bun run dev -- --host 127.0.0.1 --port 4173 --strictPort",- reuseExistingServer: !process.env.CI,- url: "http://127.0.0.1:4173",- },+ testDir: "./tests",+ testMatch: "**/*.e2e.ts",+ use: {+ channel: "chromium",+ baseURL: "http://127.0.0.1:4173",+ launchOptions: { args },+ },+ webServer: {+ command: "bun run dev -- --host 127.0.0.1 --port 4173 --strictPort",+ reuseExistingServer: !process.env.CI,+ url: "http://127.0.0.1:4173",+ },});diff --git a/public/logo.svg b/public/logo.svgindex bd423ee..cfe8b50 100644--- a/public/logo.svg+++ b/public/logo.svg@@ -1,7 +1,7 @@<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64" role="img" aria-labelledby="logo-title">- <title id="logo-title">OpenLight</title>- <rect width="64" height="64" rx="14" fill="#232323" />- <path d="M12 48c2-20 15-32 40-32" fill="none" opacity=".35" stroke="#f2f2f2" stroke-linecap="round" stroke-width="4" />- <path d="M12 48c18 0 22-32 40-32" fill="none" stroke="#f2f2f2" stroke-linecap="round" stroke-width="4" />- <path d="M12 48c25 0 38-13 40-32" fill="none" opacity=".35" stroke="#f2f2f2" stroke-linecap="round" stroke-width="4" />+ <title id="logo-title">OpenLight</title>+ <rect width="64" height="64" rx="14" fill="#232323" />+ <path d="M12 48c2-20 15-32 40-32" fill="none" opacity=".35" stroke="#f2f2f2" stroke-linecap="round" stroke-width="4" />+ <path d="M12 48c18 0 22-32 40-32" fill="none" stroke="#f2f2f2" stroke-linecap="round" stroke-width="4" />+ <path d="M12 48c25 0 38-13 40-32" fill="none" opacity=".35" stroke="#f2f2f2" stroke-linecap="round" stroke-width="4" /></svg>diff --git a/src/app/controls.ts b/src/app/controls.tsindex 6441997..de86e47 100644--- a/src/app/controls.ts+++ b/src/app/controls.ts@@ -1,19 +1,19 @@import type { Gpu } from "vgpu";import {- type ExportOptions,- exportImage,+ type ExportOptions,+ exportImage,} from "@/app/editor/export/export-image";import { createCameraRawXmpLoader } from "@/app/loaders/camera-raw-xmp";import { createImageLoader } from "@/app/loaders/image";import { createLoaderRegistry } from "@/app/loaders/registry";import type {- Adjustments,- Details,- Gradient,- Preview,- ProcessingLayer,- ToneCurve,- Vignette,+ Adjustments,+ Details,+ Gradient,+ Preview,+ ProcessingLayer,+ ToneCurve,+ Vignette,} from "@/core/document";import type { WhiteBalance } from "@/core/image";import type { ImageFrame } from "@/core/image/frame";@@ -21,22 +21,22 @@ import { setAdjustments } from "@/features/adjustments/edits";import { defaultAdjustments } from "@/features/adjustments/model";import { resetColorMixer, setColorMixer } from "@/features/color-mixer/edits";import {- defaultMixer,- type MixerChange,- type MixerColor,+ defaultMixer,+ type MixerChange,+ type MixerColor,} from "@/features/color-mixer/model";import { setDetails } from "@/features/details/edits";import { defaultDetails } from "@/features/details/model";import {- addLayer,- deleteLayer,- duplicateLayer,- type LayerPlacement,- moveLayer,- setExposure,- setLayer,- setLayerMask,- setMaskOperation,+ addLayer,+ deleteLayer,+ duplicateLayer,+ type LayerPlacement,+ moveLayer,+ setExposure,+ setLayer,+ setLayerMask,+ setMaskOperation,} from "@/features/layers/edits";import { defaultGradient } from "@/features/layers/gradient";import { defaultCurve } from "@/features/tone-curves/curve";@@ -45,129 +45,129 @@ import { setVignette } from "@/features/vignette/edits";import { defaultVignette } from "@/features/vignette/model";import { setWhiteBalance } from "@/features/white-balance/edits";import {- createLayer,- createMask,- editEffect,- findEffect,+ createLayer,+ createMask,+ editEffect,+ findEffect,} from "./editor/layers";import type { Workspace } from "./workspace";/** Imperative commands bound to an explicit workspace, usable without React. */export function createControls(gpu: Gpu, workspace: Workspace) {- const image = createImageLoader(gpu, workspace);- const xmp = createCameraRawXmpLoader(workspace);- const files = createLoaderRegistry(- [xmp, image],- () => workspace.state.getState().status === "ready",- );+ const image = createImageLoader(gpu, workspace);+ const xmp = createCameraRawXmpLoader(workspace);+ const files = createLoaderRegistry(+ [xmp, image],+ () => workspace.state.getState().status === "ready",+ );- return {- openFiles: files.openFiles,- openFile: (file: File) => files.openFiles([file]),- loadImage: (file: File) => files.loadFile(image, file),- importXmp: (file: File) => files.loadFile(xmp, file),- setDetails(change: Partial<Details>, id?: string) {- const document = workspace.getDocument();- editEffect(document, "details", id, (id) =>- setDetails(document, change, id),- );- },- setAdjustments: (change: Partial<Adjustments>, id?: string) =>- setAdjustments(workspace.getDocument(), change, id),- setWhiteBalance: (change?: Partial<WhiteBalance>) =>- setWhiteBalance(workspace.getDocument(), change),- setToneCurve: (curve?: ToneCurve, id?: string) =>- 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),- );- },- resetColorMixer(id?: string) {- const document = workspace.getDocument();- const existing =- 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),- );- },- addLayer(kind: ProcessingLayer["kind"], placement?: LayerPlacement) {- const document = workspace.getDocument();- if (kind !== "mask") {- return addLayer(document, createLayer(kind), placement);- }- const scene = document.scene.getState();- const [width, height] = document.resources.get(scene.layers[0].source)- .image.size;- const mask = createMask(defaultGradient([width, height]));- return addLayer(document, mask, placement);- },- setLayer: (id: string, change: Parameters<typeof setLayer>[2]) =>- setLayer(workspace.getDocument(), id, change),- setExposure: (id: string, exposure: number) =>- setExposure(workspace.getDocument(), id, exposure),- setLayerMask: (id: string, mask: Gradient) =>- setLayerMask(workspace.getDocument(), id, mask),- setMaskOperation: (id: string, operation: "add" | "subtract") =>- setMaskOperation(workspace.getDocument(), id, operation),- duplicateLayer: (id: string) => duplicateLayer(workspace.getDocument(), id),- deleteLayer: (id: string) => deleteLayer(workspace.getDocument(), id),- moveLayer: (id: string, index: number, parentId?: string) =>- moveLayer(workspace.getDocument(), id, index, parentId),- selectLayer: (id: string) => workspace.getDocument().selectLayer(id),- setFrame(frame: ImageFrame) {- const document = workspace.getDocument();- document.edit({- ...document.scene.getState(),- frame: structuredClone(frame),- });- },- setPreview: (change: Partial<Preview>) =>- workspace.getDocument().preview.setState(change),- beginEdit: () => workspace.getDocument().history.begin(),- commitEdit: () => workspace.getDocument().history.commit(),- cancelEdit: () => workspace.getDocument().history.cancel(),- undo: () => workspace.getDocument().history.undo(),- redo: () => workspace.getDocument().history.redo(),- exportImage: (options?: ExportOptions) =>- exportImage(gpu, workspace.getDocument(), options),- getState() {- const { file, document } = workspace.state.getState();- const scene = document?.scene.getState();- const layers = scene?.layers ?? [];- return structuredClone({- file,- preview: document?.preview.getState(),- documentId: document?.id,- scene,- selectedLayerId: document?.selection.getState().layerId,- size: scene?.frame.size,- frame: scene?.frame,- adjustments: scene?.layers[0].adjustments ?? defaultAdjustments,- whiteBalance: scene?.layers[0].whiteBalance,- details: findEffect(layers, "details")?.details ?? defaultDetails,- toneCurve: scene?.layers[0].toneCurve ?? defaultCurve,- colorMixer:- findEffect(layers, "color-mixer")?.colorMixer ?? defaultMixer,- vignette: findEffect(layers, "vignette")?.vignette ?? defaultVignette,- history: document?.history.status.getState() ?? {- undoCount: 0,- redoCount: 0,- },- });- },- };+ return {+ openFiles: files.openFiles,+ openFile: (file: File) => files.openFiles([file]),+ loadImage: (file: File) => files.loadFile(image, file),+ importXmp: (file: File) => files.loadFile(xmp, file),+ setDetails(change: Partial<Details>, id?: string) {+ const document = workspace.getDocument();+ editEffect(document, "details", id, (id) =>+ setDetails(document, change, id),+ );+ },+ setAdjustments: (change: Partial<Adjustments>, id?: string) =>+ setAdjustments(workspace.getDocument(), change, id),+ setWhiteBalance: (change?: Partial<WhiteBalance>) =>+ setWhiteBalance(workspace.getDocument(), change),+ setToneCurve: (curve?: ToneCurve, id?: string) =>+ 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),+ );+ },+ resetColorMixer(id?: string) {+ const document = workspace.getDocument();+ const existing =+ 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),+ );+ },+ addLayer(kind: ProcessingLayer["kind"], placement?: LayerPlacement) {+ const document = workspace.getDocument();+ if (kind !== "mask") {+ return addLayer(document, createLayer(kind), placement);+ }+ const scene = document.scene.getState();+ const [width, height] = document.resources.get(scene.layers[0].source)+ .image.size;+ const mask = createMask(defaultGradient([width, height]));+ return addLayer(document, mask, placement);+ },+ setLayer: (id: string, change: Parameters<typeof setLayer>[2]) =>+ setLayer(workspace.getDocument(), id, change),+ setExposure: (id: string, exposure: number) =>+ setExposure(workspace.getDocument(), id, exposure),+ setLayerMask: (id: string, mask: Gradient) =>+ setLayerMask(workspace.getDocument(), id, mask),+ setMaskOperation: (id: string, operation: "add" | "subtract") =>+ setMaskOperation(workspace.getDocument(), id, operation),+ duplicateLayer: (id: string) => duplicateLayer(workspace.getDocument(), id),+ deleteLayer: (id: string) => deleteLayer(workspace.getDocument(), id),+ moveLayer: (id: string, index: number, parentId?: string) =>+ moveLayer(workspace.getDocument(), id, index, parentId),+ selectLayer: (id: string) => workspace.getDocument().selectLayer(id),+ setFrame(frame: ImageFrame) {+ const document = workspace.getDocument();+ document.edit({+ ...document.scene.getState(),+ frame: structuredClone(frame),+ });+ },+ setPreview: (change: Partial<Preview>) =>+ workspace.getDocument().preview.setState(change),+ beginEdit: () => workspace.getDocument().history.begin(),+ commitEdit: () => workspace.getDocument().history.commit(),+ cancelEdit: () => workspace.getDocument().history.cancel(),+ undo: () => workspace.getDocument().history.undo(),+ redo: () => workspace.getDocument().history.redo(),+ exportImage: (options?: ExportOptions) =>+ exportImage(gpu, workspace.getDocument(), options),+ getState() {+ const { file, document } = workspace.state.getState();+ const scene = document?.scene.getState();+ const layers = scene?.layers ?? [];+ return structuredClone({+ file,+ preview: document?.preview.getState(),+ documentId: document?.id,+ scene,+ selectedLayerId: document?.selection.getState().layerId,+ size: scene?.frame.size,+ frame: scene?.frame,+ adjustments: scene?.layers[0].adjustments ?? defaultAdjustments,+ whiteBalance: scene?.layers[0].whiteBalance,+ details: findEffect(layers, "details")?.details ?? defaultDetails,+ toneCurve: scene?.layers[0].toneCurve ?? defaultCurve,+ colorMixer:+ findEffect(layers, "color-mixer")?.colorMixer ?? defaultMixer,+ vignette: findEffect(layers, "vignette")?.vignette ?? defaultVignette,+ history: document?.history.status.getState() ?? {+ undoCount: 0,+ redoCount: 0,+ },+ });+ },+ };}declare global {- interface Window {- openlight: ReturnType<typeof createControls>;- }+ interface Window {+ openlight: ReturnType<typeof createControls>;+ }}diff --git a/src/app/editor/adjust/index.tsx b/src/app/editor/adjust/index.tsxindex 4c10e15..1deb49b 100644--- a/src/app/editor/adjust/index.tsx+++ b/src/app/editor/adjust/index.tsx@@ -21,99 +21,99 @@ import { useEditGesture } from "@/hooks/use-edit-gesture";const curveHistogramColors = ["#a3a3a3"] as const;function CurveInputHistogram({ id }: { id: string }) {- const gpu = useGpu();- const renderer = useRenderer();- const histogram = useMemo(() => createHistogram(gpu), [gpu]);- const image = useCallback(() => renderer.inputImage(id), [renderer, id]);- useEffect(() => () => histogram.dispose(), [histogram]);- return (- <Histogram- histogram={histogram}- image={image}- subscribe={renderer.subscribe}- colors={curveHistogramColors}- working- fillOpacity={0.65}- aria-label="curve input histogram"- className="pointer-events-none absolute inset-0 h-full w-full opacity-25"- />- );+ const gpu = useGpu();+ const renderer = useRenderer();+ const histogram = useMemo(() => createHistogram(gpu), [gpu]);+ const image = useCallback(() => renderer.inputImage(id), [renderer, id]);+ useEffect(() => () => histogram.dispose(), [histogram]);+ return (+ <Histogram+ histogram={histogram}+ image={image}+ subscribe={renderer.subscribe}+ colors={curveHistogramColors}+ working+ fillOpacity={0.65}+ aria-label="curve input histogram"+ className="pointer-events-none absolute inset-0 h-full w-full opacity-25"+ />+ );}function LayerCurve({ id, toneCurve }: { id: string; toneCurve: ToneCurve }) {- const document = useDocument();- return (- <div className="px-3 pb-3">- <hr className="mb-3 border-black/50" />- <ToneCurves- points={toneCurve}- onChange={(points) => setToneCurve(document, points, id)}- >- <CurveInputHistogram id={id} />- </ToneCurves>- </div>- );+ const document = useDocument();+ return (+ <div className="px-3 pb-3">+ <hr className="mb-3 border-black/50" />+ <ToneCurves+ points={toneCurve}+ onChange={(points) => setToneCurve(document, points, id)}+ >+ <CurveInputHistogram id={id} />+ </ToneCurves>+ </div>+ );}function SelectedControls({ layer }: { layer: Layer }) {- const document = useDocument();- switch (layer.kind) {- case "details":- return <DetailsControls id={layer.id} details={layer.details} />;- case "image":- return (- <>- <AdjustmentControls- id={layer.id}- adjustments={layer.adjustments}- temperature={- document.resources.get(layer.source).raw && (- <WhiteBalanceControls />- )- }- />- <LayerCurve id={layer.id} toneCurve={layer.toneCurve} />- </>- );- case "color-mixer":- return <ColorMixerControls id={layer.id} mixer={layer.colorMixer} />;- case "vignette":- return <VignetteControls id={layer.id} vignette={layer.vignette} />;- case "exposure":- return (- <section className="p-3">- <Slider- label="Exposure"- value={layer.exposure}- min={-5}- max={5}- step={0.01}- defaultValue={0}- onChange={(value) => setExposure(document, layer.id, value)}- />- </section>- );- case "mask":- return (- <>- <AdjustmentControls id={layer.id} adjustments={layer.adjustments} />- <LayerCurve id={layer.id} toneCurve={layer.toneCurve} />- </>- );- }+ const document = useDocument();+ switch (layer.kind) {+ case "details":+ return <DetailsControls id={layer.id} details={layer.details} />;+ case "image":+ return (+ <>+ <AdjustmentControls+ id={layer.id}+ adjustments={layer.adjustments}+ temperature={+ document.resources.get(layer.source).raw && (+ <WhiteBalanceControls />+ )+ }+ />+ <LayerCurve id={layer.id} toneCurve={layer.toneCurve} />+ </>+ );+ case "color-mixer":+ return <ColorMixerControls id={layer.id} mixer={layer.colorMixer} />;+ case "vignette":+ return <VignetteControls id={layer.id} vignette={layer.vignette} />;+ case "exposure":+ return (+ <section className="p-3">+ <Slider+ label="Exposure"+ value={layer.exposure}+ min={-5}+ max={5}+ step={0.01}+ defaultValue={0}+ onChange={(value) => setExposure(document, layer.id, value)}+ />+ </section>+ );+ case "mask":+ return (+ <>+ <AdjustmentControls id={layer.id} adjustments={layer.adjustments} />+ <LayerCurve id={layer.id} toneCurve={layer.toneCurve} />+ </>+ );+ }}export function AdjustPanel() {- const document = useDocument();- const gesture = useEditGesture(document.history);- const selected = useStore(document.selection, (state) => state.layerId);- const target = useScene(- (scene) => adjustmentTarget(scene.layers, selected) ?? scene.layers[0],- );- return (- <div {...gesture}>- <PanelHeader title="Adjustments" />- <SelectedControls layer={target} />- </div>- );+ const document = useDocument();+ const gesture = useEditGesture(document.history);+ const selected = useStore(document.selection, (state) => state.layerId);+ const target = useScene(+ (scene) => adjustmentTarget(scene.layers, selected) ?? scene.layers[0],+ );+ return (+ <div {...gesture}>+ <PanelHeader title="Adjustments" />+ <SelectedControls layer={target} />+ </div>+ );}diff --git a/src/app/editor/canvas.tsx b/src/app/editor/canvas.tsxindex 5b7ae4b..9915902 100644--- a/src/app/editor/canvas.tsx+++ b/src/app/editor/canvas.tsx@@ -7,24 +7,24 @@ import { LayerToolbar } from "@/features/layers/toolbar";import { ComparisonDivider } from "./comparison-divider";export function EditorCanvas() {- const tool = useGradientTool();- let gradientKey = "selection";- if (tool.target) {- gradientKey = `new/${tool.target.shape}/${tool.target.parentId ?? "root"}/${tool.target.operation}`;- }- const size = useScene((scene) => scene.frame.size);- return (- <EditorViewport- size={size}- overlay={- <>- <ComparisonDivider />- <LayerToolbar />- </>- }- tools={<GradientOverlay key={gradientKey} />}- >- <Image original="originalImage" />- </EditorViewport>- );+ const tool = useGradientTool();+ let gradientKey = "selection";+ if (tool.target) {+ gradientKey = `new/${tool.target.shape}/${tool.target.parentId ?? "root"}/${tool.target.operation}`;+ }+ const size = useScene((scene) => scene.frame.size);+ return (+ <EditorViewport+ size={size}+ overlay={+ <>+ <ComparisonDivider />+ <LayerToolbar />+ </>+ }+ tools={<GradientOverlay key={gradientKey} />}+ >+ <Image original="originalImage" />+ </EditorViewport>+ );}diff --git a/src/app/editor/clipping-controls.tsx b/src/app/editor/clipping-controls.tsxindex 10e27f1..8d166d4 100644--- a/src/app/editor/clipping-controls.tsx+++ b/src/app/editor/clipping-controls.tsx@@ -3,32 +3,32 @@ import { useDocument } from "@/components/editor/session";import Button from "@/components/ui/button";export function ClippingControls() {- const { preview } = useDocument();- 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) => (- <Button- key={range}- variant="ghost"- aria-label={`Show clipped ${range}`}- title={`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"- onClick={() => preview.setState({ [range]: !state[range] })}- >- <svg- aria-hidden="true"- viewBox="0 0 12 12"- className="size-3"- fill="currentColor"- >- <path d="M6 2 11 10H1Z" />- </svg>- </Button>- ))}- </div>- );+ const { preview } = useDocument();+ 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) => (+ <Button+ key={range}+ variant="ghost"+ aria-label={`Show clipped ${range}`}+ title={`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"+ onClick={() => preview.setState({ [range]: !state[range] })}+ >+ <svg+ aria-hidden="true"+ viewBox="0 0 12 12"+ className="size-3"+ fill="currentColor"+ >+ <path d="M6 2 11 10H1Z" />+ </svg>+ </Button>+ ))}+ </div>+ );}diff --git a/src/app/editor/comparison-control.tsx b/src/app/editor/comparison-control.tsxindex 63e9958..705acc3 100644--- a/src/app/editor/comparison-control.tsx+++ b/src/app/editor/comparison-control.tsx@@ -5,80 +5,80 @@ import Button from "@/components/ui/button";import type { Preview } from "@/core/document";export function ComparisonControl() {- const { preview } = useDocument();- const comparison = useStore(preview, (state) => state.comparison);- useEffect(() => {- let restore: Preview["comparison"] | undefined;- function release() {- if (restore === undefined) {- return;- }- preview.setState({ comparison: restore });- restore = undefined;- }- function keyDown(event: KeyboardEvent) {- if (- event.code !== "Backslash" ||- event.repeat ||- event.metaKey ||- event.ctrlKey ||- event.altKey- ) {- return;- }- const target = event.target;- if (- target instanceof HTMLElement &&- (target.isContentEditable ||- target.closest(- 'input:not([type="range"]), textarea, select, [role="dialog"]',- ))- ) {- return;- }- event.preventDefault();- restore = preview.getState().comparison;- preview.setState({ comparison: "original" });- }- function keyUp(event: KeyboardEvent) {- if (event.code === "Backslash") {- release();- }- }- window.addEventListener("keydown", keyDown);- window.addEventListener("keyup", keyUp);- window.addEventListener("blur", release);- return () => {- window.removeEventListener("keydown", keyDown);- window.removeEventListener("keyup", keyUp);- window.removeEventListener("blur", release);- release();- };- }, [preview]);- return (- <Button- variant="ghost"- size="icon"- aria-label="Compare before and after"- aria-pressed={comparison !== "edited"}- title="Compare before and after (hold backslash for original)"- className="aria-pressed:bg-neutral-700 aria-pressed:text-neutral-100"- onClick={() =>- preview.setState({- comparison: comparison === "split" ? "edited" : "split",- })- }- >- <svg- aria-hidden="true"- viewBox="0 0 20 20"- className="size-4"- fill="none"- stroke="currentColor"- strokeWidth="1.5"- >- <path d="M10 2v16M7 5H3v10h4M13 5h4v10h-4" />- </svg>- </Button>- );+ const { preview } = useDocument();+ const comparison = useStore(preview, (state) => state.comparison);+ useEffect(() => {+ let restore: Preview["comparison"] | undefined;+ function release() {+ if (restore === undefined) {+ return;+ }+ preview.setState({ comparison: restore });+ restore = undefined;+ }+ function keyDown(event: KeyboardEvent) {+ if (+ event.code !== "Backslash" ||+ event.repeat ||+ event.metaKey ||+ event.ctrlKey ||+ event.altKey+ ) {+ return;+ }+ const target = event.target;+ if (+ target instanceof HTMLElement &&+ (target.isContentEditable ||+ target.closest(+ 'input:not([type="range"]), textarea, select, [role="dialog"]',+ ))+ ) {+ return;+ }+ event.preventDefault();+ restore = preview.getState().comparison;+ preview.setState({ comparison: "original" });+ }+ function keyUp(event: KeyboardEvent) {+ if (event.code === "Backslash") {+ release();+ }+ }+ window.addEventListener("keydown", keyDown);+ window.addEventListener("keyup", keyUp);+ window.addEventListener("blur", release);+ return () => {+ window.removeEventListener("keydown", keyDown);+ window.removeEventListener("keyup", keyUp);+ window.removeEventListener("blur", release);+ release();+ };+ }, [preview]);+ return (+ <Button+ variant="ghost"+ size="icon"+ aria-label="Compare before and after"+ aria-pressed={comparison !== "edited"}+ title="Compare before and after (hold backslash for original)"+ className="aria-pressed:bg-neutral-700 aria-pressed:text-neutral-100"+ onClick={() =>+ preview.setState({+ comparison: comparison === "split" ? "edited" : "split",+ })+ }+ >+ <svg+ aria-hidden="true"+ viewBox="0 0 20 20"+ className="size-4"+ fill="none"+ stroke="currentColor"+ strokeWidth="1.5"+ >+ <path d="M10 2v16M7 5H3v10h4M13 5h4v10h-4" />+ </svg>+ </Button>+ );}diff --git a/src/app/editor/comparison-divider.tsx b/src/app/editor/comparison-divider.tsxindex e84e0aa..cc3e3e1 100644--- a/src/app/editor/comparison-divider.tsx+++ b/src/app/editor/comparison-divider.tsx@@ -3,85 +3,85 @@ import { useStore } from "zustand";import { useDocument } from "@/components/editor/session";export function ComparisonDivider() {- const { preview } = useDocument();- const comparison = useStore(preview, (state) => state.comparison);- const split = useStore(preview, (state) => state.split);- if (comparison !== "split") {- return null;- }- const move = (position: number) =>- preview.setState({ split: Math.max(0, Math.min(1, position)) });- function drag(event: PointerEvent<HTMLDivElement>) {- if (!event.currentTarget.hasPointerCapture(event.pointerId)) {- return;- }- const bounds = event.currentTarget.parentElement?.getBoundingClientRect();- if (bounds) {- move((event.clientX - bounds.left) / bounds.width);- }- }- return (- <div- role="slider"- tabIndex={0}- aria-label="Before and after divider"- aria-valuemin={0}- aria-valuemax={100}- aria-valuenow={Math.round(split * 100)}- aria-valuetext={`${Math.round(split * 100)}% original`}- aria-orientation="horizontal"- className="absolute inset-y-0 z-10 flex w-8 -translate-x-1/2 cursor-ew-resize touch-none items-center justify-center outline-none group"- style={{ left: `${split * 100}%` }}- onPointerDown={(event) => {- if (event.button !== 0) {- return;- }- event.stopPropagation();- event.currentTarget.focus();- event.currentTarget.setPointerCapture(event.pointerId);- }}- onPointerMove={drag}- onPointerUp={(event) =>- event.currentTarget.releasePointerCapture(event.pointerId)- }- onDoubleClick={(event) => {- event.stopPropagation();- move(0.5);- }}- onKeyDown={(event) => {- const step = event.shiftKey ? 0.1 : 0.01;- const positions: Record<string, number> = {- ArrowLeft: split - step,- ArrowRight: split + step,- Home: 0,- End: 1,- };- if (!(event.key in positions)) {- return;- }- event.preventDefault();- 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">- Before- </span>- <span className="absolute bottom-4 left-6 rounded bg-black/50 px-1.5 py-0.5 text-white">- 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">- <svg- aria-hidden="true"- viewBox="0 0 20 20"- className="size-4"- fill="none"- stroke="currentColor"- strokeWidth="1.5"- >- <path d="M8 6 4 10 8 14M12 6 16 10 12 14" />- </svg>- </span>- </div>- );+ const { preview } = useDocument();+ const comparison = useStore(preview, (state) => state.comparison);+ const split = useStore(preview, (state) => state.split);+ if (comparison !== "split") {+ return null;+ }+ const move = (position: number) =>+ preview.setState({ split: Math.max(0, Math.min(1, position)) });+ function drag(event: PointerEvent<HTMLDivElement>) {+ if (!event.currentTarget.hasPointerCapture(event.pointerId)) {+ return;+ }+ const bounds = event.currentTarget.parentElement?.getBoundingClientRect();+ if (bounds) {+ move((event.clientX - bounds.left) / bounds.width);+ }+ }+ return (+ <div+ role="slider"+ tabIndex={0}+ aria-label="Before and after divider"+ aria-valuemin={0}+ aria-valuemax={100}+ aria-valuenow={Math.round(split * 100)}+ aria-valuetext={`${Math.round(split * 100)}% original`}+ aria-orientation="horizontal"+ className="absolute inset-y-0 z-10 flex w-8 -translate-x-1/2 cursor-ew-resize touch-none items-center justify-center outline-none group"+ style={{ left: `${split * 100}%` }}+ onPointerDown={(event) => {+ if (event.button !== 0) {+ return;+ }+ event.stopPropagation();+ event.currentTarget.focus();+ event.currentTarget.setPointerCapture(event.pointerId);+ }}+ onPointerMove={drag}+ onPointerUp={(event) =>+ event.currentTarget.releasePointerCapture(event.pointerId)+ }+ onDoubleClick={(event) => {+ event.stopPropagation();+ move(0.5);+ }}+ onKeyDown={(event) => {+ const step = event.shiftKey ? 0.1 : 0.01;+ const positions: Record<string, number> = {+ ArrowLeft: split - step,+ ArrowRight: split + step,+ Home: 0,+ End: 1,+ };+ if (!(event.key in positions)) {+ return;+ }+ event.preventDefault();+ 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">+ Before+ </span>+ <span className="absolute bottom-4 left-6 rounded bg-black/50 px-1.5 py-0.5 text-white">+ 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">+ <svg+ aria-hidden="true"+ viewBox="0 0 20 20"+ className="size-4"+ fill="none"+ stroke="currentColor"+ strokeWidth="1.5"+ >+ <path d="M8 6 4 10 8 14M12 6 16 10 12 14" />+ </svg>+ </span>+ </div>+ );}diff --git a/src/app/editor/export/export-image.ts b/src/app/editor/export/export-image.tsindex b4ae0a2..6e0955f 100644--- a/src/app/editor/export/export-image.ts+++ b/src/app/editor/export/export-image.ts@@ -5,92 +5,92 @@ import type { Point } from "@/core/image/frame";import { renderBitmap } from "@/core/renderer";const encodings = {- png: { type: "image/png", extension: "png" },- jpeg: { type: "image/jpeg", extension: "jpg" },- webp: { type: "image/webp", extension: "webp" },+ png: { type: "image/png", extension: "png" },+ jpeg: { type: "image/jpeg", extension: "jpg" },+ webp: { type: "image/webp", extension: "webp" },};export type ExportFormat = keyof typeof encodings;export type ExportOptions = {- format?: ExportFormat;- /** 1 to 100 for JPEG and WebP; PNG ignores it. */- quality?: number;- /** Longest output side in pixels, up to the document's. */- longEdge?: number;+ format?: ExportFormat;+ /** 1 to 100 for JPEG and WebP; PNG ignores it. */+ quality?: number;+ /** Longest output side in pixels, up to the document's. */+ longEdge?: number;};/** Whole-pixel output dimensions with the longest side scaled to `longEdge`. */export function exportSize(- [width, height]: Point,- longEdge = Math.max(width, height),+ [width, height]: Point,+ longEdge = Math.max(width, height),): Point {- const scale = longEdge / Math.max(width, height);- return [- Math.max(1, Math.round(width * scale)),- Math.max(1, Math.round(height * scale)),- ];+ const scale = longEdge / Math.max(width, height);+ return [+ Math.max(1, Math.round(width * scale)),+ Math.max(1, Math.round(height * scale)),+ ];}/** Encodes a rendered image, downsampled to `longEdge` with high-quality smoothing. */export async function encodeImage(- gpu: Gpu,- image: Target,- { format = "png", quality = 80, longEdge }: ExportOptions = {},+ gpu: Gpu,+ image: Target,+ { format = "png", quality = 80, longEdge }: ExportOptions = {},) {- if (!(format in encodings)) {- throw new Error("Choose PNG, JPEG, or WebP.");- }- if (!Number.isFinite(quality) || quality < 1 || quality > 100) {- throw new Error("Quality must be between 1 and 100.");- }- const size = exportSize(image.size);- const maxEdge = Math.max(...size);- if (- longEdge !== undefined &&- (!Number.isInteger(longEdge) || longEdge < 1 || longEdge > maxEdge)- ) {- throw new Error(`Long edge must be between 1 and ${maxEdge} pixels.`);- }- 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;+ if (!(format in encodings)) {+ throw new Error("Choose PNG, JPEG, or WebP.");+ }+ if (!Number.isFinite(quality) || quality < 1 || quality > 100) {+ throw new Error("Quality must be between 1 and 100.");+ }+ const size = exportSize(image.size);+ const maxEdge = Math.max(...size);+ if (+ longEdge !== undefined &&+ (!Number.isInteger(longEdge) || longEdge < 1 || longEdge > maxEdge)+ ) {+ throw new Error(`Long edge must be between 1 and ${maxEdge} pixels.`);+ }+ 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. */export async function exportImage(- gpu: Gpu,- document: EditorDocument,- options: ExportOptions = {},+ gpu: Gpu,+ document: EditorDocument,+ options: ExportOptions = {},) {- const scene = document.scene.getState();- const source = document.resources.get(scene.layers[0].source);- const renderer = createEditorRenderer(gpu, source);- try {- await renderer.update(scene);- // The renderer retains the source until encoding finishes.- const blob = await encodeImage(gpu, renderer.outputImage(), options);- const name = source.file.name.replace(/\.[^.]*$/, "") || "export";- const { extension } = encodings[options.format ?? "png"];- return new File([blob], `${name}.${extension}`, { type: blob.type });- } finally {- renderer.dispose();- }+ const scene = document.scene.getState();+ const source = document.resources.get(scene.layers[0].source);+ const renderer = createEditorRenderer(gpu, source);+ try {+ await renderer.update(scene);+ // The renderer retains the source until encoding finishes.+ const blob = await encodeImage(gpu, renderer.outputImage(), options);+ const name = source.file.name.replace(/\.[^.]*$/, "") || "export";+ const { extension } = encodings[options.format ?? "png"];+ return new File([blob], `${name}.${extension}`, { type: blob.type });+ } finally {+ renderer.dispose();+ }}diff --git a/src/app/editor/export/index.tsx b/src/app/editor/export/index.tsxindex fe6e23d..e1f7a48 100644--- a/src/app/editor/export/index.tsx+++ b/src/app/editor/export/index.tsx@@ -16,235 +16,235 @@ import { type ExportFormat, exportImage, exportSize } from "./export-image";import { useEncodedPreview } from "./preview";type Format = {- id: ExportFormat;- label: string;- description: string;- lossy: boolean;+ id: ExportFormat;+ label: string;+ description: string;+ lossy: boolean;};const formats: Format[] = [- {- id: "jpeg",- label: "JPEG",- description: "Small files, opens anywhere.",- lossy: true,- },- {- id: "png",- label: "PNG",- description: "Lossless, largest files.",- lossy: false,- },- {- id: "webp",- label: "WebP",- description: "Smaller than JPEG, less widely supported.",- lossy: true,- },+ {+ id: "jpeg",+ label: "JPEG",+ description: "Small files, opens anywhere.",+ lossy: true,+ },+ {+ id: "png",+ label: "PNG",+ description: "Lossless, largest files.",+ lossy: false,+ },+ {+ id: "webp",+ label: "WebP",+ description: "Smaller than JPEG, less widely supported.",+ lossy: true,+ },];const kilobytes = new Intl.NumberFormat(undefined, {- style: "unit",- unit: "kilobyte",- maximumFractionDigits: 0,+ style: "unit",+ unit: "kilobyte",+ maximumFractionDigits: 0,});const megabytes = new Intl.NumberFormat(undefined, {- style: "unit",- unit: "megabyte",- maximumFractionDigits: 1,+ style: "unit",+ unit: "megabyte",+ maximumFractionDigits: 1,});function formatBytes(bytes: number) {- if (bytes < 1_000_000) {- return kilobytes.format(bytes / 1000);- }- return megabytes.format(bytes / 1_000_000);+ if (bytes < 1_000_000) {+ return kilobytes.format(bytes / 1000);+ }+ return megabytes.format(bytes / 1_000_000);}function FormatSelect({- value,- onChange,+ value,+ onChange,}: {- value: Format;- onChange: (format: Format) => void;+ value: Format;+ onChange: (format: Format) => void;}) {- return (- <div className="space-y-2">- <label className="flex items-center justify-between text-neutral-400">- Format- <Field className="relative w-28">- <select- aria-label="Format"- value={value.id}- className="w-full cursor-pointer bg-transparent px-1 text-neutral-100 outline-none [color-scheme:dark]"- onChange={(event) =>- onChange(formats[event.currentTarget.selectedIndex])- }- >- {formats.map((format) => (- <option key={format.id} value={format.id}>- {format.label}- </option>- ))}- </select>- </Field>- </label>- <p className="text-neutral-500">{value.description}</p>- </div>- );+ return (+ <div className="space-y-2">+ <label className="flex items-center justify-between text-neutral-400">+ Format+ <Field className="relative w-28">+ <select+ aria-label="Format"+ value={value.id}+ className="w-full cursor-pointer bg-transparent px-1 text-neutral-100 outline-none [color-scheme:dark]"+ onChange={(event) =>+ onChange(formats[event.currentTarget.selectedIndex])+ }+ >+ {formats.map((format) => (+ <option key={format.id} value={format.id}>+ {format.label}+ </option>+ ))}+ </select>+ </Field>+ </label>+ <p className="text-neutral-500">{value.description}</p>+ </div>+ );}/** Width, height, and scale edit one long edge; extra rows share the grid. */function SizeFields({- size,- longEdge,- onChange,- children,+ size,+ longEdge,+ onChange,+ children,}: {- size: Point;- longEdge: number;- onChange: (longEdge: number) => void;- children: ReactNode;+ size: Point;+ longEdge: number;+ onChange: (longEdge: number) => void;+ children: ReactNode;}) {- const [fullWidth, fullHeight] = exportSize(size);- const maxEdge = Math.max(fullWidth, fullHeight);- const [width, height] = exportSize(size, longEdge);- const scale = Math.round((100 * longEdge) / maxEdge);- const scaleTo = (fraction: number) =>- onChange(Math.max(1, Math.round(maxEdge * fraction)));- return (- <div className="grid grid-cols-[auto_1fr_1.5rem] items-center gap-x-3 gap-y-2 text-neutral-400">- <span>Width</span>- <div className="justify-self-end">- <ScrubInput- aria-label="Width"- value={width}- min={1}- max={fullWidth}- onChange={(value) => scaleTo(value / fullWidth)}- />- </div>- <span className="text-neutral-500">px</span>- <span>Height</span>- <div className="justify-self-end">- <ScrubInput- aria-label="Height"- value={height}- min={1}- max={fullHeight}- onChange={(value) => scaleTo(value / fullHeight)}- />- </div>- <span className="text-neutral-500">px</span>- <span>Scale</span>- <div className="justify-self-end">- <ScrubInput- aria-label="Scale"- value={scale}- min={1}- max={100}- onChange={(value) => scaleTo(value / 100)}- />- </div>- <span className="text-neutral-500">%</span>- {children}- </div>- );+ const [fullWidth, fullHeight] = exportSize(size);+ const maxEdge = Math.max(fullWidth, fullHeight);+ const [width, height] = exportSize(size, longEdge);+ const scale = Math.round((100 * longEdge) / maxEdge);+ const scaleTo = (fraction: number) =>+ onChange(Math.max(1, Math.round(maxEdge * fraction)));+ return (+ <div className="grid grid-cols-[auto_1fr_1.5rem] items-center gap-x-3 gap-y-2 text-neutral-400">+ <span>Width</span>+ <div className="justify-self-end">+ <ScrubInput+ aria-label="Width"+ value={width}+ min={1}+ max={fullWidth}+ onChange={(value) => scaleTo(value / fullWidth)}+ />+ </div>+ <span className="text-neutral-500">px</span>+ <span>Height</span>+ <div className="justify-self-end">+ <ScrubInput+ aria-label="Height"+ value={height}+ min={1}+ max={fullHeight}+ onChange={(value) => scaleTo(value / fullHeight)}+ />+ </div>+ <span className="text-neutral-500">px</span>+ <span>Scale</span>+ <div className="justify-self-end">+ <ScrubInput+ aria-label="Scale"+ value={scale}+ min={1}+ max={100}+ onChange={(value) => scaleTo(value / 100)}+ />+ </div>+ <span className="text-neutral-500">%</span>+ {children}+ </div>+ );}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" />- </div>- );+ return (+ <div className="pointer-events-none absolute inset-0 grid place-items-center">+ <Spinner className="size-8 border-neutral-500 border-t-white" />+ </div>+ );}/** Shows the encoded file on the canvas; a spinner marks results from earlier settings as loading. */export function ExportMode({ onClose }: { onClose: () => void }) {- const gpu = useGpu();- const editorDocument = useDocument();- const size = useScene((scene) => scene.frame.size);- const maxEdge = Math.max(...exportSize(size));- const [format, setFormat] = useState(formats[0]);- const [quality, setQuality] = useState(80);- const [longEdge, setLongEdge] = useState(maxEdge);- const [error, setError] = useState("");- const exporting = useRef(false);- // A crop after choosing a size keeps the choice within the new document.- const edge = Math.min(longEdge, maxEdge);- const options = { format: format.id, quality, longEdge: edge };- const output = useMemo(() => exportSize(size, edge), [size, edge]);- const { encoded, pending } = useEncodedPreview(options);- useShortcuts({ escape: onClose });- const save = async () => {- if (exporting.current) {- return;- }- exporting.current = true;- setError("");- try {- const file = await exportImage(gpu, editorDocument, options);- const url = URL.createObjectURL(file);- const link = document.createElement("a");- link.href = url;- link.download = file.name;- link.click();- setTimeout(() => URL.revokeObjectURL(url), 1000);- } catch (error) {- setError(- error instanceof Error ? error.message : "Couldn't export image.",- );- } finally {- exporting.current = false;- }- };- return (- <>- <EditorViewport- size={encoded?.image.size ?? output}- overlay={pending && <LoadingOverlay />}- >- {encoded && <Image image={encoded.image} />}- </EditorViewport>- <EditorPanel header={<PanelHeader title="Export" onClose={onClose} />}>- <section- aria-label="Export settings"- className="flex flex-col gap-5 p-4"- >- <FormatSelect value={format} onChange={setFormat} />- {format.lossy && (- <Slider- label="Quality"- value={quality}- onChange={setQuality}- min={1}- max={100}- defaultValue={80}- />- )}- <SizeFields size={size} longEdge={edge} onChange={setLongEdge}>- <span>File size</span>- <span- className={cn(- "col-span-2 flex items-center justify-end gap-1.5 text-neutral-100 tabular-nums",- pending && "text-neutral-500",- )}- >- {encoded ? formatBytes(encoded.bytes) : "…"}- {pending && <Spinner className="size-3" />}- </span>- </SizeFields>- <Button className="w-full py-2" onClick={save}>- Save image- </Button>- {error && (- <p className="text-red-400" role="alert">- {error}- </p>- )}- </section>- </EditorPanel>- </>- );+ const gpu = useGpu();+ const editorDocument = useDocument();+ const size = useScene((scene) => scene.frame.size);+ const maxEdge = Math.max(...exportSize(size));+ const [format, setFormat] = useState(formats[0]);+ const [quality, setQuality] = useState(80);+ const [longEdge, setLongEdge] = useState(maxEdge);+ const [error, setError] = useState("");+ const exporting = useRef(false);+ // A crop after choosing a size keeps the choice within the new document.+ const edge = Math.min(longEdge, maxEdge);+ const options = { format: format.id, quality, longEdge: edge };+ const output = useMemo(() => exportSize(size, edge), [size, edge]);+ const { encoded, pending } = useEncodedPreview(options);+ useShortcuts({ escape: onClose });+ const save = async () => {+ if (exporting.current) {+ return;+ }+ exporting.current = true;+ setError("");+ try {+ const file = await exportImage(gpu, editorDocument, options);+ const url = URL.createObjectURL(file);+ const link = document.createElement("a");+ link.href = url;+ link.download = file.name;+ link.click();+ setTimeout(() => URL.revokeObjectURL(url), 1000);+ } catch (error) {+ setError(+ error instanceof Error ? error.message : "Couldn't export image.",+ );+ } finally {+ exporting.current = false;+ }+ };+ return (+ <>+ <EditorViewport+ size={encoded?.image.size ?? output}+ overlay={pending && <LoadingOverlay />}+ >+ {encoded && <Image image={encoded.image} />}+ </EditorViewport>+ <EditorPanel header={<PanelHeader title="Export" onClose={onClose} />}>+ <section+ aria-label="Export settings"+ className="flex flex-col gap-5 p-4"+ >+ <FormatSelect value={format} onChange={setFormat} />+ {format.lossy && (+ <Slider+ label="Quality"+ value={quality}+ onChange={setQuality}+ min={1}+ max={100}+ defaultValue={80}+ />+ )}+ <SizeFields size={size} longEdge={edge} onChange={setLongEdge}>+ <span>File size</span>+ <span+ className={cn(+ "col-span-2 flex items-center justify-end gap-1.5 text-neutral-100 tabular-nums",+ pending && "text-neutral-500",+ )}+ >+ {encoded ? formatBytes(encoded.bytes) : "…"}+ {pending && <Spinner className="size-3" />}+ </span>+ </SizeFields>+ <Button className="w-full py-2" onClick={save}>+ Save image+ </Button>+ {error && (+ <p className="text-red-400" role="alert">+ {error}+ </p>+ )}+ </section>+ </EditorPanel>+ </>+ );}diff --git a/src/app/editor/export/preview.tsx b/src/app/editor/export/preview.tsxindex 9021142..55064ca 100644--- a/src/app/editor/export/preview.tsx+++ b/src/app/editor/export/preview.tsx@@ -16,51 +16,51 @@ type Encoded = { key: string; bytes: number; image: Target };* The last result stays available while the current settings are still pending.*/export function useEncodedPreview({- format,- quality,- longEdge,+ format,+ quality,+ longEdge,}: ExportOptions) {- const gpu = useGpu();- const renderer = useRenderer();- const [revision, setRevision] = useState(0);- useEffect(- () => renderer.subscribe(() => setRevision((count) => count + 1)),- [renderer],- );- const key = `${format} ${quality} ${longEdge} ${revision}`;- const [encoded, setEncoded] = useState<Encoded>();- const queue = useRef(Promise.resolve());- useEffect(() => {- let active = true;- const timer = setTimeout(() => {- queue.current = queue.current.then(async () => {- if (!active) {- return;- }- try {- const blob = await encodeImage(gpu, renderer.outputImage(), {- format,- quality,- longEdge,- });- const bitmap = await createImageBitmap(blob);- if (!active) {- bitmap.close();- return;- }- setEncoded({ key, bytes: blob.size, image: linearize(gpu, bitmap) });- } catch {- if (active) {- setEncoded(undefined);- }- }- });- }, settleDelay);- return () => {- active = false;- clearTimeout(timer);- };- }, [gpu, renderer, key, format, quality, longEdge]);- useEffect(() => () => encoded?.image.color.dispose(), [encoded]);- return { encoded, pending: encoded?.key !== key };+ const gpu = useGpu();+ const renderer = useRenderer();+ const [revision, setRevision] = useState(0);+ useEffect(+ () => renderer.subscribe(() => setRevision((count) => count + 1)),+ [renderer],+ );+ const key = `${format} ${quality} ${longEdge} ${revision}`;+ const [encoded, setEncoded] = useState<Encoded>();+ const queue = useRef(Promise.resolve());+ useEffect(() => {+ let active = true;+ const timer = setTimeout(() => {+ queue.current = queue.current.then(async () => {+ if (!active) {+ return;+ }+ try {+ const blob = await encodeImage(gpu, renderer.outputImage(), {+ format,+ quality,+ longEdge,+ });+ const bitmap = await createImageBitmap(blob);+ if (!active) {+ bitmap.close();+ return;+ }+ setEncoded({ key, bytes: blob.size, image: linearize(gpu, bitmap) });+ } catch {+ if (active) {+ setEncoded(undefined);+ }+ }+ });+ }, settleDelay);+ return () => {+ active = false;+ clearTimeout(timer);+ };+ }, [gpu, renderer, key, format, quality, longEdge]);+ useEffect(() => () => encoded?.image.color.dispose(), [encoded]);+ return { encoded, pending: encoded?.key !== key };}diff --git a/src/app/editor/header.tsx b/src/app/editor/header.tsxindex a95383a..1082b1c 100644--- a/src/app/editor/header.tsx+++ b/src/app/editor/header.tsx@@ -2,24 +2,24 @@ import type { ReactNode } from "react";/** Identity on the left, document actions on the right; present in every editor state. */export function EditorHeader({- file,- children,+ file,+ children,}: {- file?: string;- children?: ReactNode;+ file?: string;+ children?: ReactNode;}) {- return (- <header className="flex h-11 shrink-0 items-center gap-3 border-black border-b bg-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>- {file && (- <span className="min-w-0 truncate text-neutral-500" title={file}>- {file}- </span>- )}- <div className="ml-auto flex items-center gap-1">{children}</div>- </header>- );+ return (+ <header className="flex h-11 shrink-0 items-center gap-3 border-black border-b bg-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>+ {file && (+ <span className="min-w-0 truncate text-neutral-500" title={file}>+ {file}+ </span>+ )}+ <div className="ml-auto flex items-center gap-1">{children}</div>+ </header>+ );}diff --git a/src/app/editor/histogram.tsx b/src/app/editor/histogram.tsxindex 3850779..9e64a05 100644--- a/src/app/editor/histogram.tsx+++ b/src/app/editor/histogram.tsx@@ -8,25 +8,25 @@ import { ClippingControls } from "./clipping-controls";const colors = ["#f25445", "#6bd175", "#5c8ffa"] as const;export function ImageHistogram() {- const gpu = useGpu();- const renderer = useRenderer();- const histogram = useMemo(() => createHistogram(gpu), [gpu]);- useEffect(() => () => histogram.dispose(), [histogram]);- return (- <section- aria-label="Image histogram"- className="group relative shrink-0 border-b border-black bg-neutral-900"- >- <ClippingControls />- <Histogram- histogram={histogram}- image={renderer.outputImage}- subscribe={renderer.subscribe}- colors={colors}- fillOpacity={0.2}- className="h-25 w-full"- aria-label="output histogram"- />- </section>- );+ const gpu = useGpu();+ const renderer = useRenderer();+ const histogram = useMemo(() => createHistogram(gpu), [gpu]);+ useEffect(() => () => histogram.dispose(), [histogram]);+ return (+ <section+ aria-label="Image histogram"+ className="group relative shrink-0 border-b border-black bg-neutral-900"+ >+ <ClippingControls />+ <Histogram+ histogram={histogram}+ image={renderer.outputImage}+ subscribe={renderer.subscribe}+ colors={colors}+ fillOpacity={0.2}+ className="h-25 w-full"+ aria-label="output histogram"+ />+ </section>+ );}diff --git a/src/app/editor/history.tsx b/src/app/editor/history.tsxindex 44b3fbc..5b2c125 100644--- a/src/app/editor/history.tsx+++ b/src/app/editor/history.tsx@@ -5,42 +5,42 @@ import Button from "@/components/ui/button";import { useShortcuts } from "@/hooks/use-shortcuts";export function HistoryControls() {- const { history } = useDocument();- const { undoCount, redoCount } = useStore(history.status);- useShortcuts({- "mod+z": history.undo,- "mod+shift+z": history.redo,- "mod+y": history.redo,- "mod+shift+y": history.redo,- });- return (- <fieldset aria-label="History" className="flex items-center gap-0.5">- <Button- variant="ghost"- size="icon"- className="disabled:pointer-events-none disabled:opacity-25"- aria-label="Undo"- title="Undo (Ctrl/⌘ Z)"- disabled={!undoCount}- onClick={history.undo}- >- <Icon viewBox="0 0 20 20" className="size-4">- <path d="m7 4-4 4 4 4M3 8h8a5 5 0 0 1 0 10" />- </Icon>- </Button>- <Button- variant="ghost"- size="icon"- className="disabled:pointer-events-none disabled:opacity-25"- aria-label="Redo"- title="Redo (Ctrl/⌘ Shift Z)"- disabled={!redoCount}- onClick={history.redo}- >- <Icon viewBox="0 0 20 20" className="size-4">- <path d="m13 4 4 4-4 4m4-4H9a5 5 0 0 0 0 10" />- </Icon>- </Button>- </fieldset>- );+ const { history } = useDocument();+ const { undoCount, redoCount } = useStore(history.status);+ useShortcuts({+ "mod+z": history.undo,+ "mod+shift+z": history.redo,+ "mod+y": history.redo,+ "mod+shift+y": history.redo,+ });+ return (+ <fieldset aria-label="History" className="flex items-center gap-0.5">+ <Button+ variant="ghost"+ size="icon"+ className="disabled:pointer-events-none disabled:opacity-25"+ aria-label="Undo"+ title="Undo (Ctrl/⌘ Z)"+ disabled={!undoCount}+ onClick={history.undo}+ >+ <Icon viewBox="0 0 20 20" className="size-4">+ <path d="m7 4-4 4 4 4M3 8h8a5 5 0 0 1 0 10" />+ </Icon>+ </Button>+ <Button+ variant="ghost"+ size="icon"+ className="disabled:pointer-events-none disabled:opacity-25"+ aria-label="Redo"+ title="Redo (Ctrl/⌘ Shift Z)"+ disabled={!redoCount}+ onClick={history.redo}+ >+ <Icon viewBox="0 0 20 20" className="size-4">+ <path d="m13 4 4 4-4 4m4-4H9a5 5 0 0 0 0 10" />+ </Icon>+ </Button>+ </fieldset>+ );}diff --git a/src/app/editor/index.tsx b/src/app/editor/index.tsxindex e3d42ca..68a0519 100644--- a/src/app/editor/index.tsx+++ b/src/app/editor/index.tsx@@ -11,8 +11,8 @@ import { findLayer } from "@/core/document";import { LayersControls } from "@/features/layers/controls";import { addLayer } from "@/features/layers/edits";import {- GradientProvider,- useGradientTool,+ GradientProvider,+ useGradientTool,} from "@/features/layers/gradient-tool";import { useShortcuts } from "@/hooks/use-shortcuts";import { EditorCanvas } from "./canvas";@@ -26,150 +26,150 @@ import { type Mode, ModeProvider, modes, useMode } from "./modes";import { createEditorRenderer } from "./renderer";function EditorSidebar({ children }: { children: ReactNode }) {- const document = useDocument();- function add(kind: EffectLayer["kind"]) {- const scene = document.scene.getState();- const selected = document.selection.getState().layerId;- const layer = findLayer(scene.layers, selected);- const placement =- layer?.kind === "mask" && scene.layers.includes(layer)- ? { inside: selected }- : { above: selected };- addLayer(document, createLayer(kind), placement);- }- return (- <EditorPanel- header={<ImageHistogram />}- footer={<LayersControls onAdd={add} />}- >- {children}- </EditorPanel>- );+ const document = useDocument();+ function add(kind: EffectLayer["kind"]) {+ const scene = document.scene.getState();+ const selected = document.selection.getState().layerId;+ const layer = findLayer(scene.layers, selected);+ const placement =+ layer?.kind === "mask" && scene.layers.includes(layer)+ ? { inside: selected }+ : { above: selected };+ addLayer(document, createLayer(kind), placement);+ }+ return (+ <EditorPanel+ header={<ImageHistogram />}+ footer={<LayersControls onAdd={add} />}+ >+ {children}+ </EditorPanel>+ );}/** A View replaces the canvas and sidebar; a Panel fills the sidebar beside the canvas. */function ModeView() {- const { mode, setMode } = useMode();- const tool = useGradientTool();- useShortcuts({- l: () => {- setMode(modes[0]);- tool.draw();- },- r: () => {- setMode(modes[0]);- tool.draw("radial");- },- });- function close() {- setMode(modes[0]);- if (window.document.activeElement instanceof HTMLElement) {- window.document.activeElement.blur();- }- }- if ("View" in mode) {- return <mode.View onClose={close} />;- }- return (- <>- <EditorCanvas />- <EditorSidebar>- <mode.Panel />- </EditorSidebar>- </>- );+ const { mode, setMode } = useMode();+ const tool = useGradientTool();+ useShortcuts({+ l: () => {+ setMode(modes[0]);+ tool.draw();+ },+ r: () => {+ setMode(modes[0]);+ tool.draw("radial");+ },+ });+ function close() {+ setMode(modes[0]);+ if (window.document.activeElement instanceof HTMLElement) {+ window.document.activeElement.blur();+ }+ }+ if ("View" in mode) {+ return <mode.View onClose={close} />;+ }+ return (+ <>+ <EditorCanvas />+ <EditorSidebar>+ <mode.Panel />+ </EditorSidebar>+ </>+ );}function ExportButton() {- const { mode, setMode } = useMode();- const target: Mode = mode.id === "export" ? modes[0] : modes[2];- return (- <Button- aria-pressed={mode.id === "export"}- title="Export (E)"- className="ml-1 aria-pressed:bg-neutral-600"- onClick={() => setMode(target)}- >- Export- </Button>- );+ const { mode, setMode } = useMode();+ const target: Mode = mode.id === "export" ? modes[0] : modes[2];+ return (+ <Button+ aria-pressed={mode.id === "export"}+ title="Export (E)"+ className="ml-1 aria-pressed:bg-neutral-600"+ onClick={() => setMode(target)}+ >+ Export+ </Button>+ );}function DocumentEditor({ file }: { file: string }) {- const document = useDocument();- function addMask(- mask: Gradient,- target: { parentId?: string; operation: "add" | "subtract" },- ) {- const scene = document.scene.getState();- const selected = document.selection.getState().layerId;- // A new top-level mask goes above the selection's root ancestor.- const root =- scene.layers.find((item) => findLayer([item], selected)) ??- scene.layers[0];- const placement = target.parentId- ? { inside: target.parentId }- : { above: root.id };- addLayer(document, createMask(mask, target.operation), placement);- }- return (- <GradientProvider onCreate={addMask}>- <ModeProvider>- <EditorHeader file={file}>- <HistoryControls />- <hr- aria-orientation="vertical"- className="mx-1 h-4 w-px border-0 bg-neutral-600"- />- <ComparisonControl />- <ExportButton />- </EditorHeader>- <div className="flex min-h-0 flex-1 flex-col md:flex-row">- <ModeRail />- <ModeView />- </div>- </ModeProvider>- </GradientProvider>- );+ const document = useDocument();+ function addMask(+ mask: Gradient,+ target: { parentId?: string; operation: "add" | "subtract" },+ ) {+ const scene = document.scene.getState();+ const selected = document.selection.getState().layerId;+ // A new top-level mask goes above the selection's root ancestor.+ const root =+ scene.layers.find((item) => findLayer([item], selected)) ??+ scene.layers[0];+ const placement = target.parentId+ ? { inside: target.parentId }+ : { above: root.id };+ addLayer(document, createMask(mask, target.operation), placement);+ }+ return (+ <GradientProvider onCreate={addMask}>+ <ModeProvider>+ <EditorHeader file={file}>+ <HistoryControls />+ <hr+ aria-orientation="vertical"+ className="mx-1 h-4 w-px border-0 bg-neutral-600"+ />+ <ComparisonControl />+ <ExportButton />+ </EditorHeader>+ <div className="flex min-h-0 flex-1 flex-col md:flex-row">+ <ModeRail />+ <ModeView />+ </div>+ </ModeProvider>+ </GradientProvider>+ );}type EditorProps = { state: ReturnType<Workspace["state"]["getState"]> };function LoadingStatus({ state }: EditorProps) {- if (state.status !== "error") {- return <Spinner />;- }- return (- <p className="max-w-md text-center text-neutral-400">- Couldn't open {state.file}: {state.error}- </p>- );+ if (state.status !== "error") {+ return <Spinner />;+ }+ return (+ <p className="max-w-md text-center text-neutral-400">+ Couldn't open {state.file}: {state.error}+ </p>+ );}function EditorContent({ state }: EditorProps) {- if (state.status === "ready") {- return (- <DocumentProvider key={state.document.id} value={state.document}>- <RendererProvider createRenderer={createEditorRenderer}>- <DocumentEditor file={state.file} />- </RendererProvider>- </DocumentProvider>- );- }- return (- <>- <EditorHeader file={state.file} />- <div className="flex min-h-0 flex-1 flex-col md:flex-row">- <div className="grid flex-1 place-items-center">- <LoadingStatus state={state} />- </div>- <ResizablePanel />- </div>- </>- );+ if (state.status === "ready") {+ return (+ <DocumentProvider key={state.document.id} value={state.document}>+ <RendererProvider createRenderer={createEditorRenderer}>+ <DocumentEditor file={state.file} />+ </RendererProvider>+ </DocumentProvider>+ );+ }+ return (+ <>+ <EditorHeader file={state.file} />+ <div className="flex min-h-0 flex-1 flex-col md:flex-row">+ <div className="grid flex-1 place-items-center">+ <LoadingStatus state={state} />+ </div>+ <ResizablePanel />+ </div>+ </>+ );}export default function Editor({ state }: EditorProps) {- return (- <main className="flex h-dvh flex-col">- <EditorContent state={state} />- </main>- );+ return (+ <main className="flex h-dvh flex-col">+ <EditorContent state={state} />+ </main>+ );}diff --git a/src/app/editor/layers.ts b/src/app/editor/layers.tsindex ef56286..c3baf68 100644--- a/src/app/editor/layers.ts+++ b/src/app/editor/layers.ts@@ -1,10 +1,10 @@import type {- EditorDocument,- EffectLayer,- Gradient,- ImageLayer,- Layer,- MaskLayer,+ EditorDocument,+ EffectLayer,+ Gradient,+ ImageLayer,+ Layer,+ MaskLayer,} from "@/core/document";import type { WhiteBalance } from "@/core/image";import { defaultAdjustments } from "@/features/adjustments/model";@@ -13,100 +13,100 @@ import { defaultDetails } from "@/features/details/model";import { defaultCurve } from "@/features/tone-curves/curve";function baseLayer() {- return { id: crypto.randomUUID(), visible: true, opacity: 1, children: [] };+ return { id: crypto.randomUUID(), visible: true, opacity: 1, children: [] };}export function createImageLayer(- source: string,- name: string,- whiteBalance?: WhiteBalance,+ source: string,+ name: string,+ whiteBalance?: WhiteBalance,): ImageLayer {- return {- kind: "image",- id: crypto.randomUUID(),- name,- source,- whiteBalance,- adjustments: { ...defaultAdjustments },- toneCurve: defaultCurve,- children: [],- };+ return {+ kind: "image",+ id: crypto.randomUUID(),+ name,+ source,+ whiteBalance,+ adjustments: { ...defaultAdjustments },+ toneCurve: defaultCurve,+ children: [],+ };}export function createLayer<K extends EffectLayer["kind"]>(- kind: K,+ kind: K,): Extract<EffectLayer, { kind: K }>;export function createLayer(kind: EffectLayer["kind"]): EffectLayer {- const base = baseLayer();- switch (kind) {- case "details":- return { ...base, kind, name: "Details", details: { ...defaultDetails } };- case "exposure":- return { ...base, kind, name: "Exposure", exposure: 1 };- case "vignette":- return {- ...base,- kind,- name: "Vignette",- vignette: { intensity: 50, softness: 50 },- };- case "color-mixer":- return { ...base, kind, name: "Color Mixer", colorMixer: defaultMixer };- default:- throw Error("Unknown layer kind.");- }+ const base = baseLayer();+ switch (kind) {+ case "details":+ return { ...base, kind, name: "Details", details: { ...defaultDetails } };+ case "exposure":+ return { ...base, kind, name: "Exposure", exposure: 1 };+ case "vignette":+ return {+ ...base,+ kind,+ name: "Vignette",+ vignette: { intensity: 50, softness: 50 },+ };+ case "color-mixer":+ return { ...base, kind, name: "Color Mixer", colorMixer: defaultMixer };+ default:+ throw Error("Unknown layer kind.");+ }}export function createMask(- mask: Gradient,- operation: MaskLayer["operation"] = "add",+ mask: Gradient,+ operation: MaskLayer["operation"] = "add",): MaskLayer {- return {- ...baseLayer(),- kind: "mask",- name: mask.kind === "radial" ? "Radial Gradient" : "Linear Gradient",- operation,- adjustments: { ...defaultAdjustments },- toneCurve: defaultCurve,- mask,- };+ return {+ ...baseLayer(),+ kind: "mask",+ name: mask.kind === "radial" ? "Radial Gradient" : "Linear Gradient",+ operation,+ adjustments: { ...defaultAdjustments },+ toneCurve: defaultCurve,+ mask,+ };}/** The first root effect of a kind. */export function findEffect<K extends EffectLayer["kind"]>(- layers: readonly Layer[],- kind: K,+ layers: readonly Layer[],+ kind: K,) {- return layers.find(- (layer): layer is Extract<EffectLayer, { kind: K }> => layer.kind === kind,- );+ 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: EffectLayer["kind"],- id: string | undefined,- edit: (id: string) => void,+ document: EditorDocument,+ kind: EffectLayer["kind"],+ id: string | undefined,+ edit: (id: string) => void,) {- const scene = document.scene.getState();- const existing = id ?? findEffect(scene.layers, kind)?.id;- if (existing) {- edit(existing);- return;- }- 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;- }+ const scene = document.scene.getState();+ const existing = id ?? findEffect(scene.layers, kind)?.id;+ if (existing) {+ edit(existing);+ return;+ }+ 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/mode-rail.tsx b/src/app/editor/mode-rail.tsxindex 110800d..bdc44b3 100644--- a/src/app/editor/mode-rail.tsx+++ b/src/app/editor/mode-rail.tsx@@ -3,37 +3,37 @@ import { useShortcuts } from "@/hooks/use-shortcuts";import { type Mode, modes, useMode } from "./modes";function ModeTab({ entry }: { entry: Mode }) {- const { mode, setMode } = useMode();- return (- <Tab- selected={entry === mode}- size="icon"- aria-label={entry.label}- title={`${entry.label} (${entry.key.toUpperCase()})`}- onClick={() => setMode(entry)}- >- <entry.Icon className="size-5" />- </Tab>- );+ const { mode, setMode } = useMode();+ return (+ <Tab+ selected={entry === mode}+ size="icon"+ aria-label={entry.label}+ title={`${entry.label} (${entry.key.toUpperCase()})`}+ onClick={() => setMode(entry)}+ >+ <entry.Icon className="size-5" />+ </Tab>+ );}/** Icon tabs in a column at the window's left edge on desktop, a bar above the canvas on mobile; titles carry the label and shortcut. */export function ModeRail() {- const { setMode } = useMode();- useShortcuts(- Object.fromEntries(- modes.map((entry) => [entry.key, () => setMode(entry)] as const),- ),- );- const editing = modes.filter((entry) => entry.group === "edit");- return (- <TabList- aria-label="Editor mode"- className="shrink-0 overflow-auto border-black border-b bg-panel p-1.5 md:w-11 md:flex-col md:border-r md:border-b-0"- >- {editing.map((entry) => (- <ModeTab key={entry.id} entry={entry} />- ))}- </TabList>- );+ const { setMode } = useMode();+ useShortcuts(+ Object.fromEntries(+ modes.map((entry) => [entry.key, () => setMode(entry)] as const),+ ),+ );+ const editing = modes.filter((entry) => entry.group === "edit");+ return (+ <TabList+ aria-label="Editor mode"+ className="shrink-0 overflow-auto border-black border-b bg-panel p-1.5 md:w-11 md:flex-col md:border-r md:border-b-0"+ >+ {editing.map((entry) => (+ <ModeTab key={entry.id} entry={entry} />+ ))}+ </TabList>+ );}diff --git a/src/app/editor/modes.tsx b/src/app/editor/modes.tsxindex 26b4ded..7b442a1 100644--- a/src/app/editor/modes.tsx+++ b/src/app/editor/modes.tsx@@ -8,25 +8,25 @@ import { AdjustPanel } from "./adjust";import { ExportMode } from "./export";const ModeContext = createContext<{- mode: Mode;- setMode: (mode: Mode) => void;+ mode: Mode;+ setMode: (mode: Mode) => void;} | null>(null);export function useMode() {- const context = useContext(ModeContext);- if (!context) {- throw new Error("A mode provider is required.");- }- return context;+ const context = useContext(ModeContext);+ if (!context) {+ throw new Error("A mode provider is required.");+ }+ return context;}const adjust = {- id: "adjust",- label: "Adjust",- key: "a",- Icon: AdjustIcon,- group: "edit",- Panel: AdjustPanel,+ id: "adjust",+ label: "Adjust",+ key: "a",+ Icon: AdjustIcon,+ group: "edit",+ Panel: AdjustPanel,} as const;/**@@ -34,33 +34,33 @@ const adjust = {* The output mode opens from the header rather than the rail.*/export const modes = [- adjust,- {- id: "crop",- label: "Crop",- key: "c",- Icon: CropIcon,- group: "edit",- View: CropEditor,- },- {- id: "export",- label: "Export",- key: "e",- Icon: ExportIcon,- group: "output",- View: ExportMode,- },+ adjust,+ {+ id: "crop",+ label: "Crop",+ key: "c",+ Icon: CropIcon,+ group: "edit",+ View: CropEditor,+ },+ {+ id: "export",+ label: "Export",+ key: "e",+ Icon: ExportIcon,+ group: "output",+ View: ExportMode,+ },] as const;export type Mode = (typeof modes)[number];export function ModeProvider({ children }: { children: ReactNode }) {- const [mode, updateMode] = useState<Mode>(adjust);- const tool = useGradientTool();- function setMode(mode: Mode) {- tool.close();- updateMode(mode);- }- return <ModeContext value={{ mode, setMode }}>{children}</ModeContext>;+ const [mode, updateMode] = useState<Mode>(adjust);+ const tool = useGradientTool();+ function setMode(mode: Mode) {+ tool.close();+ updateMode(mode);+ }+ return <ModeContext value={{ mode, setMode }}>{children}</ModeContext>;}diff --git a/src/app/editor/renderer.ts b/src/app/editor/renderer.tsindex 3d546b6..94a2ee1 100644--- a/src/app/editor/renderer.ts+++ b/src/app/editor/renderer.ts@@ -2,12 +2,12 @@ import type { Gpu, Timer } from "vgpu";import { maskModifiers, type ProcessingLayer } from "@/core/document";import type { ImageSource } from "@/core/image";import {- createRenderer,- input,- mixAdjustment,- pipeline,- type RenderImage,- transformImages,+ createRenderer,+ input,+ mixAdjustment,+ pipeline,+ type RenderImage,+ transformImages,} from "@/core/renderer";import { exposure } from "@/features/adjustments/exposure";import { adjustments } from "@/features/adjustments/pass";@@ -17,87 +17,87 @@ import { toneCurves } from "@/features/tone-curves/pass";import { vignette } from "@/features/vignette/pass";type Composition = {- image: RenderImage;- input?: RenderImage;+ image: RenderImage;+ input?: RenderImage;};function composeLayer(- below: RenderImage,- layer: ProcessingLayer,- inputId?: string,+ below: RenderImage,+ layer: ProcessingLayer,+ inputId?: string,): Composition {- if (!layer.visible || layer.opacity === 0) {- return { image: below };- }- const name = `layer/${layer.id}`;- let input: RenderImage | undefined;- let edited = below;- switch (layer.kind) {- case "details":- edited = pipeline(below, [- unsharpMask(`${name}/clarity`, layer.details.clarity / 200, 64, 16),- unsharpMask(- `${name}/sharpen`,- layer.details.sharpening / 50,- layer.details.sharpenRadius,- ),- ]);- break;- case "mask": {- const adjusted = pipeline(below, [adjustments(layer.adjustments, name)]);- if (layer.id === inputId) {- input = adjusted;- }- edited = pipeline(adjusted, [- toneCurves(layer.toneCurve, `${name}/curves`),- ]);- break;- }- case "exposure":- edited = pipeline(below, [exposure(`${name}/exposure`, layer.exposure)]);- break;- case "vignette":- edited = pipeline(below, [vignette(layer.vignette, `${name}/vignette`)]);- break;- case "color-mixer":- edited = pipeline(below, [- colorMixer(layer.colorMixer, `${name}/color-mixer`),- ]);- break;- }- // 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,- children.image,- layer.opacity,- layer.kind === "mask" ? layer.mask : undefined,- masks,- ),- input: input ?? children.input,- };+ if (!layer.visible || layer.opacity === 0) {+ return { image: below };+ }+ const name = `layer/${layer.id}`;+ let input: RenderImage | undefined;+ let edited = below;+ switch (layer.kind) {+ case "details":+ edited = pipeline(below, [+ unsharpMask(`${name}/clarity`, layer.details.clarity / 200, 64, 16),+ unsharpMask(+ `${name}/sharpen`,+ layer.details.sharpening / 50,+ layer.details.sharpenRadius,+ ),+ ]);+ break;+ case "mask": {+ const adjusted = pipeline(below, [adjustments(layer.adjustments, name)]);+ if (layer.id === inputId) {+ input = adjusted;+ }+ edited = pipeline(adjusted, [+ toneCurves(layer.toneCurve, `${name}/curves`),+ ]);+ break;+ }+ case "exposure":+ edited = pipeline(below, [exposure(`${name}/exposure`, layer.exposure)]);+ break;+ case "vignette":+ edited = pipeline(below, [vignette(layer.vignette, `${name}/vignette`)]);+ break;+ case "color-mixer":+ edited = pipeline(below, [+ colorMixer(layer.colorMixer, `${name}/color-mixer`),+ ]);+ break;+ }+ // 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,+ children.image,+ layer.opacity,+ layer.kind === "mask" ? layer.mask : undefined,+ masks,+ ),+ input: input ?? children.input,+ };}function composeLayers(- below: RenderImage,- layers: readonly ProcessingLayer[],- inputId?: string,+ below: RenderImage,+ layers: readonly ProcessingLayer[],+ inputId?: string,): Composition {- let image = below;- let input: RenderImage | undefined;- for (const layer of layers) {- const composition = composeLayer(image, layer, inputId);- image = composition.image;- input ??= composition.input;- }- return { image, input };+ let image = below;+ let input: RenderImage | undefined;+ for (const layer of layers) {+ const composition = composeLayer(image, layer, inputId);+ image = composition.image;+ input ??= composition.input;+ }+ return { image, input };}/**@@ -106,38 +106,38 @@ function composeLayers(* so a local exposure still sees the light a global exposure would push past white.*/export function createEditorRenderer(- gpu: Gpu,- source: ImageSource,- timer?: Timer,+ gpu: Gpu,+ source: ImageSource,+ timer?: Timer,) {- return createRenderer(- gpu,- source,- (image, scene, inputId) => {- const [sourceLayer, ...layers] = scene.layers;- const name = `layer/${sourceLayer.id}`;- const children = composeLayers(image, sourceLayer.children, inputId);- const composition = composeLayers(children.image, layers, inputId);- const adjusted = pipeline(composition.image, [- adjustments(sourceLayer.adjustments, name),- ]);- const full = pipeline(adjusted, [- toneCurves(sourceLayer.toneCurve, `${name}/curves`),- ]);- const [original, output] = transformImages(- [input(source.image), full],- scene.frame,- );- return {- original,- full,- output,- input:- inputId === sourceLayer.id- ? adjusted- : (children.input ?? composition.input),- };- },- timer,- );+ return createRenderer(+ gpu,+ source,+ (image, scene, inputId) => {+ const [sourceLayer, ...layers] = scene.layers;+ const name = `layer/${sourceLayer.id}`;+ const children = composeLayers(image, sourceLayer.children, inputId);+ const composition = composeLayers(children.image, layers, inputId);+ const adjusted = pipeline(composition.image, [+ adjustments(sourceLayer.adjustments, name),+ ]);+ const full = pipeline(adjusted, [+ toneCurves(sourceLayer.toneCurve, `${name}/curves`),+ ]);+ const [original, output] = transformImages(+ [input(source.image), full],+ scene.frame,+ );+ return {+ original,+ full,+ output,+ input:+ inputId === sourceLayer.id+ ? adjusted+ : (children.input ?? composition.input),+ };+ },+ timer,+ );}diff --git a/src/app/index.tsx b/src/app/index.tsxindex 7da122f..4f0d148 100644--- a/src/app/index.tsx+++ b/src/app/index.tsx@@ -5,11 +5,11 @@ import { useWorkspace } from "@/app/workspace/use-workspace";import { useFileDrop } from "@/hooks/use-file-drop";export default function App() {- const { workspace, controls } = useWorkspace();- useFileDrop(controls.openFiles);- const state = useStore(workspace.state);- if (state.status === "empty") {- return <Landing onOpen={controls.openFiles} />;- }- return <Editor state={state} />;+ const { workspace, controls } = useWorkspace();+ useFileDrop(controls.openFiles);+ const state = useStore(workspace.state);+ if (state.status === "empty") {+ return <Landing onOpen={controls.openFiles} />;+ }+ return <Editor state={state} />;}diff --git a/src/app/landing/backdrop.tsx b/src/app/landing/backdrop.tsxindex 0943389..41389dc 100644--- a/src/app/landing/backdrop.tsx+++ b/src/app/landing/backdrop.tsx@@ -7,34 +7,34 @@ import shader from "./backdrop.wgsl";const strength = { none: 0, hover: 0.05, drag: 1 };function Glow() {- const target = useCanvas();- const time = clock(useGpu());- const glow = useShader(shader);- const pointer = usePointer();- const pull = useRef(0);+ const target = useCanvas();+ const time = clock(useGpu());+ const glow = useShader(shader);+ const pointer = usePointer();+ const pull = useRef(0);- useFrameLoop((frame) => {- const { x, y, mode } = pointer.current;- const ease = 1 - Math.exp(-time.deltaTime * 8);- pull.current += (strength[mode] - pull.current) * ease;- glow.set({- params: {- pointer: [x, y],- size: target.size,- time: time.time,- pull: pull.current,- },- });- frame.pass(target, glow);- });+ useFrameLoop((frame) => {+ const { x, y, mode } = pointer.current;+ const ease = 1 - Math.exp(-time.deltaTime * 8);+ pull.current += (strength[mode] - pull.current) * ease;+ glow.set({+ params: {+ pointer: [x, y],+ size: target.size,+ time: time.time,+ pull: pull.current,+ },+ });+ frame.pass(target, glow);+ });- return null;+ return null;}export default function Backdrop() {- return (- <Canvas className="absolute inset-0 -z-10 size-full" dpr={[1, 2]}>- <Glow />- </Canvas>- );+ return (+ <Canvas className="absolute inset-0 -z-10 size-full" dpr={[1, 2]}>+ <Glow />+ </Canvas>+ );}diff --git a/src/app/landing/index.tsx b/src/app/landing/index.tsxindex 30414a2..ce9b204 100644--- a/src/app/landing/index.tsx+++ b/src/app/landing/index.tsx@@ -6,37 +6,37 @@ import Backdrop from "./backdrop";type OpenProps = { onOpen: (files: File[]) => void };function OpenImage({ onOpen }: OpenProps) {- const input = useRef<HTMLInputElement>(null);- return (- <>- <Button className="mt-3" onClick={() => input.current?.click()}>- Open image- </Button>- <input- accept={accept}- hidden- multiple- onChange={(event) => {- const files = event.currentTarget.files;- if (files?.length) {- onOpen(Array.from(files));- }- }}- ref={input}- type="file"- />- </>- );+ const input = useRef<HTMLInputElement>(null);+ return (+ <>+ <Button className="mt-3" onClick={() => input.current?.click()}>+ Open image+ </Button>+ <input+ accept={accept}+ hidden+ multiple+ onChange={(event) => {+ const files = event.currentTarget.files;+ if (files?.length) {+ onOpen(Array.from(files));+ }+ }}+ ref={input}+ type="file"+ />+ </>+ );}export default function Landing({ onOpen }: OpenProps) {- return (- <main className="relative isolate grid h-full place-content-center justify-items-center gap-3 bg-[radial-gradient(circle,#292929,#131313_55%)]">- <Backdrop />- <img alt="" className="w-16" height="64" src="/logo.svg" width="64" />- <h1 className="text-2xl font-bold">OpenLight</h1>- <p className="text-neutral-400">Edit photos in your browser.</p>- <OpenImage onOpen={onOpen} />- </main>- );+ return (+ <main className="relative isolate grid h-full place-content-center justify-items-center gap-3 bg-[radial-gradient(circle,#292929,#131313_55%)]">+ <Backdrop />+ <img alt="" className="w-16" height="64" src="/logo.svg" width="64" />+ <h1 className="text-2xl font-bold">OpenLight</h1>+ <p className="text-neutral-400">Edit photos in your browser.</p>+ <OpenImage onOpen={onOpen} />+ </main>+ );}diff --git a/src/app/loaders/camera-raw-xmp.ts b/src/app/loaders/camera-raw-xmp.tsindex b2f1fe9..ebd1e70 100644--- a/src/app/loaders/camera-raw-xmp.ts+++ b/src/app/loaders/camera-raw-xmp.ts@@ -3,70 +3,70 @@ import type { Workspace } from "@/app/workspace";import type { Adjustments, EditorDocument } from "@/core/document";import { setAdjustments } from "@/features/adjustments/edits";import {- type CameraRawXmp,- isCameraRawXmp,- readCameraRawXmp,+ type CameraRawXmp,+ isCameraRawXmp,+ readCameraRawXmp,} from "@/features/camera-raw-xmp/xmp";import { setDetails } from "@/features/details/edits";import { validateDetails } from "@/features/details/model";import type { FileLoader } from "./registry";function toAdjustments(xmp: CameraRawXmp): Partial<Adjustments> {- const adjustments: Partial<Adjustments> = {- exposure: xmp.exposure2012,- contrast: xmp.contrast2012,- highlights: xmp.highlights2012,- shadows: xmp.shadows2012,- whites: xmp.whites2012,- blacks: xmp.blacks2012,- vibrance: xmp.vibrance,- saturation: xmp.saturation,- };- return Object.fromEntries(- Object.entries(adjustments).filter(([, value]) => value !== undefined),- );+ const adjustments: Partial<Adjustments> = {+ exposure: xmp.exposure2012,+ contrast: xmp.contrast2012,+ highlights: xmp.highlights2012,+ shadows: xmp.shadows2012,+ whites: xmp.whites2012,+ blacks: xmp.blacks2012,+ vibrance: xmp.vibrance,+ saturation: xmp.saturation,+ };+ return Object.fromEntries(+ Object.entries(adjustments).filter(([, value]) => value !== undefined),+ );}function applyClarity(document: EditorDocument, clarity: number) {- validateDetails({ clarity });- const scene = document.scene.getState();- if (- clarity === 0 &&- !scene.layers.some((layer) => layer.kind === "details")- ) {- return;- }- editEffect(document, "details", undefined, (id) =>- setDetails(document, { clarity }, id),- );+ validateDetails({ clarity });+ const scene = document.scene.getState();+ if (+ clarity === 0 &&+ !scene.layers.some((layer) => layer.kind === "details")+ ) {+ return;+ }+ editEffect(document, "details", undefined, (id) =>+ setDetails(document, { clarity }, id),+ );}export function createCameraRawXmpLoader(workspace: Workspace): FileLoader {- return {- kind: "settings",- accepts: isCameraRawXmp,- async load(file) {- if (!(file instanceof File)) {- throw new Error("importXmp requires a File.");- }- const document = workspace.getDocument();- const xmp = readCameraRawXmp(await file.text());- const adjustments = toAdjustments(xmp);- if (workspace.state.getState().document !== document) {- return;- }- document.history.commit();- document.history.begin();- try {- setAdjustments(document, adjustments);- if (xmp.clarity2012 !== undefined) {- applyClarity(document, xmp.clarity2012);- }- document.history.commit();- } catch (error) {- document.history.cancel();- throw error;- }- },- };+ return {+ kind: "settings",+ accepts: isCameraRawXmp,+ async load(file) {+ if (!(file instanceof File)) {+ throw new Error("importXmp requires a File.");+ }+ const document = workspace.getDocument();+ const xmp = readCameraRawXmp(await file.text());+ const adjustments = toAdjustments(xmp);+ if (workspace.state.getState().document !== document) {+ return;+ }+ document.history.commit();+ document.history.begin();+ try {+ setAdjustments(document, adjustments);+ if (xmp.clarity2012 !== undefined) {+ applyClarity(document, xmp.clarity2012);+ }+ document.history.commit();+ } catch (error) {+ document.history.cancel();+ throw error;+ }+ },+ };}diff --git a/src/app/loaders/image.ts b/src/app/loaders/image.tsindex c02bbcd..edb3a51 100644--- a/src/app/loaders/image.ts+++ b/src/app/loaders/image.ts@@ -7,25 +7,25 @@ import { imageFrame } from "@/core/image/frame";import type { FileLoader } from "./registry";export function createImageLoader(gpu: Gpu, workspace: Workspace): FileLoader {- return {- kind: "document",- accepts: canDecode,- async load(file) {- if (!(file instanceof File)) {- throw new Error("loadImage requires a File.");- }- await workspace.open(file.name, async () => {- const decoded = await decode(gpu, file);- const resources = createResources();- const source = resources.add(file, decoded);- return createDocument(- {- frame: imageFrame(decoded.image.size),- layers: [createImageLayer(source, file.name, decoded.raw?.asShot)],- },- resources,- );- });- },- };+ return {+ kind: "document",+ accepts: canDecode,+ async load(file) {+ if (!(file instanceof File)) {+ throw new Error("loadImage requires a File.");+ }+ await workspace.open(file.name, async () => {+ const decoded = await decode(gpu, file);+ const resources = createResources();+ const source = resources.add(file, decoded);+ return createDocument(+ {+ frame: imageFrame(decoded.image.size),+ layers: [createImageLayer(source, file.name, decoded.raw?.asShot)],+ },+ resources,+ );+ });+ },+ };}diff --git a/src/app/loaders/registry.ts b/src/app/loaders/registry.tsindex d94dd83..b7093bb 100644--- a/src/app/loaders/registry.ts+++ b/src/app/loaders/registry.ts@@ -1,53 +1,53 @@export type FileLoader = {- kind: "document" | "settings";- accepts: (file: File) => boolean;- load: (file: File) => Promise<void>;+ kind: "document" | "settings";+ accepts: (file: File) => boolean;+ load: (file: File) => Promise<void>;};type Job = { file: File; loader: FileLoader };async function loadBatch(jobs: Job[], ready: () => boolean) {- const document = jobs.find(({ loader }) => loader.kind === "document");- if (document) {- await document.loader.load(document.file);- }- if (!ready()) {- return;- }- for (const { file, loader } of jobs) {- if (loader.kind === "settings") {- await loader.load(file);- }- }+ const document = jobs.find(({ loader }) => loader.kind === "document");+ if (document) {+ await document.loader.load(document.file);+ }+ if (!ready()) {+ return;+ }+ for (const { file, loader } of jobs) {+ if (loader.kind === "settings") {+ await loader.load(file);+ }+ }}export function createLoaderRegistry(- loaders: readonly FileLoader[],- ready: () => boolean,+ loaders: readonly FileLoader[],+ ready: () => boolean,) {- let pending = Promise.resolve();+ let pending = Promise.resolve();- function enqueue(jobs: Job[]) {- const result = pending.then(() => loadBatch(jobs, ready));- // Return the failure to the caller while allowing later batches to run.- pending = result.catch(() => {});- return result;- }+ function enqueue(jobs: Job[]) {+ const result = pending.then(() => loadBatch(jobs, ready));+ // Return the failure to the caller while allowing later batches to run.+ pending = result.catch(() => {});+ return result;+ }- function openFiles(files: readonly File[]) {- const jobs = files.flatMap((file) => {- if (!(file instanceof File)) {- throw new Error("openFiles requires Files.");- }- const loader = loaders.find((loader) => loader.accepts(file));- return loader ? [{ file, loader }] : [];- });- return enqueue(jobs);- }+ function openFiles(files: readonly File[]) {+ const jobs = files.flatMap((file) => {+ if (!(file instanceof File)) {+ throw new Error("openFiles requires Files.");+ }+ const loader = loaders.find((loader) => loader.accepts(file));+ return loader ? [{ file, loader }] : [];+ });+ return enqueue(jobs);+ }- function loadFile(loader: FileLoader, file: File) {- return enqueue([{ file, loader }]);- }+ function loadFile(loader: FileLoader, file: File) {+ return enqueue([{ file, loader }]);+ }- return { openFiles, loadFile };+ return { openFiles, loadFile };}diff --git a/src/app/workspace/index.ts b/src/app/workspace/index.tsindex 2fc6a25..877a5ed 100644--- a/src/app/workspace/index.ts+++ b/src/app/workspace/index.ts@@ -2,56 +2,56 @@ import { createStore } from "zustand/vanilla";import type { EditorDocument } from "@/core/document";type WorkspaceState =- | { status: "empty"; file?: undefined; document?: undefined }- | { status: "loading"; file: string; document?: undefined }- | { status: "error"; file: string; error: string; document?: undefined }- | { status: "ready"; file: string; document: EditorDocument };+ | { status: "empty"; file?: undefined; document?: undefined }+ | { status: "loading"; file: string; document?: undefined }+ | { status: "error"; file: string; error: string; document?: undefined }+ | { status: "ready"; file: string; document: EditorDocument };/** Single-document policy; document instances remain independent of this session. */export function createWorkspace() {- const state = createStore<WorkspaceState>(() => ({ status: "empty" }));- let generation = 0;- let closed = false;- return {- state: {- getState: state.getState,- getInitialState: state.getInitialState,- subscribe: state.subscribe,- },- getDocument() {- const document = state.getState().document;- if (!document) {- throw new Error("Load an image before editing.");- }- return document;- },- async open(file: string, load: () => Promise<EditorDocument>) {- if (closed) {- throw new Error("Workspace is closed.");- }- const request = ++generation;- const previous = state.getState().document;- state.setState({ status: "loading", file }, true);- previous?.dispose();- try {- const document = await load();- if (request !== generation) {- document.dispose();- return;- }- state.setState({ status: "ready", file, document }, true);- } catch (error) {- if (request === generation) {- state.setState({ status: "error", file, error: String(error) }, true);- }- }- },- dispose() {- closed = true;- generation++;- state.getState().document?.dispose();- state.setState({ status: "empty" }, true);- },- };+ const state = createStore<WorkspaceState>(() => ({ status: "empty" }));+ let generation = 0;+ let closed = false;+ return {+ state: {+ getState: state.getState,+ getInitialState: state.getInitialState,+ subscribe: state.subscribe,+ },+ getDocument() {+ const document = state.getState().document;+ if (!document) {+ throw new Error("Load an image before editing.");+ }+ return document;+ },+ async open(file: string, load: () => Promise<EditorDocument>) {+ if (closed) {+ throw new Error("Workspace is closed.");+ }+ const request = ++generation;+ const previous = state.getState().document;+ state.setState({ status: "loading", file }, true);+ previous?.dispose();+ try {+ const document = await load();+ if (request !== generation) {+ document.dispose();+ return;+ }+ state.setState({ status: "ready", file, document }, true);+ } catch (error) {+ if (request === generation) {+ state.setState({ status: "error", file, error: String(error) }, true);+ }+ }+ },+ dispose() {+ closed = true;+ generation++;+ state.getState().document?.dispose();+ state.setState({ status: "empty" }, true);+ },+ };}export type Workspace = ReturnType<typeof createWorkspace>;diff --git a/src/app/workspace/use-workspace.ts b/src/app/workspace/use-workspace.tsindex cc4f346..ad80f2b 100644--- a/src/app/workspace/use-workspace.ts+++ b/src/app/workspace/use-workspace.ts@@ -5,17 +5,17 @@ import { createWorkspace } from ".";/** Connects an imperative workspace and its browser commands to the app lifetime. */export function useWorkspace() {- const gpu = useGpu();- const session = useMemo(() => {- const workspace = createWorkspace();- return { workspace, controls: createControls(gpu, workspace) };- }, [gpu]);- useEffect(() => {- window.openlight = session.controls;- return () => {- Reflect.deleteProperty(window, "openlight");- session.workspace.dispose();- };- }, [session]);- return session;+ const gpu = useGpu();+ const session = useMemo(() => {+ const workspace = createWorkspace();+ return { workspace, controls: createControls(gpu, workspace) };+ }, [gpu]);+ useEffect(() => {+ window.openlight = session.controls;+ return () => {+ Reflect.deleteProperty(window, "openlight");+ session.workspace.dispose();+ };+ }, [session]);+ return session;}diff --git a/src/components/editor/image.tsx b/src/components/editor/image.tsxindex 7c3c19b..9d1593f 100644--- a/src/components/editor/image.tsx+++ b/src/components/editor/image.tsx@@ -13,55 +13,55 @@ type Output = "fullImage" | "outputImage" | "originalImage";/** Mount a pipeline output or any target; a supplied frame places the full source behind it. */export function Image({- image = "outputImage",- geometry,- original,+ image = "outputImage",+ geometry,+ original,}: {- /** A renderer output, or a target such as an export preview. */- image?: Output | Target;- geometry?: ImageFrame;- original?: Output;+ /** A renderer output, or a target such as an export preview. */+ image?: Output | Target;+ geometry?: ImageFrame;+ original?: Output;}) {- const gpu = useGpu();- const canvas = useCanvas();- const camera = useViewport();- const document = useDocument();- const preview = useStore(document.preview);- const sceneFrame = useScene((scene) => scene.frame);- const sourceSize = document.resources.get(- useScene((scene) => scene.layers[0].source),- ).image.size;- const renderer = useRenderer();- const display = useMemo(() => createDisplay(gpu), [gpu]);- useEffect(() => () => display.dispose(), [display]);- const render = useFrame((frame) => {- const before = original && renderer[original]();- const target = typeof image === "string" ? renderer[image]() : image;- const source =- preview.comparison === "original" && before ? before : target;- const size = geometry?.size ?? source.size;- const view = {- ...camera.view,- zoom: camera.scale / (fitScale(size, camera.viewport) || 1),- };- display(frame, canvas, source, {- view,- viewport: camera.viewport,- frame: geometry,- original: before,- split: preview.comparison === "split" ? preview.split : -1,- clipping: preview,- overlay: preview.maskOverlay && {- ...preview.maskOverlay,- frame: sceneFrame,- sourceSize,- },- });- });- useEffect(() => renderer.subscribe(render), [renderer, render]);- useEffect(- () => render(),- [render, camera, preview, geometry, image, sceneFrame, sourceSize],- );- return null;+ const gpu = useGpu();+ const canvas = useCanvas();+ const camera = useViewport();+ const document = useDocument();+ const preview = useStore(document.preview);+ const sceneFrame = useScene((scene) => scene.frame);+ const sourceSize = document.resources.get(+ useScene((scene) => scene.layers[0].source),+ ).image.size;+ const renderer = useRenderer();+ const display = useMemo(() => createDisplay(gpu), [gpu]);+ useEffect(() => () => display.dispose(), [display]);+ const render = useFrame((frame) => {+ const before = original && renderer[original]();+ const target = typeof image === "string" ? renderer[image]() : image;+ const source =+ preview.comparison === "original" && before ? before : target;+ const size = geometry?.size ?? source.size;+ const view = {+ ...camera.view,+ zoom: camera.scale / (fitScale(size, camera.viewport) || 1),+ };+ display(frame, canvas, source, {+ view,+ viewport: camera.viewport,+ frame: geometry,+ original: before,+ split: preview.comparison === "split" ? preview.split : -1,+ clipping: preview,+ overlay: preview.maskOverlay && {+ ...preview.maskOverlay,+ frame: sceneFrame,+ sourceSize,+ },+ });+ });+ useEffect(() => renderer.subscribe(render), [renderer, render]);+ useEffect(+ () => render(),+ [render, camera, preview, geometry, image, sceneFrame, sourceSize],+ );+ return null;}diff --git a/src/components/editor/panel.tsx b/src/components/editor/panel.tsxindex 70347fd..00cf388 100644--- a/src/components/editor/panel.tsx+++ b/src/components/editor/panel.tsx@@ -7,63 +7,63 @@ import { useEditorSession } from "./session";/** The resizable side panel: a fixed header, scrolling controls, and a fixed footer. */export function EditorPanel({- header,- children,- footer,- onKeyDown,+ header,+ children,+ footer,+ onKeyDown,}: {- header?: ReactNode;- children: ReactNode;- footer?: ReactNode;- onKeyDown?: KeyboardEventHandler<HTMLElement>;+ header?: ReactNode;+ children: ReactNode;+ footer?: ReactNode;+ onKeyDown?: KeyboardEventHandler<HTMLElement>;}) {- const { width, onWidthChange } = useEditorSession();- return (- <ResizablePanel- width={width}- onWidthChange={onWidthChange}- className="flex min-h-0 flex-col"- onKeyDown={onKeyDown}- >- {header}- <ScrollArea- fade- className="flex-1"- role="region"- aria-label="Editor controls"- >- {children}- </ScrollArea>- {footer}- </ResizablePanel>- );+ const { width, onWidthChange } = useEditorSession();+ return (+ <ResizablePanel+ width={width}+ onWidthChange={onWidthChange}+ className="flex min-h-0 flex-col"+ onKeyDown={onKeyDown}+ >+ {header}+ <ScrollArea+ fade+ className="flex-1"+ role="region"+ aria-label="Editor controls"+ >+ {children}+ </ScrollArea>+ {footer}+ </ResizablePanel>+ );}/** A title with optional actions and a close button, sized to the panel row. */export function PanelHeader({- title,- children,- onClose,+ title,+ children,+ onClose,}: {- title: string;- children?: ReactNode;- onClose?: () => void;+ title: string;+ children?: ReactNode;+ onClose?: () => void;}) {- return (- <div className="flex h-10 shrink-0 items-center gap-1 border-b border-black/50 pr-1.5 pl-3">- <h2 className="flex-1 font-medium text-neutral-200">{title}</h2>- {children}- {onClose && (- <Button- variant="ghost"- size="icon"- aria-label="Close"- title="Close (Esc)"- onClick={onClose}- >- <CloseIcon className="size-4" />- </Button>- )}- </div>- );+ return (+ <div className="flex h-10 shrink-0 items-center gap-1 border-b border-black/50 pr-1.5 pl-3">+ <h2 className="flex-1 font-medium text-neutral-200">{title}</h2>+ {children}+ {onClose && (+ <Button+ variant="ghost"+ size="icon"+ aria-label="Close"+ title="Close (Esc)"+ onClick={onClose}+ >+ <CloseIcon className="size-4" />+ </Button>+ )}+ </div>+ );}diff --git a/src/components/editor/pipeline.tsx b/src/components/editor/pipeline.tsxindex 9aaeaa1..7ba0c95 100644--- a/src/components/editor/pipeline.tsx+++ b/src/components/editor/pipeline.tsx@@ -1,10 +1,10 @@import {- createContext,- type ReactNode,- useContext,- useEffect,- useMemo,- useState,+ createContext,+ type ReactNode,+ useContext,+ useEffect,+ useMemo,+ useState,} from "react";import type { Gpu } from "vgpu";import { useGpu } from "vgpu-react";@@ -14,89 +14,89 @@ import type { createRenderer } from "@/core/renderer";import { useDocument, useScene } from "./session";const RendererContext = createContext<ReturnType<typeof createRenderer> | null>(- null,+ null,);export function useRenderer() {- const renderer = useContext(RendererContext);- if (!renderer) {- throw new Error("useRenderer requires RendererProvider.");- }- return renderer;+ const renderer = useContext(RendererContext);+ if (!renderer) {+ throw new Error("useRenderer requires RendererProvider.");+ }+ return renderer;}function RendererError({ message }: { message: string }) {- return (- <p- role="alert"- className="fixed bottom-4 left-4 rounded bg-neutral-900 px-3 py-2 text-red-300"- >- Renderer error: {message}- </p>- );+ return (+ <p+ role="alert"+ className="fixed bottom-4 left-4 rounded bg-neutral-900 px-3 py-2 text-red-300"+ >+ Renderer error: {message}+ </p>+ );}type RendererProviderProps = {- children: ReactNode;- createRenderer: (- gpu: Gpu,- source: ImageSource,- ) => ReturnType<typeof createRenderer>;+ children: ReactNode;+ createRenderer: (+ gpu: Gpu,+ source: ImageSource,+ ) => ReturnType<typeof createRenderer>;};export function RendererProvider({- children,- createRenderer,+ children,+ createRenderer,}: RendererProviderProps) {- const gpu = useGpu();- const document = useDocument();- const sourceId = useScene((scene) => scene.layers[0].source);- const source = document.resources.get(sourceId);- const renderer = useMemo(- () => createRenderer(gpu, source),- [gpu, source, createRenderer],- );- const [error, setError] = useState<string>();+ const gpu = useGpu();+ const document = useDocument();+ const sourceId = useScene((scene) => scene.layers[0].source);+ const source = document.resources.get(sourceId);+ const renderer = useMemo(+ () => createRenderer(gpu, source),+ [gpu, source, createRenderer],+ );+ const [error, setError] = useState<string>();- useEffect(() => {- let active = true;- let requestedScene: ReturnType<typeof document.scene.getState> | undefined;- let requestedInput: string | undefined;- const render = () => {- const scene = document.scene.getState();- const target = adjustmentTarget(- scene.layers,- document.selection.getState().layerId,- );- const input = target && "toneCurve" in target ? target.id : undefined;- // A dropped input can stay live; only a new one needs a render.- if (scene === requestedScene && (input === requestedInput || !input)) {- return;- }- requestedScene = scene;- requestedInput = input;- setError(undefined);- renderer.update(scene, input).catch((error) => {- if (active) {- setError(String(error));- }- });- };- const unsubscribeScene = document.scene.subscribe(render);- const unsubscribeSelection = document.selection.subscribe(render);- render();- return () => {- active = false;- unsubscribeScene();- unsubscribeSelection();- renderer.dispose();- };- }, [renderer, document]);+ useEffect(() => {+ let active = true;+ let requestedScene: ReturnType<typeof document.scene.getState> | undefined;+ let requestedInput: string | undefined;+ const render = () => {+ const scene = document.scene.getState();+ const target = adjustmentTarget(+ scene.layers,+ document.selection.getState().layerId,+ );+ const input = target && "toneCurve" in target ? target.id : undefined;+ // A dropped input can stay live; only a new one needs a render.+ if (scene === requestedScene && (input === requestedInput || !input)) {+ return;+ }+ requestedScene = scene;+ requestedInput = input;+ setError(undefined);+ renderer.update(scene, input).catch((error) => {+ if (active) {+ setError(String(error));+ }+ });+ };+ const unsubscribeScene = document.scene.subscribe(render);+ const unsubscribeSelection = document.selection.subscribe(render);+ render();+ return () => {+ active = false;+ unsubscribeScene();+ unsubscribeSelection();+ renderer.dispose();+ };+ }, [renderer, document]);- return (- <RendererContext value={renderer}>- {children}- {error && <RendererError message={error} />}- </RendererContext>- );+ return (+ <RendererContext value={renderer}>+ {children}+ {error && <RendererError message={error} />}+ </RendererContext>+ );}diff --git a/src/components/editor/session.tsx b/src/components/editor/session.tsxindex 362ee05..8733e20 100644--- a/src/components/editor/session.tsx+++ b/src/components/editor/session.tsx@@ -1,49 +1,49 @@import {- createContext,- type ReactNode,- useContext,- useMemo,- useState,+ createContext,+ type ReactNode,+ useContext,+ useMemo,+ useState,} from "react";import { useStore } from "zustand";import type { EditorDocument, Scene } from "@/core/document";import { createCamera } from "@/hooks/use-pan-zoom";const Session = createContext<{- document: EditorDocument;- camera: ReturnType<typeof createCamera>;- width: number;- onWidthChange: (width: number) => void;+ document: EditorDocument;+ camera: ReturnType<typeof createCamera>;+ width: number;+ onWidthChange: (width: number) => void;} | null>(null);export function useEditorSession() {- const session = useContext(Session);- if (!session) {- throw new Error("An editor session is required.");- }- return session;+ const session = useContext(Session);+ if (!session) {+ throw new Error("An editor session is required.");+ }+ return session;}export function useDocument() {- return useEditorSession().document;+ return useEditorSession().document;}export function useScene<T>(selector: (scene: Scene) => T) {- return useStore(useDocument().scene, selector);+ return useStore(useDocument().scene, selector);}/** Preserve document UI state while independent tools mount and unmount. */export function DocumentProvider({- value,- children,+ value,+ children,}: {- value: EditorDocument;- children: ReactNode;+ value: EditorDocument;+ children: ReactNode;}) {- const size = useStore(value.scene, (scene) => scene.frame.size);- const camera = useMemo(createCamera, [size[0], size[1]]);- const [width, onWidthChange] = useState(320);- return (- <Session value={{ document: value, camera, width, onWidthChange }}>- {children}- </Session>- );+ const size = useStore(value.scene, (scene) => scene.frame.size);+ const camera = useMemo(createCamera, [size[0], size[1]]);+ const [width, onWidthChange] = useState(320);+ return (+ <Session value={{ document: value, camera, width, onWidthChange }}>+ {children}+ </Session>+ );}diff --git a/src/components/editor/viewport.tsx b/src/components/editor/viewport.tsxindex 8974130..9f34644 100644--- a/src/components/editor/viewport.tsx+++ b/src/components/editor/viewport.tsx@@ -8,88 +8,88 @@ import { useEditorSession } from "./session";const Viewport = createContext<ReturnType<typeof usePanZoom> | null>(null);export function useViewport() {- const viewport = useContext(Viewport);- if (!viewport) {- throw new Error("An editor viewport is required.");- }- return viewport;+ const viewport = useContext(Viewport);+ if (!viewport) {+ throw new Error("An editor viewport is required.");+ }+ return viewport;}/** Zoom as Photoshop counts it: 100% shows one image pixel per device pixel. */function ZoomControl() {- const { scale, zoomBy, resetView } = useViewport();- const percent = Math.round(scale * devicePixelRatio * 100);- 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">- <Button- variant="ghost"- aria-label="Zoom out"- className="flex size-6 items-center justify-center rounded-full p-0"- onClick={() => zoomBy(1 / 1.25)}- >- <Icon viewBox="0 0 20 20" className="size-3.5">- <path d="M5 10h10" />- </Icon>- </Button>- <Button- variant="ghost"- title="Fit to view"- className="min-w-14 rounded-full px-1 py-0.5 text-neutral-200 tabular-nums"- onClick={() => resetView()}- >- {percent}%- </Button>- <Button- variant="ghost"- aria-label="Zoom in"- className="flex size-6 items-center justify-center rounded-full p-0"- onClick={() => zoomBy(1.25)}- >- <Icon viewBox="0 0 20 20" className="size-3.5">- <path d="M10 5v10M5 10h10" />- </Icon>- </Button>- </div>- </div>- );+ const { scale, zoomBy, resetView } = useViewport();+ const percent = Math.round(scale * devicePixelRatio * 100);+ 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">+ <Button+ variant="ghost"+ aria-label="Zoom out"+ className="flex size-6 items-center justify-center rounded-full p-0"+ onClick={() => zoomBy(1 / 1.25)}+ >+ <Icon viewBox="0 0 20 20" className="size-3.5">+ <path d="M5 10h10" />+ </Icon>+ </Button>+ <Button+ variant="ghost"+ title="Fit to view"+ className="min-w-14 rounded-full px-1 py-0.5 text-neutral-200 tabular-nums"+ onClick={() => resetView()}+ >+ {percent}%+ </Button>+ <Button+ variant="ghost"+ aria-label="Zoom in"+ className="flex size-6 items-center justify-center rounded-full p-0"+ onClick={() => zoomBy(1.25)}+ >+ <Icon viewBox="0 0 20 20" className="size-3.5">+ <path d="M10 5v10M5 10h10" />+ </Icon>+ </Button>+ </div>+ </div>+ );}export function EditorViewport({- size,- constrain = true,- children,- overlay,- tools,+ size,+ constrain = true,+ children,+ overlay,+ tools,}: {- size: Point;- constrain?: boolean;- children: ReactNode;- overlay?: ReactNode;- tools?: ReactNode;+ size: Point;+ constrain?: boolean;+ children: ReactNode;+ overlay?: ReactNode;+ tools?: ReactNode;}) {- const { camera } = useEditorSession();- const viewport = usePanZoom(camera, size, { constrain });- return (- <section- className="@container relative min-h-0 min-w-0 flex-1 overflow-hidden p-6"- aria-label="Image canvas"- >- <Viewport value={viewport}>- <div- ref={viewport.ref}- {...viewport.handlers}- data-pan-mode={viewport.panMode}- className="relative size-full cursor-grab touch-none active:cursor-grabbing data-[pan-mode=true]:[&_*]:cursor-grab! data-[pan-mode=true]:active:[&_*]:cursor-grabbing!"- >- <Canvas className="absolute -inset-6 size-[calc(100%+3rem)]">- {children}- </Canvas>- {tools}- </div>- {overlay}- <ZoomControl />- </Viewport>- </section>- );+ const { camera } = useEditorSession();+ const viewport = usePanZoom(camera, size, { constrain });+ return (+ <section+ className="@container relative min-h-0 min-w-0 flex-1 overflow-hidden p-6"+ aria-label="Image canvas"+ >+ <Viewport value={viewport}>+ <div+ ref={viewport.ref}+ {...viewport.handlers}+ data-pan-mode={viewport.panMode}+ className="relative size-full cursor-grab touch-none active:cursor-grabbing data-[pan-mode=true]:[&_*]:cursor-grab! data-[pan-mode=true]:active:[&_*]:cursor-grabbing!"+ >+ <Canvas className="absolute -inset-6 size-[calc(100%+3rem)]">+ {children}+ </Canvas>+ {tools}+ </div>+ {overlay}+ <ZoomControl />+ </Viewport>+ </section>+ );}diff --git a/src/components/icons/adjust.tsx b/src/components/icons/adjust.tsxindex ea4cb1c..240a928 100644--- a/src/components/icons/adjust.tsx+++ b/src/components/icons/adjust.tsx@@ -1,9 +1,9 @@import { Icon, type IconProps } from "./icon";export function AdjustIcon(props: IconProps) {- return (- <Icon viewBox="0 0 20 20" {...props}>- <path d="M3 5h7M14 5h3M12 3v4M3 10h3M10 10h7M8 8v4M3 15h8M15 15h2M13 13v4" />- </Icon>- );+ return (+ <Icon viewBox="0 0 20 20" {...props}>+ <path d="M3 5h7M14 5h3M12 3v4M3 10h3M10 10h7M8 8v4M3 15h8M15 15h2M13 13v4" />+ </Icon>+ );}diff --git a/src/components/icons/close.tsx b/src/components/icons/close.tsxindex b82ab3e..3e8ca28 100644--- a/src/components/icons/close.tsx+++ b/src/components/icons/close.tsx@@ -1,9 +1,9 @@import { Icon, type IconProps } from "./icon";export function CloseIcon(props: IconProps) {- return (- <Icon viewBox="0 0 20 20" {...props}>- <path d="m5 5 10 10M15 5 5 15" />- </Icon>- );+ return (+ <Icon viewBox="0 0 20 20" {...props}>+ <path d="m5 5 10 10M15 5 5 15" />+ </Icon>+ );}diff --git a/src/components/icons/crop.tsx b/src/components/icons/crop.tsxindex 30c2717..5a3b831 100644--- a/src/components/icons/crop.tsx+++ b/src/components/icons/crop.tsx@@ -1,9 +1,9 @@import { Icon, type IconProps } from "./icon";export function CropIcon(props: IconProps) {- return (- <Icon viewBox="0 0 20 20" {...props}>- <path d="M5 2v13h13M2 5h13v13" />- </Icon>- );+ return (+ <Icon viewBox="0 0 20 20" {...props}>+ <path d="M5 2v13h13M2 5h13v13" />+ </Icon>+ );}diff --git a/src/components/icons/export.tsx b/src/components/icons/export.tsxindex f252c71..8b561e4 100644--- a/src/components/icons/export.tsx+++ b/src/components/icons/export.tsx@@ -1,9 +1,9 @@import { Icon, type IconProps } from "./icon";export function ExportIcon(props: IconProps) {- return (- <Icon viewBox="0 0 20 20" {...props}>- <path d="M10 2v10m-4-4 4 4 4-4M3 12v5h14v-5" />- </Icon>- );+ return (+ <Icon viewBox="0 0 20 20" {...props}>+ <path d="M10 2v10m-4-4 4 4 4-4M3 12v5h14v-5" />+ </Icon>+ );}diff --git a/src/components/icons/flip.tsx b/src/components/icons/flip.tsxindex c5c51b4..d8f9766 100644--- a/src/components/icons/flip.tsx+++ b/src/components/icons/flip.tsx@@ -1,11 +1,11 @@import { Icon, type IconProps } from "./icon";export function FlipIcon(props: IconProps) {- return (- <Icon {...props}>- <path d="m15 5 6 7-6 7Z" />- <path d="M9 5 3 12l6 7Z" fill="currentColor" stroke="none" />- <path d="M12 3v18" strokeDasharray="0.1 3.5" />- </Icon>- );+ return (+ <Icon {...props}>+ <path d="m15 5 6 7-6 7Z" />+ <path d="M9 5 3 12l6 7Z" fill="currentColor" stroke="none" />+ <path d="M12 3v18" strokeDasharray="0.1 3.5" />+ </Icon>+ );}diff --git a/src/components/icons/icon.tsx b/src/components/icons/icon.tsxindex f47e12c..994e92d 100644--- a/src/components/icons/icon.tsx+++ b/src/components/icons/icon.tsx@@ -2,17 +2,17 @@ import type { SVGProps } from "react";export type IconProps = SVGProps<SVGSVGElement>;export function Icon(props: IconProps) {- return (- <svg- aria-hidden="true"- viewBox="0 0 24 24"- className="size-5"- fill="none"- stroke="currentColor"- strokeWidth="1.5"- strokeLinecap="round"- strokeLinejoin="round"- {...props}- />- );+ return (+ <svg+ aria-hidden="true"+ viewBox="0 0 24 24"+ className="size-5"+ fill="none"+ stroke="currentColor"+ strokeWidth="1.5"+ strokeLinecap="round"+ strokeLinejoin="round"+ {...props}+ />+ );}diff --git a/src/components/icons/rotate-cursor.ts b/src/components/icons/rotate-cursor.tsindex ed671e5..3a90146 100644--- a/src/components/icons/rotate-cursor.ts+++ b/src/components/icons/rotate-cursor.ts@@ -2,8 +2,8 @@ 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`;+ 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/icons/rotate.tsx b/src/components/icons/rotate.tsxindex 63e9f23..afe27c5 100644--- a/src/components/icons/rotate.tsx+++ b/src/components/icons/rotate.tsx@@ -1,11 +1,11 @@import { Icon, type IconProps } from "./icon";export function RotateIcon(props: IconProps) {- return (- <Icon {...props}>- <path d="M4 12a8 8 0 0 1 14-5" />- <path d="M20 3v6h-6z" fill="currentColor" stroke="none" />- <path d="M4 12a8 8 0 0 0 16 0" strokeDasharray="0.1 3.5" />- </Icon>- );+ return (+ <Icon {...props}>+ <path d="M4 12a8 8 0 0 1 14-5" />+ <path d="M20 3v6h-6z" fill="currentColor" stroke="none" />+ <path d="M4 12a8 8 0 0 0 16 0" strokeDasharray="0.1 3.5" />+ </Icon>+ );}diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsxindex 6770579..8874f00 100644--- a/src/components/ui/button.tsx+++ b/src/components/ui/button.tsx@@ -3,36 +3,36 @@ import { cn } from "cn";import type { ComponentProps } from "react";const button = cva(- "cursor-pointer rounded-md transition-colors focus-visible:outline-2 focus-visible:outline-offset-3 focus-visible:outline-neutral-400",- {- variants: {- variant: {- default:- "bg-neutral-700 text-neutral-100 shadow-ridge hover:bg-neutral-600 active:bg-neutral-700 active:shadow-groove",- ghost:- "text-neutral-400 hover:bg-neutral-700/50 hover:text-neutral-100 active:bg-neutral-700",- },- /** Both sizes pad 6 px vertically, so text and 16 px icons produce the same height. */- size: {- default: "px-4 py-1.5",- icon: "grid place-items-center p-1.5",- },- },- defaultVariants: { variant: "default", size: "default" },- },+ "cursor-pointer rounded-md transition-colors focus-visible:outline-2 focus-visible:outline-offset-3 focus-visible:outline-neutral-400",+ {+ variants: {+ variant: {+ default:+ "bg-neutral-700 text-neutral-100 shadow-ridge hover:bg-neutral-600 active:bg-neutral-700 active:shadow-groove",+ ghost:+ "text-neutral-400 hover:bg-neutral-700/50 hover:text-neutral-100 active:bg-neutral-700",+ },+ /** Both sizes pad 6 px vertically, so text and 16 px icons produce the same height. */+ size: {+ default: "px-4 py-1.5",+ icon: "grid place-items-center p-1.5",+ },+ },+ defaultVariants: { variant: "default", size: "default" },+ },);export default function Button({- className,- variant,- size,- ...props+ className,+ variant,+ size,+ ...props}: ComponentProps<"button"> & VariantProps<typeof button>) {- return (- <button- className={cn(button({ variant, size }), className)}- type="button"- {...props}- />- );+ return (+ <button+ className={cn(button({ variant, size }), className)}+ type="button"+ {...props}+ />+ );}diff --git a/src/components/ui/field.tsx b/src/components/ui/field.tsxindex 9d5b9b0..59417f5 100644--- a/src/components/ui/field.tsx+++ b/src/components/ui/field.tsx@@ -3,20 +3,20 @@ import { cn } from "cn";import type { ComponentProps } from "react";type FieldProps = ComponentProps<"span"> & {- /** "box" always shows the chrome; "text" reads as plain text until focused. */- variant?: "box" | "text";+ /** "box" always shows the chrome; "text" reads as plain text until focused. */+ variant?: "box" | "text";};const chrome = cva(- "rounded border px-1 py-0.5 focus-within:ring-1 focus-within:ring-neutral-400/30",- {- variants: {- variant: {- box: "border-black bg-neutral-900 shadow-groove",- text: "border-transparent focus-within:border-black focus-within:bg-neutral-900 focus-within:shadow-groove",- },- },- },+ "rounded border px-1 py-0.5 focus-within:ring-1 focus-within:ring-neutral-400/30",+ {+ variants: {+ variant: {+ box: "border-black bg-neutral-900 shadow-groove",+ text: "border-transparent focus-within:border-black focus-within:bg-neutral-900 focus-within:shadow-groove",+ },+ },+ },);/**@@ -24,5 +24,5 @@ const chrome = cva(* The child styles itself with `w-full bg-transparent outline-none`.*/export function Field({ variant = "box", className, ...props }: FieldProps) {- return <span className={cn(chrome({ variant }), className)} {...props} />;+ return <span className={cn(chrome({ variant }), className)} {...props} />;}diff --git a/src/components/ui/resizable-panel.tsx b/src/components/ui/resizable-panel.tsxindex 39d8a82..a81e6e6 100644--- a/src/components/ui/resizable-panel.tsx+++ b/src/components/ui/resizable-panel.tsx@@ -2,44 +2,44 @@ import { cn } from "cn";import type { ComponentProps, PointerEvent } from "react";type ResizablePanelProps = ComponentProps<"aside"> & {- width?: number;- onWidthChange?: (width: number) => void;- min?: number;- max?: number;+ width?: number;+ onWidthChange?: (width: number) => void;+ min?: number;+ max?: number;};/** Bottom half on mobile; right-side panel with a draggable left edge on desktop. */export default function ResizablePanel({- width = 320,- onWidthChange,- min = 240,- max = 400,- className,- style,- children,- ...props+ width = 320,+ onWidthChange,+ min = 240,+ max = 400,+ className,+ style,+ children,+ ...props}: ResizablePanelProps) {- const resize = (event: PointerEvent) =>- event.buttons === 1 &&- onWidthChange?.(Math.min(max, Math.max(min, width - event.movementX)));+ const resize = (event: PointerEvent) =>+ event.buttons === 1 &&+ onWidthChange?.(Math.min(max, Math.max(min, width - event.movementX)));- return (- <aside- className={cn(- "relative h-1/2 shrink-0 bg-panel max-md:w-full! max-md:border-t max-md:border-black md:h-auto",- className,- )}- style={{ width, ...style }}- {...props}- >- <div- className="absolute inset-y-0 -left-1 z-20 hidden w-2 cursor-col-resize touch-none after:absolute after:inset-y-0 after:left-1 after:w-px after:bg-black hover:after:bg-neutral-600 after:transition-colors after:duration-200 md:block"- onPointerDown={(event) =>- event.currentTarget.setPointerCapture(event.pointerId)- }- onPointerMove={resize}- />- {children}- </aside>- );+ return (+ <aside+ className={cn(+ "relative h-1/2 shrink-0 bg-panel max-md:w-full! max-md:border-t max-md:border-black md:h-auto",+ className,+ )}+ style={{ width, ...style }}+ {...props}+ >+ <div+ className="absolute inset-y-0 -left-1 z-20 hidden w-2 cursor-col-resize touch-none after:absolute after:inset-y-0 after:left-1 after:w-px after:bg-black hover:after:bg-neutral-600 after:transition-colors after:duration-200 md:block"+ onPointerDown={(event) =>+ event.currentTarget.setPointerCapture(event.pointerId)+ }+ onPointerMove={resize}+ />+ {children}+ </aside>+ );}diff --git a/src/components/ui/scroll-area.tsx b/src/components/ui/scroll-area.tsxindex ea2fdd1..adab0cc 100644--- a/src/components/ui/scroll-area.tsx+++ b/src/components/ui/scroll-area.tsx@@ -3,35 +3,35 @@ import { cn } from "cn";import type { ComponentProps } from "react";type ScrollAreaProps = ComponentProps<"div"> & {- /** Shade an edge while content is clipped beyond it. */- fade?: boolean;+ /** Shade an edge while content is clipped beyond it. */+ fade?: boolean;};export function ScrollArea({- children,- className,- fade = false,- ...props+ children,+ className,+ fade = false,+ ...props}: ScrollAreaProps) {- return (- <Primitive.Root- className={cn("relative min-h-0 overflow-hidden", className)}- {...props}- >- <Primitive.Viewport- className={cn(- "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",- )}- >- <Primitive.Content style={{ minWidth: 0 }}>- {children}- </Primitive.Content>- </Primitive.Viewport>- <Primitive.Scrollbar className="group z-10 my-1 mr-px flex w-1.5 justify-center">- <Primitive.Thumb className="w-1 rounded-full bg-neutral-400/60 group-hover:bg-neutral-300 group-data-scrolling:bg-neutral-300" />- </Primitive.Scrollbar>- </Primitive.Root>- );+ return (+ <Primitive.Root+ className={cn("relative min-h-0 overflow-hidden", className)}+ {...props}+ >+ <Primitive.Viewport+ className={cn(+ "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",+ )}+ >+ <Primitive.Content style={{ minWidth: 0 }}>+ {children}+ </Primitive.Content>+ </Primitive.Viewport>+ <Primitive.Scrollbar className="group z-10 my-1 mr-px flex w-1.5 justify-center">+ <Primitive.Thumb className="w-1 rounded-full bg-neutral-400/60 group-hover:bg-neutral-300 group-data-scrolling:bg-neutral-300" />+ </Primitive.Scrollbar>+ </Primitive.Root>+ );}diff --git a/src/components/ui/scrub-input.tsx b/src/components/ui/scrub-input.tsxindex 19002a9..f57d2a5 100644--- a/src/components/ui/scrub-input.tsx+++ b/src/components/ui/scrub-input.tsx@@ -1,125 +1,125 @@import { cva } from "class-variance-authority";import { cn } from "cn";import {- type ComponentProps,- type PointerEvent,- useRef,- useState,+ type ComponentProps,+ type PointerEvent,+ useRef,+ useState,} from "react";import { Field } from "./field";type ScrubInputProps = Omit<- ComponentProps<"input">,- "onChange" | "type" | "value" | "min" | "max" | "step"+ ComponentProps<"input">,+ "onChange" | "type" | "value" | "min" | "max" | "step"> & {- /** Rendered inline before the field; omit it inside an already-labeled row. */- label?: string;- value: number;- onChange: (value: number) => void;- min: number;- max: number;- step?: number;- /** "box" always shows the field chrome; "text" reads as plain text until edited. */- variant?: "box" | "text";+ /** Rendered inline before the field; omit it inside an already-labeled row. */+ label?: string;+ value: number;+ onChange: (value: number) => void;+ min: number;+ max: number;+ step?: number;+ /** "box" always shows the field chrome; "text" reads as plain text until edited. */+ variant?: "box" | "text";};const input = cva(- "w-full cursor-ew-resize bg-transparent text-neutral-100 tabular-nums outline-none focus:cursor-text",- {- variants: {- variant: {- box: "text-center",- text: "text-right focus:text-center",- },- },- },+ "w-full cursor-ew-resize bg-transparent text-neutral-100 tabular-nums outline-none focus:cursor-text",+ {+ variants: {+ variant: {+ box: "text-center",+ text: "text-right focus:text-center",+ },+ },+ },);type Drag = { dx: number; lastX: number; value: number; moved: boolean };/** Numeric field that edits on click and scrubs the value on horizontal drag. */export function ScrubInput({- label,- value,- onChange,- min,- max,- step = 1,- variant = "box",- className,- ...props+ label,+ value,+ onChange,+ min,+ max,+ step = 1,+ variant = "box",+ className,+ ...props}: ScrubInputProps) {- const decimals = `${step}`.split(".")[1]?.length ?? 0;- const [draft, setDraft] = useState<string>();- const drag = useRef<Drag | undefined>(undefined);+ const decimals = `${step}`.split(".")[1]?.length ?? 0;+ const [draft, setDraft] = useState<string>();+ const drag = useRef<Drag | undefined>(undefined);- const clamp = (next: number) =>- Math.min(max, Math.max(min, Number(next.toFixed(decimals))));+ const clamp = (next: number) =>+ Math.min(max, Math.max(min, Number(next.toFixed(decimals))));- const commit = () => {- if (draft && !Number.isNaN(Number(draft))) onChange(clamp(Number(draft)));- setDraft(undefined);- };+ const commit = () => {+ if (draft && !Number.isNaN(Number(draft))) onChange(clamp(Number(draft)));+ setDraft(undefined);+ };- const startScrub = (event: PointerEvent<HTMLInputElement>) => {- if (document.activeElement === event.currentTarget) return;- event.preventDefault();- event.currentTarget.setPointerCapture(event.pointerId);- drag.current = { dx: 0, lastX: event.clientX, value, moved: false };- };+ const startScrub = (event: PointerEvent<HTMLInputElement>) => {+ if (document.activeElement === event.currentTarget) return;+ event.preventDefault();+ event.currentTarget.setPointerCapture(event.pointerId);+ drag.current = { dx: 0, lastX: event.clientX, value, moved: false };+ };- const scrub = (event: PointerEvent<HTMLInputElement>) => {- const state = drag.current;- if (!state) return;- // Under pointer lock clientX freezes, so deltas come from movementX.- const locked = document.pointerLockElement === event.currentTarget;- state.dx += locked ? event.movementX : event.clientX - state.lastX;- state.lastX = event.clientX;- if (!state.moved && Math.abs(state.dx) > 2) {- state.moved = true;- // Lock hides the cursor so the drag is unbounded by screen edges.- Promise.resolve(event.currentTarget.requestPointerLock()).catch(() => {});- }- // Range-based speed so every control sweeps its full range in ~250px.- if (state.moved)- onChange(clamp(state.value + (state.dx * (max - min)) / 250));- };+ const scrub = (event: PointerEvent<HTMLInputElement>) => {+ const state = drag.current;+ if (!state) return;+ // Under pointer lock clientX freezes, so deltas come from movementX.+ const locked = document.pointerLockElement === event.currentTarget;+ state.dx += locked ? event.movementX : event.clientX - state.lastX;+ state.lastX = event.clientX;+ if (!state.moved && Math.abs(state.dx) > 2) {+ state.moved = true;+ // Lock hides the cursor so the drag is unbounded by screen edges.+ Promise.resolve(event.currentTarget.requestPointerLock()).catch(() => {});+ }+ // Range-based speed so every control sweeps its full range in ~250px.+ if (state.moved)+ onChange(clamp(state.value + (state.dx * (max - min)) / 250));+ };- const endScrub = (event: PointerEvent<HTMLInputElement>) => {- const state = drag.current;- drag.current = undefined;- if (!state) return;- if (state.moved) {- document.exitPointerLock();- return;- }- // A press that never moved is a click: enter text editing.- event.currentTarget.focus();- event.currentTarget.select();- };+ const endScrub = (event: PointerEvent<HTMLInputElement>) => {+ const state = drag.current;+ drag.current = undefined;+ if (!state) return;+ if (state.moved) {+ document.exitPointerLock();+ return;+ }+ // A press that never moved is a click: enter text editing.+ event.currentTarget.focus();+ event.currentTarget.select();+ };- return (- <label- className={cn("flex items-center gap-2 text-neutral-400", className)}- >- {label}- <Field className="w-16 max-w-full" variant={variant}>- <input- {...props}- className={input({ variant })}- inputMode="decimal"- onBlur={commit}- onChange={(event) => setDraft(event.currentTarget.value)}- onKeyDown={(event) =>- event.key === "Enter" && event.currentTarget.blur()- }- onPointerDown={startScrub}- onPointerMove={scrub}- onPointerUp={endScrub}- type="text"- value={draft ?? value.toFixed(decimals)}- />- </Field>- </label>- );+ return (+ <label+ className={cn("flex items-center gap-2 text-neutral-400", className)}+ >+ {label}+ <Field className="w-16 max-w-full" variant={variant}>+ <input+ {...props}+ className={input({ variant })}+ inputMode="decimal"+ onBlur={commit}+ onChange={(event) => setDraft(event.currentTarget.value)}+ onKeyDown={(event) =>+ event.key === "Enter" && event.currentTarget.blur()+ }+ onPointerDown={startScrub}+ onPointerMove={scrub}+ onPointerUp={endScrub}+ type="text"+ value={draft ?? value.toFixed(decimals)}+ />+ </Field>+ </label>+ );}diff --git a/src/components/ui/slider.tsx b/src/components/ui/slider.tsxindex bbc0ec6..e843a47 100644--- a/src/components/ui/slider.tsx+++ b/src/components/ui/slider.tsx@@ -2,95 +2,95 @@ import { cva } from "class-variance-authority";import { ScrubInput } from "./scrub-input";type SliderProps = {- label: string;- value: number;- onChange: (value: number) => void;- min: number;- max: number;- step?: number;- /** Restored by double-clicking the bar. */- defaultValue?: number;- /** CSS color stops painting the bar left to right, e.g. ["#46f", "#fc3"]. */- stops?: string[];- unit?: string;- /** "panel" stacks the bar under its label; "toolbar" keeps one row and drops the bar in a narrow container. */- variant?: "panel" | "toolbar";+ label: string;+ value: number;+ onChange: (value: number) => void;+ min: number;+ max: number;+ step?: number;+ /** Restored by double-clicking the bar. */+ defaultValue?: number;+ /** CSS color stops painting the bar left to right, e.g. ["#46f", "#fc3"]. */+ stops?: string[];+ unit?: string;+ /** "panel" stacks the bar under its label; "toolbar" keeps one row and drops the bar in a narrow container. */+ variant?: "panel" | "toolbar";};const root = cva("items-center text-neutral-400", {- variants: {- variant: {- panel: "grid grid-cols-[1fr_auto] gap-y-0.5",- toolbar: "flex gap-2",- },- },+ variants: {+ variant: {+ panel: "grid grid-cols-[1fr_auto] gap-y-0.5",+ toolbar: "flex gap-2",+ },+ },});const field = cva("relative z-10 flex items-center gap-1", {- variants: { variant: { panel: "", toolbar: "order-last" } },+ variants: { variant: { panel: "", toolbar: "order-last" } },});const track = cva(- "relative h-1 min-w-11 rounded-full bg-neutral-900 shadow-groove",- {- variants: {- variant: { panel: "col-span-2 my-1", toolbar: "w-20 @max-2xl:hidden" },- },- },+ "relative h-1 min-w-11 rounded-full bg-neutral-900 shadow-groove",+ {+ variants: {+ variant: { panel: "col-span-2 my-1", toolbar: "w-20 @max-2xl:hidden" },+ },+ },);const range = cva(- "absolute top-1/2 w-full -translate-y-1/2 touch-pan-y appearance-none bg-transparent outline-none [&:focus-visible::-webkit-slider-thumb]:ring-2 [&:focus-visible::-webkit-slider-thumb]:ring-sky-300 [&:focus-visible::-moz-range-thumb]:ring-2 [&:focus-visible::-moz-range-thumb]:ring-sky-300 [&::-webkit-slider-runnable-track]:bg-transparent [&::-webkit-slider-thumb]:appearance-none [&::-webkit-slider-thumb]:size-3 [&::-webkit-slider-thumb]:rounded-full [&::-webkit-slider-thumb]:bg-neutral-100 [&::-webkit-slider-thumb]:ring-1 [&::-webkit-slider-thumb]:ring-neutral-800 [&::-moz-range-track]:bg-transparent [&::-moz-range-thumb]:size-2.5 [&::-moz-range-thumb]:rounded-full [&::-moz-range-thumb]:border-0 [&::-moz-range-thumb]:bg-neutral-100 [&::-moz-range-thumb]:ring-1 [&::-moz-range-thumb]:ring-neutral-800",- { variants: { variant: { panel: "h-11", toolbar: "h-7" } } },+ "absolute top-1/2 w-full -translate-y-1/2 touch-pan-y appearance-none bg-transparent outline-none [&:focus-visible::-webkit-slider-thumb]:ring-2 [&:focus-visible::-webkit-slider-thumb]:ring-sky-300 [&:focus-visible::-moz-range-thumb]:ring-2 [&:focus-visible::-moz-range-thumb]:ring-sky-300 [&::-webkit-slider-runnable-track]:bg-transparent [&::-webkit-slider-thumb]:appearance-none [&::-webkit-slider-thumb]:size-3 [&::-webkit-slider-thumb]:rounded-full [&::-webkit-slider-thumb]:bg-neutral-100 [&::-webkit-slider-thumb]:ring-1 [&::-webkit-slider-thumb]:ring-neutral-800 [&::-moz-range-track]:bg-transparent [&::-moz-range-thumb]:size-2.5 [&::-moz-range-thumb]:rounded-full [&::-moz-range-thumb]:border-0 [&::-moz-range-thumb]:bg-neutral-100 [&::-moz-range-thumb]:ring-1 [&::-moz-range-thumb]:ring-neutral-800",+ { variants: { variant: { panel: "h-11", toolbar: "h-7" } } },);/** Labeled slider paired with a scrubbable numeric field. */export function Slider({- label,- value,- onChange,- min,- max,- step = 1,- defaultValue,- stops,- unit,- variant = "panel",+ label,+ value,+ onChange,+ min,+ max,+ step = 1,+ defaultValue,+ stops,+ unit,+ variant = "panel",}: SliderProps) {- const gradient = stops && {- background: `linear-gradient(to right, ${stops.join()})`,- };- const reset = () => defaultValue !== undefined && onChange(defaultValue);+ const gradient = stops && {+ background: `linear-gradient(to right, ${stops.join()})`,+ };+ const reset = () => defaultValue !== undefined && onChange(defaultValue);- return (- <div className={root({ variant })}>- <span>{label}</span>- <div className={field({ variant })}>- <ScrubInput- aria-label={label}- className={variant === "toolbar" ? "w-9" : undefined}- max={max}- min={min}- onChange={onChange}- step={step}- value={value}- variant="text"- />- {unit && <span className="text-neutral-500">{unit}</span>}- </div>- <div className={track({ variant })} style={gradient}>- <input- aria-label={label}- className={range({ variant })}- max={max}- min={min}- onChange={(event) => onChange(event.currentTarget.valueAsNumber)}- onDoubleClick={reset}- onKeyDown={(event) =>- event.key === "Enter" && event.currentTarget.blur()- }- step={step}- type="range"- value={value}- />- </div>- </div>- );+ return (+ <div className={root({ variant })}>+ <span>{label}</span>+ <div className={field({ variant })}>+ <ScrubInput+ aria-label={label}+ className={variant === "toolbar" ? "w-9" : undefined}+ max={max}+ min={min}+ onChange={onChange}+ step={step}+ value={value}+ variant="text"+ />+ {unit && <span className="text-neutral-500">{unit}</span>}+ </div>+ <div className={track({ variant })} style={gradient}>+ <input+ aria-label={label}+ className={range({ variant })}+ max={max}+ min={min}+ onChange={(event) => onChange(event.currentTarget.valueAsNumber)}+ onDoubleClick={reset}+ onKeyDown={(event) =>+ event.key === "Enter" && event.currentTarget.blur()+ }+ step={step}+ type="range"+ value={value}+ />+ </div>+ </div>+ );}diff --git a/src/components/ui/spinner.tsx b/src/components/ui/spinner.tsxindex c591bc9..f78c1b0 100644--- a/src/components/ui/spinner.tsx+++ b/src/components/ui/spinner.tsx@@ -2,18 +2,18 @@ import { cn } from "cn";import type { ComponentProps } from "react";export default function Spinner({- className,- ...props+ className,+ ...props}: ComponentProps<"div">) {- return (- <div- aria-label="Loading"- className={cn(- "size-5 animate-spin rounded-full border-2 border-neutral-600 border-t-neutral-100",- className,- )}- role="status"- {...props}- />- );+ return (+ <div+ aria-label="Loading"+ className={cn(+ "size-5 animate-spin rounded-full border-2 border-neutral-600 border-t-neutral-100",+ className,+ )}+ role="status"+ {...props}+ />+ );}diff --git a/src/components/ui/tabs.tsx b/src/components/ui/tabs.tsxindex b174f6d..5900cec 100644--- a/src/components/ui/tabs.tsx+++ b/src/components/ui/tabs.tsx@@ -3,57 +3,57 @@ import type { ComponentProps, KeyboardEvent } from "react";import Button from "./button";const steps: Record<string, number> = {- ArrowRight: 1,- ArrowDown: 1,- ArrowLeft: -1,- ArrowUp: -1,+ ArrowRight: 1,+ ArrowDown: 1,+ ArrowLeft: -1,+ ArrowUp: -1,};/** Arrow keys in any direction move between the tabs inside. Orientation comes from className. */export function TabList({ className, ...props }: ComponentProps<"div">) {- function selectNeighbor(event: KeyboardEvent<HTMLDivElement>) {- const step = steps[event.key];- if (!step) {- return;- }- event.preventDefault();- const tabs = [- ...event.currentTarget.querySelectorAll<HTMLElement>('[role="tab"]'),- ];- const index = tabs.findIndex(- (tab) => tab.getAttribute("aria-selected") === "true",- );- const next = tabs.at((index + step) % tabs.length);- next?.focus();- next?.click();- }- return (- <div- role="tablist"- onKeyDown={selectNeighbor}- className={cn("flex gap-1", className)}- {...props}- />- );+ function selectNeighbor(event: KeyboardEvent<HTMLDivElement>) {+ const step = steps[event.key];+ if (!step) {+ return;+ }+ event.preventDefault();+ const tabs = [+ ...event.currentTarget.querySelectorAll<HTMLElement>('[role="tab"]'),+ ];+ const index = tabs.findIndex(+ (tab) => tab.getAttribute("aria-selected") === "true",+ );+ const next = tabs.at((index + step) % tabs.length);+ next?.focus();+ next?.click();+ }+ return (+ <div+ role="tablist"+ onKeyDown={selectNeighbor}+ className={cn("flex gap-1", className)}+ {...props}+ />+ );}/** Only the selected tab is in the tab order; arrow keys reach the rest. */export function Tab({- selected,- className,- ...props+ selected,+ className,+ ...props}: ComponentProps<typeof Button> & { selected: boolean }) {- return (- <Button- variant="ghost"- role="tab"- aria-selected={selected}- tabIndex={selected ? 0 : -1}- className={cn(- "aria-selected:bg-neutral-700 aria-selected:text-neutral-100 aria-selected:shadow-ridge",- className,- )}- {...props}- />- );+ return (+ <Button+ variant="ghost"+ role="tab"+ aria-selected={selected}+ tabIndex={selected ? 0 : -1}+ className={cn(+ "aria-selected:bg-neutral-700 aria-selected:text-neutral-100 aria-selected:shadow-ridge",+ className,+ )}+ {...props}+ />+ );}diff --git a/src/components/ui/tree-drag.tsx b/src/components/ui/tree-drag.tsxindex 1be8733..ed0e667 100644--- a/src/components/ui/tree-drag.tsx+++ b/src/components/ui/tree-drag.tsx@@ -1,156 +1,156 @@import {- type CollisionDetection,- DndContext,- type DragMoveEvent,- DragOverlay,- MouseSensor,- pointerWithin,- TouchSensor,- useDraggable,- useDroppable,- useSensor,- useSensors,+ type CollisionDetection,+ DndContext,+ type DragMoveEvent,+ DragOverlay,+ MouseSensor,+ pointerWithin,+ TouchSensor,+ useDraggable,+ useDroppable,+ useSensor,+ useSensors,} from "@dnd-kit/core";import {- createContext,- type ReactNode,- useCallback,- useContext,- useMemo,- useState,+ createContext,+ type ReactNode,+ useCallback,+ useContext,+ useMemo,+ useState,} from "react";export type TreeDrop = {- id: string;- target: string;- position: "before" | "after" | "inside";+ id: string;+ target: string;+ position: "before" | "after" | "inside";};const Context = createContext<{ drop: TreeDrop | null; active: string | null }>(- { drop: null, active: null },+ { drop: null, active: null },);type TreeDragProps = {- children: ReactNode;- canDrop: (drop: TreeDrop) => boolean;- onDrop: (drop: TreeDrop) => void;- label: (id: string) => string;+ children: ReactNode;+ canDrop: (drop: TreeDrop) => boolean;+ onDrop: (drop: TreeDrop) => void;+ label: (id: string) => string;};const collision: CollisionDetection = (args) =>- pointerWithin(args).map((hit) => ({- ...hit,- data: { ...hit.data, pointerY: args.pointerCoordinates?.y },- }));+ pointerWithin(args).map((hit) => ({+ ...hit,+ data: { ...hit.data, pointerY: args.pointerCoordinates?.y },+ }));/** Gesture ownership only. The caller defines tree constraints and commits the move. */export function TreeDrag({ children, canDrop, onDrop, label }: TreeDragProps) {- const [active, setActive] = useState<string | null>(null);- const [drop, setDrop] = useState<TreeDrop | null>(null);- const sensors = useSensors(- useSensor(MouseSensor, { activationConstraint: { distance: 6 } }),- useSensor(TouchSensor, {- activationConstraint: { delay: 180, tolerance: 6 },- }),- );- function locate(event: DragMoveEvent): TreeDrop | null {- if (- !event.over ||- typeof event.active.id !== "string" ||- typeof event.over.id !== "string"- ) {- return null;- }- const rect = event.over.rect;- const y = event.collisions?.[0]?.data?.pointerY;- if (typeof y !== "number") {- return null;- }- const fraction = (y - rect.top) / rect.height;- let position: TreeDrop["position"] = "inside";- if (fraction < 0.25) {- position = "before";- }- if (fraction > 0.75) {- position = "after";- }- // A line beneath an expanded header would falsely imply moving above its children.- if (position === "after" && event.over.data.current?.expanded) {- return null;- }- 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 (- <DndContext- sensors={sensors}- collisionDetection={collision}- onDragStart={({ active }) => {- if (typeof active.id === "string") {- setActive(active.id);- }- }}- onDragMove={move}- onDragCancel={clear}- onDragEnd={() => {- if (drop) {- onDrop(drop);- }- clear();- }}- accessibility={{- screenReaderInstructions: {- draggable:- "Drag to reorder or nest. Use the layer actions menu to move with the keyboard.",- },- }}- >- <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">- {label(active)}- </div>- )}- </DragOverlay>- </DndContext>- );+ const [active, setActive] = useState<string | null>(null);+ const [drop, setDrop] = useState<TreeDrop | null>(null);+ const sensors = useSensors(+ useSensor(MouseSensor, { activationConstraint: { distance: 6 } }),+ useSensor(TouchSensor, {+ activationConstraint: { delay: 180, tolerance: 6 },+ }),+ );+ function locate(event: DragMoveEvent): TreeDrop | null {+ if (+ !event.over ||+ typeof event.active.id !== "string" ||+ typeof event.over.id !== "string"+ ) {+ return null;+ }+ const rect = event.over.rect;+ const y = event.collisions?.[0]?.data?.pointerY;+ if (typeof y !== "number") {+ return null;+ }+ const fraction = (y - rect.top) / rect.height;+ let position: TreeDrop["position"] = "inside";+ if (fraction < 0.25) {+ position = "before";+ }+ if (fraction > 0.75) {+ position = "after";+ }+ // A line beneath an expanded header would falsely imply moving above its children.+ if (position === "after" && event.over.data.current?.expanded) {+ return null;+ }+ 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 (+ <DndContext+ sensors={sensors}+ collisionDetection={collision}+ onDragStart={({ active }) => {+ if (typeof active.id === "string") {+ setActive(active.id);+ }+ }}+ onDragMove={move}+ onDragCancel={clear}+ onDragEnd={() => {+ if (drop) {+ onDrop(drop);+ }+ clear();+ }}+ accessibility={{+ screenReaderInstructions: {+ draggable:+ "Drag to reorder or nest. Use the layer actions menu to move with the keyboard.",+ },+ }}+ >+ <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">+ {label(active)}+ </div>+ )}+ </DragOverlay>+ </DndContext>+ );}export function useTreeDragItem(- id: string,- { disabled = false, expanded = false } = {},+ id: string,+ { disabled = false, expanded = false } = {},) {- const { active, drop } = useContext(Context);- const draggable = useDraggable({ id, disabled });- const droppable = useDroppable({ id, data: { expanded } });- 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,- };+ const { active, drop } = useContext(Context);+ const draggable = useDraggable({ id, disabled });+ const droppable = useDroppable({ id, data: { expanded } });+ 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/components/ui/vertical-slider.tsx b/src/components/ui/vertical-slider.tsxindex 3a2a2fe..6a49f26 100644--- a/src/components/ui/vertical-slider.tsx+++ b/src/components/ui/vertical-slider.tsx@@ -1,45 +1,45 @@type VerticalSliderProps = {- label: string;- value: number;- onChange: (value: number) => void;- min: number;- max: number;- defaultValue?: number;- stops: readonly string[];- color: string;+ label: string;+ value: number;+ onChange: (value: number) => void;+ min: number;+ max: number;+ defaultValue?: number;+ stops: readonly string[];+ color: string;};/** Native vertical range: up increases, down decreases, double-click restores the default. */export function VerticalSlider({- label,- value,- onChange,- min,- max,- defaultValue,- stops,- color,+ label,+ value,+ onChange,+ min,+ max,+ defaultValue,+ stops,+ color,}: VerticalSliderProps) {- return (- <div className="relative flex h-44 w-full justify-center">- <div- className="pointer-events-none absolute inset-y-2 w-1 rounded-full shadow-groove"- style={{ background: `linear-gradient(to top, ${stops.join()})` }}- />- <input- aria-label={label}- aria-orientation="vertical"- className="relative h-full w-full touch-none cursor-ns-resize appearance-none bg-transparent [direction:rtl] [writing-mode:vertical-lr] focus-visible:outline-1 focus-visible:outline-offset-2 focus-visible:outline-neutral-400 [&::-webkit-slider-runnable-track]:bg-transparent [&::-webkit-slider-thumb]:size-4 [&::-webkit-slider-thumb]:appearance-none [&::-webkit-slider-thumb]:rounded-full [&::-webkit-slider-thumb]:bg-current [&::-webkit-slider-thumb]:ring-1 [&::-webkit-slider-thumb]:ring-black/30 [&::-moz-range-track]:bg-transparent [&::-moz-range-thumb]:size-4 [&::-moz-range-thumb]:rounded-full [&::-moz-range-thumb]:border-0 [&::-moz-range-thumb]:bg-current [&::-moz-range-thumb]:ring-1 [&::-moz-range-thumb]:ring-black/30"- style={{ color }}- type="range"- min={min}- max={max}- value={value}- onChange={(event) => onChange(event.currentTarget.valueAsNumber)}- onDoubleClick={() =>- defaultValue !== undefined && onChange(defaultValue)- }- />- </div>- );+ return (+ <div className="relative flex h-44 w-full justify-center">+ <div+ className="pointer-events-none absolute inset-y-2 w-1 rounded-full shadow-groove"+ style={{ background: `linear-gradient(to top, ${stops.join()})` }}+ />+ <input+ aria-label={label}+ aria-orientation="vertical"+ className="relative h-full w-full touch-none cursor-ns-resize appearance-none bg-transparent [direction:rtl] [writing-mode:vertical-lr] focus-visible:outline-1 focus-visible:outline-offset-2 focus-visible:outline-neutral-400 [&::-webkit-slider-runnable-track]:bg-transparent [&::-webkit-slider-thumb]:size-4 [&::-webkit-slider-thumb]:appearance-none [&::-webkit-slider-thumb]:rounded-full [&::-webkit-slider-thumb]:bg-current [&::-webkit-slider-thumb]:ring-1 [&::-webkit-slider-thumb]:ring-black/30 [&::-moz-range-track]:bg-transparent [&::-moz-range-thumb]:size-4 [&::-moz-range-thumb]:rounded-full [&::-moz-range-thumb]:border-0 [&::-moz-range-thumb]:bg-current [&::-moz-range-thumb]:ring-1 [&::-moz-range-thumb]:ring-black/30"+ style={{ color }}+ type="range"+ min={min}+ max={max}+ value={value}+ onChange={(event) => onChange(event.currentTarget.valueAsNumber)}+ onDoubleClick={() =>+ defaultValue !== undefined && onChange(defaultValue)+ }+ />+ </div>+ );}diff --git a/src/core/document/history.ts b/src/core/document/history.tsindex 11099b2..a6c8547 100644--- a/src/core/document/history.ts+++ b/src/core/document/history.ts@@ -2,91 +2,91 @@ import { createStore, type StoreApi } from "zustand/vanilla";/** Bounded immutable snapshots, grouped explicitly by an editing gesture. */export function createHistory<T extends object>(- state: StoreApi<T>,- equal: (a: T, b: T) => boolean,- limit = 100,- onChange?: (retained: readonly T[]) => void,+ state: StoreApi<T>,+ equal: (a: T, b: T) => boolean,+ limit = 100,+ onChange?: (retained: readonly T[]) => void,) {- const status = createStore(() => ({ undoCount: 0, redoCount: 0 }));- const past: T[] = [];- const future: T[] = [];- let group: T | undefined;- function publish() {- status.setState({ undoCount: past.length, redoCount: future.length });- onChange?.([- ...past,- ...future,- ...(group ? [group] : []),- state.getState(),- ]);- }- function record(before: T) {- if (equal(before, state.getState())) {- return;- }- past.push(before);- if (past.length > limit) {- past.shift();- }- future.length = 0;- }- function commit() {- const before = group;- group = undefined;- if (before !== undefined) {- record(before);- publish();- }- }- function cancel() {- const before = group;- group = undefined;- if (before !== undefined) {- state.setState(before, true);- publish();- }- }- function travel(from: T[], to: T[]) {- commit();- const next = from.pop();- if (next === undefined) {- return;- }- to.push(state.getState());- state.setState(next, true);- publish();- }- return {- status: {- getState: status.getState,- getInitialState: status.getInitialState,- subscribe: status.subscribe,- },- update(next: T) {- const before = state.getState();- if (equal(before, next)) {- return;- }- state.setState(next, true);- if (!group) {- record(before);- }- 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,- undo: () => travel(past, future),- redo: () => travel(future, past),- clear() {- group = undefined;- past.length = future.length = 0;- publish();- },- };+ const status = createStore(() => ({ undoCount: 0, redoCount: 0 }));+ const past: T[] = [];+ const future: T[] = [];+ let group: T | undefined;+ function publish() {+ status.setState({ undoCount: past.length, redoCount: future.length });+ onChange?.([+ ...past,+ ...future,+ ...(group ? [group] : []),+ state.getState(),+ ]);+ }+ function record(before: T) {+ if (equal(before, state.getState())) {+ return;+ }+ past.push(before);+ if (past.length > limit) {+ past.shift();+ }+ future.length = 0;+ }+ function commit() {+ const before = group;+ group = undefined;+ if (before !== undefined) {+ record(before);+ publish();+ }+ }+ function cancel() {+ const before = group;+ group = undefined;+ if (before !== undefined) {+ state.setState(before, true);+ publish();+ }+ }+ function travel(from: T[], to: T[]) {+ commit();+ const next = from.pop();+ if (next === undefined) {+ return;+ }+ to.push(state.getState());+ state.setState(next, true);+ publish();+ }+ return {+ status: {+ getState: status.getState,+ getInitialState: status.getInitialState,+ subscribe: status.subscribe,+ },+ update(next: T) {+ const before = state.getState();+ if (equal(before, next)) {+ return;+ }+ state.setState(next, true);+ if (!group) {+ record(before);+ }+ 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,+ undo: () => travel(past, future),+ redo: () => travel(future, past),+ clear() {+ group = undefined;+ past.length = future.length = 0;+ publish();+ },+ };}diff --git a/src/core/document/index.ts b/src/core/document/index.tsindex 046d3d3..b0a6224 100644--- a/src/core/document/index.ts+++ b/src/core/document/index.ts@@ -6,135 +6,135 @@ import type { Gradient, MaskModifier, Scene } from "./scene";import { findLayer } from "./tree";export type {- Adjustments,- ColorMixer,- CurvePoint,- Details,- EffectLayer,- Gradient,- ImageLayer,- Layer,- LinearGradient,- MaskLayer,- MaskModifier,- ProcessingLayer,- RadialGradient,- Scene,- ToneCurve,- Vignette,+ Adjustments,+ ColorMixer,+ CurvePoint,+ Details,+ EffectLayer,+ Gradient,+ ImageLayer,+ Layer,+ LinearGradient,+ MaskLayer,+ MaskModifier,+ ProcessingLayer,+ RadialGradient,+ Scene,+ ToneCurve,+ Vignette,} from "./scene";export {- adjustmentTarget,- editLayer,- findLayer,- locateLayer,- maskModifiers,- updateLayer,- walkLayers,+ adjustmentTarget,+ editLayer,+ findLayer,+ locateLayer,+ maskModifiers,+ updateLayer,+ walkLayers,} from "./tree";export { createResources };export type Preview = {- comparison: "edited" | "original" | "split";- split: number;- shadows: boolean;- highlights: boolean;- /** The mask whose coverage the display tints red. */- maskOverlay?: {- readonly mask: Gradient;- readonly modifiers: readonly MaskModifier[];- };+ comparison: "edited" | "original" | "split";+ split: number;+ shadows: boolean;+ highlights: boolean;+ /** The mask whose coverage the display tints red. */+ maskOverlay?: {+ readonly mask: Gradient;+ readonly modifiers: readonly MaskModifier[];+ };};/** Scenes contain only plain values; unchanged branches keep their identity. */function equal(a: unknown, b: unknown): boolean {- if (a === b) {- return true;- }- if (- !a ||- !b ||- typeof a !== "object" ||- typeof b !== "object" ||- Array.isArray(a) !== Array.isArray(b)- ) {- return false;- }- const keys = Object.keys(a);- return (- keys.length === Object.keys(b).length &&- keys.every(- (key) =>- Object.hasOwn(b, key) &&- equal(Reflect.get(a, key), Reflect.get(b, key)),- )- );+ if (a === b) {+ return true;+ }+ if (+ !a ||+ !b ||+ typeof a !== "object" ||+ typeof b !== "object" ||+ Array.isArray(a) !== Array.isArray(b)+ ) {+ return false;+ }+ const keys = Object.keys(a);+ return (+ keys.length === Object.keys(b).length &&+ keys.every(+ (key) =>+ Object.hasOwn(b, key) &&+ equal(Reflect.get(a, key), Reflect.get(b, key)),+ )+ );}/** One independent editing session. No React, decoders, or file workflows. */export function createDocument(initial: Scene, resources = createResources()) {- const scene = createStore(() => initial);- const selection = createStore(() => ({ layerId: initial.layers[0].id }));- const { update, ...history } = createHistory(- scene,- equal,- 100,- (retained) => {- resources.retain(- new Set(retained.map((state) => state.layers[0].source)),- );- },- );- const unsubscribe = scene.subscribe((state) => {- const id = selection.getState().layerId;- if (!findLayer(state.layers, id)) {- selection.setState({ layerId: state.layers[0].id });- }- });- let closed = false;- return {- id: crypto.randomUUID(),- scene: {- getState: scene.getState,- getInitialState: scene.getInitialState,- subscribe: scene.subscribe,- },- selection,- selectLayer(layerId: string) {- const state = scene.getState();- if (!findLayer(state.layers, layerId)) {- throw Error("Layer is unavailable.");- }- if (selection.getState().layerId !== layerId) {- history.commit();- selection.setState({ layerId });- }- },- preview: createStore<Preview>(() => ({- comparison: "edited",- split: 0.5,- shadows: false,- highlights: false,- })),- history,- resources,- edit(next: Scene) {- if (closed) {- throw new Error("Document is closed.");- }- validateFrame(next.frame);- update(next);- },- dispose() {- if (closed) {- return;- }- closed = true;- unsubscribe();- history.clear();- resources.dispose();- },- };+ const scene = createStore(() => initial);+ const selection = createStore(() => ({ layerId: initial.layers[0].id }));+ const { update, ...history } = createHistory(+ scene,+ equal,+ 100,+ (retained) => {+ resources.retain(+ new Set(retained.map((state) => state.layers[0].source)),+ );+ },+ );+ const unsubscribe = scene.subscribe((state) => {+ const id = selection.getState().layerId;+ if (!findLayer(state.layers, id)) {+ selection.setState({ layerId: state.layers[0].id });+ }+ });+ let closed = false;+ return {+ id: crypto.randomUUID(),+ scene: {+ getState: scene.getState,+ getInitialState: scene.getInitialState,+ subscribe: scene.subscribe,+ },+ selection,+ selectLayer(layerId: string) {+ const state = scene.getState();+ if (!findLayer(state.layers, layerId)) {+ throw Error("Layer is unavailable.");+ }+ if (selection.getState().layerId !== layerId) {+ history.commit();+ selection.setState({ layerId });+ }+ },+ preview: createStore<Preview>(() => ({+ comparison: "edited",+ split: 0.5,+ shadows: false,+ highlights: false,+ })),+ history,+ resources,+ edit(next: Scene) {+ if (closed) {+ throw new Error("Document is closed.");+ }+ validateFrame(next.frame);+ update(next);+ },+ dispose() {+ if (closed) {+ return;+ }+ closed = true;+ unsubscribe();+ history.clear();+ resources.dispose();+ },+ };}export type EditorDocument = ReturnType<typeof createDocument>;diff --git a/src/core/document/resources.ts b/src/core/document/resources.tsindex f3175f0..cfa7638 100644--- a/src/core/document/resources.ts+++ b/src/core/document/resources.ts@@ -2,38 +2,38 @@ import type { ImageSource } from "@/core/image";/** Owns the document's image files and GPU targets, outside scene history. */export function createResources() {- const images = new Map<string, { file: File } & ImageSource>();- let disposed = false;- return {- add(file: File, source: ImageSource) {- if (disposed) {- throw new Error("Document is closed.");- }- const id = crypto.randomUUID();- images.set(id, { file, ...source });- return id;- },- get(id: string) {- const resource = images.get(id);- if (!resource) {- throw new Error("Image resource is unavailable.");- }- return resource;- },- retain(ids: ReadonlySet<string>) {- for (const [id, source] of images) {- if (!ids.has(id)) {- source.dispose();- images.delete(id);- }- }- },- dispose() {- disposed = true;- for (const source of images.values()) {- source.dispose();- }- images.clear();- },- };+ const images = new Map<string, { file: File } & ImageSource>();+ let disposed = false;+ return {+ add(file: File, source: ImageSource) {+ if (disposed) {+ throw new Error("Document is closed.");+ }+ const id = crypto.randomUUID();+ images.set(id, { file, ...source });+ return id;+ },+ get(id: string) {+ const resource = images.get(id);+ if (!resource) {+ throw new Error("Image resource is unavailable.");+ }+ return resource;+ },+ retain(ids: ReadonlySet<string>) {+ for (const [id, source] of images) {+ if (!ids.has(id)) {+ source.dispose();+ images.delete(id);+ }+ }+ },+ dispose() {+ disposed = true;+ for (const source of images.values()) {+ source.dispose();+ }+ images.clear();+ },+ };}diff --git a/src/core/document/scene.ts b/src/core/document/scene.tsindex c8e9d17..1cd021e 100644--- a/src/core/document/scene.ts+++ b/src/core/document/scene.ts@@ -2,22 +2,22 @@ import type { WhiteBalance } from "@/core/image";import type { ImageFrame, Point } from "@/core/image/frame";export type Adjustments = {- exposure: number;- incrementalTemperature: number;- incrementalTint: number;- contrast: number;- highlights: number;- shadows: number;- whites: number;- blacks: number;- vibrance: number;- saturation: number;+ exposure: number;+ incrementalTemperature: number;+ incrementalTint: number;+ contrast: number;+ highlights: number;+ shadows: number;+ whites: number;+ blacks: number;+ vibrance: number;+ saturation: number;};export type Details = {- clarity: number;- sharpening: number;- sharpenRadius: number;+ clarity: number;+ sharpening: number;+ sharpenRadius: number;};export type CurvePoint = { readonly x: number; readonly y: number };@@ -25,60 +25,60 @@ export type ToneCurve = readonly CurvePoint[];/** Eight color ranges, ordered red through magenta; values use -100..100 UI units. */export type ColorMixer = {- readonly hue: readonly number[];- readonly saturation: readonly number[];- readonly luminance: readonly number[];+ readonly hue: readonly number[];+ readonly saturation: readonly number[];+ readonly luminance: readonly number[];};/** Source-centered darkening in 0..100 UI units. */export type Vignette = {- readonly intensity: number;- readonly softness: number;+ readonly intensity: number;+ readonly softness: number;};export type ImageLayer = {- readonly kind: "image";- readonly id: string;- readonly name: string;- readonly source: string;- readonly whiteBalance?: Readonly<WhiteBalance>;- readonly adjustments: Readonly<Adjustments>;- readonly toneCurve: ToneCurve;- readonly children: readonly ProcessingLayer[];+ readonly kind: "image";+ readonly id: string;+ readonly name: string;+ readonly source: string;+ readonly whiteBalance?: Readonly<WhiteBalance>;+ readonly adjustments: Readonly<Adjustments>;+ readonly toneCurve: ToneCurve;+ readonly children: readonly ProcessingLayer[];};/** Endpoints in the original document canvas, independent of crop and rotation. */export type LinearGradient = {- readonly kind: "linear";- readonly start: Point;- readonly end: Point;+ readonly kind: "linear";+ readonly start: Point;+ readonly end: Point;};export type RadialGradient = {- readonly kind: "radial";- readonly center: Point;- readonly radius: Point;- readonly angle: number;- readonly feather: number;+ readonly kind: "radial";+ readonly center: Point;+ readonly radius: Point;+ readonly angle: number;+ readonly feather: number;};export type Gradient = LinearGradient | RadialGradient;export type ProcessingLayer = {- readonly id: string;- readonly name: string;- readonly visible: boolean;- readonly opacity: number;- readonly children: readonly ProcessingLayer[];+ readonly id: string;+ readonly name: string;+ readonly visible: boolean;+ readonly opacity: number;+ readonly children: readonly ProcessingLayer[];} & (- | { readonly kind: "details"; readonly details: Readonly<Details> }- | { readonly kind: "exposure"; readonly exposure: number }- | { readonly kind: "vignette"; readonly vignette: Vignette }- | { readonly kind: "color-mixer"; readonly colorMixer: ColorMixer }- | {- readonly kind: "mask";- readonly operation: "add" | "subtract";- readonly mask: Gradient;- readonly adjustments: Readonly<Adjustments>;- readonly toneCurve: ToneCurve;- }+ | { readonly kind: "details"; readonly details: Readonly<Details> }+ | { readonly kind: "exposure"; readonly exposure: number }+ | { readonly kind: "vignette"; readonly vignette: Vignette }+ | { readonly kind: "color-mixer"; readonly colorMixer: ColorMixer }+ | {+ readonly kind: "mask";+ readonly operation: "add" | "subtract";+ readonly mask: Gradient;+ readonly adjustments: Readonly<Adjustments>;+ readonly toneCurve: ToneCurve;+ });export type MaskLayer = Extract<ProcessingLayer, { kind: "mask" }>;/** A child mask that adds to or subtracts from its parent's coverage. */@@ -88,6 +88,6 @@ export type Layer = ImageLayer | ProcessingLayer;/** The sole image source is pinned below the ordered processing tree. */export type Scene = {- readonly frame: ImageFrame;- readonly layers: readonly [ImageLayer, ...ProcessingLayer[]];+ readonly frame: ImageFrame;+ readonly layers: readonly [ImageLayer, ...ProcessingLayer[]];};diff --git a/src/core/document/tree.ts b/src/core/document/tree.tsindex 2ae6446..022f499 100644--- a/src/core/document/tree.ts+++ b/src/core/document/tree.ts@@ -2,104 +2,104 @@ import type { EditorDocument } from "./index";import type { Layer, MaskLayer, ProcessingLayer, Scene } from "./scene";export function walkLayers(layers: readonly Layer[]): Layer[] {- return layers.flatMap((layer) => [layer, ...walkLayers(layer.children)]);+ return layers.flatMap((layer) => [layer, ...walkLayers(layer.children)]);}type LayerLocation = {- layer: Layer;- siblings: readonly Layer[];- parent?: Layer;+ layer: Layer;+ siblings: readonly Layer[];+ parent?: Layer;};export function locateLayer(- layers: readonly Layer[],- id: string,- parent?: Layer,+ layers: readonly Layer[],+ id: string,+ parent?: Layer,): LayerLocation | undefined {- for (const layer of layers) {- if (layer.id === id) {- return { layer, siblings: layers, parent };- }- const child = locateLayer(layer.children, id, layer);- if (child) {- return child;- }- }- return undefined;+ for (const layer of layers) {+ if (layer.id === id) {+ return { layer, siblings: layers, parent };+ }+ const child = locateLayer(layer.children, id, layer);+ if (child) {+ return child;+ }+ }+ return undefined;}export function findLayer(layers: readonly Layer[], id: string) {- return locateLayer(layers, id)?.layer;+ return locateLayer(layers, id)?.layer;}/** A mask inside a mask only shapes coverage; its parent owns the adjustments and curve. */export function adjustmentTarget(layers: readonly Layer[], id: string) {- const location = locateLayer(layers, id);- if (!location) {- return undefined;- }- const { layer, parent } = location;- return layer.kind === "mask" && parent?.kind === "mask" ? parent : layer;+ const location = locateLayer(layers, id);+ if (!location) {+ return undefined;+ }+ const { layer, parent } = location;+ return layer.kind === "mask" && parent?.kind === "mask" ? parent : layer;}/** 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,- );+ 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[],+ layer: L,+ children: readonly ProcessingLayer[],): L {- return children.every((child, index) => child === layer.children[index])- ? layer- : { ...layer, children };+ return children.every((child, index) => child === layer.children[index])+ ? layer+ : { ...layer, children };}export function updateLayer(- scene: Scene,- id: string,- update: (layer: Layer) => Layer,+ scene: Scene,+ id: string,+ update: (layer: Layer) => Layer,): Scene {- const [image, ...layers] = scene.layers;- 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.");- }- const next: Scene["layers"] = [- withChildren(base, children),- ...updateChildren(layers),- ];- if (!matched) {- throw Error("Layer is unavailable.");- }- return { ...scene, layers: next };+ const [image, ...layers] = scene.layers;+ 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.");+ }+ const next: Scene["layers"] = [+ withChildren(base, children),+ ...updateChildren(layers),+ ];+ if (!matched) {+ throw Error("Layer is unavailable.");+ }+ return { ...scene, layers: next };}export function editLayer(- document: EditorDocument,- id: string,- update: (layer: Layer) => Layer,+ document: EditorDocument,+ id: string,+ update: (layer: Layer) => Layer,) {- document.edit(updateLayer(document.scene.getState(), id, update));+ document.edit(updateLayer(document.scene.getState(), id, update));}diff --git a/src/core/image/decode/heic.ts b/src/core/image/decode/heic.tsindex 3a0fc86..93403fc 100644--- a/src/core/image/decode/heic.ts+++ b/src/core/image/decode/heic.ts@@ -6,308 +6,308 @@type Box = { type: string; start: number; end: number };function check(condition: unknown): asserts condition {- if (!condition) {- throw new Error("HEIF: invalid or unsupported image");- }+ if (!condition) {+ throw new Error("HEIF: invalid or unsupported image");+ }}class Reader {- at = 0;- end: number;+ at = 0;+ end: number;- constructor(readonly bytes: Uint8Array) {- this.end = bytes.length;- }+ constructor(readonly bytes: Uint8Array) {+ this.end = bytes.length;+ }- /** Big-endian unsigned integer of `size` bytes (0, 1, 2, 4 or 8). */- uint(size: number) {- check([0, 1, 2, 4, 8].includes(size));- let value = 0;- for (const byte of this.slice(this.at, this.at + size, this.end)) {- value = value * 256 + byte;- }- this.at += size;- check(Number.isSafeInteger(value));- return value;- }+ /** Big-endian unsigned integer of `size` bytes (0, 1, 2, 4 or 8). */+ uint(size: number) {+ check([0, 1, 2, 4, 8].includes(size));+ let value = 0;+ for (const byte of this.slice(this.at, this.at + size, this.end)) {+ value = value * 256 + byte;+ }+ this.at += size;+ check(Number.isSafeInteger(value));+ return value;+ }- slice(start: number, end: number, limit = this.bytes.length) {- check(- Number.isSafeInteger(start) &&- Number.isSafeInteger(end) &&- start >= 0 &&- end >= start &&- end <= limit,- );- return this.bytes.subarray(start, end);- }+ slice(start: number, end: number, limit = this.bytes.length) {+ check(+ Number.isSafeInteger(start) &&+ Number.isSafeInteger(end) &&+ start >= 0 &&+ end >= start &&+ end <= limit,+ );+ return this.bytes.subarray(start, end);+ }- fourcc() {- const start = this.at;- this.uint(4);- return String.fromCharCode(...this.bytes.subarray(start, this.at));- }+ fourcc() {+ const start = this.at;+ this.uint(4);+ return String.fromCharCode(...this.bytes.subarray(start, this.at));+ }- /** Positions at a full box's content and returns its version byte. */- open(box: Box) {- this.at = box.start;- this.end = box.end;- return this.uint(4) >>> 24;- }+ /** Positions at a full box's content and returns its version byte. */+ open(box: Box) {+ this.at = box.start;+ this.end = box.end;+ return this.uint(4) >>> 24;+ }- /** Boxes in [start, end), each spanning its content. */- boxes(start: number, end: number) {- this.slice(start, end);- this.end = end;- const list: Box[] = [];- for (this.at = start; this.at < end; ) {- const head = this.at;- const size = this.uint(4);- const type = this.fourcc();- let length = size;- if (size === 1) {- length = this.uint(8);- } else if (size === 0) {- length = end - head;- }- check(length >= this.at - head && length <= end - head);- list.push({ type, start: this.at, end: head + length });- this.at = head + length;- }- return list;- }+ /** Boxes in [start, end), each spanning its content. */+ boxes(start: number, end: number) {+ this.slice(start, end);+ this.end = end;+ const list: Box[] = [];+ for (this.at = start; this.at < end; ) {+ const head = this.at;+ const size = this.uint(4);+ const type = this.fourcc();+ let length = size;+ if (size === 1) {+ length = this.uint(8);+ } else if (size === 0) {+ length = end - head;+ }+ check(length >= this.at - head && length <= end - head);+ list.push({ type, start: this.at, end: head + length });+ this.at = head + length;+ }+ return list;+ }- content(box: Box) {- return this.slice(box.start, box.end);- }+ content(box: Box) {+ return this.slice(box.start, box.end);+ }}function find(boxes: Box[], type: string) {- const box = boxes.find((b) => b.type === type);- if (!box) {- throw new Error(`HEIF: missing ${type} box`);- }- return box;+ const box = boxes.find((b) => b.type === type);+ if (!box) {+ throw new Error(`HEIF: missing ${type} box`);+ }+ return box;}/** iinf: item id → item type. */function itemTypes(reader: Reader, iinf: Box) {- const types = new Map<number, string>();- 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 version = reader.open(infe);- const id = reader.uint(version === 2 ? 2 : 4);- reader.at += 2;- types.set(id, reader.fourcc());- }- return types;+ const types = new Map<number, string>();+ 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 version = reader.open(infe);+ const id = reader.uint(version === 2 ? 2 : 4);+ reader.at += 2;+ types.set(id, reader.fourcc());+ }+ return types;}/** iloc: item id → its bytes, joining extents from the file or the idat box. */function itemData(reader: Reader, iloc: Box, idat?: Box) {- const data = new Map<number, Uint8Array>();- const version = reader.open(iloc);- const sizes = reader.uint(2);- const [offsetSize, lengthSize, baseSize] = [- sizes >> 12,- (sizes >> 8) & 15,- (sizes >> 4) & 15,- ];- const indexSize = version === 0 ? 0 : sizes & 15;- const idSize = version < 2 ? 2 : 4;- 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));- 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 + length,- method === 1 ? idat?.end : reader.bytes.length,- );- });- const joined = new Uint8Array(- extents.reduce((n, e) => n + e.byteLength, 0),- );- let at = 0;- for (const extent of extents) {- joined.set(extent, at);- at += extent.byteLength;- }- data.set(id, joined);- }- return data;+ const data = new Map<number, Uint8Array>();+ const version = reader.open(iloc);+ const sizes = reader.uint(2);+ const [offsetSize, lengthSize, baseSize] = [+ sizes >> 12,+ (sizes >> 8) & 15,+ (sizes >> 4) & 15,+ ];+ const indexSize = version === 0 ? 0 : sizes & 15;+ const idSize = version < 2 ? 2 : 4;+ 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));+ 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 + length,+ method === 1 ? idat?.end : reader.bytes.length,+ );+ });+ const joined = new Uint8Array(+ extents.reduce((n, e) => n + e.byteLength, 0),+ );+ let at = 0;+ for (const extent of extents) {+ joined.set(extent, at);+ at += extent.byteLength;+ }+ data.set(id, joined);+ }+ return data;}/** iprp: item id → its property boxes (ipco entries, associated through ipma). */function itemProperties(reader: Reader, iprp: Box) {- const children = reader.boxes(iprp.start, iprp.end);- const ipco = find(children, "ipco");- const properties = reader.boxes(ipco.start, ipco.end);- const associations = new Map<number, Box[]>();- for (const ipma of children.filter((b) => b.type === "ipma")) {- reader.at = ipma.start;- reader.end = ipma.end;- const versionFlags = reader.uint(4);- const wide = versionFlags & 1;- for (let count = reader.uint(4); count > 0; count--) {- const id = reader.uint(versionFlags >>> 24 === 0 ? 2 : 4);- const boxes = Array.from({ length: reader.uint(1) }, () => {- const index = reader.uint(wide ? 2 : 1) & (wide ? 0x7fff : 0x7f);- check(index <= properties.length);- return properties[index - 1];- });- associations.set(- id,- boxes.filter((b) => b !== undefined),- );- }- }- return associations;+ const children = reader.boxes(iprp.start, iprp.end);+ const ipco = find(children, "ipco");+ const properties = reader.boxes(ipco.start, ipco.end);+ const associations = new Map<number, Box[]>();+ for (const ipma of children.filter((b) => b.type === "ipma")) {+ reader.at = ipma.start;+ reader.end = ipma.end;+ const versionFlags = reader.uint(4);+ const wide = versionFlags & 1;+ for (let count = reader.uint(4); count > 0; count--) {+ const id = reader.uint(versionFlags >>> 24 === 0 ? 2 : 4);+ const boxes = Array.from({ length: reader.uint(1) }, () => {+ const index = reader.uint(wide ? 2 : 1) & (wide ? 0x7fff : 0x7f);+ check(index <= properties.length);+ return properties[index - 1];+ });+ associations.set(+ id,+ boxes.filter((b) => b !== undefined),+ );+ }+ }+ return associations;}/** iref dimg: derived item id → source item ids, in order. */function itemSources(reader: Reader, iref?: Box) {- const sources = new Map<number, number[]>();- if (iref) {- const idSize = reader.open(iref) === 0 ? 2 : 4;- for (const ref of reader.boxes(reader.at, iref.end)) {- reader.at = ref.start;- reader.end = ref.end;- const from = reader.uint(idSize);- const to = Array.from({ length: reader.uint(2) }, () =>- reader.uint(idSize),- );- if (ref.type === "dimg") {- sources.set(from, to);- }- }- }- return sources;+ const sources = new Map<number, number[]>();+ if (iref) {+ const idSize = reader.open(iref) === 0 ? 2 : 4;+ for (const ref of reader.boxes(reader.at, iref.end)) {+ reader.at = ref.start;+ reader.end = ref.end;+ const from = reader.uint(idSize);+ const to = Array.from({ length: reader.uint(2) }, () =>+ reader.uint(idSize),+ );+ if (ref.type === "dimg") {+ sources.set(from, to);+ }+ }+ }+ return sources;}/** WebCodecs codec string for an HEVC decoder configuration record (hvcC). */function codecOf(hvcC: Uint8Array) {- check(hvcC.length >= 23 && hvcC[0] === 1);- const profile = hvcC[1] ?? 0;- const view = new DataView(hvcC.buffer, hvcC.byteOffset, hvcC.byteLength);- let compatibility = 0;- for (let i = 0; i < 32; i++) {- compatibility =- ((compatibility << 1) | ((view.getUint32(2) >>> i) & 1)) >>> 0;- }- const constraints = Array.from(hvcC.subarray(6, 12), (b) =>- b.toString(16).padStart(2, "0"),- );- while (constraints.at(-1) === "00") {- constraints.pop();- }- const space = ["", "A", "B", "C"][profile >> 6];- const tier = profile & 0x20 ? "H" : "L";- return [- `hvc1.${space}${profile & 31}`,- compatibility.toString(16),- `${tier}${hvcC[12]}`,- ...constraints,- ].join(".");+ check(hvcC.length >= 23 && hvcC[0] === 1);+ const profile = hvcC[1] ?? 0;+ const view = new DataView(hvcC.buffer, hvcC.byteOffset, hvcC.byteLength);+ let compatibility = 0;+ for (let i = 0; i < 32; i++) {+ compatibility =+ ((compatibility << 1) | ((view.getUint32(2) >>> i) & 1)) >>> 0;+ }+ const constraints = Array.from(hvcC.subarray(6, 12), (b) =>+ b.toString(16).padStart(2, "0"),+ );+ while (constraints.at(-1) === "00") {+ constraints.pop();+ }+ const space = ["", "A", "B", "C"][profile >> 6];+ const tier = profile & 0x20 ? "H" : "L";+ return [+ `hvc1.${space}${profile & 31}`,+ compatibility.toString(16),+ `${tier}${hvcC[12]}`,+ ...constraints,+ ].join(".");}/** ispe: [width, height]. */function sizeOf(ispe: Uint8Array) {- check(ispe.length >= 12);- const view = new DataView(ispe.buffer, ispe.byteOffset, ispe.byteLength);- return [view.getUint32(4), view.getUint32(8)] as const;+ check(ispe.length >= 12);+ const view = new DataView(ispe.buffer, ispe.byteOffset, ispe.byteLength);+ return [view.getUint32(4), view.getUint32(8)] as const;}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 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,- find(boxes, "iloc"),- boxes.find((b) => b.type === "idat"),- );- const properties = itemProperties(reader, find(boxes, "iprp"));- const sources = itemSources(- reader,- boxes.find((b) => b.type === "iref"),- );- const property = (id: number, type: string) => {- const box = properties.get(id)?.find((b) => b.type === type);- return box && reader.content(box);- };+ 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 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,+ find(boxes, "iloc"),+ boxes.find((b) => b.type === "idat"),+ );+ const properties = itemProperties(reader, find(boxes, "iprp"));+ const sources = itemSources(+ reader,+ boxes.find((b) => b.type === "iref"),+ );+ const property = (id: number, type: string) => {+ const box = properties.get(id)?.find((b) => b.type === type);+ return box && reader.content(box);+ };- const grid = types.get(primary) === "grid" ? data.get(primary) : undefined;- const items = grid ? (sources.get(primary) ?? []) : [primary];- const hvcC = property(items[0] ?? primary, "hvcC");- const ispe = property(primary, "ispe");- if (!hvcC || !ispe) {- throw new Error("HEIF: primary item is not an HEVC image");- }- const [width, height] = sizeOf(ispe);- const columns = grid ? (grid[3] ?? 0) + 1 : 1;- check(width > 0 && height > 0 && items.length > 0);- check(- !grid || (grid.length >= 8 && items.length === (grid[2] + 1) * columns),- );- const chunks = items.map((id) => {- const bytes = data.get(id);- check(types.get(id) === "hvc1" && bytes?.length);- return bytes;- });- return {- width,- height,- columns,- rotation: (property(primary, "irot")?.[0] ?? 0) & 3,- codec: codecOf(hvcC),- description: hvcC,- chunks,- };+ const grid = types.get(primary) === "grid" ? data.get(primary) : undefined;+ const items = grid ? (sources.get(primary) ?? []) : [primary];+ const hvcC = property(items[0] ?? primary, "hvcC");+ const ispe = property(primary, "ispe");+ if (!hvcC || !ispe) {+ throw new Error("HEIF: primary item is not an HEVC image");+ }+ const [width, height] = sizeOf(ispe);+ const columns = grid ? (grid[3] ?? 0) + 1 : 1;+ check(width > 0 && height > 0 && items.length > 0);+ check(+ !grid || (grid.length >= 8 && items.length === (grid[2] + 1) * columns),+ );+ const chunks = items.map((id) => {+ const bytes = data.get(id);+ check(types.get(id) === "hvc1" && bytes?.length);+ return bytes;+ });+ return {+ width,+ height,+ columns,+ rotation: (property(primary, "irot")?.[0] ?? 0) & 3,+ codec: codecOf(hvcC),+ description: hvcC,+ chunks,+ };}export async function decodeHeic(file: Blob) {- const { chunks, codec, description, ...image } = parseHeic(- new Uint8Array(await file.arrayBuffer()),- );- const tiles: VideoFrame[] = [];- let failure: DOMException | undefined;- const decoder = new VideoDecoder({- output: (frame) => {- tiles[frame.timestamp] = frame;- },- error: (error) => {- failure = error;- },- });- try {- decoder.configure({ codec, description });- for (const [timestamp, data] of chunks.entries()) {- decoder.decode(new EncodedVideoChunk({ type: "key", timestamp, data }));- }- await decoder.flush();- check(chunks.every((_, index) => tiles[index]));- return { ...image, tiles };- } catch (error) {- for (const frame of tiles) {- frame?.close();- }- throw failure ?? error;- } finally {- if (decoder.state !== "closed") {- decoder.close();- }- }+ const { chunks, codec, description, ...image } = parseHeic(+ new Uint8Array(await file.arrayBuffer()),+ );+ const tiles: VideoFrame[] = [];+ let failure: DOMException | undefined;+ const decoder = new VideoDecoder({+ output: (frame) => {+ tiles[frame.timestamp] = frame;+ },+ error: (error) => {+ failure = error;+ },+ });+ try {+ decoder.configure({ codec, description });+ for (const [timestamp, data] of chunks.entries()) {+ decoder.decode(new EncodedVideoChunk({ type: "key", timestamp, data }));+ }+ await decoder.flush();+ check(chunks.every((_, index) => tiles[index]));+ return { ...image, tiles };+ } catch (error) {+ for (const frame of tiles) {+ frame?.close();+ }+ throw failure ?? error;+ } finally {+ if (decoder.state !== "closed") {+ decoder.close();+ }+ }}diff --git a/src/core/image/decode/index.ts b/src/core/image/decode/index.tsindex 966ab5d..55bf0e6 100644--- a/src/core/image/decode/index.ts+++ b/src/core/image/decode/index.ts@@ -8,104 +8,104 @@ import type { Decoder } from "./types";export type { Target };type Format = {- types: string[];- extensions: string[];- decode: (gpu: Gpu, file: File) => Promise<ImageSource>;+ types: string[];+ extensions: string[];+ decode: (gpu: Gpu, file: File) => Promise<ImageSource>;};/** A format whose decoder yields pixels needing the GPU leg into the working space. */function pixelFormat(load: () => Promise<Decoder>) {- return async (gpu: Gpu, file: File) => {- const decoder = await load();- const decoded = await decoder(file);- return createImageSource(linearize(gpu, decoded));- };+ return async (gpu: Gpu, file: File) => {+ const decoder = await load();+ const decoded = await decoder(file);+ return createImageSource(linearize(gpu, decoded));+ };}const native = pixelFormat(async () => createImageBitmap);const svg = pixelFormat(async () => decodeSvg);const heic = pixelFormat(async () => decodeHeic);const tiff = async (gpu: Gpu, file: File) =>- (await import("./tiff")).decodeTiff(gpu, file);+ (await import("./tiff")).decodeTiff(gpu, file);const raw = async (gpu: Gpu, file: File) =>- (await import("./raw")).decodeRaw(gpu, file);+ (await import("./raw")).decodeRaw(gpu, file);const formats: Format[] = [- {- types: ["image/x-adobe-dng", "image/dng"],- extensions: [- "dng",- "cr2",- "cr3",- "crw",- "nef",- "nrw",- "arw",- "sr2",- "srf",- "raf",- "orf",- "rw2",- "raw",- "rwl",- "pef",- "ptx",- "srw",- "3fr",- "fff",- "iiq",- "kdc",- "dcr",- "mos",- "mef",- "erf",- "mrw",- "x3f",- ],- decode: raw,- },- {- types: ["image/tiff", "image/x-tiff"],- extensions: ["tif", "tiff"],- decode: tiff,- },- { types: ["image/png"], extensions: ["png"], decode: native },- { types: ["image/jpeg"], extensions: ["jpg", "jpeg"], decode: native },- { types: ["image/gif"], extensions: ["gif"], decode: native },- { types: ["image/webp"], extensions: ["webp"], decode: native },- { types: ["image/avif"], extensions: ["avif"], decode: native },- { types: ["image/bmp"], extensions: ["bmp"], decode: native },- { types: ["image/svg+xml"], extensions: ["svg"], decode: svg },- {- types: ["image/heic", "image/heif"],- extensions: ["heic", "heif"],- decode: heic,- },+ {+ types: ["image/x-adobe-dng", "image/dng"],+ extensions: [+ "dng",+ "cr2",+ "cr3",+ "crw",+ "nef",+ "nrw",+ "arw",+ "sr2",+ "srf",+ "raf",+ "orf",+ "rw2",+ "raw",+ "rwl",+ "pef",+ "ptx",+ "srw",+ "3fr",+ "fff",+ "iiq",+ "kdc",+ "dcr",+ "mos",+ "mef",+ "erf",+ "mrw",+ "x3f",+ ],+ decode: raw,+ },+ {+ types: ["image/tiff", "image/x-tiff"],+ extensions: ["tif", "tiff"],+ decode: tiff,+ },+ { types: ["image/png"], extensions: ["png"], decode: native },+ { types: ["image/jpeg"], extensions: ["jpg", "jpeg"], decode: native },+ { types: ["image/gif"], extensions: ["gif"], decode: native },+ { types: ["image/webp"], extensions: ["webp"], decode: native },+ { types: ["image/avif"], extensions: ["avif"], decode: native },+ { types: ["image/bmp"], extensions: ["bmp"], decode: native },+ { types: ["image/svg+xml"], extensions: ["svg"], decode: svg },+ {+ types: ["image/heic", "image/heif"],+ extensions: ["heic", "heif"],+ decode: heic,+ },];/** Matches by MIME type, then by extension for files the OS doesn't type. */function formatOf(file: File) {- const extension = file.name.split(".").pop()?.toLowerCase() ?? "";- return formats.find(- (f) => f.types.includes(file.type) || f.extensions.includes(extension),- );+ const extension = file.name.split(".").pop()?.toLowerCase() ?? "";+ return formats.find(+ (f) => f.types.includes(file.type) || f.extensions.includes(extension),+ );}/** Types and extensions `decode` accepts, for `<input accept>`. */export const accept = formats- .flatMap((f) => [...f.types, ...f.extensions.map((e) => `.${e}`)])- .join(",");+ .flatMap((f) => [...f.types, ...f.extensions.map((e) => `.${e}`)])+ .join(",");export const canDecode = (file: File) => formatOf(file) !== undefined;/** Decodes the file into a linear rgba16float target: the format's decoder, then its GPU leg. */export default async function decode(- gpu: Gpu,- file: File,+ gpu: Gpu,+ file: File,): Promise<ImageSource> {- const format = formatOf(file);- if (!format) {- throw new Error(`Unsupported image: ${file.name}`);- }- return format.decode(gpu, file);+ const format = formatOf(file);+ if (!format) {+ throw new Error(`Unsupported image: ${file.name}`);+ }+ return format.decode(gpu, file);}diff --git a/src/core/image/decode/linearize.ts b/src/core/image/decode/linearize.tsindex 197c420..740a434 100644--- a/src/core/image/decode/linearize.ts+++ b/src/core/image/decode/linearize.ts@@ -6,79 +6,79 @@ type Size = [number, number];/** Display P3 primaries, which TypeScript's VideoColorPrimaries doesn't list yet. */const isP3 = (frame?: VideoFrame) =>- (frame?.colorSpace.primaries as string) === "smpte432";+ (frame?.colorSpace.primaries as string) === "smpte432";/** A texture whose format decodes sRGB-encoded bytes to linear when read. */function staging(gpu: Gpu, size: Size) {- return gpu.device.createTexture({- size,- format: "rgba8unorm-srgb",- usage: ["texture_binding", "copy_dst", "render_attachment"],- });+ return gpu.device.createTexture({+ size,+ format: "rgba8unorm-srgb",+ usage: ["texture_binding", "copy_dst", "render_attachment"],+ });}/** Uploads the decoded image into a staging texture, tiles laid out on their grid. */function stage(gpu: Gpu, decoded: Decoded) {- const queue = gpu.gpu.queue;- const size: Size = [decoded.width, decoded.height];- if (decoded instanceof ImageBitmap) {- const texture = staging(gpu, size);- queue.copyExternalImageToTexture(- { source: decoded },- { texture: texture.gpu },- size,- );- decoded.close();- return texture;- }- if ("tiles" in decoded) {- const { tiles, columns } = decoded;- const tile: Size = [- tiles[0]?.displayWidth ?? 0,- tiles[0]?.displayHeight ?? 0,- ];- const rows = Math.ceil(tiles.length / columns);- const texture = staging(gpu, [columns * tile[0], rows * tile[1]]);- tiles.forEach((frame, i) => {- const origin = [- (i % columns) * tile[0],- Math.floor(i / columns) * tile[1],- ];- const colorSpace = isP3(frame) ? "display-p3" : "srgb";- queue.copyExternalImageToTexture(- { source: frame },- { texture: texture.gpu, origin, colorSpace },- tile,- );- frame.close();- });- return texture;- }- const texture = staging(gpu, size);- queue.writeTexture(- { texture: texture.gpu },- decoded.data,- { bytesPerRow: decoded.width * 4 },- size,- );- return texture;+ const queue = gpu.gpu.queue;+ const size: Size = [decoded.width, decoded.height];+ if (decoded instanceof ImageBitmap) {+ const texture = staging(gpu, size);+ queue.copyExternalImageToTexture(+ { source: decoded },+ { texture: texture.gpu },+ size,+ );+ decoded.close();+ return texture;+ }+ if ("tiles" in decoded) {+ const { tiles, columns } = decoded;+ const tile: Size = [+ tiles[0]?.displayWidth ?? 0,+ tiles[0]?.displayHeight ?? 0,+ ];+ const rows = Math.ceil(tiles.length / columns);+ const texture = staging(gpu, [columns * tile[0], rows * tile[1]]);+ tiles.forEach((frame, i) => {+ const origin = [+ (i % columns) * tile[0],+ Math.floor(i / columns) * tile[1],+ ];+ const colorSpace = isP3(frame) ? "display-p3" : "srgb";+ queue.copyExternalImageToTexture(+ { source: frame },+ { texture: texture.gpu, origin, colorSpace },+ tile,+ );+ frame.close();+ });+ return texture;+ }+ const texture = staging(gpu, size);+ queue.writeTexture(+ { texture: texture.gpu },+ decoded.data,+ { bytesPerRow: decoded.width * 4 },+ size,+ );+ return texture;}/** GPU leg for sRGB-encoded decoders: renders the decoded image into a linear Rec.2020 rgba16float target. */export default function linearize(gpu: Gpu, decoded: Decoded) {- const frames = "tiles" in decoded ? decoded : undefined;- const rotation = frames?.rotation ?? 0;- const p3 = Number(isP3(frames?.tiles[0]));- const size: Size = [decoded.width, decoded.height];- const source = stage(gpu, decoded);- const image = target(gpu, {- size: rotation % 2 ? [size[1], size[0]] : size,- format: "rgba16float",- });- const params = { size, rotation, p3 };- frame(gpu, (f) =>- f.pass(image, effect(gpu, shader, { set: { source, params } })),- );- source.dispose();- return image;+ const frames = "tiles" in decoded ? decoded : undefined;+ const rotation = frames?.rotation ?? 0;+ const p3 = Number(isP3(frames?.tiles[0]));+ const size: Size = [decoded.width, decoded.height];+ const source = stage(gpu, decoded);+ const image = target(gpu, {+ size: rotation % 2 ? [size[1], size[0]] : size,+ format: "rgba16float",+ });+ const params = { size, rotation, p3 };+ frame(gpu, (f) =>+ f.pass(image, effect(gpu, shader, { set: { source, params } })),+ );+ source.dispose();+ return image;}diff --git a/src/core/image/decode/raw.ts b/src/core/image/decode/raw.tsindex 9cacd06..2e9cc49 100644--- a/src/core/image/decode/raw.ts+++ b/src/core/image/decode/raw.ts@@ -6,57 +6,57 @@ const decoders = new WeakMap<Gpu, RawDecoder>();/** Adapts package-owned sensor sources to OpenLight's document and renderer lifetimes. */export async function decodeRaw(gpu: Gpu, file: File) {- let decoder = decoders.get(gpu);- if (!decoder) {- decoder = createRawDecoder(gpu.gpu);- decoders.set(gpu, decoder);- }- const source = await decoder.load(file);- let original: Target | undefined;- try {- original = target(gpu, { size: source.size, format: "rgba16float" });- const initial = source.createDevelopPass();- try {- initial.render({- destination: original.color.gpu,- calibration: source.calibration,- });- } finally {- initial.dispose();- }- return createImageSource(original, {- asShot: source.asShot,- createPass() {- const output = target(gpu, {- size: source.size,- format: "rgba16float",- });- const pass = source.createDevelopPass();- let calibration = source.calibration;- let dirty = true;- return {- async prepare(balance) {- calibration = await source.calibrate(balance);- dirty = true;- },- render() {- if (dirty) {- pass.render({ destination: output.color.gpu, calibration });- dirty = false;- }- return output;- },- dispose() {- pass.dispose();- output.color.dispose();- },- };- },- dispose: source.dispose,- });- } catch (error) {- original?.color.dispose();- source.dispose();- throw error;- }+ let decoder = decoders.get(gpu);+ if (!decoder) {+ decoder = createRawDecoder(gpu.gpu);+ decoders.set(gpu, decoder);+ }+ const source = await decoder.load(file);+ let original: Target | undefined;+ try {+ original = target(gpu, { size: source.size, format: "rgba16float" });+ const initial = source.createDevelopPass();+ try {+ initial.render({+ destination: original.color.gpu,+ calibration: source.calibration,+ });+ } finally {+ initial.dispose();+ }+ return createImageSource(original, {+ asShot: source.asShot,+ createPass() {+ const output = target(gpu, {+ size: source.size,+ format: "rgba16float",+ });+ const pass = source.createDevelopPass();+ let calibration = source.calibration;+ let dirty = true;+ return {+ async prepare(balance) {+ calibration = await source.calibrate(balance);+ dirty = true;+ },+ render() {+ if (dirty) {+ pass.render({ destination: output.color.gpu, calibration });+ dirty = false;+ }+ return output;+ },+ dispose() {+ pass.dispose();+ output.color.dispose();+ },+ };+ },+ dispose: source.dispose,+ });+ } catch (error) {+ original?.color.dispose();+ source.dispose();+ throw error;+ }}diff --git a/src/core/image/decode/svg.ts b/src/core/image/decode/svg.tsindex d5eb7cc..0d2dbf1 100644--- a/src/core/image/decode/svg.ts+++ b/src/core/image/decode/svg.ts@@ -2,14 +2,14 @@ const fallbackSize = 1024;/** Rasterizes through an <img>, since SVGs without intrinsic size can't go straight to a bitmap. */export default async function decodeSvg(file: Blob) {- const image = new Image();- image.src = URL.createObjectURL(file);- await image.decode();- URL.revokeObjectURL(image.src);- const canvas = new OffscreenCanvas(- image.naturalWidth || fallbackSize,- image.naturalHeight || fallbackSize,- );- canvas.getContext("2d")?.drawImage(image, 0, 0, canvas.width, canvas.height);- return canvas.transferToImageBitmap();+ const image = new Image();+ image.src = URL.createObjectURL(file);+ await image.decode();+ URL.revokeObjectURL(image.src);+ const canvas = new OffscreenCanvas(+ image.naturalWidth || fallbackSize,+ image.naturalHeight || fallbackSize,+ );+ canvas.getContext("2d")?.drawImage(image, 0, 0, canvas.width, canvas.height);+ return canvas.transferToImageBitmap();}diff --git a/src/core/image/decode/tiff.ts b/src/core/image/decode/tiff.tsindex 1d70a4e..d3f4638 100644--- a/src/core/image/decode/tiff.ts+++ b/src/core/image/decode/tiff.ts@@ -1,10 +1,10 @@import {- type Effect,- effect,- frame,- type Gpu,- type Target,- target,+ type Effect,+ effect,+ frame,+ type Gpu,+ type Target,+ target,} from "vgpu";import { createImageSource } from "@/core/image";import shader from "./tiff.wgsl";@@ -13,25 +13,25 @@ const transfers = new WeakMap<Gpu, Effect>();/** Transfers package-owned pixels into the editor's owned vgpu target, entirely on GPU. */export async function decodeTiff(gpu: Gpu, file: File) {- const { decodeTiff } = await import("raw-webgpu");- const decoded = await decodeTiff(gpu.gpu, file);- let image: Target | undefined;- try {- const transfer = transfers.get(gpu) ?? effect(gpu, shader);- transfers.set(gpu, transfer);- const output = target(gpu, { size: decoded.size, format: "rgba16float" });- image = output;- frame(gpu, (frame) =>- frame.pass(- output,- transfer.set({ source: decoded.texture.createView() }),- ),- );- return createImageSource(image);- } catch (error) {- image?.color.dispose();- throw error;- } finally {- decoded.dispose();- }+ const { decodeTiff } = await import("raw-webgpu");+ const decoded = await decodeTiff(gpu.gpu, file);+ let image: Target | undefined;+ try {+ const transfer = transfers.get(gpu) ?? effect(gpu, shader);+ transfers.set(gpu, transfer);+ const output = target(gpu, { size: decoded.size, format: "rgba16float" });+ image = output;+ frame(gpu, (frame) =>+ frame.pass(+ output,+ transfer.set({ source: decoded.texture.createView() }),+ ),+ );+ return createImageSource(image);+ } catch (error) {+ image?.color.dispose();+ throw error;+ } finally {+ decoded.dispose();+ }}diff --git a/src/core/image/decode/types.ts b/src/core/image/decode/types.tsindex c693006..f508195 100644--- a/src/core/image/decode/types.ts+++ b/src/core/image/decode/types.ts@@ -1,16 +1,16 @@/** Raw interleaved rgba8, for decoders that don't go through the browser's image pipeline. */export type Pixels = {- width: number;- height: number;- data: Uint8ClampedArray<ArrayBuffer>;+ width: number;+ height: number;+ data: Uint8ClampedArray<ArrayBuffer>;};/** Video frames tiled on a grid `columns` wide, cropped to width × height, then rotated counter-clockwise by `rotation` quarter turns. */export type Frames = {- width: number;- height: number;- tiles: VideoFrame[];- columns: number;- rotation: number;+ width: number;+ height: number;+ tiles: VideoFrame[];+ columns: number;+ rotation: number;};export type Decoded = ImageBitmap | Pixels | Frames;export type Decoder = (file: Blob) => Promise<Decoded>;diff --git a/src/core/image/frame.ts b/src/core/image/frame.tsindex 777749b..40afd2d 100644--- a/src/core/image/frame.ts+++ b/src/core/image/frame.ts@@ -1,84 +1,84 @@export type Point = readonly [number, number];export type ImageFrame = {- center: Point;- size: Point;- rotation: number;- angle: number;- scale: Point;+ center: Point;+ size: Point;+ rotation: number;+ angle: number;+ scale: Point;};/** Source pixels under the output center, output dimensions, and signed source scale. */export function imageFrame(size: readonly number[]): ImageFrame {- return {- center: [size[0] / 2, size[1] / 2],- size: [size[0], size[1]],- rotation: 0,- angle: 0,- scale: [1, 1],- };+ return {+ center: [size[0] / 2, size[1] / 2],+ size: [size[0], size[1]],+ rotation: 0,+ angle: 0,+ scale: [1, 1],+ };}export function frameValues(frame: ImageFrame) {- return [- ...frame.center,- ...frame.size,- ...frame.scale,- frame.rotation,- frame.angle,- ];+ return [+ ...frame.center,+ ...frame.size,+ ...frame.scale,+ frame.rotation,+ frame.angle,+ ];}export function validateFrame(frame: ImageFrame) {- if (- !frame ||- ![frame.center, frame.size, frame.scale].every(- (point) =>- Array.isArray(point) &&- point.length === 2 &&- Number.isFinite(point[0]) &&- Number.isFinite(point[1]),- ) ||- !Number.isFinite(frame.rotation) ||- !Number.isFinite(frame.angle) ||- frame.size.some((value) => value < 1) ||- frame.scale.some((value) => value === 0)- ) {- throw new Error("Invalid image frame.");- }+ if (+ !frame ||+ ![frame.center, frame.size, frame.scale].every(+ (point) =>+ Array.isArray(point) &&+ point.length === 2 &&+ Number.isFinite(point[0]) &&+ Number.isFinite(point[1]),+ ) ||+ !Number.isFinite(frame.rotation) ||+ !Number.isFinite(frame.angle) ||+ frame.size.some((value) => value < 1) ||+ frame.scale.some((value) => value === 0)+ ) {+ throw new Error("Invalid image frame.");+ }}export function sourceOffset(frame: ImageFrame, x: number, y: number): Point {- const angle = (-(frame.rotation + frame.angle) * Math.PI) / 180;- const dx = x * frame.scale[0];- const dy = y * frame.scale[1];- return [- Math.cos(angle) * dx - Math.sin(angle) * dy,- Math.sin(angle) * dx + Math.cos(angle) * dy,- ];+ const angle = (-(frame.rotation + frame.angle) * Math.PI) / 180;+ const dx = x * frame.scale[0];+ const dy = y * frame.scale[1];+ return [+ Math.cos(angle) * dx - Math.sin(angle) * dy,+ Math.sin(angle) * dx + Math.cos(angle) * dy,+ ];}/** Output offset of a source-pixel offset: the inverse of sourceOffset. */export function outputOffset(frame: ImageFrame, dx: number, dy: number): Point {- const angle = ((frame.rotation + frame.angle) * Math.PI) / 180;- return [- (Math.cos(angle) * dx - Math.sin(angle) * dy) / frame.scale[0],- (Math.sin(angle) * dx + Math.cos(angle) * dy) / frame.scale[1],- ];+ const angle = ((frame.rotation + frame.angle) * Math.PI) / 180;+ return [+ (Math.cos(angle) * dx - Math.sin(angle) * dy) / frame.scale[0],+ (Math.sin(angle) * dx + Math.cos(angle) * dy) / frame.scale[1],+ ];}/** Affine UV mapping used by image display and resampling, independent of editing tools. */export function frameTransform(- frame: ImageFrame,- sourceSize: readonly number[],+ frame: ImageFrame,+ sourceSize: readonly number[],) {- const xAxis = sourceOffset(frame, frame.size[0], 0).map(- (value, axis) => value / sourceSize[axis],- );- const yAxis = sourceOffset(frame, 0, frame.size[1]).map(- (value, axis) => value / sourceSize[axis],- );- const origin = frame.center.map(- (value, axis) => value / sourceSize[axis] - (xAxis[axis] + yAxis[axis]) / 2,- );- return { origin, xAxis, yAxis };+ const xAxis = sourceOffset(frame, frame.size[0], 0).map(+ (value, axis) => value / sourceSize[axis],+ );+ const yAxis = sourceOffset(frame, 0, frame.size[1]).map(+ (value, axis) => value / sourceSize[axis],+ );+ const origin = frame.center.map(+ (value, axis) => value / sourceSize[axis] - (xAxis[axis] + yAxis[axis]) / 2,+ );+ return { origin, xAxis, yAxis };}diff --git a/src/core/image/index.ts b/src/core/image/index.tsindex 4be6b9a..20a4d95 100644--- a/src/core/image/index.ts+++ b/src/core/image/index.ts@@ -2,43 +2,43 @@ import type { Target } from "vgpu";export type WhiteBalance = { temperature: number; tint: number };export type RawDevelopment = {- asShot: WhiteBalance;- createPass(): {- prepare(balance: WhiteBalance): Promise<void>;- render(): Target;- dispose(): void;- };- dispose(): void;+ asShot: WhiteBalance;+ createPass(): {+ prepare(balance: WhiteBalance): Promise<void>;+ render(): Target;+ dispose(): void;+ };+ dispose(): void;};/** Document content retained while a preview or export still uses it. */export function createImageSource(image: Target, raw?: RawDevelopment) {- let references = 1;- function release() {- let active = true;- return () => {- if (!active) {- return;- }- active = false;- if (--references === 0) {- image.color.dispose();- raw?.dispose();- }- };- }- return {- image,- raw,- retain() {- if (!references) {- throw Error("Image source is closed.");- }- references++;- return release();- },- dispose: release(),- };+ let references = 1;+ function release() {+ let active = true;+ return () => {+ if (!active) {+ return;+ }+ active = false;+ if (--references === 0) {+ image.color.dispose();+ raw?.dispose();+ }+ };+ }+ return {+ image,+ raw,+ retain() {+ if (!references) {+ throw Error("Image source is closed.");+ }+ references++;+ return release();+ },+ dispose: release(),+ };}export type ImageSource = ReturnType<typeof createImageSource>;diff --git a/src/core/renderer/blend/index.ts b/src/core/renderer/blend/index.tsindex 6f4b90c..0aab2ac 100644--- a/src/core/renderer/blend/index.ts+++ b/src/core/renderer/blend/index.ts@@ -6,73 +6,73 @@ const emptyModifiers = new Float32Array(8);/** Uniform fields for one gradient; kind 0 means full coverage. */export function gradientParams(mask?: Gradient) {- if (mask?.kind === "radial") {- return {- kind: 2,- first: mask.center,- second: mask.radius,- feather: mask.feather,- angle: (mask.angle * Math.PI) / 180,- };- }- return {- kind: Number(!!mask),- first: mask?.start ?? [0, 0],- second: mask?.end ?? [1, 0],- feather: 0,- angle: 0,- };+ if (mask?.kind === "radial") {+ return {+ kind: 2,+ first: mask.center,+ second: mask.radius,+ feather: mask.feather,+ angle: (mask.angle * Math.PI) / 180,+ };+ }+ return {+ kind: Number(!!mask),+ first: mask?.start ?? [0, 0],+ second: mask?.end ?? [1, 0],+ feather: 0,+ angle: 0,+ };}/** Two vec4 per modifier: geometry, then signed strength, kind, feather, and angle. */export function modifierData(modifiers: readonly MaskModifier[]) {- if (!modifiers.length) {- return emptyModifiers;- }- const data = new Float32Array(modifiers.length * 8);- modifiers.forEach(({ mask, opacity, operation }, index) => {- const { first, second, kind, feather, angle } = gradientParams(mask);- data.set(- [- ...first,- ...second,- operation === "add" ? opacity : -opacity,- kind,- feather,- angle,- ],- index * 8,- );- });- return data;+ if (!modifiers.length) {+ return emptyModifiers;+ }+ const data = new Float32Array(modifiers.length * 8);+ modifiers.forEach(({ mask, opacity, operation }, index) => {+ const { first, second, kind, feather, angle } = gradientParams(mask);+ data.set(+ [+ ...first,+ ...second,+ operation === "add" ? opacity : -opacity,+ kind,+ feather,+ angle,+ ],+ index * 8,+ );+ });+ return data;}/** Interpolates an adjustment result without changing image coverage or HDR headroom. */export function mixAdjustment(- name: string,- original: RenderImage,- edited: RenderImage,- opacity: number,- mask?: Gradient,- modifiers: readonly MaskModifier[] = [],+ name: string,+ original: RenderImage,+ edited: RenderImage,+ opacity: number,+ mask?: Gradient,+ modifiers: readonly MaskModifier[] = [],) {- if (original === edited || opacity === 0) {- return original;- }- if (opacity === 1 && !mask) {- return edited;- }- return merge(- { original, edited },- node(name, shader, {- storage: { modifiers: modifierData(modifiers) },- set: {- params: {- opacity,- ...gradientParams(mask),- modifierCount: modifiers.length,- },- },- }),- );+ if (original === edited || opacity === 0) {+ return original;+ }+ if (opacity === 1 && !mask) {+ return edited;+ }+ return merge(+ { original, edited },+ node(name, shader, {+ storage: { modifiers: modifierData(modifiers) },+ set: {+ params: {+ opacity,+ ...gradientParams(mask),+ modifierCount: modifiers.length,+ },+ },+ }),+ );}diff --git a/src/core/renderer/display/index.ts b/src/core/renderer/display/index.tsindex 911148a..9c82b62 100644--- a/src/core/renderer/display/index.ts+++ b/src/core/renderer/display/index.ts@@ -1,19 +1,19 @@import {- type Buffer,- effect,- type Frame,- frame,- type Gpu,- sampler,- surface,- type Target,+ type Buffer,+ effect,+ type Frame,+ frame,+ type Gpu,+ sampler,+ surface,+ type Target,} from "vgpu";import type { Gradient, MaskModifier } from "@/core/document";import {- frameTransform,- type ImageFrame,- imageFrame,- type Point,+ frameTransform,+ type ImageFrame,+ imageFrame,+ type Point,} from "@/core/image/frame";import { gradientParams, modifierData } from "@/core/renderer/blend";import shader from "./image.wgsl";@@ -22,109 +22,109 @@ export type View = { zoom: number; pan: readonly [number, number] };export type Clipping = { shadows: boolean; highlights: boolean };/** A mask to tint over the displayed image; its geometry lives in source pixels. */export type MaskOverlay = {- mask: Gradient;- modifiers: readonly MaskModifier[];- frame: ImageFrame;- sourceSize: readonly number[];+ mask: Gradient;+ modifiers: readonly MaskModifier[];+ frame: ImageFrame;+ sourceSize: readonly number[];};type DisplayOptions = {- view: View;- viewport?: readonly number[];- frame?: ImageFrame;- original?: Target;- split?: number;- clipping?: Clipping;- overlay?: MaskOverlay;+ view: View;+ viewport?: readonly number[];+ frame?: ImageFrame;+ original?: Target;+ split?: number;+ clipping?: Clipping;+ overlay?: MaskOverlay;};/** Display any transformed image with optional comparison, clipping indicators, and mask overlay. */export function createDisplay(gpu: Gpu) {- const draw = effect(gpu, shader, {- set: {- sourceSampler: sampler(gpu, { magFilter: "linear", minFilter: "linear" }),- },- });- let modifiers: Buffer | undefined;- function writeModifiers(overlay?: MaskOverlay) {- const data = modifierData(overlay?.modifiers ?? []);- if (!modifiers || modifiers.options.size < data.byteLength) {- modifiers?.dispose();- modifiers = gpu.device.createBuffer({- size: data.byteLength,- usage: ["storage", "copy_dst"],- });- draw.set({ modifiers });- }- if (overlay) {- modifiers.write(data);- }- }- function display(- frame: Frame,- canvas: Target & { dpr: number },- image: Target,- options: DisplayOptions,- ) {- const geometry = options.frame ?? imageFrame(image.size);- const viewport =- options.viewport ?? canvas.size.map((value) => value / canvas.dpr);- const overlay = options.overlay;- writeModifiers(overlay);- frame.pass(- canvas,- draw.set({- source: image.color,- original: (options.original ?? image).color,- transform: frameTransform(geometry, image.size),- split: options.split ?? -1,- view: {- size: canvas.size,- fitSize: viewport.map((value) => value * canvas.dpr),- imageSize: geometry.size,- pan: options.view.pan.map((value) => value * canvas.dpr),- zoom: options.view.zoom,- shadows: Number(options.clipping?.shadows ?? false),- highlights: Number(options.clipping?.highlights ?? false),- },- maskTransform: frameTransform(- overlay?.frame ?? geometry,- overlay?.sourceSize ?? image.size,- ),- overlay: {- ...gradientParams(overlay?.mask),- modifierCount: overlay?.modifiers.length ?? 0,- sourceSize: overlay?.sourceSize ?? image.size,- },- }),- );- }- return Object.assign(display, {- dispose() {- modifiers?.dispose();- modifiers = undefined;- },- });+ const draw = effect(gpu, shader, {+ set: {+ sourceSampler: sampler(gpu, { magFilter: "linear", minFilter: "linear" }),+ },+ });+ let modifiers: Buffer | undefined;+ function writeModifiers(overlay?: MaskOverlay) {+ const data = modifierData(overlay?.modifiers ?? []);+ if (!modifiers || modifiers.options.size < data.byteLength) {+ modifiers?.dispose();+ modifiers = gpu.device.createBuffer({+ size: data.byteLength,+ usage: ["storage", "copy_dst"],+ });+ draw.set({ modifiers });+ }+ if (overlay) {+ modifiers.write(data);+ }+ }+ function display(+ frame: Frame,+ canvas: Target & { dpr: number },+ image: Target,+ options: DisplayOptions,+ ) {+ const geometry = options.frame ?? imageFrame(image.size);+ const viewport =+ options.viewport ?? canvas.size.map((value) => value / canvas.dpr);+ const overlay = options.overlay;+ writeModifiers(overlay);+ frame.pass(+ canvas,+ draw.set({+ source: image.color,+ original: (options.original ?? image).color,+ transform: frameTransform(geometry, image.size),+ split: options.split ?? -1,+ view: {+ size: canvas.size,+ fitSize: viewport.map((value) => value * canvas.dpr),+ imageSize: geometry.size,+ pan: options.view.pan.map((value) => value * canvas.dpr),+ zoom: options.view.zoom,+ shadows: Number(options.clipping?.shadows ?? false),+ highlights: Number(options.clipping?.highlights ?? false),+ },+ maskTransform: frameTransform(+ overlay?.frame ?? geometry,+ overlay?.sourceSize ?? image.size,+ ),+ overlay: {+ ...gradientParams(overlay?.mask),+ modifierCount: overlay?.modifiers.length ?? 0,+ sourceSize: overlay?.sourceSize ?? image.size,+ },+ }),+ );+ }+ return Object.assign(display, {+ dispose() {+ modifiers?.dispose();+ modifiers = undefined;+ },+ });}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();- }+ 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/graph.ts b/src/core/renderer/graph.tsindex 97a9063..88f4e05 100644--- a/src/core/renderer/graph.ts+++ b/src/core/renderer/graph.ts@@ -1,206 +1,206 @@import {- type Buffer,- type Effect,- effect,- frame,- type Gpu,- sampler,- type Target,- type Timer,- target,+ type Buffer,+ type Effect,+ effect,+ frame,+ type Gpu,+ sampler,+ type Target,+ type Timer,+ target,} from "vgpu";import type { RenderImage, RenderNode } from "./node";type Pass = {- shader: RenderNode["shader"];- effect: Effect;- buffers: Map<string, Buffer>;+ shader: RenderNode["shader"];+ effect: Effect;+ buffers: Map<string, Buffer>;};function plan(outputs: readonly RenderImage[]) {- const uses = new Map<RenderImage, number>();- const order: RenderNode[] = [];- const live = new Set<Target>();- const names = new Set<string>();- function visit(image: RenderImage) {- const count = uses.get(image) ?? 0;- uses.set(image, count + 1);- if (count) {- return;- }- if (!("inputs" in image)) {- live.add(image.target);- return;- }- if (names.has(image.name)) {- throw Error(`Duplicate render node: ${image.name}.`);- }- names.add(image.name);- Object.values(image.inputs).forEach(visit);- order.push(image);- }- // Requested outputs count as consumers, keeping their targets live.- outputs.forEach(visit);- return { order, uses, live };+ const uses = new Map<RenderImage, number>();+ const order: RenderNode[] = [];+ const live = new Set<Target>();+ const names = new Set<string>();+ function visit(image: RenderImage) {+ const count = uses.get(image) ?? 0;+ uses.set(image, count + 1);+ if (count) {+ return;+ }+ if (!("inputs" in image)) {+ live.add(image.target);+ return;+ }+ if (names.has(image.name)) {+ throw Error(`Duplicate render node: ${image.name}.`);+ }+ names.add(image.name);+ Object.values(image.inputs).forEach(visit);+ order.push(image);+ }+ // Requested outputs count as consumers, keeping their targets live.+ outputs.forEach(visit);+ return { order, uses, live };}/** Owns effects, storage buffers, and transient targets for one renderer. */export function createRenderGraph(gpu: Gpu, timer?: Timer) {- const pool: Target[] = [];- const effects = new Map<string, Pass>();- let passes: string[] = [];- let disposed = false;- function prepare(node: RenderNode) {- let pass = effects.get(node.name);- if (!pass) {- const bindings = Object.fromEntries(- Object.entries(node.samplers ?? {}).map(([name, descriptor]) => [- name,- sampler(gpu, descriptor),- ]),- );- pass = {- shader: node.shader,- effect: effect(gpu, node.shader, {- label: node.name,- set: bindings,- }),- buffers: new Map(),- };- effects.set(node.name, pass);- }- if (pass.shader !== node.shader) {- throw Error(`Render node ${node.name} changed shader; use a new name.`);- }- for (const [name, data] of Object.entries(node.storage ?? {})) {- let buffer = pass.buffers.get(name);- if (!buffer || buffer.options.size !== data.byteLength) {- buffer?.dispose();- buffer = gpu.device.createBuffer({- size: data.byteLength,- usage: ["storage", "copy_dst"],- });- pass.buffers.set(name, buffer);- pass.effect.set({ [name]: buffer });- }- buffer.write(data);- }- return pass.effect;- }- function acquire(- node: RenderNode,- live: ReadonlySet<Target>,- written: ReadonlySet<Target>,- ) {- const exact = pool.find(- (image) =>- !live.has(image) &&- image.format === node.format &&- image.size[0] === node.size[0] &&- image.size[1] === node.size[1],- );- if (exact) {- return exact;- }- // Resize only targets not referenced by commands in this frame.- const spare = pool.find(- (image) =>- !live.has(image) && !written.has(image) && image.format === node.format,- );- if (spare) {- spare.resize(node.size);- return spare;- }- const image = target(gpu, { size: node.size, format: node.format });- pool.push(image);- return image;- }- return {- /** Retire removed composition instances; bypassed instances remain reusable. */- release(prefix: string) {- for (const [name, pass] of effects) {- if (name.startsWith(prefix)) {- for (const buffer of pass.buffers.values()) {- buffer.dispose();- }- effects.delete(name);- }- }- },- render(outputs: readonly RenderImage[]) {- if (disposed) {- throw Error("Render graph is closed.");- }- const { order, uses, live } = plan(outputs);- const results = new Map<RenderNode, Target>();- function resolve(image: RenderImage): Target {- if (!("inputs" in image)) {- return image.target;- }- const result = results.get(image);- if (!result) {- throw Error(`Unrendered node: ${image.name}.`);- }- return result;- }- const written = new Set<Target>();- frame(gpu, (frame) => {- for (const node of order) {- const pass = prepare(node);- pass.set({- ...node.set,- ...Object.fromEntries(- Object.entries(node.inputs).map(([name, image]) => [- name,- resolve(image).color,- ]),- ),- });- const output = acquire(node, live, written);- live.add(output);- written.add(output);- frame.pass({ target: output, timer: timer?.span(node.name) }, pass);- results.set(node, output);- for (const input of Object.values(node.inputs)) {- const remaining = (uses.get(input) ?? 0) - 1;- uses.set(input, remaining);- if (!remaining && "inputs" in input) {- live.delete(resolve(input));- }- }- }- });- // Avoid retaining old crop sizes or the peak of a previously active effect.- for (let i = pool.length - 1; i >= 0; i--) {- if (!written.has(pool[i]) && !live.has(pool[i])) {- pool[i].color.dispose();- pool.splice(i, 1);- }- }- passes = order.map((node) => node.name);- return outputs.map(resolve);- },- inspect() {- return {- passes: [...passes],- textures: pool.map(({ size, format }) => ({- size: [...size],- format,- })),- };- },- dispose() {- disposed = true;- for (const pass of effects.values()) {- for (const buffer of pass.buffers.values()) {- buffer.dispose();- }- }- effects.clear();- for (const image of pool) {- image.color.dispose();- }- pool.length = 0;- },- };+ const pool: Target[] = [];+ const effects = new Map<string, Pass>();+ let passes: string[] = [];+ let disposed = false;+ function prepare(node: RenderNode) {+ let pass = effects.get(node.name);+ if (!pass) {+ const bindings = Object.fromEntries(+ Object.entries(node.samplers ?? {}).map(([name, descriptor]) => [+ name,+ sampler(gpu, descriptor),+ ]),+ );+ pass = {+ shader: node.shader,+ effect: effect(gpu, node.shader, {+ label: node.name,+ set: bindings,+ }),+ buffers: new Map(),+ };+ effects.set(node.name, pass);+ }+ if (pass.shader !== node.shader) {+ throw Error(`Render node ${node.name} changed shader; use a new name.`);+ }+ for (const [name, data] of Object.entries(node.storage ?? {})) {+ let buffer = pass.buffers.get(name);+ if (!buffer || buffer.options.size !== data.byteLength) {+ buffer?.dispose();+ buffer = gpu.device.createBuffer({+ size: data.byteLength,+ usage: ["storage", "copy_dst"],+ });+ pass.buffers.set(name, buffer);+ pass.effect.set({ [name]: buffer });+ }+ buffer.write(data);+ }+ return pass.effect;+ }+ function acquire(+ node: RenderNode,+ live: ReadonlySet<Target>,+ written: ReadonlySet<Target>,+ ) {+ const exact = pool.find(+ (image) =>+ !live.has(image) &&+ image.format === node.format &&+ image.size[0] === node.size[0] &&+ image.size[1] === node.size[1],+ );+ if (exact) {+ return exact;+ }+ // Resize only targets not referenced by commands in this frame.+ const spare = pool.find(+ (image) =>+ !live.has(image) && !written.has(image) && image.format === node.format,+ );+ if (spare) {+ spare.resize(node.size);+ return spare;+ }+ const image = target(gpu, { size: node.size, format: node.format });+ pool.push(image);+ return image;+ }+ return {+ /** Retire removed composition instances; bypassed instances remain reusable. */+ release(prefix: string) {+ for (const [name, pass] of effects) {+ if (name.startsWith(prefix)) {+ for (const buffer of pass.buffers.values()) {+ buffer.dispose();+ }+ effects.delete(name);+ }+ }+ },+ render(outputs: readonly RenderImage[]) {+ if (disposed) {+ throw Error("Render graph is closed.");+ }+ const { order, uses, live } = plan(outputs);+ const results = new Map<RenderNode, Target>();+ function resolve(image: RenderImage): Target {+ if (!("inputs" in image)) {+ return image.target;+ }+ const result = results.get(image);+ if (!result) {+ throw Error(`Unrendered node: ${image.name}.`);+ }+ return result;+ }+ const written = new Set<Target>();+ frame(gpu, (frame) => {+ for (const node of order) {+ const pass = prepare(node);+ pass.set({+ ...node.set,+ ...Object.fromEntries(+ Object.entries(node.inputs).map(([name, image]) => [+ name,+ resolve(image).color,+ ]),+ ),+ });+ const output = acquire(node, live, written);+ live.add(output);+ written.add(output);+ frame.pass({ target: output, timer: timer?.span(node.name) }, pass);+ results.set(node, output);+ for (const input of Object.values(node.inputs)) {+ const remaining = (uses.get(input) ?? 0) - 1;+ uses.set(input, remaining);+ if (!remaining && "inputs" in input) {+ live.delete(resolve(input));+ }+ }+ }+ });+ // Avoid retaining old crop sizes or the peak of a previously active effect.+ for (let i = pool.length - 1; i >= 0; i--) {+ if (!written.has(pool[i]) && !live.has(pool[i])) {+ pool[i].color.dispose();+ pool.splice(i, 1);+ }+ }+ passes = order.map((node) => node.name);+ return outputs.map(resolve);+ },+ inspect() {+ return {+ passes: [...passes],+ textures: pool.map(({ size, format }) => ({+ size: [...size],+ format,+ })),+ };+ },+ dispose() {+ disposed = true;+ for (const pass of effects.values()) {+ for (const buffer of pass.buffers.values()) {+ buffer.dispose();+ }+ }+ effects.clear();+ for (const image of pool) {+ image.color.dispose();+ }+ pool.length = 0;+ },+ };}diff --git a/src/core/renderer/index.ts b/src/core/renderer/index.tsindex d1733b9..4c45617 100644--- a/src/core/renderer/index.ts+++ b/src/core/renderer/index.ts@@ -6,162 +6,162 @@ import { input, type RenderImage } from "./node";export { mixAdjustment } from "./blend";export {- type Clipping,- createDisplay,- type MaskOverlay,- renderBitmap,- type View,+ type Clipping,+ createDisplay,+ type MaskOverlay,+ renderBitmap,+ type View,} from "./display";export {- input,- merge,- type NodeDefinition,- node,- pipeline,- type RenderImage,- type RenderInput,- type RenderNode,- type RenderStep,- split,+ input,+ merge,+ type NodeDefinition,+ node,+ pipeline,+ type RenderImage,+ type RenderInput,+ type RenderNode,+ type RenderStep,+ split,} from "./node";export { transformImages } from "./transform";export { createRenderGraph };/** App composition describes requested outputs; the engine owns their storage. */export type SceneProcessing = (- source: RenderImage,- scene: Scene,- inputId?: string,+ source: RenderImage,+ scene: Scene,+ inputId?: string,) => {- original: RenderImage;- full: RenderImage;- output: RenderImage;- input?: RenderImage;+ original: RenderImage;+ full: RenderImage;+ output: RenderImage;+ input?: RenderImage;};type RenderRequest = {- scene: Scene;- inputId?: string;+ scene: Scene;+ inputId?: string;};function sameBalance(a: WhiteBalance | undefined, b: WhiteBalance | undefined) {- return a?.temperature === b?.temperature && a?.tint === b?.tint;+ return a?.temperature === b?.temperature && a?.tint === b?.tint;}/** Owns scene passes and intermediate textures for one decoded source. */export function createRenderer(- gpu: Gpu,- resource: ImageSource,- compose: SceneProcessing,- timer?: Timer,+ gpu: Gpu,+ resource: ImageSource,+ compose: SceneProcessing,+ timer?: Timer,) {- const source = resource.image;- const graph = createRenderGraph(gpu, timer);- const release = resource.retain();- const raw = resource.raw?.createPass();- let original = source;- let full = source;- const listeners = new Set<() => void>();- let rendered = false;- let output = source;- let inspected: { id: string; image: Target } | undefined;- let balance = resource.raw?.asShot;- let next: RenderRequest | undefined;- let pending: Promise<void> | undefined;- let disposed = false;- let instances = new Set<string>();- function render({ scene, inputId }: RenderRequest) {- const active = new Set(walkLayers(scene.layers).map((layer) => layer.id));- for (const id of instances) {- if (!active.has(id)) {- graph.release(`layer/${id}/`);- }- }- instances = active;- const images = compose(input(raw?.render() ?? source), scene, inputId);- const targets = graph.render([- images.original,- images.full,- images.output,- ...(images.input ? [images.input] : []),- ]);- [original, full, output] = targets;- inspected =- inputId && targets[3] ? { id: inputId, image: targets[3] } : undefined;- rendered = true;- for (const listener of listeners) {- listener();- }- }- /** Only calibration crosses the worker; each renderer owns its GPU RAW pass. */- async function develop() {- while (next && !disposed) {- const request = next;- next = undefined;- const { scene } = request;- const selected = scene.layers[0].whiteBalance ?? resource.raw?.asShot;- if (raw && selected && !sameBalance(balance, selected)) {- await raw.prepare(selected);- if (disposed) {- return;- }- balance = selected;- }- if (!next) {- render(request);- }- }- }- async function update(scene: Scene, inputId?: string): Promise<void> {- if (disposed) {- throw Error("Renderer is closed.");- }- if (!resource.raw) {- render({ scene, inputId });- return;- }- next = { scene, inputId };- pending ??= develop()- .catch((error) => {- if (!next) {- throw error;- }- })- .finally(() => {- pending = undefined;- if (next && !disposed) {- return update(next.scene, next.inputId);- }- });- return pending;- }+ const source = resource.image;+ const graph = createRenderGraph(gpu, timer);+ const release = resource.retain();+ const raw = resource.raw?.createPass();+ let original = source;+ let full = source;+ const listeners = new Set<() => void>();+ let rendered = false;+ let output = source;+ let inspected: { id: string; image: Target } | undefined;+ let balance = resource.raw?.asShot;+ let next: RenderRequest | undefined;+ let pending: Promise<void> | undefined;+ let disposed = false;+ let instances = new Set<string>();+ function render({ scene, inputId }: RenderRequest) {+ const active = new Set(walkLayers(scene.layers).map((layer) => layer.id));+ for (const id of instances) {+ if (!active.has(id)) {+ graph.release(`layer/${id}/`);+ }+ }+ instances = active;+ const images = compose(input(raw?.render() ?? source), scene, inputId);+ const targets = graph.render([+ images.original,+ images.full,+ images.output,+ ...(images.input ? [images.input] : []),+ ]);+ [original, full, output] = targets;+ inspected =+ inputId && targets[3] ? { id: inputId, image: targets[3] } : undefined;+ rendered = true;+ for (const listener of listeners) {+ listener();+ }+ }+ /** Only calibration crosses the worker; each renderer owns its GPU RAW pass. */+ async function develop() {+ while (next && !disposed) {+ const request = next;+ next = undefined;+ const { scene } = request;+ const selected = scene.layers[0].whiteBalance ?? resource.raw?.asShot;+ if (raw && selected && !sameBalance(balance, selected)) {+ await raw.prepare(selected);+ if (disposed) {+ return;+ }+ balance = selected;+ }+ if (!next) {+ render(request);+ }+ }+ }+ async function update(scene: Scene, inputId?: string): Promise<void> {+ if (disposed) {+ throw Error("Renderer is closed.");+ }+ if (!resource.raw) {+ render({ scene, inputId });+ return;+ }+ next = { scene, inputId };+ pending ??= develop()+ .catch((error) => {+ if (!next) {+ throw error;+ }+ })+ .finally(() => {+ pending = undefined;+ if (next && !disposed) {+ return update(next.scene, next.inputId);+ }+ });+ return pending;+ }- return {- originalImage: () => original,- fullImage: () => full,- outputImage: () => output,- inputImage: (id: string) =>- inspected?.id === id ? inspected.image : undefined,- inspect: graph.inspect,- subscribe(listener: () => void) {- listeners.add(listener);- if (rendered) {- listener();- }- return () => {- listeners.delete(listener);- };- },- update,- dispose() {- if (disposed) {- return;- }- disposed = true;- listeners.clear();- graph.dispose();- raw?.dispose();- release();- },- };+ return {+ originalImage: () => original,+ fullImage: () => full,+ outputImage: () => output,+ inputImage: (id: string) =>+ inspected?.id === id ? inspected.image : undefined,+ inspect: graph.inspect,+ subscribe(listener: () => void) {+ listeners.add(listener);+ if (rendered) {+ listener();+ }+ return () => {+ listeners.delete(listener);+ };+ },+ update,+ dispose() {+ if (disposed) {+ return;+ }+ disposed = true;+ listeners.clear();+ graph.dispose();+ raw?.dispose();+ release();+ },+ };}diff --git a/src/core/renderer/node.ts b/src/core/renderer/node.tsindex 6490a48..b3e680e 100644--- a/src/core/renderer/node.ts+++ b/src/core/renderer/node.ts@@ -1,82 +1,82 @@import type { EffectOptions, ShaderSource, Target } from "vgpu";type NodeOptions = {- readonly set?: EffectOptions["set"];- readonly samplers?: Readonly<Record<string, GPUSamplerDescriptor>>;- readonly storage?: Readonly<Record<string, Float32Array<ArrayBuffer>>>;- readonly size?: readonly [number, number];- readonly format?: GPUTextureFormat;+ readonly set?: EffectOptions["set"];+ readonly samplers?: Readonly<Record<string, GPUSamplerDescriptor>>;+ readonly storage?: Readonly<Record<string, Float32Array<ArrayBuffer>>>;+ readonly size?: readonly [number, number];+ readonly format?: GPUTextureFormat;};export type NodeDefinition = NodeOptions & {- readonly name: string;- readonly shader: string | ShaderSource;+ readonly name: string;+ readonly shader: string | ShaderSource;};export type RenderInput = {- readonly target: Target;- readonly size: readonly [number, number];- readonly format: GPUTextureFormat;+ readonly target: Target;+ readonly size: readonly [number, number];+ readonly format: GPUTextureFormat;};export type RenderNode = NodeDefinition & {- readonly inputs: Readonly<Record<string, RenderImage>>;- readonly size: readonly [number, number];- readonly format: GPUTextureFormat;+ readonly inputs: Readonly<Record<string, RenderImage>>;+ readonly size: readonly [number, number];+ readonly format: GPUTextureFormat;};export type RenderImage = RenderInput | RenderNode;export type RenderStep =- | NodeDefinition- | ((image: RenderImage) => RenderImage)- | undefined;+ | NodeDefinition+ | ((image: RenderImage) => RenderImage)+ | undefined;/** Imports a caller-owned texture without copying or allocating GPU resources. */export function input(target: Target): RenderInput {- return { target, size: target.size, format: target.format };+ return { target, size: target.size, format: target.format };}export function node(- name: string,- shader: NodeDefinition["shader"],- options: NodeOptions = {},+ name: string,+ shader: NodeDefinition["shader"],+ options: NodeOptions = {},): NodeDefinition {- return { ...options, name, shader };+ return { ...options, name, shader };}/** Connects named shader inputs; the shader defines how to combine them. */export function merge(- inputs: RenderNode["inputs"],- definition: NodeDefinition,+ inputs: RenderNode["inputs"],+ definition: NodeDefinition,): RenderNode {- const first = Object.values(inputs)[0];- if (!first) {- throw Error(`Render node ${definition.name} needs an input.`);- }- return {- ...definition,- inputs,- size: definition.size ?? first.size,- format: definition.format ?? first.format,- };+ const first = Object.values(inputs)[0];+ if (!first) {+ throw Error(`Render node ${definition.name} needs an input.`);+ }+ return {+ ...definition,+ inputs,+ size: definition.size ?? first.size,+ format: definition.format ?? first.format,+ };}/** Connects source → output in order; an omitted step is a bypass. */export function pipeline(- source: RenderImage,- steps: readonly RenderStep[],+ source: RenderImage,+ steps: readonly RenderStep[],): RenderImage {- return steps.reduce<RenderImage>((image, step) => {- if (!step) {- return image;- }- if (typeof step === "function") {- return step(image);- }- return merge({ source: image }, step);- }, source);+ return steps.reduce<RenderImage>((image, step) => {+ if (!step) {+ return image;+ }+ if (typeof step === "function") {+ return step(image);+ }+ return merge({ source: image }, step);+ }, source);}/** Branches share their input; this does not copy textures. */export function split(- source: RenderImage,- branches: readonly (readonly RenderStep[])[],+ source: RenderImage,+ branches: readonly (readonly RenderStep[])[],) {- return branches.map((steps) => pipeline(source, steps));+ return branches.map((steps) => pipeline(source, steps));}diff --git a/src/core/renderer/transform/index.ts b/src/core/renderer/transform/index.tsindex 995b6c5..026d0d6 100644--- a/src/core/renderer/transform/index.ts+++ b/src/core/renderer/transform/index.ts@@ -1,38 +1,38 @@import {- frameTransform,- frameValues,- type ImageFrame,- imageFrame,+ frameTransform,+ frameValues,+ type ImageFrame,+ imageFrame,} from "@/core/image/frame";import { merge, node, type RenderImage } from "@/core/renderer/node";import shader from "./frame.wgsl";/** Equal inputs share a transform node; identity geometry preserves the input. */export function transformImages(- sources: readonly RenderImage[],- geometry: ImageFrame,+ sources: readonly RenderImage[],+ geometry: ImageFrame,) {- const initial = frameValues(imageFrame(sources[0].size));- if (frameValues(geometry).every((value, i) => value === initial[i])) {- return sources;- }- const outputs = new Map<RenderImage, RenderImage>();- return sources.map((input, i) => {- const existing = outputs.get(input);- if (existing) {- return existing;- }- const output = merge(- { source: input },- node(`transform/${i}`, shader, {- set: { transform: frameTransform(geometry, input.size) },- samplers: {- sourceSampler: { magFilter: "linear", minFilter: "linear" },- },- size: [Math.round(geometry.size[0]), Math.round(geometry.size[1])],- }),- );- outputs.set(input, output);- return output;- });+ const initial = frameValues(imageFrame(sources[0].size));+ if (frameValues(geometry).every((value, i) => value === initial[i])) {+ return sources;+ }+ const outputs = new Map<RenderImage, RenderImage>();+ return sources.map((input, i) => {+ const existing = outputs.get(input);+ if (existing) {+ return existing;+ }+ const output = merge(+ { source: input },+ node(`transform/${i}`, shader, {+ set: { transform: frameTransform(geometry, input.size) },+ samplers: {+ sourceSampler: { magFilter: "linear", minFilter: "linear" },+ },+ size: [Math.round(geometry.size[0]), Math.round(geometry.size[1])],+ }),+ );+ outputs.set(input, output);+ return output;+ });}diff --git a/src/features/adjustments/controls.tsx b/src/features/adjustments/controls.tsxindex ef02e9f..e41ad04 100644--- a/src/features/adjustments/controls.tsx+++ b/src/features/adjustments/controls.tsx@@ -6,82 +6,82 @@ import { setAdjustments } from "./edits";import { adjustmentLimits, defaultAdjustments } from "./model";const stops: Partial<Record<keyof Adjustments, string[]>> = {- incrementalTemperature: ["#4a6fc3", "#c3b84a"],- incrementalTint: ["#5ab34a", "#b34ab3"],- saturation: [- "#7b7d85",- "#868686 50%",- "#7fa066 68%",- "#b8a75c 84%",- "#c25a48",- ],+ incrementalTemperature: ["#4a6fc3", "#c3b84a"],+ incrementalTint: ["#5ab34a", "#b34ab3"],+ saturation: [+ "#7b7d85",+ "#868686 50%",+ "#7fa066 68%",+ "#b8a75c 84%",+ "#c25a48",+ ],};const tone = [- ["exposure", "Exposure"],- ["contrast", "Contrast"],- ["highlights", "Highlights"],- ["shadows", "Shadows"],- ["whites", "Whites"],- ["blacks", "Blacks"],+ ["exposure", "Exposure"],+ ["contrast", "Contrast"],+ ["highlights", "Highlights"],+ ["shadows", "Shadows"],+ ["whites", "Whites"],+ ["blacks", "Blacks"],] as const;const color = [- ["incrementalTemperature", "Temp"],- ["incrementalTint", "Tint"],- ["vibrance", "Vibrance"],- ["saturation", "Saturation"],+ ["incrementalTemperature", "Temp"],+ ["incrementalTint", "Tint"],+ ["vibrance", "Vibrance"],+ ["saturation", "Saturation"],] as const;type Control = (typeof tone)[number] | (typeof color)[number];function AdjustmentSliders({- id,- adjustments,- controls,+ id,+ adjustments,+ controls,}: {- id: string;- adjustments: Readonly<Adjustments>;- controls: readonly Control[];+ id: string;+ adjustments: Readonly<Adjustments>;+ controls: readonly Control[];}) {- const document = useDocument();- return controls.map(([name, label]) => {- const step = name === "exposure" ? 0.01 : 1;- const gradient = name === "vibrance" ? stops.saturation : stops[name];- return (- <Slider- key={name}- label={label}- value={adjustments[name]}- step={step}- stops={gradient}- min={-adjustmentLimits[name]}- max={adjustmentLimits[name]}- defaultValue={defaultAdjustments[name]}- onChange={(value) => setAdjustments(document, { [name]: value }, id)}- />- );- });+ const document = useDocument();+ return controls.map(([name, label]) => {+ const step = name === "exposure" ? 0.01 : 1;+ const gradient = name === "vibrance" ? stops.saturation : stops[name];+ return (+ <Slider+ key={name}+ label={label}+ value={adjustments[name]}+ step={step}+ stops={gradient}+ min={-adjustmentLimits[name]}+ max={adjustmentLimits[name]}+ defaultValue={defaultAdjustments[name]}+ onChange={(value) => setAdjustments(document, { [name]: value }, id)}+ />+ );+ });}/** The temperature slot replaces the incremental temperature and tint sliders. */export function AdjustmentControls({- id,- adjustments,- temperature,+ id,+ adjustments,+ temperature,}: {- id: string;- adjustments: Readonly<Adjustments>;- temperature?: ReactNode;+ id: string;+ adjustments: Readonly<Adjustments>;+ temperature?: ReactNode;}) {- return (- <section className="flex flex-col gap-2 p-3">- <AdjustmentSliders id={id} adjustments={adjustments} controls={tone} />- <hr className="my-1 border-black/50" />- {temperature}- <AdjustmentSliders- id={id}- adjustments={adjustments}- controls={temperature ? color.slice(2) : color}- />- </section>- );+ return (+ <section className="flex flex-col gap-2 p-3">+ <AdjustmentSliders id={id} adjustments={adjustments} controls={tone} />+ <hr className="my-1 border-black/50" />+ {temperature}+ <AdjustmentSliders+ id={id}+ adjustments={adjustments}+ controls={temperature ? color.slice(2) : color}+ />+ </section>+ );}diff --git a/src/features/adjustments/edits.ts b/src/features/adjustments/edits.tsindex d5aca18..eb9d753 100644--- a/src/features/adjustments/edits.ts+++ b/src/features/adjustments/edits.ts@@ -1,33 +1,33 @@import {- type Adjustments,- type EditorDocument,- editLayer,+ type Adjustments,+ type EditorDocument,+ editLayer,} from "@/core/document";import { adjustmentLimits } from "./model";export function setAdjustments(- document: EditorDocument,- change: Partial<Adjustments>,- id = document.scene.getState().layers[0].id,+ document: EditorDocument,+ change: Partial<Adjustments>,+ id = document.scene.getState().layers[0].id,) {- for (const [name, value] of Object.entries(change)) {- const limit = Reflect.get(adjustmentLimits, name);- if (- typeof limit !== "number" ||- typeof value !== "number" ||- !Number.isFinite(value) ||- value > limit ||- value < -limit- ) {- throw new Error(`Invalid adjustment: ${name}.`);- }- }- editLayer(document, id, (layer) => {- if (layer.kind !== "image" && layer.kind !== "mask") {- throw Error("Select an image or mask layer.");- }- const adjustments = { ...layer.adjustments, ...change };+ for (const [name, value] of Object.entries(change)) {+ const limit = Reflect.get(adjustmentLimits, name);+ if (+ typeof limit !== "number" ||+ typeof value !== "number" ||+ !Number.isFinite(value) ||+ value > limit ||+ value < -limit+ ) {+ throw new Error(`Invalid adjustment: ${name}.`);+ }+ }+ editLayer(document, id, (layer) => {+ if (layer.kind !== "image" && layer.kind !== "mask") {+ throw Error("Select an image or mask layer.");+ }+ const adjustments = { ...layer.adjustments, ...change };- return { ...layer, adjustments };- });+ return { ...layer, adjustments };+ });}diff --git a/src/features/adjustments/exposure.ts b/src/features/adjustments/exposure.tsindex 18c411f..c0e50b0 100644--- a/src/features/adjustments/exposure.ts+++ b/src/features/adjustments/exposure.ts@@ -2,8 +2,8 @@ import { node } from "@/core/renderer";import shader from "./exposure.wgsl";export function exposure(name: string, value: number) {- if (value === 0) {- return;- }- return node(name, shader, { set: { exposure: value } });+ if (value === 0) {+ return;+ }+ return node(name, shader, { set: { exposure: value } });}diff --git a/src/features/adjustments/model.ts b/src/features/adjustments/model.tsindex 1aa581d..879aa87 100644--- a/src/features/adjustments/model.ts+++ b/src/features/adjustments/model.ts@@ -1,27 +1,27 @@import type { Adjustments } from "@/core/document";export const defaultAdjustments: Adjustments = {- exposure: 0,- incrementalTemperature: 0,- incrementalTint: 0,- contrast: 0,- highlights: 0,- shadows: 0,- whites: 0,- blacks: 0,- vibrance: 0,- saturation: 0,+ exposure: 0,+ incrementalTemperature: 0,+ incrementalTint: 0,+ contrast: 0,+ highlights: 0,+ shadows: 0,+ whites: 0,+ blacks: 0,+ vibrance: 0,+ saturation: 0,};export const adjustmentLimits: Adjustments = {- exposure: 5,- incrementalTemperature: 100,- incrementalTint: 100,- contrast: 100,- highlights: 100,- shadows: 100,- whites: 100,- blacks: 100,- vibrance: 100,- saturation: 100,+ exposure: 5,+ incrementalTemperature: 100,+ incrementalTint: 100,+ contrast: 100,+ highlights: 100,+ shadows: 100,+ whites: 100,+ blacks: 100,+ vibrance: 100,+ saturation: 100,};diff --git a/src/features/adjustments/pass.ts b/src/features/adjustments/pass.tsindex b52882b..b7dc846 100644--- a/src/features/adjustments/pass.ts+++ b/src/features/adjustments/pass.ts@@ -6,15 +6,15 @@ import { defaultAdjustments } from "./model";/** 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" } },- });+ 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/camera-raw-xmp/xmp.ts b/src/features/camera-raw-xmp/xmp.tsindex 9587152..9760b3f 100644--- a/src/features/camera-raw-xmp/xmp.ts+++ b/src/features/camera-raw-xmp/xmp.ts@@ -2,47 +2,47 @@ const cameraRaw = "http://ns.adobe.com/camera-raw-settings/1.0/";const rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";export type CameraRawXmp = {- exposure2012?: number;- contrast2012?: number;- clarity2012?: number;- highlights2012?: number;- shadows2012?: number;- whites2012?: number;- blacks2012?: number;- vibrance?: number;- saturation?: number;+ exposure2012?: number;+ contrast2012?: number;+ clarity2012?: number;+ highlights2012?: number;+ shadows2012?: number;+ whites2012?: number;+ blacks2012?: number;+ vibrance?: number;+ saturation?: number;};const attributes = {- Exposure2012: "exposure2012",- Contrast2012: "contrast2012",- Clarity2012: "clarity2012",- Highlights2012: "highlights2012",- Shadows2012: "shadows2012",- Whites2012: "whites2012",- Blacks2012: "blacks2012",- Vibrance: "vibrance",- Saturation: "saturation",+ Exposure2012: "exposure2012",+ Contrast2012: "contrast2012",+ Clarity2012: "clarity2012",+ Highlights2012: "highlights2012",+ Shadows2012: "shadows2012",+ Whites2012: "whites2012",+ Blacks2012: "blacks2012",+ Vibrance: "vibrance",+ Saturation: "saturation",} as const satisfies Record<string, keyof CameraRawXmp>;export function isCameraRawXmp(file: File) {- return /\.(xmp|xml)$/i.test(file.name);+ return /\.(xmp|xml)$/i.test(file.name);}export function readCameraRawXmp(text: string): CameraRawXmp {- const document = new DOMParser().parseFromString(text, "application/xml");- const description = document.getElementsByTagNameNS(rdf, "Description")[0];- if (!description) {- return {};- }- return Object.fromEntries(- Object.entries(attributes).flatMap(([attribute, setting]) => {- const raw = description.getAttributeNS(cameraRaw, attribute);- if (raw === null || raw.trim() === "") {- return [];- }- const value = Number(raw);- return Number.isFinite(value) ? [[setting, value]] : [];- }),- );+ const document = new DOMParser().parseFromString(text, "application/xml");+ const description = document.getElementsByTagNameNS(rdf, "Description")[0];+ if (!description) {+ return {};+ }+ return Object.fromEntries(+ Object.entries(attributes).flatMap(([attribute, setting]) => {+ const raw = description.getAttributeNS(cameraRaw, attribute);+ if (raw === null || raw.trim() === "") {+ return [];+ }+ const value = Number(raw);+ return Number.isFinite(value) ? [[setting, value]] : [];+ }),+ );}diff --git a/src/features/color-mixer/controls.tsx b/src/features/color-mixer/controls.tsxindex ff1a2ab..33c1413 100644--- a/src/features/color-mixer/controls.tsx+++ b/src/features/color-mixer/controls.tsx@@ -8,103 +8,103 @@ import { setColorMixer } from "./edits";import { channels, colors, type MixerChannel } from "./model";function gradient(hue: number, channel: MixerChannel) {- if (channel === "hue") {- return [-30, 0, 30].map((shift) => `hsl(${hue + shift} 65% 55%)`);- }- if (channel === "saturation") {- return [0, 50, 100].map((saturation) => `hsl(${hue} ${saturation}% 55%)`);- }- return [20, 55, 85].map((lightness) => `hsl(${hue} 65% ${lightness}%)`);+ if (channel === "hue") {+ return [-30, 0, 30].map((shift) => `hsl(${hue + shift} 65% 55%)`);+ }+ if (channel === "saturation") {+ return [0, 50, 100].map((saturation) => `hsl(${hue} ${saturation}% 55%)`);+ }+ return [20, 55, 85].map((lightness) => `hsl(${hue} 65% ${lightness}%)`);}function ColorSlider({- index,- channel,- value,- layerId,+ index,+ channel,+ value,+ layerId,}: {- index: number;- channel: MixerChannel;- value: number;- layerId: string;+ index: number;+ channel: MixerChannel;+ value: number;+ layerId: string;}) {- const document = useDocument();- const color = colors[index];- const label = `${color.label} ${channel}`;- const change = (value: number) =>- setColorMixer(document, color.id, { [channel]: value }, layerId);- return (- <div- className="flex min-w-0 flex-col items-center gap-1"- title={color.label}- >- <ScrubInput- aria-label={`${label} value`}- className="w-full leading-4 [&>span]:px-0 [&_input]:text-center [&_input]:tracking-tight"- variant="text"- value={value}- 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>- );+ const document = useDocument();+ const color = colors[index];+ const label = `${color.label} ${channel}`;+ const change = (value: number) =>+ setColorMixer(document, color.id, { [channel]: value }, layerId);+ return (+ <div+ className="flex min-w-0 flex-col items-center gap-1"+ title={color.label}+ >+ <ScrubInput+ aria-label={`${label} value`}+ className="w-full leading-4 [&>span]:px-0 [&_input]:text-center [&_input]:tracking-tight"+ variant="text"+ value={value}+ 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>+ );}export function ColorMixerControls({- id: layerId,- mixer,+ id: layerId,+ mixer,}: {- id: string;- mixer: ColorMixer;+ id: string;+ mixer: ColorMixer;}) {- const [channel, setChannel] = useState<MixerChannel>("hue");- const id = useId();- return (- <section className="p-3">- <TabList- aria-label="Color Mixer adjustment"- className="mb-3 gap-0.5 rounded-md bg-neutral-900 p-0.5 shadow-groove"- >- {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 rounded px-1 py-1.5"- >- {label}- </Tab>- ))}- </TabList>- <div- id={`${id}-sliders`}- role="tabpanel"- aria-labelledby={`${id}-${channel}`}- className="grid grid-cols-8"- >- {colors.map((color, index) => (- <ColorSlider- key={color.id}- index={index}- channel={channel}- value={mixer[channel][index]}- layerId={layerId}- />- ))}- </div>- </section>- );+ const [channel, setChannel] = useState<MixerChannel>("hue");+ const id = useId();+ return (+ <section className="p-3">+ <TabList+ aria-label="Color Mixer adjustment"+ className="mb-3 gap-0.5 rounded-md bg-neutral-900 p-0.5 shadow-groove"+ >+ {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 rounded px-1 py-1.5"+ >+ {label}+ </Tab>+ ))}+ </TabList>+ <div+ id={`${id}-sliders`}+ role="tabpanel"+ aria-labelledby={`${id}-${channel}`}+ className="grid grid-cols-8"+ >+ {colors.map((color, index) => (+ <ColorSlider+ key={color.id}+ index={index}+ channel={channel}+ value={mixer[channel][index]}+ layerId={layerId}+ />+ ))}+ </div>+ </section>+ );}diff --git a/src/features/color-mixer/edits.ts b/src/features/color-mixer/edits.tsindex abc0c43..1eba982 100644--- a/src/features/color-mixer/edits.ts+++ b/src/features/color-mixer/edits.ts@@ -1,67 +1,67 @@import {- type ColorMixer,- type EditorDocument,- editLayer,+ type ColorMixer,+ type EditorDocument,+ editLayer,} from "@/core/document";import {- channels,- colors,- defaultMixer,- type MixerChange,- type MixerColor,+ channels,+ colors,+ defaultMixer,+ type MixerChange,+ type MixerColor,} from "./model";export function changeColorMixer(- current: ColorMixer,- color: MixerColor,- change: MixerChange,+ current: ColorMixer,+ color: MixerColor,+ change: MixerChange,) {- const index = colors.findIndex(({ id }) => id === color);- if (index < 0) {- throw new Error(`Invalid color range: ${color}.`);- }- for (const [name, value] of Object.entries(change)) {- if (- !channels.some(({ id }) => id === name) ||- typeof value !== "number" ||- !Number.isFinite(value) ||- Math.abs(value) > 100- ) {- throw new Error(`Invalid color mixer adjustment: ${name}.`);- }- }- const next = { ...current };- for (const { id } of channels) {- const value = change[id];- if (value !== undefined && value !== current[id][index]) {- next[id] = current[id].with(index, value);- }- }- return next;+ const index = colors.findIndex(({ id }) => id === color);+ if (index < 0) {+ throw new Error(`Invalid color range: ${color}.`);+ }+ for (const [name, value] of Object.entries(change)) {+ if (+ !channels.some(({ id }) => id === name) ||+ typeof value !== "number" ||+ !Number.isFinite(value) ||+ Math.abs(value) > 100+ ) {+ throw new Error(`Invalid color mixer adjustment: ${name}.`);+ }+ }+ const next = { ...current };+ for (const { id } of channels) {+ const value = change[id];+ if (value !== undefined && value !== current[id][index]) {+ next[id] = current[id].with(index, value);+ }+ }+ return next;}export function setColorMixer(- document: EditorDocument,- color: MixerColor,- change: MixerChange,- id: string,+ document: EditorDocument,+ color: MixerColor,+ change: MixerChange,+ id: string,) {- editLayer(document, id, (layer) => {- if (layer.kind !== "color-mixer") {- throw Error("Select a color mixer layer.");- }- return {- ...layer,- colorMixer: changeColorMixer(layer.colorMixer, color, change),- };- });+ editLayer(document, id, (layer) => {+ if (layer.kind !== "color-mixer") {+ throw Error("Select a color mixer layer.");+ }+ return {+ ...layer,+ colorMixer: changeColorMixer(layer.colorMixer, color, change),+ };+ });}export function resetColorMixer(document: EditorDocument, id: string) {- editLayer(document, id, (layer) => {- if (layer.kind !== "color-mixer") {- throw Error("Select a color mixer layer.");- }- return { ...layer, colorMixer: defaultMixer };- });+ editLayer(document, id, (layer) => {+ if (layer.kind !== "color-mixer") {+ throw Error("Select a color mixer layer.");+ }+ return { ...layer, colorMixer: defaultMixer };+ });}diff --git a/src/features/color-mixer/model.ts b/src/features/color-mixer/model.tsindex 55e8484..766022f 100644--- a/src/features/color-mixer/model.ts+++ b/src/features/color-mixer/model.ts@@ -2,20 +2,20 @@ import type { ColorMixer } from "@/core/document";// Oklab angles of the eight full-saturation sRGB colors, for circular interpolation.export const colors = [- { id: "red", label: "Red", hue: 0, angle: 29.23389 },- { id: "orange", label: "Orange", hue: 30, angle: 52.77574 },- { id: "yellow", label: "Yellow", hue: 60, angle: 109.76923 },- { id: "green", label: "Green", hue: 120, angle: 142.49534 },- { id: "aqua", label: "Aqua", hue: 180, angle: 194.76895 },- { id: "blue", label: "Blue", hue: 240, angle: 264.05202 },- { id: "purple", label: "Purple", hue: 270, angle: 293.77405 },- { id: "magenta", label: "Magenta", hue: 300, angle: 328.36342 },+ { id: "red", label: "Red", hue: 0, angle: 29.23389 },+ { id: "orange", label: "Orange", hue: 30, angle: 52.77574 },+ { id: "yellow", label: "Yellow", hue: 60, angle: 109.76923 },+ { id: "green", label: "Green", hue: 120, angle: 142.49534 },+ { id: "aqua", label: "Aqua", hue: 180, angle: 194.76895 },+ { id: "blue", label: "Blue", hue: 240, angle: 264.05202 },+ { id: "purple", label: "Purple", hue: 270, angle: 293.77405 },+ { id: "magenta", label: "Magenta", hue: 300, angle: 328.36342 },] as const;export const channels = [- { id: "hue", label: "Hue" },- { id: "saturation", label: "Saturation" },- { id: "luminance", label: "Luminance" },+ { id: "hue", label: "Hue" },+ { id: "saturation", label: "Saturation" },+ { id: "luminance", label: "Luminance" },] as const;export type MixerColor = (typeof colors)[number]["id"];@@ -24,11 +24,11 @@ export type MixerChange = Partial<Record<MixerChannel, number>>;const zeros = Object.freeze(colors.map(() => 0));export const defaultMixer: ColorMixer = Object.freeze({- hue: zeros,- saturation: zeros,- luminance: zeros,+ hue: zeros,+ saturation: zeros,+ luminance: zeros,});export function isNeutral(mixer: ColorMixer) {- return channels.every(({ id }) => mixer[id].every((value) => value === 0));+ return channels.every(({ id }) => mixer[id].every((value) => value === 0));}diff --git a/src/features/color-mixer/pass.ts b/src/features/color-mixer/pass.tsindex ca03013..c674404 100644--- a/src/features/color-mixer/pass.ts+++ b/src/features/color-mixer/pass.ts@@ -4,19 +4,19 @@ import shader from "./mixer.wgsl";import { colors, isNeutral } from "./model";export function colorMixer(mixer?: ColorMixer, name = "color-mixer") {- if (!mixer || isNeutral(mixer)) {- return;- }- return node(name, shader, {- storage: {- settings: new Float32Array(- colors.flatMap(({ angle }, index) => [- mixer.hue[index],- mixer.saturation[index],- mixer.luminance[index],- angle,- ]),- ),- },- });+ if (!mixer || isNeutral(mixer)) {+ return;+ }+ return node(name, shader, {+ storage: {+ settings: new Float32Array(+ colors.flatMap(({ angle }, index) => [+ mixer.hue[index],+ mixer.saturation[index],+ mixer.luminance[index],+ angle,+ ]),+ ),+ },+ });}diff --git a/src/features/crop/geometry.ts b/src/features/crop/geometry.tsindex df04fd9..a4918ca 100644--- a/src/features/crop/geometry.ts+++ b/src/features/crop/geometry.ts@@ -2,135 +2,135 @@ import { type ImageFrame, type Point, sourceOffset } from "@/core/image/frame";import { clamp } from "@/lib/math";function radius(frame: ImageFrame): Point {- const x = sourceOffset(frame, frame.size[0] / 2, 0);- const y = sourceOffset(frame, 0, frame.size[1] / 2);- return [Math.abs(x[0]) + Math.abs(y[0]), Math.abs(x[1]) + Math.abs(y[1])];+ const x = sourceOffset(frame, frame.size[0] / 2, 0);+ const y = sourceOffset(frame, 0, frame.size[1] / 2);+ return [Math.abs(x[0]) + Math.abs(y[0]), Math.abs(x[1]) + Math.abs(y[1])];}/** Translation slides independently along source edges. */export function move(- frame: ImageFrame,- dx: number,- dy: number,- source: Point,+ frame: ImageFrame,+ dx: number,+ dy: number,+ source: Point,): ImageFrame {- const offset = sourceOffset(frame, dx, dy);- const half = radius(frame);- return {- ...frame,- center: [- clamp(frame.center[0] + offset[0], half[0], source[0] - half[0]),- clamp(frame.center[1] + offset[1], half[1], source[1] - half[1]),- ],- };+ const offset = sourceOffset(frame, dx, dy);+ const half = radius(frame);+ return {+ ...frame,+ center: [+ clamp(frame.center[0] + offset[0], half[0], source[0] - half[0]),+ clamp(frame.center[1] + offset[1], half[1], source[1] - half[1]),+ ],+ };}/** Anchor the opposite source edge or corner, stopping the gesture at the first bound. */export function resize(- frame: ImageFrame,- handle: string,- dx: number,- dy: number,- ratio: number | null,- source: Point,+ frame: ImageFrame,+ handle: string,+ dx: number,+ dy: number,+ ratio: number | null,+ source: Point,): ImageFrame {- const sx = Number(handle.includes("e")) - Number(handle.includes("w"));- const sy = Number(handle.includes("s")) - Number(handle.includes("n"));- const xWeight = Math.abs(sx);- const yWeight = Math.abs(sy);- const width = frame.size[0] + sx * dx;- const height = frame.size[1] + sy * dy;- const w = ratio- ? Math.max(- 1,- ratio,- ((width * ratio * xWeight + height * yWeight) * ratio) /- (ratio * ratio * xWeight + yWeight),- )- : Math.max(1, width);- const h = ratio ? w / ratio : Math.max(1, height);- const offset = sourceOffset(- frame,- ((w - frame.size[0]) * sx) / 2,- ((h - frame.size[1]) * sy) / 2,- );- const before = radius(frame);- const after = radius({ ...frame, size: [w, h] });- let fraction = 1;- for (const axis of [0, 1]) {- for (const sign of [-1, 1]) {- const start = frame.center[axis] + sign * before[axis];- const end = frame.center[axis] + offset[axis] + sign * after[axis];- if (end < -1e-7 || end > source[axis] + 1e-7) {- fraction = Math.min(- fraction,- clamp((clamp(end, 0, source[axis]) - start) / (end - start)),- );- }- }- }- const blend = (a: number, b: number) => a + (b - a) * fraction;- return {- ...frame,- size: [blend(frame.size[0], w), blend(frame.size[1], h)],- center: [- frame.center[0] + offset[0] * fraction,- frame.center[1] + offset[1] * fraction,- ],- };+ const sx = Number(handle.includes("e")) - Number(handle.includes("w"));+ const sy = Number(handle.includes("s")) - Number(handle.includes("n"));+ const xWeight = Math.abs(sx);+ const yWeight = Math.abs(sy);+ const width = frame.size[0] + sx * dx;+ const height = frame.size[1] + sy * dy;+ const w = ratio+ ? Math.max(+ 1,+ ratio,+ ((width * ratio * xWeight + height * yWeight) * ratio) /+ (ratio * ratio * xWeight + yWeight),+ )+ : Math.max(1, width);+ const h = ratio ? w / ratio : Math.max(1, height);+ const offset = sourceOffset(+ frame,+ ((w - frame.size[0]) * sx) / 2,+ ((h - frame.size[1]) * sy) / 2,+ );+ const before = radius(frame);+ const after = radius({ ...frame, size: [w, h] });+ let fraction = 1;+ for (const axis of [0, 1]) {+ for (const sign of [-1, 1]) {+ const start = frame.center[axis] + sign * before[axis];+ const end = frame.center[axis] + offset[axis] + sign * after[axis];+ if (end < -1e-7 || end > source[axis] + 1e-7) {+ fraction = Math.min(+ fraction,+ clamp((clamp(end, 0, source[axis]) - start) / (end - start)),+ );+ }+ }+ }+ const blend = (a: number, b: number) => a + (b - a) * fraction;+ return {+ ...frame,+ size: [blend(frame.size[0], w), blend(frame.size[1], h)],+ center: [+ frame.center[0] + offset[0] * fraction,+ frame.center[1] + offset[1] * fraction,+ ],+ };}/** Magnify around the current source center only as much as coverage requires. */export function rotate(- frame: ImageFrame,- angle: number,- source: Point,+ frame: ImageFrame,+ angle: number,+ source: Point,): ImageFrame {- const next: ImageFrame = {- ...frame,- angle,- scale: [Math.sign(frame.scale[0]), Math.sign(frame.scale[1])],- };- const half = radius(next);- const scale = Math.min(- 1,- ...source.map(- (size, axis) =>- Math.min(frame.center[axis], size - frame.center[axis]) / half[axis],- ),- );- return { ...next, scale: [next.scale[0] * scale, next.scale[1] * scale] };+ const next: ImageFrame = {+ ...frame,+ angle,+ scale: [Math.sign(frame.scale[0]), Math.sign(frame.scale[1])],+ };+ const half = radius(next);+ const scale = Math.min(+ 1,+ ...source.map(+ (size, axis) =>+ Math.min(frame.center[axis], size - frame.center[axis]) / half[axis],+ ),+ );+ return { ...next, scale: [next.scale[0] * scale, next.scale[1] * scale] };}export function turn(frame: ImageFrame, direction: number): ImageFrame {- return {- ...frame,- rotation: (frame.rotation + direction * 90 + 360) % 360,- size: [frame.size[1], frame.size[0]],- scale: [frame.scale[1], frame.scale[0]],- };+ return {+ ...frame,+ rotation: (frame.rotation + direction * 90 + 360) % 360,+ size: [frame.size[1], frame.size[0]],+ scale: [frame.scale[1], frame.scale[0]],+ };}export function flip(frame: ImageFrame, axis: number): ImageFrame {- const [x, y] = frame.scale;- return { ...frame, scale: axis === 0 ? [-x, y] : [x, -y] };+ const [x, y] = frame.scale;+ return { ...frame, scale: axis === 0 ? [-x, y] : [x, -y] };}export function fitRatio(frame: ImageFrame, ratio: number): ImageFrame {- const width = Math.max(- 1,- ratio,- Math.min(frame.size[0], frame.size[1] * ratio),- );- // Keep one output pixel per axis without expanding source coverage.- const scale = Math.min(- 1,- frame.size[0] / width,- (frame.size[1] * ratio) / width,- );- return {- ...frame,- size: [width, width / ratio],- scale: [frame.scale[0] * scale, frame.scale[1] * scale],- };+ const width = Math.max(+ 1,+ ratio,+ Math.min(frame.size[0], frame.size[1] * ratio),+ );+ // Keep one output pixel per axis without expanding source coverage.+ const scale = Math.min(+ 1,+ frame.size[0] / width,+ (frame.size[1] * ratio) / width,+ );+ return {+ ...frame,+ size: [width, width / ratio],+ scale: [frame.scale[0] * scale, frame.scale[1] * scale],+ };}diff --git a/src/features/crop/overlay.tsx b/src/features/crop/overlay.tsxindex b0f039a..3b504ec 100644--- a/src/features/crop/overlay.tsx+++ b/src/features/crop/overlay.tsx@@ -6,157 +6,157 @@ import { clamp } from "@/lib/math";import { move, resize, rotate } from "./geometry";const handles = [- ["n", "top", 50, 0, "ns-resize"],- ["e", "right", 100, 50, "ew-resize"],- ["s", "bottom", 50, 100, "ns-resize"],- ["w", "left", 0, 50, "ew-resize"],- ["nw", "top left", 0, 0, "nwse-resize"],- ["ne", "top right", 100, 0, "nesw-resize"],- ["sw", "bottom left", 0, 100, "nesw-resize"],- ["se", "bottom right", 100, 100, "nwse-resize"],+ ["n", "top", 50, 0, "ns-resize"],+ ["e", "right", 100, 50, "ew-resize"],+ ["s", "bottom", 50, 100, "ns-resize"],+ ["w", "left", 0, 50, "ew-resize"],+ ["nw", "top left", 0, 0, "nwse-resize"],+ ["ne", "top right", 100, 0, "nesw-resize"],+ ["sw", "bottom left", 0, 100, "nesw-resize"],+ ["se", "bottom right", 100, 100, "nwse-resize"],] as const;const arrows: Record<string, Point> = {- ArrowLeft: [-1, 0],- ArrowRight: [1, 0],- ArrowUp: [0, -1],- ArrowDown: [0, 1],+ ArrowLeft: [-1, 0],+ ArrowRight: [1, 0],+ ArrowUp: [0, -1],+ ArrowDown: [0, 1],};export function CropOverlay({- frame,- source,- ratio,- onChange,+ frame,+ source,+ ratio,+ onChange,}: {- frame: ImageFrame;- source: Point;- ratio: number | null;- onChange: (frame: ImageFrame) => void;+ frame: ImageFrame;+ source: Point;+ ratio: number | null;+ onChange: (frame: ImageFrame) => void;}) {- const camera = useViewport();- const selection = useRef<HTMLDivElement>(null);- const style = {- width: frame.size[0] * camera.scale,- height: frame.size[1] * camera.scale,- marginLeft: camera.view.pan[0],- marginTop: camera.view.pan[1],- };- function hit(event: PointerEvent) {- const box = selection.current?.getBoundingClientRect();- if (!box || !(event.target instanceof Element)) {- return null;- }- const handle =- event.target.closest<HTMLElement>("[data-handle]")?.dataset.handle;- return { box, handle: handle ?? "rotate" };- }- function change(handle: string, dx: number, dy: number) {- onChange(- handle === "move"- ? move(frame, -dx, -dy, source)- : resize(frame, handle, dx * 2, dy * 2, ratio, source),- );- }- function start(event: PointerEvent<HTMLDivElement>) {- const target = hit(event);- if (event.button !== 0 || !event.isPrimary || !target?.handle) {- return;- }- const { handle, box } = target;- event.preventDefault();- event.stopPropagation();- const element = event.currentTarget;- element.setPointerCapture(event.pointerId);- if (event.target instanceof HTMLElement) {- event.target.closest("button")?.focus();- }- const { clientX: x, clientY: y, pointerId } = event;- const bearing = (px: number, py: number) =>- Math.atan2(py - box.y - box.height / 2, px - box.x - box.width / 2);- element.onpointermove = (pointer) => {- if (pointer.pointerId !== pointerId) {- return;- }- if (handle !== "rotate") {- change(- handle,- (pointer.clientX - x) / camera.scale,- (pointer.clientY - y) / camera.scale,- );- return;- }- const delta = bearing(pointer.clientX, pointer.clientY) - bearing(x, y);- const angle =- frame.angle +- (Math.atan2(Math.sin(delta), Math.cos(delta)) * 180) / Math.PI;- onChange(- rotate(frame, clamp(Math.round(angle * 10) / 10, -45, 45), source),- );- };- element.onlostpointercapture = () => {- element.onpointermove = null;- };- }- return (- <div- className="absolute -inset-6 touch-none"- onPointerDown={start}- onPointerMove={(event) => {- const target = hit(event);- if (target?.handle !== "rotate") {- event.currentTarget.style.cursor = "inherit";- return;- }- const { box } = target;- const angle = Math.atan2(- box.y + box.height / 2 - event.clientY,- box.x + box.width / 2 - event.clientX,- );- event.currentTarget.style.cursor = rotateCursor(- Math.round((angle * 180) / Math.PI),- );- }}- >- <div- ref={selection}- role="application"- 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"- onKeyDown={(event) => {- const delta = arrows[event.key];- if (!delta || !(event.target instanceof HTMLElement)) {- return;- }- event.preventDefault();- const step = event.shiftKey ? 0.05 : 0.005;- change(- event.target.dataset.handle ?? "move",- delta[0] * source[0] * step,- delta[1] * source[1] * step,- );- }}- >- <button- type="button"- aria-label="Move crop"- className="absolute inset-0 cursor-[inherit] focus-visible:outline-2 focus-visible:outline-white"- />+ const camera = useViewport();+ const selection = useRef<HTMLDivElement>(null);+ const style = {+ width: frame.size[0] * camera.scale,+ height: frame.size[1] * camera.scale,+ marginLeft: camera.view.pan[0],+ marginTop: camera.view.pan[1],+ };+ function hit(event: PointerEvent) {+ const box = selection.current?.getBoundingClientRect();+ if (!box || !(event.target instanceof Element)) {+ return null;+ }+ const handle =+ event.target.closest<HTMLElement>("[data-handle]")?.dataset.handle;+ return { box, handle: handle ?? "rotate" };+ }+ function change(handle: string, dx: number, dy: number) {+ onChange(+ handle === "move"+ ? move(frame, -dx, -dy, source)+ : resize(frame, handle, dx * 2, dy * 2, ratio, source),+ );+ }+ function start(event: PointerEvent<HTMLDivElement>) {+ const target = hit(event);+ if (event.button !== 0 || !event.isPrimary || !target?.handle) {+ return;+ }+ const { handle, box } = target;+ event.preventDefault();+ event.stopPropagation();+ const element = event.currentTarget;+ element.setPointerCapture(event.pointerId);+ if (event.target instanceof HTMLElement) {+ event.target.closest("button")?.focus();+ }+ const { clientX: x, clientY: y, pointerId } = event;+ const bearing = (px: number, py: number) =>+ Math.atan2(py - box.y - box.height / 2, px - box.x - box.width / 2);+ element.onpointermove = (pointer) => {+ if (pointer.pointerId !== pointerId) {+ return;+ }+ if (handle !== "rotate") {+ change(+ handle,+ (pointer.clientX - x) / camera.scale,+ (pointer.clientY - y) / camera.scale,+ );+ return;+ }+ const delta = bearing(pointer.clientX, pointer.clientY) - bearing(x, y);+ const angle =+ frame.angle ++ (Math.atan2(Math.sin(delta), Math.cos(delta)) * 180) / Math.PI;+ onChange(+ rotate(frame, clamp(Math.round(angle * 10) / 10, -45, 45), source),+ );+ };+ element.onlostpointercapture = () => {+ element.onpointermove = null;+ };+ }+ return (+ <div+ className="absolute -inset-6 touch-none"+ onPointerDown={start}+ onPointerMove={(event) => {+ const target = hit(event);+ if (target?.handle !== "rotate") {+ event.currentTarget.style.cursor = "inherit";+ return;+ }+ const { box } = target;+ const angle = Math.atan2(+ box.y + box.height / 2 - event.clientY,+ box.x + box.width / 2 - event.clientX,+ );+ event.currentTarget.style.cursor = rotateCursor(+ Math.round((angle * 180) / Math.PI),+ );+ }}+ >+ <div+ ref={selection}+ role="application"+ 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"+ onKeyDown={(event) => {+ const delta = arrows[event.key];+ if (!delta || !(event.target instanceof HTMLElement)) {+ return;+ }+ event.preventDefault();+ const step = event.shiftKey ? 0.05 : 0.005;+ change(+ event.target.dataset.handle ?? "move",+ delta[0] * source[0] * step,+ delta[1] * source[1] * step,+ );+ }}+ >+ <button+ type="button"+ aria-label="Move crop"+ className="absolute inset-0 cursor-[inherit] focus-visible:outline-2 focus-visible:outline-white"+ />- {handles.map(([handle, label, left, top, cursor]) => (- <button- key={handle}- type="button"- data-handle={handle}- aria-label={`Resize crop ${label}`}- 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" />- </button>- ))}- </div>- </div>- );+ {handles.map(([handle, label, left, top, cursor]) => (+ <button+ key={handle}+ type="button"+ data-handle={handle}+ aria-label={`Resize crop ${label}`}+ 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" />+ </button>+ ))}+ </div>+ </div>+ );}diff --git a/src/features/crop/view.tsx b/src/features/crop/view.tsxindex 65e125e..46219d1 100644--- a/src/features/crop/view.tsx+++ b/src/features/crop/view.tsx@@ -14,171 +14,171 @@ import { fitRatio, flip, rotate, turn } from "./geometry";import { CropOverlay } from "./overlay";const actions = [- { label: "Rotate counterclockwise", turn: -1, transform: "scaleX(-1)" },- { label: "Rotate clockwise", turn: 1, transform: "" },- { label: "Flip horizontal", flip: 0, transform: "" },- { label: "Flip vertical", flip: 1, transform: "rotate(90deg)" },+ { label: "Rotate counterclockwise", turn: -1, transform: "scaleX(-1)" },+ { label: "Rotate clockwise", turn: 1, transform: "" },+ { label: "Flip horizontal", flip: 0, transform: "" },+ { label: "Flip vertical", flip: 1, transform: "rotate(90deg)" },] as const;export function CropEditor({ onClose }: { onClose: () => void }) {- const document = useDocument();- const { camera } = useEditorSession();- const [frame, setFrame] = useState(() => document.scene.getState().frame);- const [reference, setReference] = useState(frame.size);- const [ratio, setRatio] = useState<number | null>(- frame.size[0] / frame.size[1],- );- const sourceId = document.scene.getState().layers[0].source;- const [width, height] = document.resources.get(sourceId).image.size;- const source: Point = [width, height];- function fitView() {- camera.setState(camera.getInitialState(), true);- }- function reset() {- setFrame(imageFrame(source));- setReference(source);- setRatio(source[0] / source[1]);- fitView();- }- function apply() {- document.history.commit();- document.edit({ ...document.scene.getState(), frame });- fitView();- onClose();- }- useShortcuts({ enter: apply, escape: onClose }, { inputs: true });- const original =- frame.rotation % 180 ? source[1] / source[0] : source[0] / source[1];- const ratios = {- Original: original,- Square: 1,- "4:3": 4 / 3,- "3:2": 3 / 2,- "16:9": 16 / 9,- "4:5": 4 / 5,- "9:16": 9 / 16,- "3:4": 3 / 4,- "2:3": 2 / 3,- "5:4": 5 / 4,- };- const custom = ratio !== null && !Object.values(ratios).includes(ratio);- function changeRatio(value: string) {- const ratio = Number(value) || null;- setRatio(ratio);- if (ratio) {- setFrame(fitRatio(frame, ratio));- }- }+ const document = useDocument();+ const { camera } = useEditorSession();+ const [frame, setFrame] = useState(() => document.scene.getState().frame);+ const [reference, setReference] = useState(frame.size);+ const [ratio, setRatio] = useState<number | null>(+ frame.size[0] / frame.size[1],+ );+ const sourceId = document.scene.getState().layers[0].source;+ const [width, height] = document.resources.get(sourceId).image.size;+ const source: Point = [width, height];+ function fitView() {+ camera.setState(camera.getInitialState(), true);+ }+ function reset() {+ setFrame(imageFrame(source));+ setReference(source);+ setRatio(source[0] / source[1]);+ fitView();+ }+ function apply() {+ document.history.commit();+ document.edit({ ...document.scene.getState(), frame });+ fitView();+ onClose();+ }+ useShortcuts({ enter: apply, escape: onClose }, { inputs: true });+ const original =+ frame.rotation % 180 ? source[1] / source[0] : source[0] / source[1];+ const ratios = {+ Original: original,+ Square: 1,+ "4:3": 4 / 3,+ "3:2": 3 / 2,+ "16:9": 16 / 9,+ "4:5": 4 / 5,+ "9:16": 9 / 16,+ "3:4": 3 / 4,+ "2:3": 2 / 3,+ "5:4": 5 / 4,+ };+ const custom = ratio !== null && !Object.values(ratios).includes(ratio);+ function changeRatio(value: string) {+ const ratio = Number(value) || null;+ setRatio(ratio);+ if (ratio) {+ setFrame(fitRatio(frame, ratio));+ }+ }- function applyAction(action: (typeof actions)[number]) {- if ("turn" in action) {- setFrame(turn(frame, action.turn));- setReference([reference[1], reference[0]]);- setRatio(ratio && 1 / ratio);- } else {- setFrame(flip(frame, action.flip));- }- }- return (- <>- <EditorViewport size={reference} constrain={false}>- <Image image="fullImage" geometry={frame} />- <CropOverlay- frame={frame}- source={source}- ratio={ratio}- onChange={setFrame}- />- </EditorViewport>- <EditorPanel- header={<PanelHeader title="Crop" onClose={onClose} />}- onKeyDown={(event) => {- // Enter on a panel button is its click; the crop handles still apply.- if (- event.key === "Enter" &&- event.target instanceof Element &&- event.target.closest("button")- ) {- event.stopPropagation();- }- }}- footer={- <div className="border-t border-black p-3">- <Button className="w-full py-2" onClick={apply}>- Apply crop- </Button>- </div>- }- >- <section aria-label="Crop tool" className="space-y-5 p-4">- <label className="flex items-center justify-between text-neutral-400">- Aspect ratio- <Field className="relative w-24">- <select- aria-label="Aspect ratio"- value={ratio ?? "free"}- className="w-full cursor-pointer bg-transparent px-1 text-neutral-100 outline-none [color-scheme:dark]"- onChange={(event) => changeRatio(event.currentTarget.value)}- >- <option value="free">Free</option>- {custom && <option value={ratio}>Current</option>}- {Object.entries(ratios).map(([label, value]) => (- <option key={label} value={value}>- {label}- </option>- ))}- </select>- </Field>- </label>- <section- 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>- <Button- variant="ghost"- className="justify-self-end px-2 py-1"- onClick={reset}- >- Reset- </Button>+ function applyAction(action: (typeof actions)[number]) {+ if ("turn" in action) {+ setFrame(turn(frame, action.turn));+ setReference([reference[1], reference[0]]);+ setRatio(ratio && 1 / ratio);+ } else {+ setFrame(flip(frame, action.flip));+ }+ }+ return (+ <>+ <EditorViewport size={reference} constrain={false}>+ <Image image="fullImage" geometry={frame} />+ <CropOverlay+ frame={frame}+ source={source}+ ratio={ratio}+ onChange={setFrame}+ />+ </EditorViewport>+ <EditorPanel+ header={<PanelHeader title="Crop" onClose={onClose} />}+ onKeyDown={(event) => {+ // Enter on a panel button is its click; the crop handles still apply.+ if (+ event.key === "Enter" &&+ event.target instanceof Element &&+ event.target.closest("button")+ ) {+ event.stopPropagation();+ }+ }}+ footer={+ <div className="border-t border-black p-3">+ <Button className="w-full py-2" onClick={apply}>+ Apply crop+ </Button>+ </div>+ }+ >+ <section aria-label="Crop tool" className="space-y-5 p-4">+ <label className="flex items-center justify-between text-neutral-400">+ Aspect ratio+ <Field className="relative w-24">+ <select+ aria-label="Aspect ratio"+ value={ratio ?? "free"}+ className="w-full cursor-pointer bg-transparent px-1 text-neutral-100 outline-none [color-scheme:dark]"+ onChange={(event) => changeRatio(event.currentTarget.value)}+ >+ <option value="free">Free</option>+ {custom && <option value={ratio}>Current</option>}+ {Object.entries(ratios).map(([label, value]) => (+ <option key={label} value={value}>+ {label}+ </option>+ ))}+ </select>+ </Field>+ </label>+ <section+ 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>+ <Button+ variant="ghost"+ className="justify-self-end px-2 py-1"+ onClick={reset}+ >+ Reset+ </Button>- {actions.map((action) => {- const Icon = "turn" in action ? RotateIcon : FlipIcon;+ {actions.map((action) => {+ const Icon = "turn" in action ? RotateIcon : FlipIcon;- return (- <Button- key={action.label}- variant="ghost"- aria-label={action.label}- title={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>- );- })}- </section>- <Slider- label="Rotation"- min={-45}- max={45}- step={0.1}- value={frame.angle}- defaultValue={0}- onChange={(angle) => setFrame(rotate(frame, angle, source))}- />- <p className="text-neutral-500">- 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">- {frame.size.map(Math.round).join(" × ")} px- </p>- </section>- </EditorPanel>- </>- );+ return (+ <Button+ key={action.label}+ variant="ghost"+ aria-label={action.label}+ title={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>+ );+ })}+ </section>+ <Slider+ label="Rotation"+ min={-45}+ max={45}+ step={0.1}+ value={frame.angle}+ defaultValue={0}+ onChange={(angle) => setFrame(rotate(frame, angle, source))}+ />+ <p className="text-neutral-500">+ 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">+ {frame.size.map(Math.round).join(" × ")} px+ </p>+ </section>+ </EditorPanel>+ </>+ );}diff --git a/src/features/details/controls.tsx b/src/features/details/controls.tsxindex c686b6a..49d3477 100644--- a/src/features/details/controls.tsx+++ b/src/features/details/controls.tsx@@ -5,32 +5,32 @@ import { setDetails } from "./edits";import { defaultDetails, detailLimits } from "./model";export function DetailsControls({- id,- details,+ id,+ details,}: {- id: string;- details: Readonly<Details>;+ id: string;+ details: Readonly<Details>;}) {- const document = useDocument();- const controls = [- ["clarity", "Clarity", 1],- ["sharpening", "Sharpening", 1],- ["sharpenRadius", "Radius", 0.1],- ] as const;- return (- <section className="flex flex-col gap-2 p-3">- {controls.map(([name, label, step]) => (- <Slider- key={name}- label={label}- value={details[name]}- min={detailLimits[name][0]}- max={detailLimits[name][1]}- step={step}- defaultValue={defaultDetails[name]}- onChange={(value) => setDetails(document, { [name]: value }, id)}- />- ))}- </section>- );+ const document = useDocument();+ const controls = [+ ["clarity", "Clarity", 1],+ ["sharpening", "Sharpening", 1],+ ["sharpenRadius", "Radius", 0.1],+ ] as const;+ return (+ <section className="flex flex-col gap-2 p-3">+ {controls.map(([name, label, step]) => (+ <Slider+ key={name}+ label={label}+ value={details[name]}+ min={detailLimits[name][0]}+ max={detailLimits[name][1]}+ step={step}+ defaultValue={defaultDetails[name]}+ onChange={(value) => setDetails(document, { [name]: value }, id)}+ />+ ))}+ </section>+ );}diff --git a/src/features/details/edits.ts b/src/features/details/edits.tsindex d12f685..0f3dc0a 100644--- a/src/features/details/edits.ts+++ b/src/features/details/edits.ts@@ -2,15 +2,15 @@ import { type Details, type EditorDocument, editLayer } from "@/core/document";import { validateDetails } from "./model";export function setDetails(- document: EditorDocument,- change: Partial<Details>,- id: string,+ document: EditorDocument,+ change: Partial<Details>,+ id: string,) {- validateDetails(change);- editLayer(document, id, (layer) => {- if (layer.kind !== "details") {- throw Error("Select a Details layer.");- }- return { ...layer, details: { ...layer.details, ...change } };- });+ validateDetails(change);+ editLayer(document, id, (layer) => {+ if (layer.kind !== "details") {+ throw Error("Select a Details layer.");+ }+ return { ...layer, details: { ...layer.details, ...change } };+ });}diff --git a/src/features/details/model.ts b/src/features/details/model.tsindex 46f3611..99c99fb 100644--- a/src/features/details/model.ts+++ b/src/features/details/model.ts@@ -1,27 +1,27 @@import type { Details } from "@/core/document";export const defaultDetails: Details = {- clarity: 0,- sharpening: 0,- sharpenRadius: 1,+ clarity: 0,+ sharpening: 0,+ sharpenRadius: 1,};export const detailLimits = {- clarity: [-100, 100],- sharpening: [0, 150],- sharpenRadius: [0.5, 3],+ clarity: [-100, 100],+ sharpening: [0, 150],+ sharpenRadius: [0.5, 3],} as const;export function validateDetails(change: Partial<Details>) {- for (const [name, value] of Object.entries(change)) {- const limits = Reflect.get(detailLimits, name);- if (- !Array.isArray(limits) ||- typeof value !== "number" ||- !Number.isFinite(value) ||- value < limits[0] ||- value > limits[1]- ) {- throw Error(`Invalid detail adjustment: ${name}.`);- }- }+ for (const [name, value] of Object.entries(change)) {+ const limits = Reflect.get(detailLimits, name);+ if (+ !Array.isArray(limits) ||+ typeof value !== "number" ||+ !Number.isFinite(value) ||+ value < limits[0] ||+ value > limits[1]+ ) {+ throw Error(`Invalid detail adjustment: ${name}.`);+ }+ }}diff --git a/src/features/details/unsharp-mask.ts b/src/features/details/unsharp-mask.tsindex f6b7888..df5dc79 100644--- a/src/features/details/unsharp-mask.ts+++ b/src/features/details/unsharp-mask.ts@@ -3,45 +3,45 @@ import shader from "./unsharp-mask.wgsl";/** Builds a separable luminance blur and combines it with the unchanged input. */export function unsharpMask(- name: string,- amount: number,- radius: number,- reduction = 1,+ name: string,+ amount: number,+ radius: number,+ reduction = 1,) {- if (amount === 0) {- return;- }- return (image: RenderImage) => {- const size: [number, number] = [- Math.ceil(image.size[0] / reduction),- Math.ceil(image.size[1] / reduction),- ];- const samplers = {- linearSampler: { minFilter: "linear", magFilter: "linear" },- } as const;- const params = { reduction, amount, sigma: radius / reduction };- function blur(label: string, mode: number) {- const pass = node(`${name}/${label}`, shader, {- size,- samplers,- set: { params: { ...params, mode } },- });- return (source: RenderImage) => merge({ source, base: source }, pass);- }- const [original, blurred] = split(image, [- [],- [- reduction === 1 ? undefined : blur("reduce", 0),- blur("horizontal", 1),- blur("vertical", 2),- ],- ]);- return merge(- { source: original, base: blurred },- node(name, shader, {- samplers,- set: { params: { ...params, mode: 3 } },- }),- );- };+ if (amount === 0) {+ return;+ }+ return (image: RenderImage) => {+ const size: [number, number] = [+ Math.ceil(image.size[0] / reduction),+ Math.ceil(image.size[1] / reduction),+ ];+ const samplers = {+ linearSampler: { minFilter: "linear", magFilter: "linear" },+ } as const;+ const params = { reduction, amount, sigma: radius / reduction };+ function blur(label: string, mode: number) {+ const pass = node(`${name}/${label}`, shader, {+ size,+ samplers,+ set: { params: { ...params, mode } },+ });+ return (source: RenderImage) => merge({ source, base: source }, pass);+ }+ const [original, blurred] = split(image, [+ [],+ [+ reduction === 1 ? undefined : blur("reduce", 0),+ blur("horizontal", 1),+ blur("vertical", 2),+ ],+ ]);+ return merge(+ { source: original, base: blurred },+ node(name, shader, {+ samplers,+ set: { params: { ...params, mode: 3 } },+ }),+ );+ };}diff --git a/src/features/histogram/histogram.ts b/src/features/histogram/histogram.tsindex 6db9c13..d02a3d8 100644--- a/src/features/histogram/histogram.ts+++ b/src/features/histogram/histogram.ts@@ -2,100 +2,100 @@ import { compute, type Gpu, type Target } from "vgpu";import shader from "./histogram.wgsl";export function createHistogram(gpu: Gpu) {- const bins = gpu.device.createBuffer({- size: 3072,- usage: ["storage", "copy_dst"],- });- const heights = gpu.device.createBuffer({- size: 3072,- usage: ["storage", "copy_src"],- });- const count = compute(gpu, shader, { entry: "count", set: { bins } });- const finish = compute(gpu, shader, {- entry: "finish",- set: { bins, heights },- });- const empty = new Uint32Array(768);- async function read(image: Target, working = false, channels: 1 | 3 = 3) {- const params = { working: Number(working), channels };- bins.write(empty);- count.set({ source: image.color, params }).dispatch(32, 20);- finish.set({ params }).dispatch(1);- return new Float32Array(await heights.read(channels * 1024));- }- return {- read,- attach(- svg: SVGSVGElement,- image: () => Target | undefined,- colors: readonly [string] | readonly [string, string, string],- working = false,- ) {- const namespace = "http://www.w3.org/2000/svg";- const plot = document.createElementNS(namespace, "g");- const curves = colors.map((color) => {- const polygon = document.createElementNS(namespace, "polygon");- const polyline = document.createElementNS(namespace, "polyline");- polygon.setAttribute("fill", color);- polygon.setAttribute("stroke", "none");- polyline.setAttribute("fill", "none");- polyline.setAttribute("stroke", color);- polyline.setAttribute("vector-effect", "non-scaling-stroke");- plot.append(polygon, polyline);- return { polygon, polyline };- });- svg.append(plot);- let pending = false;- let requested = false;- async function update() {- requested = true;- if (pending) {- return;- }- pending = true;- try {- do {- requested = false;- const source = image();- if (!source) {- for (const { polygon, polyline } of curves) {- polygon.setAttribute("points", "");- polyline.setAttribute("points", "");- }- return;- }- const values = await read(source, working, colors.length);- if (!plot.isConnected) {- return;- }- if (requested) {- continue;- }- curves.forEach(({ polygon, polyline }, channel) => {- const points = Array.from(- values.subarray(channel * 256, (channel + 1) * 256),- (y, x) => `${x},${y.toFixed(1)}`,- ).join(" ");- polygon.setAttribute("points", `0,100 ${points} 255,100`);- polyline.setAttribute("points", points);- });- } while (requested);- } catch (error) {- if (plot.isConnected) {- console.error(error);- }- } finally {- pending = false;- }- }- return {- update,- dispose: () => plot.remove(),- };- },- dispose() {- bins.dispose();- heights.dispose();- },- };+ const bins = gpu.device.createBuffer({+ size: 3072,+ usage: ["storage", "copy_dst"],+ });+ const heights = gpu.device.createBuffer({+ size: 3072,+ usage: ["storage", "copy_src"],+ });+ const count = compute(gpu, shader, { entry: "count", set: { bins } });+ const finish = compute(gpu, shader, {+ entry: "finish",+ set: { bins, heights },+ });+ const empty = new Uint32Array(768);+ async function read(image: Target, working = false, channels: 1 | 3 = 3) {+ const params = { working: Number(working), channels };+ bins.write(empty);+ count.set({ source: image.color, params }).dispatch(32, 20);+ finish.set({ params }).dispatch(1);+ return new Float32Array(await heights.read(channels * 1024));+ }+ return {+ read,+ attach(+ svg: SVGSVGElement,+ image: () => Target | undefined,+ colors: readonly [string] | readonly [string, string, string],+ working = false,+ ) {+ const namespace = "http://www.w3.org/2000/svg";+ const plot = document.createElementNS(namespace, "g");+ const curves = colors.map((color) => {+ const polygon = document.createElementNS(namespace, "polygon");+ const polyline = document.createElementNS(namespace, "polyline");+ polygon.setAttribute("fill", color);+ polygon.setAttribute("stroke", "none");+ polyline.setAttribute("fill", "none");+ polyline.setAttribute("stroke", color);+ polyline.setAttribute("vector-effect", "non-scaling-stroke");+ plot.append(polygon, polyline);+ return { polygon, polyline };+ });+ svg.append(plot);+ let pending = false;+ let requested = false;+ async function update() {+ requested = true;+ if (pending) {+ return;+ }+ pending = true;+ try {+ do {+ requested = false;+ const source = image();+ if (!source) {+ for (const { polygon, polyline } of curves) {+ polygon.setAttribute("points", "");+ polyline.setAttribute("points", "");+ }+ return;+ }+ const values = await read(source, working, colors.length);+ if (!plot.isConnected) {+ return;+ }+ if (requested) {+ continue;+ }+ curves.forEach(({ polygon, polyline }, channel) => {+ const points = Array.from(+ values.subarray(channel * 256, (channel + 1) * 256),+ (y, x) => `${x},${y.toFixed(1)}`,+ ).join(" ");+ polygon.setAttribute("points", `0,100 ${points} 255,100`);+ polyline.setAttribute("points", points);+ });+ } while (requested);+ } catch (error) {+ if (plot.isConnected) {+ console.error(error);+ }+ } finally {+ pending = false;+ }+ }+ return {+ update,+ dispose: () => plot.remove(),+ };+ },+ dispose() {+ bins.dispose();+ heights.dispose();+ },+ };}diff --git a/src/features/histogram/index.tsx b/src/features/histogram/index.tsxindex 3269637..a6388c9 100644--- a/src/features/histogram/index.tsx+++ b/src/features/histogram/index.tsx@@ -3,42 +3,42 @@ import type { Target } from "vgpu";import type { createHistogram } from "./histogram";type Props = ComponentProps<"svg"> & {- histogram: ReturnType<typeof createHistogram>;- image: () => Target | undefined;- subscribe: (listener: () => void) => () => void;- colors: readonly [string] | readonly [string, string, string];- working?: boolean;+ histogram: ReturnType<typeof createHistogram>;+ image: () => Target | undefined;+ subscribe: (listener: () => void) => () => void;+ colors: readonly [string] | readonly [string, string, string];+ working?: boolean;};export function Histogram({- histogram,- image,- subscribe,- colors,- working,- ...props+ histogram,+ image,+ subscribe,+ colors,+ working,+ ...props}: Props) {- const attach = useCallback(- (svg: SVGSVGElement | null) => {- if (svg) {- const plot = histogram.attach(svg, image, colors, working);- plot.update();- const unsubscribe = subscribe(plot.update);- return () => {- unsubscribe();- plot.dispose();- };- }- },- [histogram, image, subscribe, colors, working],- );- return (- <svg- ref={attach}- aria-label="Histogram"- viewBox="0 0 255 100"- preserveAspectRatio="none"- {...props}- />- );+ const attach = useCallback(+ (svg: SVGSVGElement | null) => {+ if (svg) {+ const plot = histogram.attach(svg, image, colors, working);+ plot.update();+ const unsubscribe = subscribe(plot.update);+ return () => {+ unsubscribe();+ plot.dispose();+ };+ }+ },+ [histogram, image, subscribe, colors, working],+ );+ return (+ <svg+ ref={attach}+ aria-label="Histogram"+ viewBox="0 0 255 100"+ preserveAspectRatio="none"+ {...props}+ />+ );}diff --git a/src/features/layers/controls.tsx b/src/features/layers/controls.tsxindex 990dc07..7852ad6 100644--- a/src/features/layers/controls.tsx+++ b/src/features/layers/controls.tsx@@ -1,9 +1,9 @@import {- type ComponentProps,- memo,- useCallback,- useEffect,- useState,+ type ComponentProps,+ memo,+ useCallback,+ useEffect,+ useState,} from "react";import { useStore } from "zustand";import { PanelHeader } from "@/components/editor/panel";@@ -11,15 +11,15 @@ import { useDocument, useScene } from "@/components/editor/session";import { Icon } from "@/components/icons/icon";import { ScrollArea } from "@/components/ui/scroll-area";import {- TreeDrag,- type TreeDrop,- useTreeDragItem,+ TreeDrag,+ type TreeDrop,+ useTreeDragItem,} from "@/components/ui/tree-drag";import {- type EffectLayer,- findLayer,- type Layer,- type ProcessingLayer,+ type EffectLayer,+ findLayer,+ type Layer,+ type ProcessingLayer,} from "@/core/document";import { layerDrop } from "./drop";import { moveLayer, setLayer } from "./edits";@@ -28,327 +28,327 @@ import { LayerActions, LayerMenu } from "./menu";import { ImageThumbnail, MaskThumbnail } from "./thumbnails";function EffectSymbol({ kind }: { kind: ProcessingLayer["kind"] }) {- switch (kind) {- case "color-mixer":- return (- <>- <circle cx="9" cy="9" r="5" />- <circle cx="15" cy="9" r="5" />- <circle cx="12" cy="15" r="5" />- </>- );- case "details":- return <path d="m4 18 8-14 8 14H4Zm8-8v6" />;- case "vignette":- return (- <>- <circle cx="12" cy="12" r="8" />- <circle cx="12" cy="12" r="3" />- </>- );- default:- return (- <>- <circle cx="12" cy="12" r="8" />- <path d="M12 4a8 8 0 0 1 0 16Z" fill="currentColor" stroke="none" />- </>- );- }+ switch (kind) {+ case "color-mixer":+ return (+ <>+ <circle cx="9" cy="9" r="5" />+ <circle cx="15" cy="9" r="5" />+ <circle cx="12" cy="15" r="5" />+ </>+ );+ case "details":+ return <path d="m4 18 8-14 8 14H4Zm8-8v6" />;+ case "vignette":+ return (+ <>+ <circle cx="12" cy="12" r="8" />+ <circle cx="12" cy="12" r="3" />+ </>+ );+ default:+ return (+ <>+ <circle cx="12" cy="12" r="8" />+ <path d="M12 4a8 8 0 0 1 0 16Z" fill="currentColor" stroke="none" />+ </>+ );+ }}function LayerThumbnail({ layer }: { layer: Layer }) {- if (layer.kind === "image") {- return <ImageThumbnail />;- }- if (layer.kind === "mask") {- 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">- <Icon className="size-4">- <EffectSymbol kind={layer.kind} />- </Icon>- </span>- );+ if (layer.kind === "image") {+ return <ImageThumbnail />;+ }+ if (layer.kind === "mask") {+ 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">+ <Icon className="size-4">+ <EffectSymbol kind={layer.kind} />+ </Icon>+ </span>+ );}function LayerName({- layer,- onSelect,- dragHandle,+ layer,+ onSelect,+ dragHandle,}: {- layer: Layer;- onSelect: () => void;- dragHandle: ComponentProps<"button">;+ layer: Layer;+ onSelect: () => void;+ dragHandle: ComponentProps<"button">;}) {- const document = useDocument();- const [renaming, setRenaming] = useState(false);- if (renaming) {- return (- <input- 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"- onKeyDown={(event) => {- if (event.key === "Enter") {- event.currentTarget.blur();- }- if (event.key === "Escape") {- event.currentTarget.value = layer.name;- event.currentTarget.blur();- }- }}- onBlur={(event) => {- const name = event.currentTarget.value.trim();- if (name && name !== layer.name) {- setLayer(document, layer.id, { name });- }- setRenaming(false);- }}- />- );- }- function rename() {- if (layer.kind !== "image") {- setRenaming(true);- }- }- return (- <button- {...dragHandle}- type="button"- aria-label={layer.name}- title={layer.name}- onClick={onSelect}- onDoubleClick={rename}- className="min-w-0 flex-1 self-stretch truncate text-left touch-manipulation cursor-grab active:cursor-grabbing"- >- {layer.name}- </button>- );+ const document = useDocument();+ const [renaming, setRenaming] = useState(false);+ if (renaming) {+ return (+ <input+ 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"+ onKeyDown={(event) => {+ if (event.key === "Enter") {+ event.currentTarget.blur();+ }+ if (event.key === "Escape") {+ event.currentTarget.value = layer.name;+ event.currentTarget.blur();+ }+ }}+ onBlur={(event) => {+ const name = event.currentTarget.value.trim();+ if (name && name !== layer.name) {+ setLayer(document, layer.id, { name });+ }+ setRenaming(false);+ }}+ />+ );+ }+ function rename() {+ if (layer.kind !== "image") {+ setRenaming(true);+ }+ }+ return (+ <button+ {...dragHandle}+ type="button"+ aria-label={layer.name}+ title={layer.name}+ onClick={onSelect}+ onDoubleClick={rename}+ className="min-w-0 flex-1 self-stretch truncate text-left touch-manipulation cursor-grab active:cursor-grabbing"+ >+ {layer.name}+ </button>+ );}/** Rows subscribe to selection themselves, so unchanged branches skip when a sibling edits. */const LayerRow = memo(function LayerRow({- layer,- parent,- depth,- onSelect,+ layer,+ parent,+ depth,+ onSelect,}: {- layer: Layer;- parent?: Layer;- depth: number;- onSelect: (id: string) => void;+ layer: Layer;+ parent?: Layer;+ depth: number;+ 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;- useEffect(() => {- if (findLayer(layer.children, selected)) {- setCollapsed(false);- }- }, [layer.children, selected]);- const expanded = !collapsed;- const drag = useTreeDragItem(layer.id, {- disabled: isImage,- expanded: expanded && layer.children.length > 0,- });- const dragHandle = isImage ? {} : drag.handle;- const chevronStyle = { transform: expanded ? "rotate(90deg)" : undefined };- const isSubmask = layer.kind === "mask" && parent?.kind === "mask";- const maskSign =- layer.kind === "mask" && layer.operation === "subtract" ? "−" : "+";- const expandLabel = `${expanded ? "Collapse" : "Expand"} ${layer.name}`;- return (- <>- <div- ref={drag.ref}- data-drop={drag.drop}- data-dragging={drag.dragging}- data-selected={selected === layer.id}- data-hidden={!visible}- style={{ paddingLeft: depth * 12 }}- className="group relative flex h-10 items-center border-b border-black/50 pr-1 text-neutral-300 pointer-coarse:h-12 data-[selected=false]:hover:bg-white/5 data-[selected=true]:bg-neutral-700 data-[hidden=true]:text-neutral-500 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"- >- <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>- <button- type="button"- aria-label={`Select ${layer.name}`}- onClick={() => onSelect(layer.id)}- className="mr-2 shrink-0"- >- <LayerThumbnail layer={layer} />- </button>- <LayerName- layer={layer}- onSelect={() => onSelect(layer.id)}- dragHandle={dragHandle}- />- {isSubmask && (- <span- title={layer.operation}- className="grid size-6 shrink-0 place-items-center text-neutral-500"- >- {maskSign}- </span>- )}- {layer.children.length > 0 && (- <button- type="button"- 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"- >- <Icon className="size-3 transition-transform" style={chevronStyle}>- <path d="m9 5 7 7-7 7" />- </Icon>- </button>- )}- {layer.kind === "image" && (- <span- title="Base image is locked"- 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>- )}- {layer.kind !== "image" && (- <LayerActions layer={layer} onSelect={onSelect} />- )}- </div>- {expanded &&- layer.children- .toReversed()- .map((child) => (- <LayerRow- key={child.id}- layer={child}- parent={layer}- depth={depth + 1}- onSelect={onSelect}- />- ))}- </>- );+ 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;+ useEffect(() => {+ if (findLayer(layer.children, selected)) {+ setCollapsed(false);+ }+ }, [layer.children, selected]);+ const expanded = !collapsed;+ const drag = useTreeDragItem(layer.id, {+ disabled: isImage,+ expanded: expanded && layer.children.length > 0,+ });+ const dragHandle = isImage ? {} : drag.handle;+ const chevronStyle = { transform: expanded ? "rotate(90deg)" : undefined };+ const isSubmask = layer.kind === "mask" && parent?.kind === "mask";+ const maskSign =+ layer.kind === "mask" && layer.operation === "subtract" ? "−" : "+";+ const expandLabel = `${expanded ? "Collapse" : "Expand"} ${layer.name}`;+ return (+ <>+ <div+ ref={drag.ref}+ data-drop={drag.drop}+ data-dragging={drag.dragging}+ data-selected={selected === layer.id}+ data-hidden={!visible}+ style={{ paddingLeft: depth * 12 }}+ className="group relative flex h-10 items-center border-b border-black/50 pr-1 text-neutral-300 pointer-coarse:h-12 data-[selected=false]:hover:bg-white/5 data-[selected=true]:bg-neutral-700 data-[hidden=true]:text-neutral-500 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"+ >+ <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>+ <button+ type="button"+ aria-label={`Select ${layer.name}`}+ onClick={() => onSelect(layer.id)}+ className="mr-2 shrink-0"+ >+ <LayerThumbnail layer={layer} />+ </button>+ <LayerName+ layer={layer}+ onSelect={() => onSelect(layer.id)}+ dragHandle={dragHandle}+ />+ {isSubmask && (+ <span+ title={layer.operation}+ className="grid size-6 shrink-0 place-items-center text-neutral-500"+ >+ {maskSign}+ </span>+ )}+ {layer.children.length > 0 && (+ <button+ type="button"+ 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"+ >+ <Icon className="size-3 transition-transform" style={chevronStyle}>+ <path d="m9 5 7 7-7 7" />+ </Icon>+ </button>+ )}+ {layer.kind === "image" && (+ <span+ title="Base image is locked"+ 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>+ )}+ {layer.kind !== "image" && (+ <LayerActions layer={layer} onSelect={onSelect} />+ )}+ </div>+ {expanded &&+ layer.children+ .toReversed()+ .map((child) => (+ <LayerRow+ key={child.id}+ layer={child}+ parent={layer}+ depth={depth + 1}+ onSelect={onSelect}+ />+ ))}+ </>+ );});export function LayersControls({- onAdd,+ onAdd,}: {- onAdd: (kind: EffectLayer["kind"]) => void;+ onAdd: (kind: EffectLayer["kind"]) => void;}) {- const document = useDocument();- const layers = useScene((scene) => scene.layers);- const tool = useGradientTool();- 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) {- moveLayer(document, target.id, position.index, position.parentId);- select(target.id);- }- }+ const document = useDocument();+ const layers = useScene((scene) => scene.layers);+ const tool = useGradientTool();+ 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) {+ moveLayer(document, target.id, position.index, position.parentId);+ select(target.id);+ }+ }- return (- <section- aria-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"- >- <PanelHeader title="Layers">- <button- type="button"- aria-label="Add linear mask"- title="Draw a linear mask (L)"- onClick={() => tool.draw()}- className="grid size-7 place-items-center rounded-md text-neutral-400 hover:bg-neutral-700 hover:text-neutral-100 pointer-coarse:size-10"- >- <Icon className="size-4">- <rect x="4" y="4" width="16" height="16" rx="2" />- <circle cx="12" cy="12" r="4" fill="currentColor" stroke="none" />- </Icon>- </button>- <button- type="button"- aria-label="Add radial mask"- title="Draw a radial mask (R)"- onClick={() => tool.draw("radial")}- className="grid size-7 place-items-center rounded-md text-neutral-400 hover:bg-neutral-700 hover:text-neutral-100 pointer-coarse:size-10"- >- <Icon className="size-4">- <ellipse cx="12" cy="12" rx="9" ry="6" />- <circle cx="12" cy="12" r="2" fill="currentColor" stroke="none" />- </Icon>- </button>- <LayerMenu- label="Add effect"- icon={- <Icon className="size-4">- <path d="M12 4v16M4 12h16" />- </Icon>- }- >- <button type="submit" onClick={() => onAdd("details")}>- Details- </button>- <button type="submit" onClick={() => onAdd("exposure")}>- Exposure- </button>- <button type="submit" onClick={() => onAdd("color-mixer")}>- Color Mixer- </button>- <button type="submit" onClick={() => onAdd("vignette")}>- Vignette- </button>- </LayerMenu>- </PanelHeader>- <ScrollArea fade>- <TreeDrag- canDrop={(target) =>- Boolean(layerDrop(document.scene.getState(), target))- }- onDrop={drop}- label={(id) => findLayer(layers, id)?.name ?? id}- >- {layers.toReversed().map((layer) => (- <LayerRow- key={layer.id}- layer={layer}- depth={0}- onSelect={select}- />- ))}- </TreeDrag>- </ScrollArea>- </section>- );+ return (+ <section+ aria-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"+ >+ <PanelHeader title="Layers">+ <button+ type="button"+ aria-label="Add linear mask"+ title="Draw a linear mask (L)"+ onClick={() => tool.draw()}+ className="grid size-7 place-items-center rounded-md text-neutral-400 hover:bg-neutral-700 hover:text-neutral-100 pointer-coarse:size-10"+ >+ <Icon className="size-4">+ <rect x="4" y="4" width="16" height="16" rx="2" />+ <circle cx="12" cy="12" r="4" fill="currentColor" stroke="none" />+ </Icon>+ </button>+ <button+ type="button"+ aria-label="Add radial mask"+ title="Draw a radial mask (R)"+ onClick={() => tool.draw("radial")}+ className="grid size-7 place-items-center rounded-md text-neutral-400 hover:bg-neutral-700 hover:text-neutral-100 pointer-coarse:size-10"+ >+ <Icon className="size-4">+ <ellipse cx="12" cy="12" rx="9" ry="6" />+ <circle cx="12" cy="12" r="2" fill="currentColor" stroke="none" />+ </Icon>+ </button>+ <LayerMenu+ label="Add effect"+ icon={+ <Icon className="size-4">+ <path d="M12 4v16M4 12h16" />+ </Icon>+ }+ >+ <button type="submit" onClick={() => onAdd("details")}>+ Details+ </button>+ <button type="submit" onClick={() => onAdd("exposure")}>+ Exposure+ </button>+ <button type="submit" onClick={() => onAdd("color-mixer")}>+ Color Mixer+ </button>+ <button type="submit" onClick={() => onAdd("vignette")}>+ Vignette+ </button>+ </LayerMenu>+ </PanelHeader>+ <ScrollArea fade>+ <TreeDrag+ canDrop={(target) =>+ Boolean(layerDrop(document.scene.getState(), target))+ }+ onDrop={drop}+ label={(id) => findLayer(layers, id)?.name ?? id}+ >+ {layers.toReversed().map((layer) => (+ <LayerRow+ key={layer.id}+ layer={layer}+ depth={0}+ onSelect={select}+ />+ ))}+ </TreeDrag>+ </ScrollArea>+ </section>+ );}diff --git a/src/features/layers/drop.ts b/src/features/layers/drop.tsindex 9af8828..073ef25 100644--- a/src/features/layers/drop.ts+++ b/src/features/layers/drop.ts@@ -1,50 +1,50 @@import { findLayer, locateLayer, type Scene } from "@/core/document";export type LayerDrop = {- id: string;- target: string;- position: "before" | "after" | "inside";+ id: string;+ target: string;+ position: "before" | "after" | "inside";};/** Resolve visual top-to-bottom placement into the document's bottom-to-top sibling index. */export function layerDrop(- scene: Scene,- drop: LayerDrop,+ scene: Scene,+ drop: LayerDrop,): { index: number; parentId?: string } | undefined {- const source = findLayer(scene.layers, drop.id);- const location = locateLayer(scene.layers, drop.target);- if (- !source ||- source.kind === "image" ||- !location ||- findLayer([source], location.layer.id)- ) {- return;- }- const target = location.layer;- if (drop.position === "inside") {- if (- source.children.length ||- target.kind === "image" ||- !scene.layers.includes(target)- ) {- return;- }- return {- parentId: target.id,- index: target.children.filter((item) => item.id !== source.id).length,- };- }- const { siblings, parent } = location;- if (parent && source.children.length) {- return;- }- const remaining = siblings.filter((item) => item.id !== source.id);- const index =- remaining.findIndex((item) => item.id === target.id) +- Number(drop.position === "before");- if (!parent && index === 0) {- return;- }- return { parentId: parent?.id, index };+ const source = findLayer(scene.layers, drop.id);+ const location = locateLayer(scene.layers, drop.target);+ if (+ !source ||+ source.kind === "image" ||+ !location ||+ findLayer([source], location.layer.id)+ ) {+ return;+ }+ const target = location.layer;+ if (drop.position === "inside") {+ if (+ source.children.length ||+ target.kind === "image" ||+ !scene.layers.includes(target)+ ) {+ return;+ }+ return {+ parentId: target.id,+ index: target.children.filter((item) => item.id !== source.id).length,+ };+ }+ const { siblings, parent } = location;+ if (parent && source.children.length) {+ return;+ }+ const remaining = siblings.filter((item) => item.id !== source.id);+ const index =+ remaining.findIndex((item) => item.id === target.id) ++ Number(drop.position === "before");+ if (!parent && index === 0) {+ return;+ }+ return { parentId: parent?.id, index };}diff --git a/src/features/layers/edits.ts b/src/features/layers/edits.tsindex 26b830a..82b8f24 100644--- a/src/features/layers/edits.ts+++ b/src/features/layers/edits.ts@@ -1,266 +1,266 @@import {- type EditorDocument,- editLayer,- findLayer,- type Gradient,- type Layer,- locateLayer,- type ProcessingLayer,- type Scene,- updateLayer,- walkLayers,+ type EditorDocument,+ editLayer,+ findLayer,+ type Gradient,+ type Layer,+ locateLayer,+ type ProcessingLayer,+ type Scene,+ updateLayer,+ walkLayers,} from "@/core/document";function validateMask(mask: Gradient) {- if (mask.kind === "radial") {- if (- mask.center.length !== 2 ||- mask.radius.length !== 2 ||- ![...mask.center, ...mask.radius, mask.angle, mask.feather].every(- Number.isFinite,- ) ||- mask.radius.some((value) => value <= 0) ||- mask.feather < 0 ||- mask.feather > 1- ) {- throw Error(- "A radial gradient needs positive radii, finite geometry, and feather from 0 to 1.",- );- }- return;- }- if (- mask.kind !== "linear" ||- mask.start.length !== 2 ||- mask.end.length !== 2 ||- ![...mask.start, ...mask.end].every(Number.isFinite) ||- (mask.start[0] === mask.end[0] && mask.start[1] === mask.end[1])- ) {- throw Error("A gradient needs two distinct finite points.");- }+ if (mask.kind === "radial") {+ if (+ mask.center.length !== 2 ||+ mask.radius.length !== 2 ||+ ![...mask.center, ...mask.radius, mask.angle, mask.feather].every(+ Number.isFinite,+ ) ||+ mask.radius.some((value) => value <= 0) ||+ mask.feather < 0 ||+ mask.feather > 1+ ) {+ throw Error(+ "A radial gradient needs positive radii, finite geometry, and feather from 0 to 1.",+ );+ }+ return;+ }+ if (+ mask.kind !== "linear" ||+ mask.start.length !== 2 ||+ mask.end.length !== 2 ||+ ![...mask.start, ...mask.end].every(Number.isFinite) ||+ (mask.start[0] === mask.end[0] && mask.start[1] === mask.end[1])+ ) {+ throw Error("A gradient needs two distinct finite points.");+ }}function processingLayer(document: EditorDocument, id: string) {- const layer = findLayer(document.scene.getState().layers, id);- if (!layer || layer.kind === "image") {- throw Error("Processing layer is unavailable.");- }- return layer;+ const layer = findLayer(document.scene.getState().layers, id);+ if (!layer || layer.kind === "image") {+ throw Error("Processing layer is unavailable.");+ }+ return layer;}function changeChildren(- scene: Scene,- parentId: string | undefined,- change: (layers: readonly ProcessingLayer[]) => readonly ProcessingLayer[],+ scene: Scene,+ parentId: string | undefined,+ change: (layers: readonly ProcessingLayer[]) => readonly ProcessingLayer[],): Scene {- const [image, ...layers] = scene.layers;- if (!parentId) {- return { ...scene, layers: [image, ...change(layers)] };- }- if (parentId === image.id) {- throw Error("The image layer cannot contain layers.");- }- return updateLayer(scene, parentId, (layer) => ({- ...layer,- children: change(layer.children),- }));+ const [image, ...layers] = scene.layers;+ if (!parentId) {+ return { ...scene, layers: [image, ...change(layers)] };+ }+ if (parentId === image.id) {+ throw Error("The image layer cannot contain layers.");+ }+ return updateLayer(scene, parentId, (layer) => ({+ ...layer,+ children: change(layer.children),+ }));}function validateDepth(layers: readonly Layer[]) {- if (- layers.some((layer) =>- layer.children.some((child) => child.children.length > 0),- )- ) {- throw Error("Layers support two levels: a parent and its children.");- }+ if (+ layers.some((layer) =>+ layer.children.some((child) => child.children.length > 0),+ )+ ) {+ throw Error("Layers support two levels: a parent and its children.");+ }}/** Above a sibling, inside a processing layer, or on top of the root stack. */export type LayerPlacement = { above: string } | { inside: string };function placementIndex(- scene: Scene,- placement?: LayerPlacement,+ scene: Scene,+ placement?: LayerPlacement,): { parentId?: string; index?: number } {- if (placement === undefined) {- return {};- }- if (typeof placement !== "object" || placement === null) {- throw Error("Invalid layer placement.");- }- if ("inside" in placement) {- return { parentId: placement.inside };- }- const location = locateLayer(scene.layers, placement.above);- if (!location) {- throw Error("Layer is unavailable.");- }- const index =- location.siblings.findIndex((item) => item.id === location.layer.id) +- (location.parent ? 1 : 0);- return { parentId: location.parent?.id, index };+ if (placement === undefined) {+ return {};+ }+ if (typeof placement !== "object" || placement === null) {+ throw Error("Invalid layer placement.");+ }+ if ("inside" in placement) {+ return { parentId: placement.inside };+ }+ const location = locateLayer(scene.layers, placement.above);+ if (!location) {+ throw Error("Layer is unavailable.");+ }+ const index =+ location.siblings.findIndex((item) => item.id === location.layer.id) ++ (location.parent ? 1 : 0);+ return { parentId: location.parent?.id, index };}/** Structural commands commit an open gesture and record one entry each. */export function addLayer(- document: EditorDocument,- layer: ProcessingLayer,- placement?: LayerPlacement,+ document: EditorDocument,+ layer: ProcessingLayer,+ placement?: LayerPlacement,) {- const scene = document.scene.getState();- const existing = new Set(walkLayers(scene.layers).map((item) => item.id));- for (const item of walkLayers([layer])) {- if (existing.has(item.id)) {- throw Error("Layer IDs must be unique.");- }- existing.add(item.id);- }- const { parentId, index } = placementIndex(scene, placement);- const next = changeChildren(scene, parentId, (layers) =>- layers.toSpliced(index ?? layers.length, 0, layer),- );- validateDepth(next.layers);- document.history.commit();- document.edit(next);- document.selectLayer(layer.id);- return layer.id;+ const scene = document.scene.getState();+ const existing = new Set(walkLayers(scene.layers).map((item) => item.id));+ for (const item of walkLayers([layer])) {+ if (existing.has(item.id)) {+ throw Error("Layer IDs must be unique.");+ }+ existing.add(item.id);+ }+ const { parentId, index } = placementIndex(scene, placement);+ const next = changeChildren(scene, parentId, (layers) =>+ layers.toSpliced(index ?? layers.length, 0, layer),+ );+ validateDepth(next.layers);+ document.history.commit();+ document.edit(next);+ document.selectLayer(layer.id);+ return layer.id;}export function setLayer(- document: EditorDocument,- id: string,- change: Partial<Pick<ProcessingLayer, "visible" | "opacity" | "name">>,+ document: EditorDocument,+ id: string,+ change: Partial<Pick<ProcessingLayer, "visible" | "opacity" | "name">>,) {- if (- Object.keys(change).some(- (key) => !["visible", "opacity", "name"].includes(key),- ) ||- Object.values(change).some((value) => value === undefined) ||- (change.opacity !== undefined &&- (!Number.isFinite(change.opacity) ||- change.opacity < 0 ||- change.opacity > 1)) ||- (change.visible !== undefined && typeof change.visible !== "boolean") ||- (change.name !== undefined &&- (typeof change.name !== "string" || !change.name.trim()))- ) {- throw Error("Invalid layer settings.");- }- processingLayer(document, id);- editLayer(document, id, (layer) => ({ ...layer, ...change }));+ if (+ Object.keys(change).some(+ (key) => !["visible", "opacity", "name"].includes(key),+ ) ||+ Object.values(change).some((value) => value === undefined) ||+ (change.opacity !== undefined &&+ (!Number.isFinite(change.opacity) ||+ change.opacity < 0 ||+ change.opacity > 1)) ||+ (change.visible !== undefined && typeof change.visible !== "boolean") ||+ (change.name !== undefined &&+ (typeof change.name !== "string" || !change.name.trim()))+ ) {+ throw Error("Invalid layer settings.");+ }+ processingLayer(document, id);+ editLayer(document, id, (layer) => ({ ...layer, ...change }));}export function setExposure(- document: EditorDocument,- id: string,- exposure: number,+ document: EditorDocument,+ id: string,+ exposure: number,) {- if (!Number.isFinite(exposure) || Math.abs(exposure) > 5) {- throw Error("Exposure must be between -5 and 5 EV.");- }- editLayer(document, id, (layer) => {- if (layer.kind !== "exposure") {- throw Error("Select an exposure layer.");- }- return { ...layer, exposure };- });+ if (!Number.isFinite(exposure) || Math.abs(exposure) > 5) {+ throw Error("Exposure must be between -5 and 5 EV.");+ }+ editLayer(document, id, (layer) => {+ if (layer.kind !== "exposure") {+ throw Error("Select an exposure layer.");+ }+ return { ...layer, exposure };+ });}export function setLayerMask(- document: EditorDocument,- id: string,- mask: Gradient,+ document: EditorDocument,+ id: string,+ mask: Gradient,) {- validateMask(mask);- editLayer(document, id, (layer) => {- if (layer.kind !== "mask") {- throw Error("Select a mask layer.");- }- return { ...layer, mask: structuredClone(mask) };- });+ validateMask(mask);+ editLayer(document, id, (layer) => {+ if (layer.kind !== "mask") {+ throw Error("Select a mask layer.");+ }+ return { ...layer, mask: structuredClone(mask) };+ });}export function setMaskOperation(- document: EditorDocument,- id: string,- operation: "add" | "subtract",+ document: EditorDocument,+ id: string,+ operation: "add" | "subtract",) {- if (operation !== "add" && operation !== "subtract") {- throw Error("Choose Add or Subtract for a mask.");- }- editLayer(document, id, (layer) => {- if (layer.kind !== "mask") {- throw Error("Select a mask layer.");- }- return { ...layer, operation };- });+ if (operation !== "add" && operation !== "subtract") {+ throw Error("Choose Add or Subtract for a mask.");+ }+ editLayer(document, id, (layer) => {+ if (layer.kind !== "mask") {+ throw Error("Select a mask layer.");+ }+ return { ...layer, operation };+ });}export function duplicateLayer(document: EditorDocument, id: string) {- const source = processingLayer(document, id);- function clone(layer: ProcessingLayer): ProcessingLayer {- return {- ...structuredClone(layer),- id: crypto.randomUUID(),- children: layer.children.map(clone),- };- }- const layer = { ...clone(source), name: `${source.name} copy` };- const scene = document.scene.getState();- const parent = locateLayer(scene.layers, id)?.parent?.id;- const next = changeChildren(scene, parent, (layers) =>- layers.toSpliced(layers.findIndex((item) => item.id === id) + 1, 0, layer),- );- validateDepth(next.layers);- document.history.commit();- document.edit(next);- document.selectLayer(layer.id);- return layer.id;+ const source = processingLayer(document, id);+ function clone(layer: ProcessingLayer): ProcessingLayer {+ return {+ ...structuredClone(layer),+ id: crypto.randomUUID(),+ children: layer.children.map(clone),+ };+ }+ const layer = { ...clone(source), name: `${source.name} copy` };+ const scene = document.scene.getState();+ const parent = locateLayer(scene.layers, id)?.parent?.id;+ const next = changeChildren(scene, parent, (layers) =>+ layers.toSpliced(layers.findIndex((item) => item.id === id) + 1, 0, layer),+ );+ validateDepth(next.layers);+ document.history.commit();+ document.edit(next);+ document.selectLayer(layer.id);+ return layer.id;}export function deleteLayer(document: EditorDocument, id: string) {- processingLayer(document, id);- const scene = document.scene.getState();- const next = changeChildren(- scene,- locateLayer(scene.layers, id)?.parent?.id,- (layers) => layers.filter((layer) => layer.id !== id),- );- validateDepth(next.layers);- document.history.commit();- document.edit(next);+ processingLayer(document, id);+ const scene = document.scene.getState();+ const next = changeChildren(+ scene,+ locateLayer(scene.layers, id)?.parent?.id,+ (layers) => layers.filter((layer) => layer.id !== id),+ );+ validateDepth(next.layers);+ document.history.commit();+ document.edit(next);}/** Index is the final sibling position, ordered bottom to top; the root image occupies index zero. */export function moveLayer(- document: EditorDocument,- id: string,- index: number,- parentId?: string,+ document: EditorDocument,+ id: string,+ index: number,+ parentId?: string,) {- const layer = processingLayer(document, id);- const scene = document.scene.getState();- if (parentId && findLayer([layer], parentId)) {- throw Error("A layer cannot contain itself.");- }- const removed = changeChildren(- scene,- locateLayer(scene.layers, id)?.parent?.id,- (layers) => layers.filter((item) => item.id !== id),- );- const next = changeChildren(removed, parentId, (layers) => {- const position = parentId ? index : index - 1;- if (- !Number.isInteger(position) ||- position < 0 ||- position > layers.length- ) {- throw Error("Invalid layer position.");- }- return layers.toSpliced(position, 0, layer);- });- validateDepth(next.layers);- document.history.commit();- document.edit(next);+ const layer = processingLayer(document, id);+ const scene = document.scene.getState();+ if (parentId && findLayer([layer], parentId)) {+ throw Error("A layer cannot contain itself.");+ }+ const removed = changeChildren(+ scene,+ locateLayer(scene.layers, id)?.parent?.id,+ (layers) => layers.filter((item) => item.id !== id),+ );+ const next = changeChildren(removed, parentId, (layers) => {+ const position = parentId ? index : index - 1;+ if (+ !Number.isInteger(position) ||+ position < 0 ||+ position > layers.length+ ) {+ throw Error("Invalid layer position.");+ }+ return layers.toSpliced(position, 0, layer);+ });+ validateDepth(next.layers);+ document.history.commit();+ document.edit(next);}diff --git a/src/features/layers/gradient-guides.tsx b/src/features/layers/gradient-guides.tsxindex 01f2e05..cbf8808 100644--- a/src/features/layers/gradient-guides.tsx+++ b/src/features/layers/gradient-guides.tsx@@ -6,237 +6,237 @@ import { type GradientHandle, radialPoint } from "./gradient";const rotationCursor = rotateCursor();function resizeCursor(from: Point, to: Point) {- const angle = Math.atan2(to[1] - from[1], to[0] - from[0]);- const direction = (Math.round(angle / (Math.PI / 4)) + 4) % 4;- return ["ew-resize", "nwse-resize", "ns-resize", "nesw-resize"][direction];+ const angle = Math.atan2(to[1] - from[1], to[0] - from[0]);+ const direction = (Math.round(angle / (Math.PI / 4)) + 4) % 4;+ return ["ew-resize", "nwse-resize", "ns-resize", "nesw-resize"][direction];}function Handle({- point,- handle,- label,- cursor = "grab",+ point,+ handle,+ label,+ cursor = "grab",}: {- point: Point;- handle: GradientHandle;- label: string;- cursor?: string;+ point: Point;+ handle: GradientHandle;+ label: string;+ cursor?: string;}) {- return (- <g className="group/handle" style={{ cursor }}>- <title>{label}</title>- <circle- cx={point[0]}- cy={point[1]}- r="12"- fill="transparent"- data-gradient-handle={handle}- aria-label={label}- className="pointer-events-auto"- />- <circle- cx={point[0]}- cy={point[1]}- r="4"- fill="white"- stroke="#171717"- className="group-hover/handle:fill-sky-300"- />- </g>- );+ return (+ <g className="group/handle" style={{ cursor }}>+ <title>{label}</title>+ <circle+ cx={point[0]}+ cy={point[1]}+ r="12"+ fill="transparent"+ data-gradient-handle={handle}+ aria-label={label}+ className="pointer-events-auto"+ />+ <circle+ cx={point[0]}+ cy={point[1]}+ r="4"+ fill="white"+ stroke="#171717"+ className="group-hover/handle:fill-sky-300"+ />+ </g>+ );}function Guide({- point,- direction,- handle,- cursor,+ point,+ direction,+ handle,+ cursor,}: {- point: Point;- direction: Point;- handle: GradientHandle;- cursor: string;+ point: Point;+ direction: Point;+ handle: GradientHandle;+ cursor: string;}) {- const line = {- x1: point[0] - direction[0],- y1: point[1] - direction[1],- x2: point[0] + direction[0],- y2: point[1] + direction[1],- };- return (- <g>- <line {...line} stroke="black" strokeOpacity="0.6" strokeWidth="3" />- <line {...line} stroke="white" strokeOpacity="0.9" />- <line- {...line}- stroke="transparent"- strokeWidth="16"- data-gradient-handle={handle}- aria-label={`Gradient ${handle} guide`}- className="[pointer-events:stroke]"- style={{ cursor }}- />- </g>- );+ const line = {+ x1: point[0] - direction[0],+ y1: point[1] - direction[1],+ x2: point[0] + direction[0],+ y2: point[1] + direction[1],+ };+ return (+ <g>+ <line {...line} stroke="black" strokeOpacity="0.6" strokeWidth="3" />+ <line {...line} stroke="white" strokeOpacity="0.9" />+ <line+ {...line}+ stroke="transparent"+ strokeWidth="16"+ data-gradient-handle={handle}+ aria-label={`Gradient ${handle} guide`}+ className="[pointer-events:stroke]"+ style={{ cursor }}+ />+ </g>+ );}function LinearGuides({- startPoint,- endPoint,- extent,+ startPoint,+ endPoint,+ extent,}: {- startPoint: Point;- endPoint: Point;- extent: number;+ startPoint: Point;+ endPoint: Point;+ extent: number;}) {- const dx = endPoint[0] - startPoint[0],- dy = endPoint[1] - startPoint[1];- const length = Math.max(1, Math.hypot(dx, dy));- const direction: Point = [(-dy / length) * extent, (dx / length) * extent];- const center: Point = [- (startPoint[0] + endPoint[0]) / 2,- (startPoint[1] + endPoint[1]) / 2,- ];- return (- <g>- <title>Linear gradient guides</title>- <Guide- point={startPoint}- direction={direction}- handle="start"- cursor={resizeCursor(startPoint, endPoint)}- />- <Guide- point={endPoint}- direction={direction}- handle="end"- cursor={resizeCursor(startPoint, endPoint)}- />- <Guide- point={center}- direction={direction}- handle="rotate"- cursor={rotationCursor}- />- <Handle point={center} handle="move" label="Move gradient" />- </g>- );+ const dx = endPoint[0] - startPoint[0],+ dy = endPoint[1] - startPoint[1];+ const length = Math.max(1, Math.hypot(dx, dy));+ const direction: Point = [(-dy / length) * extent, (dx / length) * extent];+ const center: Point = [+ (startPoint[0] + endPoint[0]) / 2,+ (startPoint[1] + endPoint[1]) / 2,+ ];+ return (+ <g>+ <title>Linear gradient guides</title>+ <Guide+ point={startPoint}+ direction={direction}+ handle="start"+ cursor={resizeCursor(startPoint, endPoint)}+ />+ <Guide+ point={endPoint}+ direction={direction}+ handle="end"+ cursor={resizeCursor(startPoint, endPoint)}+ />+ <Guide+ point={center}+ direction={direction}+ handle="rotate"+ cursor={rotationCursor}+ />+ <Handle point={center} handle="move" label="Move gradient" />+ </g>+ );}function RadialGuides({- mask,- screen,+ mask,+ screen,}: {- mask: RadialGradient;- screen: (point: Point) => Point;+ mask: RadialGradient;+ screen: (point: Point) => Point;}) {- const center = screen(mask.center);- const right = screen(radialPoint(mask, 1, 0));- const bottom = screen(radialPoint(mask, 0, 1));- const feather = screen(radialPoint(mask, 1 - mask.feather, 0));- const showFeather =- Math.min(- Math.hypot(feather[0] - center[0], feather[1] - center[1]),- Math.hypot(feather[0] - right[0], feather[1] - right[1]),- ) >= 24;- const rotationRadius =- 1 +- 24 / Math.max(1, Math.hypot(bottom[0] - center[0], bottom[1] - center[1]));- const transform = `matrix(${right[0] - center[0]},${right[1] - center[1]},${bottom[0] - center[0]},${bottom[1] - center[1]},${center[0]},${center[1]})`;- return (- <g>- <title>Radial gradient guides</title>- <g transform={transform} fill="none" stroke="white">- <circle- r="1"- fill="transparent"- stroke="none"- data-gradient-handle="move"- aria-label="Move radial gradient"- className="pointer-events-auto cursor-grab hover:fill-white/5"- />- <circle- r="1"- stroke="black"- strokeOpacity="0.6"- strokeWidth="3"- vectorEffect="non-scaling-stroke"- />- <circle r="1" strokeOpacity="0.9" vectorEffect="non-scaling-stroke" />- <circle- r={1 - mask.feather}- strokeDasharray="4 3"- strokeOpacity="0.8"- vectorEffect="non-scaling-stroke"- />- <path- d={`M0 -1V${-rotationRadius}`}- vectorEffect="non-scaling-stroke"- />- </g>- <Handle point={center} handle="move" label="Move gradient" />- <Handle- point={right}- handle="radius-x"- label="Radial right radius"- cursor={resizeCursor(center, right)}- />- <Handle- point={screen(radialPoint(mask, -1, 0))}- handle="radius-x"- label="Radial left radius"- cursor={resizeCursor(center, right)}- />- <Handle- point={bottom}- handle="radius-y"- label="Radial bottom radius"- cursor={resizeCursor(center, bottom)}- />- <Handle- point={screen(radialPoint(mask, 0, -1))}- handle="radius-y"- label="Radial top radius"- cursor={resizeCursor(center, bottom)}- />- <Handle- point={screen(radialPoint(mask, 0, -rotationRadius))}- handle="rotate"- label="Rotate radial gradient"- cursor={rotationCursor}- />- {showFeather && (- <Handle- point={feather}- handle="feather"- label="Radial feather"- cursor={resizeCursor(center, right)}- />- )}- </g>- );+ const center = screen(mask.center);+ const right = screen(radialPoint(mask, 1, 0));+ const bottom = screen(radialPoint(mask, 0, 1));+ const feather = screen(radialPoint(mask, 1 - mask.feather, 0));+ const showFeather =+ Math.min(+ Math.hypot(feather[0] - center[0], feather[1] - center[1]),+ Math.hypot(feather[0] - right[0], feather[1] - right[1]),+ ) >= 24;+ const rotationRadius =+ 1 ++ 24 / Math.max(1, Math.hypot(bottom[0] - center[0], bottom[1] - center[1]));+ const transform = `matrix(${right[0] - center[0]},${right[1] - center[1]},${bottom[0] - center[0]},${bottom[1] - center[1]},${center[0]},${center[1]})`;+ return (+ <g>+ <title>Radial gradient guides</title>+ <g transform={transform} fill="none" stroke="white">+ <circle+ r="1"+ fill="transparent"+ stroke="none"+ data-gradient-handle="move"+ aria-label="Move radial gradient"+ className="pointer-events-auto cursor-grab hover:fill-white/5"+ />+ <circle+ r="1"+ stroke="black"+ strokeOpacity="0.6"+ strokeWidth="3"+ vectorEffect="non-scaling-stroke"+ />+ <circle r="1" strokeOpacity="0.9" vectorEffect="non-scaling-stroke" />+ <circle+ r={1 - mask.feather}+ strokeDasharray="4 3"+ strokeOpacity="0.8"+ vectorEffect="non-scaling-stroke"+ />+ <path+ d={`M0 -1V${-rotationRadius}`}+ vectorEffect="non-scaling-stroke"+ />+ </g>+ <Handle point={center} handle="move" label="Move gradient" />+ <Handle+ point={right}+ handle="radius-x"+ label="Radial right radius"+ cursor={resizeCursor(center, right)}+ />+ <Handle+ point={screen(radialPoint(mask, -1, 0))}+ handle="radius-x"+ label="Radial left radius"+ cursor={resizeCursor(center, right)}+ />+ <Handle+ point={bottom}+ handle="radius-y"+ label="Radial bottom radius"+ cursor={resizeCursor(center, bottom)}+ />+ <Handle+ point={screen(radialPoint(mask, 0, -1))}+ handle="radius-y"+ label="Radial top radius"+ cursor={resizeCursor(center, bottom)}+ />+ <Handle+ point={screen(radialPoint(mask, 0, -rotationRadius))}+ handle="rotate"+ label="Rotate radial gradient"+ cursor={rotationCursor}+ />+ {showFeather && (+ <Handle+ point={feather}+ handle="feather"+ label="Radial feather"+ cursor={resizeCursor(center, right)}+ />+ )}+ </g>+ );}export function GradientGuides({- mask,- screen,- extent,+ mask,+ screen,+ extent,}: {- mask: Gradient;- screen: (point: Point) => Point;- extent: number;+ mask: Gradient;+ screen: (point: Point) => Point;+ extent: number;}) {- return (- <svg className="pointer-events-none absolute inset-0 size-full overflow-visible">- <title>Gradient guides</title>- {mask.kind === "linear" && (- <LinearGuides- startPoint={screen(mask.start)}- endPoint={screen(mask.end)}- extent={extent}- />- )}- {mask.kind === "radial" && <RadialGuides mask={mask} screen={screen} />}- </svg>- );+ return (+ <svg className="pointer-events-none absolute inset-0 size-full overflow-visible">+ <title>Gradient guides</title>+ {mask.kind === "linear" && (+ <LinearGuides+ startPoint={screen(mask.start)}+ endPoint={screen(mask.end)}+ extent={extent}+ />+ )}+ {mask.kind === "radial" && <RadialGuides mask={mask} screen={screen} />}+ </svg>+ );}diff --git a/src/features/layers/gradient-overlay.tsx b/src/features/layers/gradient-overlay.tsxindex b70e8f7..84cb871 100644--- a/src/features/layers/gradient-overlay.tsx+++ b/src/features/layers/gradient-overlay.tsx@@ -3,273 +3,273 @@ import { useStore } from "zustand";import { useDocument, useScene } from "@/components/editor/session";import { useViewport } from "@/components/editor/viewport";import {- type EditorDocument,- findLayer,- type Gradient,- maskModifiers,+ 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";import {- drawGradient,- type GradientHandle,- gradientHandles,- moveGradient,+ drawGradient,+ type GradientHandle,+ gradientHandles,+ moveGradient,} from "./gradient";import { GradientGuides } from "./gradient-guides";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;- handle: GradientHandle | "new";- id: string;+ pointer: number;+ /** The viewport bounds measured once; pointer capture keeps them valid for the drag. */+ box: DOMRect | undefined;+ from: Point;+ to: Point;+ mask: Gradient;+ handle: GradientHandle | "new";+ id: string;};function hideOverlay(document: EditorDocument) {- if (document.preview.getState().maskOverlay) {- document.preview.setState({ maskOverlay: undefined });- }+ if (document.preview.getState().maskOverlay) {+ document.preview.setState({ maskOverlay: undefined });+ }}export function GradientOverlay() {- const document = useDocument();- const tool = useGradientTool();- const camera = useViewport();- const frame = useScene((scene) => scene.frame);- const selected = useStore(document.selection, (state) => state.layerId);- const layer = useScene((scene) => {- const item = findLayer(scene.layers, selected);- return item?.kind === "mask" ? item : undefined;- });- const mask = layer?.mask;- const [draft, setDraft] = useState<Gradient | null>(null);- const dragging = useRef<Drag | null>(null);- const [dragCursor, setDragCursor] = useState<string>();- /** Ends any drag, restoring the scene unless it was committed. */- function reset() {- if (dragging.current && dragging.current.handle !== "new") {- document.history.cancel();- }- dragging.current = null;- setDraft(null);- setDragCursor(undefined);- tool.close();- }- useEffect(- () => () => {- if (dragging.current && dragging.current.handle !== "new") {- document.history.cancel();- }- },- [document],- );- function remove() {- reset();- if (mask) {- deleteLayer(document, selected);- }- }- function dismiss() {- if (dragging.current || tool.target) {- reset();- return;- }- if (tool.overlay === "new" && mask) {- deleteLayer(document, selected);- }- tool.setOverlay("hidden");- }- useShortcuts({- escape: dismiss,- ...(tool.overlay === "hidden"- ? {}- : { enter: () => tool.setOverlay("hidden") }),- ...(mask- ? { o: tool.toggleOverlay, delete: remove, backspace: remove }- : {}),- });- function documentPoint(event: PointerEvent, box: DOMRect | undefined): Point {- if (!box) {- return frame.center;- }- const offset = sourceOffset(- frame,- (event.clientX - box.left - box.width / 2 - camera.view.pan[0]) /- camera.scale,- (event.clientY - box.top - box.height / 2 - camera.view.pan[1]) /- camera.scale,- );- return [frame.center[0] + offset[0], frame.center[1] + offset[1]];- }- function screenPoint(point: Point): Point {- const [x, y] = outputOffset(- frame,- point[0] - frame.center[0],- point[1] - frame.center[1],- );- return [- camera.viewport[0] / 2 + camera.view.pan[0] + x * camera.scale,- camera.viewport[1] / 2 + camera.view.pan[1] + y * camera.scale,- ];- }- function start(event: PointerEvent<HTMLDivElement>) {- if (event.button !== 0 || !event.isPrimary || camera.panMode) {- return;- }- const target =- event.target instanceof Element- ? event.target- .closest("[data-gradient-handle]")- ?.getAttribute("data-gradient-handle")- : null;- const handle = gradientHandles.find((handle) => handle === target);- if (!tool.target && (!mask || !handle)) {- return;- }- 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),- handle: "new",- id: selected,- };- setDraft(dragging.current.mask);- } else if (mask && handle) {- document.history.commit();- document.history.begin();- dragging.current = {- pointer: event.pointerId,- box,- from,- to: from,- mask,- handle,- id: selected,- };- }- const cursor =- event.target instanceof Element- ? getComputedStyle(event.target).cursor- : "grab";- const activeCursor = cursor === "grab" ? "grabbing" : cursor;- setDragCursor(tool.target ? "crosshair" : activeCursor);- 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, drag.box);- drag.to = point;- if (drag.handle === "new") {- const next = drawGradient(- drag.mask.kind,- drag.from,- point,- event.shiftKey,- );- drag.mask = next;- setDraft(next);- } else {- setLayerMask(- document,- drag.id,- moveGradient(drag.mask, drag.handle, drag.from, point),- );- }- }- function finish(event: PointerEvent<HTMLDivElement>) {- const drag = dragging.current;- if (!drag || drag.pointer !== event.pointerId) {- return;- }- // Commit the last preview; pointerup must not reinterpret geometry or Shift.- if (drag.handle === "new") {- const point = drag.to;- const distance =- Math.hypot(point[0] - drag.from[0], point[1] - drag.from[1]) *- camera.scale;- if (distance >= 3 && tool.target) {- tool.create(drag.mask, tool.target);- }- } else {- document.history.commit();- }- reset();- event.currentTarget.releasePointerCapture(event.pointerId);- }- const visible = draft ?? mask;- const preview =- !!draft || dragCursor !== undefined || tool.overlay !== "hidden";- const modifiers = useMemo(- () => (draft || !layer ? [] : maskModifiers(layer)),- [draft, layer],- );- const shown = visible && preview && !camera.panMode;- useEffect(() => {- if (shown) {- document.preview.setState({ maskOverlay: { mask: visible, modifiers } });- return;- }- hideOverlay(document);- }, [document, shown, visible, modifiers]);- useEffect(() => () => hideOverlay(document), [document]);- const cursor = dragCursor ?? (tool.target ? "crosshair" : undefined);- const pointerEvents =- (tool.target || dragCursor) && !camera.panMode ? "auto" : "none";- return (- <div- role="application"- aria-label="Gradient mask canvas"- className="absolute inset-0 touch-none data-[cursor=true]:[&_*]:cursor-[inherit]!"- data-cursor={!!cursor}- style={{ pointerEvents, cursor }}- onDoubleClick={(event) => event.stopPropagation()}- onPointerDown={start}- onPointerMove={move}- onPointerUp={finish}- onPointerCancel={reset}- onLostPointerCapture={() => {- if (dragging.current) {- reset();- }- }}- >- {visible && !camera.panMode && (- <GradientGuides- mask={visible}- screen={screenPoint}- extent={Math.hypot(...camera.viewport)}- />- )}- {tool.overlay === "new" && !tool.target && (- <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">- Adjust the mask · Enter to keep · Esc to remove · O toggles overlay- </p>- )}- {tool.target && (- <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">- Drag to draw · Shift to constrain · Esc to cancel- </p>- )}- </div>- );+ const document = useDocument();+ const tool = useGradientTool();+ const camera = useViewport();+ const frame = useScene((scene) => scene.frame);+ const selected = useStore(document.selection, (state) => state.layerId);+ const layer = useScene((scene) => {+ const item = findLayer(scene.layers, selected);+ return item?.kind === "mask" ? item : undefined;+ });+ const mask = layer?.mask;+ const [draft, setDraft] = useState<Gradient | null>(null);+ const dragging = useRef<Drag | null>(null);+ const [dragCursor, setDragCursor] = useState<string>();+ /** Ends any drag, restoring the scene unless it was committed. */+ function reset() {+ if (dragging.current && dragging.current.handle !== "new") {+ document.history.cancel();+ }+ dragging.current = null;+ setDraft(null);+ setDragCursor(undefined);+ tool.close();+ }+ useEffect(+ () => () => {+ if (dragging.current && dragging.current.handle !== "new") {+ document.history.cancel();+ }+ },+ [document],+ );+ function remove() {+ reset();+ if (mask) {+ deleteLayer(document, selected);+ }+ }+ function dismiss() {+ if (dragging.current || tool.target) {+ reset();+ return;+ }+ if (tool.overlay === "new" && mask) {+ deleteLayer(document, selected);+ }+ tool.setOverlay("hidden");+ }+ useShortcuts({+ escape: dismiss,+ ...(tool.overlay === "hidden"+ ? {}+ : { enter: () => tool.setOverlay("hidden") }),+ ...(mask+ ? { o: tool.toggleOverlay, delete: remove, backspace: remove }+ : {}),+ });+ function documentPoint(event: PointerEvent, box: DOMRect | undefined): Point {+ if (!box) {+ return frame.center;+ }+ const offset = sourceOffset(+ frame,+ (event.clientX - box.left - box.width / 2 - camera.view.pan[0]) /+ camera.scale,+ (event.clientY - box.top - box.height / 2 - camera.view.pan[1]) /+ camera.scale,+ );+ return [frame.center[0] + offset[0], frame.center[1] + offset[1]];+ }+ function screenPoint(point: Point): Point {+ const [x, y] = outputOffset(+ frame,+ point[0] - frame.center[0],+ point[1] - frame.center[1],+ );+ return [+ camera.viewport[0] / 2 + camera.view.pan[0] + x * camera.scale,+ camera.viewport[1] / 2 + camera.view.pan[1] + y * camera.scale,+ ];+ }+ function start(event: PointerEvent<HTMLDivElement>) {+ if (event.button !== 0 || !event.isPrimary || camera.panMode) {+ return;+ }+ const target =+ event.target instanceof Element+ ? event.target+ .closest("[data-gradient-handle]")+ ?.getAttribute("data-gradient-handle")+ : null;+ const handle = gradientHandles.find((handle) => handle === target);+ if (!tool.target && (!mask || !handle)) {+ return;+ }+ 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),+ handle: "new",+ id: selected,+ };+ setDraft(dragging.current.mask);+ } else if (mask && handle) {+ document.history.commit();+ document.history.begin();+ dragging.current = {+ pointer: event.pointerId,+ box,+ from,+ to: from,+ mask,+ handle,+ id: selected,+ };+ }+ const cursor =+ event.target instanceof Element+ ? getComputedStyle(event.target).cursor+ : "grab";+ const activeCursor = cursor === "grab" ? "grabbing" : cursor;+ setDragCursor(tool.target ? "crosshair" : activeCursor);+ 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, drag.box);+ drag.to = point;+ if (drag.handle === "new") {+ const next = drawGradient(+ drag.mask.kind,+ drag.from,+ point,+ event.shiftKey,+ );+ drag.mask = next;+ setDraft(next);+ } else {+ setLayerMask(+ document,+ drag.id,+ moveGradient(drag.mask, drag.handle, drag.from, point),+ );+ }+ }+ function finish(event: PointerEvent<HTMLDivElement>) {+ const drag = dragging.current;+ if (!drag || drag.pointer !== event.pointerId) {+ return;+ }+ // Commit the last preview; pointerup must not reinterpret geometry or Shift.+ if (drag.handle === "new") {+ const point = drag.to;+ const distance =+ Math.hypot(point[0] - drag.from[0], point[1] - drag.from[1]) *+ camera.scale;+ if (distance >= 3 && tool.target) {+ tool.create(drag.mask, tool.target);+ }+ } else {+ document.history.commit();+ }+ reset();+ event.currentTarget.releasePointerCapture(event.pointerId);+ }+ const visible = draft ?? mask;+ const preview =+ !!draft || dragCursor !== undefined || tool.overlay !== "hidden";+ const modifiers = useMemo(+ () => (draft || !layer ? [] : maskModifiers(layer)),+ [draft, layer],+ );+ const shown = visible && preview && !camera.panMode;+ useEffect(() => {+ if (shown) {+ document.preview.setState({ maskOverlay: { mask: visible, modifiers } });+ return;+ }+ hideOverlay(document);+ }, [document, shown, visible, modifiers]);+ useEffect(() => () => hideOverlay(document), [document]);+ const cursor = dragCursor ?? (tool.target ? "crosshair" : undefined);+ const pointerEvents =+ (tool.target || dragCursor) && !camera.panMode ? "auto" : "none";+ return (+ <div+ role="application"+ aria-label="Gradient mask canvas"+ className="absolute inset-0 touch-none data-[cursor=true]:[&_*]:cursor-[inherit]!"+ data-cursor={!!cursor}+ style={{ pointerEvents, cursor }}+ onDoubleClick={(event) => event.stopPropagation()}+ onPointerDown={start}+ onPointerMove={move}+ onPointerUp={finish}+ onPointerCancel={reset}+ onLostPointerCapture={() => {+ if (dragging.current) {+ reset();+ }+ }}+ >+ {visible && !camera.panMode && (+ <GradientGuides+ mask={visible}+ screen={screenPoint}+ extent={Math.hypot(...camera.viewport)}+ />+ )}+ {tool.overlay === "new" && !tool.target && (+ <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">+ Adjust the mask · Enter to keep · Esc to remove · O toggles overlay+ </p>+ )}+ {tool.target && (+ <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">+ Drag to draw · Shift to constrain · Esc to cancel+ </p>+ )}+ </div>+ );}diff --git a/src/features/layers/gradient-tool.tsx b/src/features/layers/gradient-tool.tsxindex 53af6d3..4444559 100644--- a/src/features/layers/gradient-tool.tsx+++ b/src/features/layers/gradient-tool.tsx@@ -1,110 +1,110 @@import {- createContext,- type ReactNode,- useCallback,- useContext,- useEffect,- useState,+ createContext,+ type ReactNode,+ useCallback,+ useContext,+ useEffect,+ useState,} from "react";import { useDocument } from "@/components/editor/session";import { findLayer, type Gradient, type MaskLayer } from "@/core/document";type NewMask = {- shape: Gradient["kind"];- parentId?: string;- operation: "add" | "subtract";+ shape: Gradient["kind"];+ parentId?: string;+ operation: "add" | "subtract";};/** "new" previews a just-drawn mask until Enter, Escape, or its first adjustment. */type Overlay = "hidden" | "shown" | "new";const GradientTool = createContext<{- target: NewMask | null;- overlay: Overlay;- draw: (shape?: Gradient["kind"]) => void;- add: (- parentId: string,- operation: "add" | "subtract",- shape: Gradient["kind"],- ) => void;- close: () => void;- create: (mask: Gradient, target: NewMask) => void;- setOverlay: (overlay: Overlay) => void;- toggleOverlay: () => void;+ target: NewMask | null;+ overlay: Overlay;+ draw: (shape?: Gradient["kind"]) => void;+ add: (+ parentId: string,+ operation: "add" | "subtract",+ shape: Gradient["kind"],+ ) => void;+ close: () => void;+ create: (mask: Gradient, target: NewMask) => void;+ setOverlay: (overlay: Overlay) => void;+ toggleOverlay: () => void;} | null>(null);export function useGradientTool() {- const tool = useContext(GradientTool);- if (!tool) {- throw new Error("A gradient tool provider is required.");- }- return tool;+ const tool = useContext(GradientTool);+ if (!tool) {+ throw new Error("A gradient tool provider is required.");+ }+ return tool;}/** Geometry edits keep the preview; effect edits end it. */function adjusted(before: MaskLayer, after: MaskLayer) {- return (- before.adjustments !== after.adjustments ||- before.toneCurve !== after.toneCurve ||- before.children !== after.children ||- before.opacity !== after.opacity- );+ return (+ before.adjustments !== after.adjustments ||+ before.toneCurve !== after.toneCurve ||+ before.children !== after.children ||+ before.opacity !== after.opacity+ );}export function GradientProvider({- children,- onCreate,+ children,+ onCreate,}: {- children: ReactNode;- onCreate: (mask: Gradient, target: NewMask) => void;+ children: ReactNode;+ onCreate: (mask: Gradient, target: NewMask) => void;}) {- const [target, setTarget] = useState<NewMask | null>(null);- const [overlay, setOverlay] = useState<Overlay>("hidden");- const close = useCallback(() => setTarget(null), []);- const document = useDocument();- useEffect(- () =>- document.selection.subscribe(() => {- setTarget(null);- setOverlay("hidden");- }),- [document],- );- useEffect(- () =>- document.scene.subscribe((scene, previous) => {- const id = document.selection.getState().layerId;- const before = findLayer(previous.layers, id);- const after = findLayer(scene.layers, id);- if (- before?.kind === "mask" &&- after?.kind === "mask" &&- adjusted(before, after)- ) {- setOverlay("hidden");- }- }),- [document],- );- return (- <GradientTool- value={{- target,- overlay,- draw: (shape = "linear") => setTarget({ shape, operation: "add" }),- add: (parentId, operation, shape) =>- setTarget({ shape, parentId, operation }),- close,- create: (mask, target) => {- onCreate(mask, target);- setOverlay("new");- },- setOverlay,- toggleOverlay: () =>- setOverlay((overlay) => (overlay === "hidden" ? "shown" : "hidden")),- }}- >- {children}- </GradientTool>- );+ const [target, setTarget] = useState<NewMask | null>(null);+ const [overlay, setOverlay] = useState<Overlay>("hidden");+ const close = useCallback(() => setTarget(null), []);+ const document = useDocument();+ useEffect(+ () =>+ document.selection.subscribe(() => {+ setTarget(null);+ setOverlay("hidden");+ }),+ [document],+ );+ useEffect(+ () =>+ document.scene.subscribe((scene, previous) => {+ const id = document.selection.getState().layerId;+ const before = findLayer(previous.layers, id);+ const after = findLayer(scene.layers, id);+ if (+ before?.kind === "mask" &&+ after?.kind === "mask" &&+ adjusted(before, after)+ ) {+ setOverlay("hidden");+ }+ }),+ [document],+ );+ return (+ <GradientTool+ value={{+ target,+ overlay,+ draw: (shape = "linear") => setTarget({ shape, operation: "add" }),+ add: (parentId, operation, shape) =>+ setTarget({ shape, parentId, operation }),+ close,+ create: (mask, target) => {+ onCreate(mask, target);+ setOverlay("new");+ },+ setOverlay,+ toggleOverlay: () =>+ setOverlay((overlay) => (overlay === "hidden" ? "shown" : "hidden")),+ }}+ >+ {children}+ </GradientTool>+ );}diff --git a/src/features/layers/gradient.ts b/src/features/layers/gradient.tsindex 975e149..ab9199e 100644--- a/src/features/layers/gradient.ts+++ b/src/features/layers/gradient.ts@@ -3,152 +3,152 @@ import type { Point } from "@/core/image/frame";import { clamp } from "@/lib/math";export const gradientHandles = [- "move",- "start",- "end",- "rotate",- "radius-x",- "radius-y",- "feather",+ "move",+ "start",+ "end",+ "rotate",+ "radius-x",+ "radius-y",+ "feather",] as const;export type GradientHandle = (typeof gradientHandles)[number];export function drawGradient(- kind: Gradient["kind"],- from: Point,- to: Point,- constrain = false,+ kind: Gradient["kind"],+ from: Point,+ to: Point,+ constrain = false,): Gradient {- const dx = to[0] - from[0];- const dy = to[1] - from[1];- if (kind === "radial") {- let radius: Point = [Math.max(1, Math.abs(dx)), Math.max(1, Math.abs(dy))];- if (constrain) {- radius = [Math.max(...radius), Math.max(...radius)];- }- return { kind, center: from, radius, angle: 0, feather: 0.5 };- }- if (!constrain) {- return { kind, start: from, end: to };- }- const end: Point =- Math.abs(dx) > Math.abs(dy) ? [to[0], from[1]] : [from[0], to[1]];- return { kind, start: from, end };+ const dx = to[0] - from[0];+ const dy = to[1] - from[1];+ if (kind === "radial") {+ let radius: Point = [Math.max(1, Math.abs(dx)), Math.max(1, Math.abs(dy))];+ if (constrain) {+ radius = [Math.max(...radius), Math.max(...radius)];+ }+ return { kind, center: from, radius, angle: 0, feather: 0.5 };+ }+ if (!constrain) {+ return { kind, start: from, end: to };+ }+ const end: Point =+ Math.abs(dx) > Math.abs(dy) ? [to[0], from[1]] : [from[0], to[1]];+ return { kind, start: from, end };}function rotate(point: Point, angle: number): Point {- return [- point[0] * Math.cos(angle) - point[1] * Math.sin(angle),- point[0] * Math.sin(angle) + point[1] * Math.cos(angle),- ];+ return [+ point[0] * Math.cos(angle) - point[1] * Math.sin(angle),+ point[0] * Math.sin(angle) + point[1] * Math.cos(angle),+ ];}/** Map an ellipse's unit coordinates into the source image. */export function radialPoint(mask: RadialGradient, x: number, y: number): Point {- const offset = rotate(- [x * mask.radius[0], y * mask.radius[1]],- (mask.angle * Math.PI) / 180,- );- return [mask.center[0] + offset[0], mask.center[1] + offset[1]];+ const offset = rotate(+ [x * mask.radius[0], y * mask.radius[1]],+ (mask.angle * Math.PI) / 180,+ );+ return [mask.center[0] + offset[0], mask.center[1] + offset[1]];}function moveLinear(- mask: LinearGradient,- handle: GradientHandle,- from: Point,- to: Point,+ mask: LinearGradient,+ handle: GradientHandle,+ from: Point,+ to: Point,): LinearGradient {- const dx = to[0] - from[0];- const dy = to[1] - from[1];- if (handle === "move") {- return {- ...mask,- start: [mask.start[0] + dx, mask.start[1] + dy],- end: [mask.end[0] + dx, mask.end[1] + dy],- };- }- const vx = mask.end[0] - mask.start[0];- const vy = mask.end[1] - mask.start[1];- const length = Math.hypot(vx, vy);- if (handle === "rotate") {- const center: Point = [- (mask.start[0] + mask.end[0]) / 2,- (mask.start[1] + mask.end[1]) / 2,- ];- const angle =- Math.atan2(to[1] - center[1], to[0] - center[0]) -- Math.atan2(from[1] - center[1], from[0] - center[0]);- const offset = rotate([vx / 2, vy / 2], angle);- return {- ...mask,- start: [center[0] - offset[0], center[1] - offset[1]],- end: [center[0] + offset[0], center[1] + offset[1]],- };- }- if (handle !== "start" && handle !== "end") {- return mask;- }- const amount = (dx * vx + dy * vy) / length;- const distance =- handle === "start"- ? Math.min(amount, length - 1)- : Math.max(amount, 1 - length);- const point: Point = [- mask[handle][0] + (vx / length) * distance,- mask[handle][1] + (vy / length) * distance,- ];- return { ...mask, [handle]: point };+ const dx = to[0] - from[0];+ const dy = to[1] - from[1];+ if (handle === "move") {+ return {+ ...mask,+ start: [mask.start[0] + dx, mask.start[1] + dy],+ end: [mask.end[0] + dx, mask.end[1] + dy],+ };+ }+ const vx = mask.end[0] - mask.start[0];+ const vy = mask.end[1] - mask.start[1];+ const length = Math.hypot(vx, vy);+ if (handle === "rotate") {+ const center: Point = [+ (mask.start[0] + mask.end[0]) / 2,+ (mask.start[1] + mask.end[1]) / 2,+ ];+ const angle =+ Math.atan2(to[1] - center[1], to[0] - center[0]) -+ Math.atan2(from[1] - center[1], from[0] - center[0]);+ const offset = rotate([vx / 2, vy / 2], angle);+ return {+ ...mask,+ start: [center[0] - offset[0], center[1] - offset[1]],+ end: [center[0] + offset[0], center[1] + offset[1]],+ };+ }+ if (handle !== "start" && handle !== "end") {+ return mask;+ }+ const amount = (dx * vx + dy * vy) / length;+ const distance =+ handle === "start"+ ? Math.min(amount, length - 1)+ : Math.max(amount, 1 - length);+ const point: Point = [+ mask[handle][0] + (vx / length) * distance,+ mask[handle][1] + (vy / length) * distance,+ ];+ return { ...mask, [handle]: point };}export function moveGradient(- mask: Gradient,- handle: GradientHandle,- from: Point,- to: Point,+ mask: Gradient,+ handle: GradientHandle,+ from: Point,+ to: Point,): Gradient {- if (mask.kind === "linear") {- return moveLinear(mask, handle, from, to);- }- const dx = to[0] - from[0];- const dy = to[1] - from[1];- if (handle === "move") {- return { ...mask, center: [mask.center[0] + dx, mask.center[1] + dy] };- }- if (handle === "rotate") {- const angle =- Math.atan2(to[1] - mask.center[1], to[0] - mask.center[0]) -- Math.atan2(from[1] - mask.center[1], from[0] - mask.center[0]);- return { ...mask, angle: mask.angle + (angle * 180) / Math.PI };- }- const angle = (-mask.angle * Math.PI) / 180;- const delta = rotate([dx, dy], angle);- const origin = rotate(- [from[0] - mask.center[0], from[1] - mask.center[1]],- angle,- );- 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: clamp(mask.feather - delta[0] / mask.radius[0]),- };- }- return mask;+ if (mask.kind === "linear") {+ return moveLinear(mask, handle, from, to);+ }+ const dx = to[0] - from[0];+ const dy = to[1] - from[1];+ if (handle === "move") {+ return { ...mask, center: [mask.center[0] + dx, mask.center[1] + dy] };+ }+ if (handle === "rotate") {+ const angle =+ Math.atan2(to[1] - mask.center[1], to[0] - mask.center[0]) -+ Math.atan2(from[1] - mask.center[1], from[0] - mask.center[0]);+ return { ...mask, angle: mask.angle + (angle * 180) / Math.PI };+ }+ const angle = (-mask.angle * Math.PI) / 180;+ const delta = rotate([dx, dy], angle);+ const origin = rotate(+ [from[0] - mask.center[0], from[1] - mask.center[1]],+ angle,+ );+ 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: clamp(mask.feather - delta[0] / mask.radius[0]),+ };+ }+ return mask;}/** A horizontal gradient across the middle of an image. */export function defaultGradient(size: Point): LinearGradient {- return {- kind: "linear",- start: [size[0] * 0.2, size[1] * 0.5],- end: [size[0] * 0.8, size[1] * 0.5],- };+ return {+ kind: "linear",+ start: [size[0] * 0.2, size[1] * 0.5],+ end: [size[0] * 0.8, size[1] * 0.5],+ };}diff --git a/src/features/layers/mask-fill.tsx b/src/features/layers/mask-fill.tsxindex f9d103d..8795bba 100644--- a/src/features/layers/mask-fill.tsx+++ b/src/features/layers/mask-fill.tsx@@ -4,63 +4,63 @@ import type { Gradient } from "@/core/document";const samples = [0, 0.25, 0.5, 0.75, 1];function coverageStops(mask: Gradient): [number, number][] {- if (mask.kind === "linear") {- return [- [0, 1],- [1, 0],- ];- }- return samples.map((t) => [- 1 - mask.feather + t * mask.feather,- 1 - t * t * (3 - 2 * t),- ]);+ if (mask.kind === "linear") {+ return [+ [0, 1],+ [1, 0],+ ];+ }+ return samples.map((t) => [+ 1 - mask.feather + t * mask.feather,+ 1 - t * t * (3 - 2 * t),+ ]);}/** An SVG gradient in document coordinates whose opacity follows the mask's coverage. */export function MaskFill({- id,- mask,- color = "white",- alpha = (coverage: number) => coverage,+ id,+ mask,+ color = "white",+ alpha = (coverage: number) => coverage,}: {- id: string;- mask: Gradient;- color?: string;- alpha?: (coverage: number) => number;+ id: string;+ mask: Gradient;+ color?: string;+ alpha?: (coverage: number) => number;}) {- const stops = coverageStops(mask).map(([offset, coverage]) => (- <stop- key={`${offset}/${coverage}`}- offset={offset}- stopColor={color}- stopOpacity={alpha(coverage)}- />- ));- if (mask.kind === "radial") {- const transform = `translate(${mask.center[0]} ${mask.center[1]}) rotate(${mask.angle}) scale(${mask.radius[0]} ${mask.radius[1]})`;- return (- <radialGradient- id={id}- gradientUnits="userSpaceOnUse"- cx="0"- cy="0"- r="1"- gradientTransform={transform}- >- {stops}- </radialGradient>- );- }- return (- <linearGradient- id={id}- gradientUnits="userSpaceOnUse"- x1={mask.start[0]}- y1={mask.start[1]}- x2={mask.end[0]}- y2={mask.end[1]}- >- {stops}- </linearGradient>- );+ const stops = coverageStops(mask).map(([offset, coverage]) => (+ <stop+ key={`${offset}/${coverage}`}+ offset={offset}+ stopColor={color}+ stopOpacity={alpha(coverage)}+ />+ ));+ if (mask.kind === "radial") {+ const transform = `translate(${mask.center[0]} ${mask.center[1]}) rotate(${mask.angle}) scale(${mask.radius[0]} ${mask.radius[1]})`;+ return (+ <radialGradient+ id={id}+ gradientUnits="userSpaceOnUse"+ cx="0"+ cy="0"+ r="1"+ gradientTransform={transform}+ >+ {stops}+ </radialGradient>+ );+ }+ return (+ <linearGradient+ id={id}+ gradientUnits="userSpaceOnUse"+ x1={mask.start[0]}+ y1={mask.start[1]}+ x2={mask.end[0]}+ y2={mask.end[1]}+ >+ {stops}+ </linearGradient>+ );}diff --git a/src/features/layers/menu.tsx b/src/features/layers/menu.tsxindex a985181..91b5565 100644--- a/src/features/layers/menu.tsx+++ b/src/features/layers/menu.tsx@@ -6,172 +6,172 @@ import { findLayer, locateLayer, type ProcessingLayer } from "@/core/document";import { deleteLayer, duplicateLayer, moveLayer } from "./edits";const trigger = cva(- "grid shrink-0 place-items-center text-neutral-400 hover:text-neutral-100",- {- variants: {- variant: {- row: "size-7 rounded hover:bg-neutral-600/40 pointer-coarse:size-10",- pill: "h-7 rounded-full px-2.5 hover:bg-white/10 pointer-coarse:h-9",- },- },- },+ "grid shrink-0 place-items-center text-neutral-400 hover:text-neutral-100",+ {+ variants: {+ variant: {+ row: "size-7 rounded hover:bg-neutral-600/40 pointer-coarse:size-10",+ pill: "h-7 rounded-full px-2.5 hover:bg-white/10 pointer-coarse:h-9",+ },+ },+ },);export function LayerMenu({- label,- children,- icon,- variant = "row",+ label,+ children,+ icon,+ variant = "row",}: {- label: string;- children: ReactNode;- icon: ReactNode;- variant?: "row" | "pill";+ label: string;+ children: ReactNode;+ icon: ReactNode;+ variant?: "row" | "pill";}) {- const id = useId();- const popover = useRef<HTMLDivElement>(null);- const [open, setOpen] = useState(false);- return (- <>- <button- type="button"- aria-label={label}- title={label}- popoverTarget={id}- className={trigger({ variant })}- >- {icon}- </button>- <div- 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- onSubmit={(event) => {- event.preventDefault();- popover.current?.hidePopover();- }}- >- {open && children}- </form>- </div>- </>- );+ const id = useId();+ const popover = useRef<HTMLDivElement>(null);+ const [open, setOpen] = useState(false);+ return (+ <>+ <button+ type="button"+ aria-label={label}+ title={label}+ popoverTarget={id}+ className={trigger({ variant })}+ >+ {icon}+ </button>+ <div+ 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+ onSubmit={(event) => {+ event.preventDefault();+ popover.current?.hidePopover();+ }}+ >+ {open && children}+ </form>+ </div>+ </>+ );}/** Mounted only while the menu is open, so rows do not track siblings and containers. */function LayerActionItems({- layer,- onSelect,+ layer,+ onSelect,}: {- layer: ProcessingLayer;- onSelect: (id: string) => void;+ layer: ProcessingLayer;+ 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) =>- layer.children.length === 0 &&- item.kind !== "image" &&- item.id !== parent?.id &&- !findLayer([layer], item.id),- );- const bottom = !parent ? 1 : 0;- function moveOut() {- if (!parent) {- return;- }- const index = layers.findIndex((item) => item.id === parent.id);- moveLayer(document, layer.id, index + 1);- }- return (- <>- <button- type="submit"- disabled={index === siblings.length - 1}- onClick={() => moveLayer(document, layer.id, index + 1, parent?.id)}- >- Move up- </button>- <button- type="submit"- disabled={index === bottom}- onClick={() => moveLayer(document, layer.id, index - 1, parent?.id)}- >- Move down- </button>- {parent && (- <button type="submit" onClick={moveOut}>- Move out- </button>- )}- {containers.length > 0 && (- <label className="flex items-center justify-between gap-3 px-2 py-1.5">- Move into- <select- aria-label={`Move ${layer.name} into`}- value=""- className="min-w-0 max-w-32 bg-neutral-800"- onChange={(event) => {- const target = findLayer(layers, event.target.value);- if (target) {- moveLayer(- document,- layer.id,- target.children.length,- target.id,- );- }- }}- >- <option value="" disabled>- Choose layer- </option>- {containers.map((item) => (- <option key={item.id} value={item.id}>- {item.name}- </option>- ))}- </select>- </label>- )}- <div className="my-1 border-t border-neutral-700" />- <button- type="submit"- onClick={() => onSelect(duplicateLayer(document, layer.id))}- >- Duplicate- </button>- <button type="submit" onClick={() => deleteLayer(document, layer.id)}>- Delete- </button>- </>- );+ 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) =>+ layer.children.length === 0 &&+ item.kind !== "image" &&+ item.id !== parent?.id &&+ !findLayer([layer], item.id),+ );+ const bottom = !parent ? 1 : 0;+ function moveOut() {+ if (!parent) {+ return;+ }+ const index = layers.findIndex((item) => item.id === parent.id);+ moveLayer(document, layer.id, index + 1);+ }+ return (+ <>+ <button+ type="submit"+ disabled={index === siblings.length - 1}+ onClick={() => moveLayer(document, layer.id, index + 1, parent?.id)}+ >+ Move up+ </button>+ <button+ type="submit"+ disabled={index === bottom}+ onClick={() => moveLayer(document, layer.id, index - 1, parent?.id)}+ >+ Move down+ </button>+ {parent && (+ <button type="submit" onClick={moveOut}>+ Move out+ </button>+ )}+ {containers.length > 0 && (+ <label className="flex items-center justify-between gap-3 px-2 py-1.5">+ Move into+ <select+ aria-label={`Move ${layer.name} into`}+ value=""+ className="min-w-0 max-w-32 bg-neutral-800"+ onChange={(event) => {+ const target = findLayer(layers, event.target.value);+ if (target) {+ moveLayer(+ document,+ layer.id,+ target.children.length,+ target.id,+ );+ }+ }}+ >+ <option value="" disabled>+ Choose layer+ </option>+ {containers.map((item) => (+ <option key={item.id} value={item.id}>+ {item.name}+ </option>+ ))}+ </select>+ </label>+ )}+ <div className="my-1 border-t border-neutral-700" />+ <button+ type="submit"+ onClick={() => onSelect(duplicateLayer(document, layer.id))}+ >+ Duplicate+ </button>+ <button type="submit" onClick={() => deleteLayer(document, layer.id)}>+ Delete+ </button>+ </>+ );}export function LayerActions(props: {- layer: ProcessingLayer;- onSelect: (id: string) => void;+ 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>- );+ 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 694f5ad..92eb8cc 100644--- a/src/features/layers/thumbnails.tsx+++ b/src/features/layers/thumbnails.tsx@@ -7,65 +7,65 @@ import { MaskFill } from "./mask-fill";/** A small original-image snapshot, rendered once when the source changes. */export function ImageThumbnail() {- const gpu = useGpu();- const document = useDocument();- const sourceId = useScene((scene) => scene.layers[0].source);- const source = document.resources.get(sourceId);- const canvas = useRef<HTMLCanvasElement>(null);- const [error, setError] = useState<string>();- useEffect(() => {- const release = source.retain();- let active = true;- async function draw() {- try {- 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 {- release();- }- }- void draw();- return () => {- active = false;- };- }, [gpu, source]);- return (- <canvas- ref={canvas}- width={64}- height={64}- aria-label="Original image thumbnail"- title={error ?? "Original image"}- className="size-8 shrink-0 rounded-sm border border-neutral-600 bg-neutral-950"- />- );+ const gpu = useGpu();+ const document = useDocument();+ const sourceId = useScene((scene) => scene.layers[0].source);+ const source = document.resources.get(sourceId);+ const canvas = useRef<HTMLCanvasElement>(null);+ const [error, setError] = useState<string>();+ useEffect(() => {+ const release = source.retain();+ let active = true;+ async function draw() {+ try {+ 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 {+ release();+ }+ }+ void draw();+ return () => {+ active = false;+ };+ }, [gpu, source]);+ return (+ <canvas+ ref={canvas}+ width={64}+ height={64}+ aria-label="Original image thumbnail"+ title={error ?? "Original image"}+ className="size-8 shrink-0 rounded-sm border border-neutral-600 bg-neutral-950"+ />+ );}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 (- <svg- aria-label="Gradient mask thumbnail"- role="img"- viewBox={`0 0 ${size[0]} ${size[1]}`}- className="size-8 shrink-0 rounded-sm border border-neutral-600 bg-neutral-950"- >- <defs>- <MaskFill id={id} mask={mask} />- </defs>- <rect width={size[0]} height={size[1]} fill={`url(#${id})`} />- </svg>- );+ const id = useId();+ const document = useDocument();+ const sourceId = useScene((scene) => scene.layers[0].source);+ const size = document.resources.get(sourceId).image.size;+ return (+ <svg+ aria-label="Gradient mask thumbnail"+ role="img"+ viewBox={`0 0 ${size[0]} ${size[1]}`}+ className="size-8 shrink-0 rounded-sm border border-neutral-600 bg-neutral-950"+ >+ <defs>+ <MaskFill id={id} mask={mask} />+ </defs>+ <rect width={size[0]} height={size[1]} fill={`url(#${id})`} />+ </svg>+ );}diff --git a/src/features/layers/toolbar.tsx b/src/features/layers/toolbar.tsxindex df737bc..8200246 100644--- a/src/features/layers/toolbar.tsx+++ b/src/features/layers/toolbar.tsx@@ -8,123 +8,123 @@ import { useGradientTool } from "./gradient-tool";import { LayerMenu } from "./menu";const maskOperations = [- ["add", "Add", "Add to mask"],- ["subtract", "Subtract", "Subtract from mask"],+ ["add", "Add", "Add to mask"],+ ["subtract", "Subtract", "Subtract from mask"],] as const;function MaskOptions({ layer }: { layer: MaskLayer }) {- const document = useDocument();- const tool = useGradientTool();- const parent = useScene(- (scene) => locateLayer(scene.layers, layer.id)?.parent,- );- const isSubmask = parent?.kind === "mask";- return (- <>- <hr- aria-orientation="vertical"- className="h-4 w-px border-0 bg-white/15"- />- <button- type="button"- aria-pressed={tool.overlay !== "hidden"}- title="Show mask overlay (O)"- 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- </button>- {layer.mask.kind === "radial" && (- <Slider- label="Feather"- value={layer.mask.feather * 100}- min={0}- max={100}- defaultValue={50}- unit="%"- variant="toolbar"- onChange={(value) => {- if (layer.mask.kind === "radial") {- setLayerMask(document, layer.id, {- ...layer.mask,- feather: value / 100,- });- }- }}- />- )}- {isSubmask && (- <select- aria-label="Mask operation"- title="Combine with the parent mask"- value={layer.operation}- className="h-7 rounded-full bg-white/10 px-2.5 text-neutral-200 hover:bg-white/15"- onChange={(event) => {- const operation = event.target.value;- if (operation === "add" || operation === "subtract") {- setMaskOperation(document, layer.id, operation);- }- }}- >- <option value="add">Add</option>- <option value="subtract">Subtract</option>- </select>- )}- {!parent &&- 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")}- >- Radial gradient- </button>- </LayerMenu>- ))}- </>- );+ const document = useDocument();+ const tool = useGradientTool();+ const parent = useScene(+ (scene) => locateLayer(scene.layers, layer.id)?.parent,+ );+ const isSubmask = parent?.kind === "mask";+ return (+ <>+ <hr+ aria-orientation="vertical"+ className="h-4 w-px border-0 bg-white/15"+ />+ <button+ type="button"+ aria-pressed={tool.overlay !== "hidden"}+ title="Show mask overlay (O)"+ 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+ </button>+ {layer.mask.kind === "radial" && (+ <Slider+ label="Feather"+ value={layer.mask.feather * 100}+ min={0}+ max={100}+ defaultValue={50}+ unit="%"+ variant="toolbar"+ onChange={(value) => {+ if (layer.mask.kind === "radial") {+ setLayerMask(document, layer.id, {+ ...layer.mask,+ feather: value / 100,+ });+ }+ }}+ />+ )}+ {isSubmask && (+ <select+ aria-label="Mask operation"+ title="Combine with the parent mask"+ value={layer.operation}+ className="h-7 rounded-full bg-white/10 px-2.5 text-neutral-200 hover:bg-white/15"+ onChange={(event) => {+ const operation = event.target.value;+ if (operation === "add" || operation === "subtract") {+ setMaskOperation(document, layer.id, operation);+ }+ }}+ >+ <option value="add">Add</option>+ <option value="subtract">Subtract</option>+ </select>+ )}+ {!parent &&+ 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")}+ >+ Radial gradient+ </button>+ </LayerMenu>+ ))}+ </>+ );}export function LayerToolbar() {- const document = useDocument();- const gesture = useEditGesture(document.history);- const selected = useStore(document.selection, (state) => state.layerId);- const layer = useScene(- (scene) => findLayer(scene.layers, selected) ?? scene.layers[0],- );- if (layer.kind === "image") {- return null;- }- return (- <fieldset- aria-label="Layer options"- {...gesture}- className="absolute top-3 left-3 flex max-w-[calc(100%-1.5rem)] flex-wrap items-center gap-x-3 gap-y-1 rounded-full bg-neutral-800/80 p-1 pl-2.5 backdrop-blur-sm"- >- <Slider- label="Opacity"- value={layer.opacity * 100}- min={0}- max={100}- defaultValue={100}- unit="%"- variant="toolbar"- onChange={(value) =>- setLayer(document, layer.id, { opacity: value / 100 })- }- />- {layer.kind === "mask" && <MaskOptions layer={layer} />}- </fieldset>- );+ const document = useDocument();+ const gesture = useEditGesture(document.history);+ const selected = useStore(document.selection, (state) => state.layerId);+ const layer = useScene(+ (scene) => findLayer(scene.layers, selected) ?? scene.layers[0],+ );+ if (layer.kind === "image") {+ return null;+ }+ return (+ <fieldset+ aria-label="Layer options"+ {...gesture}+ className="absolute top-3 left-3 flex max-w-[calc(100%-1.5rem)] flex-wrap items-center gap-x-3 gap-y-1 rounded-full bg-neutral-800/80 p-1 pl-2.5 backdrop-blur-sm"+ >+ <Slider+ label="Opacity"+ value={layer.opacity * 100}+ min={0}+ max={100}+ defaultValue={100}+ unit="%"+ variant="toolbar"+ onChange={(value) =>+ setLayer(document, layer.id, { opacity: value / 100 })+ }+ />+ {layer.kind === "mask" && <MaskOptions layer={layer} />}+ </fieldset>+ );}diff --git a/src/features/tone-curves/curve.ts b/src/features/tone-curves/curve.tsindex 5736416..aef8ef3 100644--- a/src/features/tone-curves/curve.ts+++ b/src/features/tone-curves/curve.ts@@ -2,110 +2,110 @@ import type { CurvePoint, ToneCurve } from "@/core/document";import { clamp, interpolatePchip } from "@/lib/math";export const defaultCurve: ToneCurve = [- { x: 0, y: 0 },- { x: 1, y: 1 },+ { x: 0, y: 0 },+ { x: 1, y: 1 },];const gap = 1 / 1024;export function validateCurve(points: ToneCurve) {- if (!Array.isArray(points) || points.length < 2) {- throw new Error("A curve needs at least two points.");- }- for (const [index, point] of points.entries()) {- if (- !point ||- ![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.",- );- }- if (index > 0 && point.x < points[index - 1].x + gap) {- throw new Error(- "Curve points must be ordered with a minimum x gap of 1/1024.",- );- }- }- const first = points[0];- const last = points[points.length - 1];- if ((first.x !== 0 && first.y !== 0) || (last.x !== 1 && last.y !== 1)) {- throw new Error(- "Curve endpoints must follow the lower-left and upper-right edges.",- );- }+ if (!Array.isArray(points) || points.length < 2) {+ throw new Error("A curve needs at least two points.");+ }+ for (const [index, point] of points.entries()) {+ if (+ !point ||+ ![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.",+ );+ }+ if (index > 0 && point.x < points[index - 1].x + gap) {+ throw new Error(+ "Curve points must be ordered with a minimum x gap of 1/1024.",+ );+ }+ }+ const first = points[0];+ const last = points[points.length - 1];+ if ((first.x !== 0 && first.y !== 0) || (last.x !== 1 && last.y !== 1)) {+ throw new Error(+ "Curve endpoints must follow the lower-left and upper-right edges.",+ );+ }}export function moveCurvePoint(- points: ToneCurve,- index: number,- point: CurvePoint,+ points: ToneCurve,+ index: number,+ point: CurvePoint,): ToneCurve {- if (!points[index]) {- return points;- }- let x = clamp(point.x);- let y = clamp(point.y);- if (index === 0) {- x = Math.min(x, points[1].x - gap);- if (x < y) {- x = 0;- } else {- y = 0;- }- } else if (index === points.length - 1) {- x = Math.max(x, points[index - 1].x + gap);- if (x > y) {- x = 1;- } else {- y = 1;- }- } else {- x = clamp(x, points[index - 1].x + gap, points[index + 1].x - gap);- }- return points.with(index, { x, y });+ if (!points[index]) {+ return points;+ }+ let x = clamp(point.x);+ let y = clamp(point.y);+ if (index === 0) {+ x = Math.min(x, points[1].x - gap);+ if (x < y) {+ x = 0;+ } else {+ y = 0;+ }+ } else if (index === points.length - 1) {+ x = Math.max(x, points[index - 1].x + gap);+ if (x > y) {+ x = 1;+ } else {+ y = 1;+ }+ } else {+ x = clamp(x, points[index - 1].x + gap, points[index + 1].x - gap);+ }+ return points.with(index, { x, y });}export function removeCurvePoint(points: ToneCurve, index: number): ToneCurve {- if (index <= 0 || index >= points.length - 1) {- return points;- }- return points.toSpliced(index, 1);+ if (index <= 0 || index >= points.length - 1) {+ return points;+ }+ return points.toSpliced(index, 1);}/** Uniform samples over 0..1, including both endpoints; size must be at least two. */export function sampleCurve(points: ToneCurve, size = 1024) {- const evaluate = interpolatePchip(points);- return Float32Array.from({ length: size }, (_, i) =>- evaluate(i / (size - 1)),- );+ const evaluate = interpolatePchip(points);+ return Float32Array.from({ length: size }, (_, i) =>+ evaluate(i / (size - 1)),+ );}function midpoint(points: ToneCurve): CurvePoint {- let widest = 0;- for (let i = 1; i < points.length - 1; i++) {- if (- points[i + 1].x - points[i].x >- points[widest + 1].x - points[widest].x- ) {- widest = i;- }- }- const x = (points[widest].x + points[widest + 1].x) / 2;- return { x, y: interpolatePchip(points)(x) };+ let widest = 0;+ for (let i = 1; i < points.length - 1; i++) {+ if (+ points[i + 1].x - points[i].x >+ points[widest + 1].x - points[widest].x+ ) {+ widest = i;+ }+ }+ const x = (points[widest].x + points[widest + 1].x) / 2;+ return { x, y: interpolatePchip(points)(x) };}/** Without a position, insert on the curve in its widest interval. */export function insertCurvePoint(points: ToneCurve, point = midpoint(points)) {- const index = points.findIndex((next) => next.x > point.x);- if (- index <= 0 ||- point.x - points[index - 1].x < gap ||- points[index].x - point.x < gap- ) {- return null;- }- return { curve: points.toSpliced(index, 0, point), index };+ const index = points.findIndex((next) => next.x > point.x);+ if (+ index <= 0 ||+ point.x - points[index - 1].x < gap ||+ points[index].x - point.x < gap+ ) {+ return null;+ }+ return { curve: points.toSpliced(index, 0, point), index };}diff --git a/src/features/tone-curves/edits.ts b/src/features/tone-curves/edits.tsindex 757f264..f8e4ff7 100644--- a/src/features/tone-curves/edits.ts+++ b/src/features/tone-curves/edits.ts@@ -1,20 +1,20 @@import {- type EditorDocument,- editLayer,- type ToneCurve,+ type EditorDocument,+ editLayer,+ type ToneCurve,} from "@/core/document";import { defaultCurve, validateCurve } from "./curve";export function setToneCurve(- document: EditorDocument,- points: ToneCurve = defaultCurve,- id = document.scene.getState().layers[0].id,+ document: EditorDocument,+ points: ToneCurve = defaultCurve,+ id = document.scene.getState().layers[0].id,) {- validateCurve(points);- editLayer(document, id, (layer) => {- if (layer.kind !== "image" && layer.kind !== "mask") {- throw Error("Select an image or mask layer.");- }- return { ...layer, toneCurve: points.map((point) => ({ ...point })) };- });+ validateCurve(points);+ editLayer(document, id, (layer) => {+ if (layer.kind !== "image" && layer.kind !== "mask") {+ throw Error("Select an image or mask layer.");+ }+ return { ...layer, toneCurve: points.map((point) => ({ ...point })) };+ });}diff --git a/src/features/tone-curves/graph.tsx b/src/features/tone-curves/graph.tsxindex 3c26fd2..635750d 100644--- a/src/features/tone-curves/graph.tsx+++ b/src/features/tone-curves/graph.tsx@@ -1,212 +1,212 @@import {- type KeyboardEvent,- type MouseEvent,- type PointerEvent,- useEffect,- useRef,- useState,+ type KeyboardEvent,+ type MouseEvent,+ type PointerEvent,+ useEffect,+ useRef,+ useState,} from "react";import type { CurvePoint, ToneCurve } from "@/core/document";import { clamp } from "@/lib/math";import {- insertCurvePoint,- moveCurvePoint,- removeCurvePoint,- sampleCurve,+ insertCurvePoint,+ moveCurvePoint,+ removeCurvePoint,+ sampleCurve,} from "./curve";function gridLines(divisions: number, [width, height]: readonly number[]) {- return Array.from({ length: divisions - 1 }, (_, index) => {- const x = ((index + 1) * width) / divisions;- const y = ((index + 1) * height) / divisions;- return `M${x} 0V${height} M0 ${y}H${width}`;- }).join(" ");+ return Array.from({ length: divisions - 1 }, (_, index) => {+ const x = ((index + 1) * width) / divisions;+ const y = ((index + 1) * height) / divisions;+ return `M${x} 0V${height} M0 ${y}H${width}`;+ }).join(" ");}/** The graph draws in pixels so lines and points keep their weight at any box aspect. */function useBoxSize(ref: React.RefObject<SVGSVGElement | null>) {- const [size, setSize] = useState<readonly [number, number]>([256, 256]);- useEffect(() => {- const element = ref.current;- if (!element) {- return;- }- const observer = new ResizeObserver(([entry]) => {- const { width, height } = entry.contentRect;- setSize([width, height]);- });- observer.observe(element);- return () => observer.disconnect();- }, [ref]);- return size;+ const [size, setSize] = useState<readonly [number, number]>([256, 256]);+ useEffect(() => {+ const element = ref.current;+ if (!element) {+ return;+ }+ const observer = new ResizeObserver(([entry]) => {+ const { width, height } = entry.contentRect;+ setSize([width, height]);+ });+ observer.observe(element);+ return () => observer.disconnect();+ }, [ref]);+ return size;}function position(event: MouseEvent<SVGSVGElement>): CurvePoint {- const bounds = event.currentTarget.getBoundingClientRect();- return {- x: clamp((event.clientX - bounds.left) / bounds.width),- y: clamp(1 - (event.clientY - bounds.top) / bounds.height),- };+ const bounds = event.currentTarget.getBoundingClientRect();+ return {+ x: clamp((event.clientX - bounds.left) / bounds.width),+ y: clamp(1 - (event.clientY - bounds.top) / bounds.height),+ };}type GraphProps = {- points: ToneCurve;- onChange: (points: ToneCurve) => void;+ points: ToneCurve;+ onChange: (points: ToneCurve) => void;};export function Graph({ points, onChange }: GraphProps) {- const [selected, select] = useState<number | null>(null);- const svg = useRef<SVGSVGElement>(null);- const [width, height] = useBoxSize(svg);- const line = Array.from(- sampleCurve(points, 257),- (y, x) => `${(x / 256) * width},${height * (1 - y)}`,- ).join(" ");- function move(index: number, point: CurvePoint) {- onChange(moveCurvePoint(points, index, point));- }- function remove(index: number) {- const curve = removeCurvePoint(points, index);- if (curve !== points) {- onChange(curve);- select(null);- }- }- function hitTest(event: MouseEvent<SVGSVGElement>) {- const point = position(event);- const bounds = event.currentTarget.getBoundingClientRect();- return points.findIndex(- (candidate) =>- Math.hypot(- (candidate.x - point.x) * bounds.width,- (candidate.y - point.y) * bounds.height,- ) <= 12,- );- }- function doubleClick(event: MouseEvent<SVGSVGElement>) {- const index = hitTest(event);- if (index === 0) {- move(index, { x: 0, y: 0 });- } else if (index === points.length - 1) {- move(index, { x: 1, y: 1 });- } else {- remove(index);- }- }- function insert(point?: CurvePoint) {- const inserted = insertCurvePoint(points, point);- if (!inserted) {- return null;- }- onChange(inserted.curve);- select(inserted.index);- return inserted.index;- }- function start(event: PointerEvent<SVGSVGElement>) {- if (event.button !== 0) {- return;- }- event.preventDefault();- event.currentTarget.focus();- const point = position(event);- let index = hitTest(event);- if (index < 0) {- const added = insert(point);- if (added === null) {- return;- }- index = added;- }- select(index);- event.currentTarget.setPointerCapture(event.pointerId);- }- function keyDown(event: KeyboardEvent<SVGSVGElement>) {- if (event.key === "Enter") {- event.preventDefault();- insert();- return;- }- if (selected === null || !points[selected]) {- return;- }- if (event.key === "Delete" || event.key === "Backspace") {- event.preventDefault();- remove(selected);- return;- }- const directions: Record<string, CurvePoint> = {- ArrowLeft: { x: -1, y: 0 },- ArrowRight: { x: 1, y: 0 },- ArrowDown: { x: 0, y: -1 },- ArrowUp: { x: 0, y: 1 },- };- const direction = directions[event.key];- if (direction) {- event.preventDefault();- const step = event.shiftKey ? 0.01 : 0.001;- move(selected, {- x: points[selected].x + direction.x * step,- y: points[selected].y + direction.y * step,- });- }- }- return (- <svg- aria-label="Tone curve"- aria-description="Click or press Enter to add a point. Drag or use arrow keys to move it. Endpoints follow the edges. Shift moves faster. Double-click resets an endpoint or removes an interior point. Delete removes an interior point."- className="absolute inset-0 h-full w-full cursor-crosshair touch-none overflow-visible outline-none"- onDoubleClick={doubleClick}- onKeyDown={keyDown}- onPointerDown={start}- onPointerMove={(event) => {- if (- selected !== null &&- event.currentTarget.hasPointerCapture(event.pointerId)- ) {- move(selected, position(event));- }- }}- ref={svg}- role="application"- tabIndex={-1}- >- <path- d={gridLines(32, [width, height])}- fill="none"- stroke="white"- strokeOpacity="0.04"- />- <path- d={gridLines(8, [width, height])}- fill="none"- stroke="white"- strokeOpacity="0.07"- />- <path- d={`M0 ${height}L${width} 0`}- fill="none"- stroke="#a3a3a3"- strokeDasharray="3 4"- strokeOpacity="0.2"- />- <polyline- className="drop-shadow-[0_1px_1px_rgb(0_0_0/0.25)]"- fill="none"- points={line}- stroke="#e5e5e5"- strokeWidth="2"- />- {points.map((point, index) => (- <circle- className="fill-neutral-800 stroke-neutral-200 data-[selected=true]:fill-neutral-100"- cx={point.x * width}- cy={(1 - point.y) * height}- data-selected={selected === index}- key={point.x}- r="4"- strokeWidth="2"- />- ))}- </svg>- );+ const [selected, select] = useState<number | null>(null);+ const svg = useRef<SVGSVGElement>(null);+ const [width, height] = useBoxSize(svg);+ const line = Array.from(+ sampleCurve(points, 257),+ (y, x) => `${(x / 256) * width},${height * (1 - y)}`,+ ).join(" ");+ function move(index: number, point: CurvePoint) {+ onChange(moveCurvePoint(points, index, point));+ }+ function remove(index: number) {+ const curve = removeCurvePoint(points, index);+ if (curve !== points) {+ onChange(curve);+ select(null);+ }+ }+ function hitTest(event: MouseEvent<SVGSVGElement>) {+ const point = position(event);+ const bounds = event.currentTarget.getBoundingClientRect();+ return points.findIndex(+ (candidate) =>+ Math.hypot(+ (candidate.x - point.x) * bounds.width,+ (candidate.y - point.y) * bounds.height,+ ) <= 12,+ );+ }+ function doubleClick(event: MouseEvent<SVGSVGElement>) {+ const index = hitTest(event);+ if (index === 0) {+ move(index, { x: 0, y: 0 });+ } else if (index === points.length - 1) {+ move(index, { x: 1, y: 1 });+ } else {+ remove(index);+ }+ }+ function insert(point?: CurvePoint) {+ const inserted = insertCurvePoint(points, point);+ if (!inserted) {+ return null;+ }+ onChange(inserted.curve);+ select(inserted.index);+ return inserted.index;+ }+ function start(event: PointerEvent<SVGSVGElement>) {+ if (event.button !== 0) {+ return;+ }+ event.preventDefault();+ event.currentTarget.focus();+ const point = position(event);+ let index = hitTest(event);+ if (index < 0) {+ const added = insert(point);+ if (added === null) {+ return;+ }+ index = added;+ }+ select(index);+ event.currentTarget.setPointerCapture(event.pointerId);+ }+ function keyDown(event: KeyboardEvent<SVGSVGElement>) {+ if (event.key === "Enter") {+ event.preventDefault();+ insert();+ return;+ }+ if (selected === null || !points[selected]) {+ return;+ }+ if (event.key === "Delete" || event.key === "Backspace") {+ event.preventDefault();+ remove(selected);+ return;+ }+ const directions: Record<string, CurvePoint> = {+ ArrowLeft: { x: -1, y: 0 },+ ArrowRight: { x: 1, y: 0 },+ ArrowDown: { x: 0, y: -1 },+ ArrowUp: { x: 0, y: 1 },+ };+ const direction = directions[event.key];+ if (direction) {+ event.preventDefault();+ const step = event.shiftKey ? 0.01 : 0.001;+ move(selected, {+ x: points[selected].x + direction.x * step,+ y: points[selected].y + direction.y * step,+ });+ }+ }+ return (+ <svg+ aria-label="Tone curve"+ aria-description="Click or press Enter to add a point. Drag or use arrow keys to move it. Endpoints follow the edges. Shift moves faster. Double-click resets an endpoint or removes an interior point. Delete removes an interior point."+ className="absolute inset-0 h-full w-full cursor-crosshair touch-none overflow-visible outline-none"+ onDoubleClick={doubleClick}+ onKeyDown={keyDown}+ onPointerDown={start}+ onPointerMove={(event) => {+ if (+ selected !== null &&+ event.currentTarget.hasPointerCapture(event.pointerId)+ ) {+ move(selected, position(event));+ }+ }}+ ref={svg}+ role="application"+ tabIndex={-1}+ >+ <path+ d={gridLines(32, [width, height])}+ fill="none"+ stroke="white"+ strokeOpacity="0.04"+ />+ <path+ d={gridLines(8, [width, height])}+ fill="none"+ stroke="white"+ strokeOpacity="0.07"+ />+ <path+ d={`M0 ${height}L${width} 0`}+ fill="none"+ stroke="#a3a3a3"+ strokeDasharray="3 4"+ strokeOpacity="0.2"+ />+ <polyline+ className="drop-shadow-[0_1px_1px_rgb(0_0_0/0.25)]"+ fill="none"+ points={line}+ stroke="#e5e5e5"+ strokeWidth="2"+ />+ {points.map((point, index) => (+ <circle+ className="fill-neutral-800 stroke-neutral-200 data-[selected=true]:fill-neutral-100"+ cx={point.x * width}+ cy={(1 - point.y) * height}+ data-selected={selected === index}+ key={point.x}+ r="4"+ strokeWidth="2"+ />+ ))}+ </svg>+ );}diff --git a/src/features/tone-curves/pass.ts b/src/features/tone-curves/pass.tsindex 08297ef..20e9586 100644--- a/src/features/tone-curves/pass.ts+++ b/src/features/tone-curves/pass.ts@@ -4,10 +4,10 @@ import { sampleCurve } from "./curve";import shader from "./curves.wgsl";export function toneCurves(points: ToneCurve, name = "curves") {- if (points.every((point) => point.x === point.y)) {- return;- }- return node(name, shader, {- storage: { curve: sampleCurve(points, 1024) },- });+ if (points.every((point) => point.x === point.y)) {+ return;+ }+ return node(name, shader, {+ storage: { curve: sampleCurve(points, 1024) },+ });}diff --git a/src/features/tone-curves/tone-curves.tsx b/src/features/tone-curves/tone-curves.tsxindex 44e1b6d..71de081 100644--- a/src/features/tone-curves/tone-curves.tsx+++ b/src/features/tone-curves/tone-curves.tsx@@ -5,31 +5,31 @@ import { defaultCurve } from "./curve";import { Graph } from "./graph";type ToneCurvesProps = {- points: ToneCurve;- onChange: (points: ToneCurve) => void;- children?: ReactNode;+ points: ToneCurve;+ onChange: (points: ToneCurve) => void;+ children?: ReactNode;};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>- <Button- variant="ghost"- aria-label="Reset curve"- className="px-2 py-1"- onClick={() => onChange(defaultCurve)}- >- Reset- </Button>- </div>- <div className="px-0.5">- <div className="relative aspect-square max-h-60 w-full rounded border border-black bg-neutral-900 shadow-groove">- {children}- <Graph onChange={onChange} points={points} />- </div>- </div>- </section>- );+ return (+ <section aria-label="Curves" className="space-y-2.5">+ <div className="flex items-center justify-between">+ <h2 className="text-neutral-400">Curves</h2>+ <Button+ variant="ghost"+ aria-label="Reset curve"+ className="px-2 py-1"+ onClick={() => onChange(defaultCurve)}+ >+ Reset+ </Button>+ </div>+ <div className="px-0.5">+ <div className="relative aspect-square max-h-60 w-full rounded border border-black bg-neutral-900 shadow-groove">+ {children}+ <Graph onChange={onChange} points={points} />+ </div>+ </div>+ </section>+ );}diff --git a/src/features/vignette/controls.tsx b/src/features/vignette/controls.tsxindex 0ea07d8..9660be7 100644--- a/src/features/vignette/controls.tsx+++ b/src/features/vignette/controls.tsx@@ -5,31 +5,31 @@ import { setVignette } from "./edits";import { defaultVignette } from "./model";export function VignetteControls({- id,- vignette,+ id,+ vignette,}: {- id: string;- vignette: Vignette;+ id: string;+ vignette: Vignette;}) {- const document = useDocument();- return (- <section className="flex flex-col gap-2 p-3">- <Slider- label="Intensity"- value={vignette.intensity}- onChange={(intensity) => setVignette(document, { intensity }, id)}- min={0}- max={100}- defaultValue={defaultVignette.intensity}- />- <Slider- label="Softness"- value={vignette.softness}- onChange={(softness) => setVignette(document, { softness }, id)}- min={0}- max={100}- defaultValue={defaultVignette.softness}- />- </section>- );+ const document = useDocument();+ return (+ <section className="flex flex-col gap-2 p-3">+ <Slider+ label="Intensity"+ value={vignette.intensity}+ onChange={(intensity) => setVignette(document, { intensity }, id)}+ min={0}+ max={100}+ defaultValue={defaultVignette.intensity}+ />+ <Slider+ label="Softness"+ value={vignette.softness}+ onChange={(softness) => setVignette(document, { softness }, id)}+ min={0}+ max={100}+ defaultValue={defaultVignette.softness}+ />+ </section>+ );}diff --git a/src/features/vignette/edits.ts b/src/features/vignette/edits.tsindex 6704501..558a773 100644--- a/src/features/vignette/edits.ts+++ b/src/features/vignette/edits.ts@@ -1,29 +1,29 @@import { type EditorDocument, editLayer, type Vignette } from "@/core/document";export function validateVignette(change: Partial<Vignette>) {- for (const [name, value] of Object.entries(change)) {- if (- (name !== "intensity" && name !== "softness") ||- typeof value !== "number" ||- !Number.isFinite(value) ||- value < 0 ||- value > 100- ) {- throw new Error(`Invalid vignette adjustment: ${name}.`);- }- }+ for (const [name, value] of Object.entries(change)) {+ if (+ (name !== "intensity" && name !== "softness") ||+ typeof value !== "number" ||+ !Number.isFinite(value) ||+ value < 0 ||+ value > 100+ ) {+ throw new Error(`Invalid vignette adjustment: ${name}.`);+ }+ }}export function setVignette(- document: EditorDocument,- change: Partial<Vignette>,- id: string,+ document: EditorDocument,+ change: Partial<Vignette>,+ id: string,) {- validateVignette(change);- editLayer(document, id, (layer) => {- if (layer.kind !== "vignette") {- throw Error("Select a vignette layer.");- }- return { ...layer, vignette: { ...layer.vignette, ...change } };- });+ validateVignette(change);+ editLayer(document, id, (layer) => {+ if (layer.kind !== "vignette") {+ throw Error("Select a vignette layer.");+ }+ return { ...layer, vignette: { ...layer.vignette, ...change } };+ });}diff --git a/src/features/vignette/model.ts b/src/features/vignette/model.tsindex 106f980..84557ad 100644--- a/src/features/vignette/model.ts+++ b/src/features/vignette/model.ts@@ -1,6 +1,6 @@import type { Vignette } from "@/core/document";export const defaultVignette: Readonly<Vignette> = {- intensity: 0,- softness: 50,+ intensity: 0,+ softness: 50,};diff --git a/src/features/vignette/pass.ts b/src/features/vignette/pass.tsindex 2a328b4..4e4fb19 100644--- a/src/features/vignette/pass.ts+++ b/src/features/vignette/pass.ts@@ -3,8 +3,8 @@ import { node } from "@/core/renderer";import shader from "./vignette.wgsl";export function vignette(settings?: Vignette, name = "vignette") {- if (!settings || settings.intensity === 0) {- return;- }- return node(name, shader, { set: { params: settings } });+ if (!settings || settings.intensity === 0) {+ return;+ }+ return node(name, shader, { set: { params: settings } });}diff --git a/src/features/white-balance/controls.tsx b/src/features/white-balance/controls.tsxindex 88ffaa2..ba6e9ee 100644--- a/src/features/white-balance/controls.tsx+++ b/src/features/white-balance/controls.tsx@@ -3,39 +3,39 @@ import { Slider } from "@/components/ui/slider";import { setWhiteBalance, whiteBalanceLimits } from "./edits";export function WhiteBalanceControls() {- const document = useDocument();- const source = useScene((scene) => scene.layers[0].source);- const selected = useScene((scene) => scene.layers[0].whiteBalance);- const asShot = document.resources.get(source).raw?.asShot;- if (!asShot) {- return null;- }- const balance = selected ?? asShot;- const limits = whiteBalanceLimits(asShot);- return (- <>- <button- type="button"- className="cursor-pointer self-end text-neutral-400 hover:text-neutral-100"- onClick={() => setWhiteBalance(document)}- >- As Shot- </button>- <Slider- label="Temperature (K)"- value={balance.temperature}- {...limits.temperature}- defaultValue={asShot.temperature}- onChange={(temperature) => setWhiteBalance(document, { temperature })}- />- <Slider- label="Tint"- value={balance.tint}- step={0.1}- {...limits.tint}- defaultValue={asShot.tint}- onChange={(tint) => setWhiteBalance(document, { tint })}- />- </>- );+ const document = useDocument();+ const source = useScene((scene) => scene.layers[0].source);+ const selected = useScene((scene) => scene.layers[0].whiteBalance);+ const asShot = document.resources.get(source).raw?.asShot;+ if (!asShot) {+ return null;+ }+ const balance = selected ?? asShot;+ const limits = whiteBalanceLimits(asShot);+ return (+ <>+ <button+ type="button"+ className="cursor-pointer self-end text-neutral-400 hover:text-neutral-100"+ onClick={() => setWhiteBalance(document)}+ >+ As Shot+ </button>+ <Slider+ label="Temperature (K)"+ value={balance.temperature}+ {...limits.temperature}+ defaultValue={asShot.temperature}+ onChange={(temperature) => setWhiteBalance(document, { temperature })}+ />+ <Slider+ label="Tint"+ value={balance.tint}+ step={0.1}+ {...limits.tint}+ defaultValue={asShot.tint}+ onChange={(tint) => setWhiteBalance(document, { tint })}+ />+ </>+ );}diff --git a/src/features/white-balance/edits.ts b/src/features/white-balance/edits.tsindex 012995d..86b2cb1 100644--- a/src/features/white-balance/edits.ts+++ b/src/features/white-balance/edits.ts@@ -2,48 +2,48 @@ import { type EditorDocument, editLayer } from "@/core/document";import type { WhiteBalance } from "@/core/image";export function whiteBalanceLimits(asShot: WhiteBalance) {- return {- temperature: {- min: Math.min(2000, asShot.temperature),- max: Math.max(25000, asShot.temperature),- },- tint: {- min: Math.min(-150, asShot.tint),- max: Math.max(150, asShot.tint),- },- };+ return {+ temperature: {+ min: Math.min(2000, asShot.temperature),+ max: Math.max(25000, asShot.temperature),+ },+ tint: {+ min: Math.min(-150, asShot.tint),+ max: Math.max(150, asShot.tint),+ },+ };}function validateWhiteBalance(balance: WhiteBalance, asShot: WhiteBalance) {- const limits = whiteBalanceLimits(asShot);- for (const channel of ["temperature", "tint"] as const) {- const value = balance[channel];- const { min, max } = limits[channel];- if (!Number.isFinite(value) || value < min || value > max) {- throw Error("Invalid RAW white balance.");- }- }+ const limits = whiteBalanceLimits(asShot);+ for (const channel of ["temperature", "tint"] as const) {+ const value = balance[channel];+ const { min, max } = limits[channel];+ if (!Number.isFinite(value) || value < min || value > max) {+ throw Error("Invalid RAW white balance.");+ }+ }}/** Without a change, resets to the camera's as-shot balance. */export function setWhiteBalance(- document: EditorDocument,- change?: Partial<WhiteBalance>,+ document: EditorDocument,+ change?: Partial<WhiteBalance>,) {- const scene = document.scene.getState();- const asShot = document.resources.get(scene.layers[0].source).raw?.asShot;- if (!asShot) {- throw Error("This image does not support RAW white balance.");- }- let whiteBalance = asShot;- if (change) {- whiteBalance = { ...(scene.layers[0].whiteBalance ?? asShot), ...change };- validateWhiteBalance(whiteBalance, asShot);- }- editLayer(document, scene.layers[0].id, (layer) => {- if (layer.kind !== "image") {- throw Error("Select the image layer.");- }- return { ...layer, whiteBalance };- });+ const scene = document.scene.getState();+ const asShot = document.resources.get(scene.layers[0].source).raw?.asShot;+ if (!asShot) {+ throw Error("This image does not support RAW white balance.");+ }+ let whiteBalance = asShot;+ if (change) {+ whiteBalance = { ...(scene.layers[0].whiteBalance ?? asShot), ...change };+ validateWhiteBalance(whiteBalance, asShot);+ }+ editLayer(document, scene.layers[0].id, (layer) => {+ if (layer.kind !== "image") {+ throw Error("Select the image layer.");+ }+ return { ...layer, whiteBalance };+ });}diff --git a/src/hooks/use-edit-gesture.ts b/src/hooks/use-edit-gesture.tsindex 0eb6930..f6b9204 100644--- a/src/hooks/use-edit-gesture.ts+++ b/src/hooks/use-edit-gesture.ts@@ -1,8 +1,8 @@import {- type KeyboardEvent,- type PointerEvent,- useEffect,- useRef,+ type KeyboardEvent,+ type PointerEvent,+ useEffect,+ useRef,} from "react";type Edit = { begin: () => void; commit: () => void; cancel: () => void };@@ -10,69 +10,69 @@ type Gesture = "pointerup" | "keyup";/** Groups pointer and repeated keyboard changes; text fields commit their own draft. */export function useEditGesture(edit: Edit) {- const active = useRef<Gesture | null>(null);- function begin(end: Gesture) {- active.current = end;- edit.begin();- }- useEffect(() => {- function finish(event: Event) {- if (active.current !== event.type) {- return;- }- active.current = null;- edit.commit();- }- function cancel() {- if (!active.current) {- return;- }- active.current = null;- edit.cancel();- }- const controller = new AbortController();- const { signal } = controller;- window.addEventListener("pointerup", finish, { signal });- window.addEventListener("keyup", finish, { signal });- window.addEventListener("pointercancel", cancel, { signal });- window.addEventListener("blur", cancel, { signal });- return () => {- controller.abort();- cancel();- };- }, [edit]);- return {- onPointerDownCapture(event: PointerEvent) {- if (event.button === 0) {- const focused = document.activeElement;- if (- focused instanceof HTMLInputElement &&- focused.type === "text" &&- focused !== event.target- ) {- focused.blur();- }- begin("pointerup");- }- },- onPointerMoveCapture() {- if (active.current === "pointerup") {- edit.begin();- }- },- onKeyDownCapture(event: KeyboardEvent) {- if (- event.metaKey ||- event.ctrlKey ||- event.altKey ||- active.current === "pointerup" ||- (event.target instanceof HTMLInputElement &&- event.target.type !== "range")- ) {- return;- }- // Unused keys create no history entry; shortcuts keep their own transactions.- begin("keyup");- },- };+ const active = useRef<Gesture | null>(null);+ function begin(end: Gesture) {+ active.current = end;+ edit.begin();+ }+ useEffect(() => {+ function finish(event: Event) {+ if (active.current !== event.type) {+ return;+ }+ active.current = null;+ edit.commit();+ }+ function cancel() {+ if (!active.current) {+ return;+ }+ active.current = null;+ edit.cancel();+ }+ const controller = new AbortController();+ const { signal } = controller;+ window.addEventListener("pointerup", finish, { signal });+ window.addEventListener("keyup", finish, { signal });+ window.addEventListener("pointercancel", cancel, { signal });+ window.addEventListener("blur", cancel, { signal });+ return () => {+ controller.abort();+ cancel();+ };+ }, [edit]);+ return {+ onPointerDownCapture(event: PointerEvent) {+ if (event.button === 0) {+ const focused = document.activeElement;+ if (+ focused instanceof HTMLInputElement &&+ focused.type === "text" &&+ focused !== event.target+ ) {+ focused.blur();+ }+ begin("pointerup");+ }+ },+ onPointerMoveCapture() {+ if (active.current === "pointerup") {+ edit.begin();+ }+ },+ onKeyDownCapture(event: KeyboardEvent) {+ if (+ event.metaKey ||+ event.ctrlKey ||+ event.altKey ||+ active.current === "pointerup" ||+ (event.target instanceof HTMLInputElement &&+ event.target.type !== "range")+ ) {+ return;+ }+ // Unused keys create no history entry; shortcuts keep their own transactions.+ begin("keyup");+ },+ };}diff --git a/src/hooks/use-file-drop.ts b/src/hooks/use-file-drop.tsindex 7d02a9c..a83efb3 100644--- a/src/hooks/use-file-drop.ts+++ b/src/hooks/use-file-drop.ts@@ -1,19 +1,19 @@import { useEffect } from "react";export function useFileDrop(onFiles: (files: File[]) => void) {- useEffect(() => {- const controller = new AbortController();- const { signal } = controller;- const preventDefault = (event: DragEvent) => event.preventDefault();- const drop = (event: DragEvent) => {- event.preventDefault();- const files = event.dataTransfer?.files;- if (files?.length) {- onFiles(Array.from(files));- }- };- document.addEventListener("dragover", preventDefault, { signal });- document.addEventListener("drop", drop, { signal });- return () => controller.abort();- }, [onFiles]);+ useEffect(() => {+ const controller = new AbortController();+ const { signal } = controller;+ const preventDefault = (event: DragEvent) => event.preventDefault();+ const drop = (event: DragEvent) => {+ event.preventDefault();+ const files = event.dataTransfer?.files;+ if (files?.length) {+ onFiles(Array.from(files));+ }+ };+ document.addEventListener("dragover", preventDefault, { signal });+ document.addEventListener("drop", drop, { signal });+ return () => controller.abort();+ }, [onFiles]);}diff --git a/src/hooks/use-pan-zoom.ts b/src/hooks/use-pan-zoom.tsindex d011df8..e373ad6 100644--- a/src/hooks/use-pan-zoom.ts+++ b/src/hooks/use-pan-zoom.ts@@ -1,10 +1,10 @@import {- type PointerEvent,- useCallback,- useEffect,- useLayoutEffect,- useRef,- useState,+ type PointerEvent,+ useCallback,+ useEffect,+ useLayoutEffect,+ useRef,+ useState,} from "react";import { useStore } from "zustand";@@ -20,49 +20,49 @@ export type Camera = ReturnType<typeof createCamera>;const maxZoom = 8;function measureGesture(points: Iterable<Point>) {- const [first, second = first] = points;- return {- center: [(first[0] + second[0]) / 2, (first[1] + second[1]) / 2] as const,- distance: Math.hypot(second[0] - first[0], second[1] - first[1]),- };+ const [first, second = first] = points;+ return {+ center: [(first[0] + second[0]) / 2, (first[1] + second[1]) / 2] as const,+ distance: Math.hypot(second[0] - first[0], second[1] - first[1]),+ };}function pan(view: View, x: number, y: number): View {- return { ...view, pan: [view.pan[0] + x, view.pan[1] + y] };+ return { ...view, pan: [view.pan[0] + x, view.pan[1] + y] };}/** Keeps the content point under `focal` fixed while changing zoom. */function zoomAt(view: View, focal: Point, zoom: number, minimum = 1): View {- const ratio = Math.min(Math.max(zoom, minimum), maxZoom) / view.zoom;- return {- ...view,- zoom: view.zoom * ratio,- pan: [- focal[0] + (view.pan[0] - focal[0]) * ratio,- focal[1] + (view.pan[1] - focal[1]) * ratio,- ],- };+ const ratio = Math.min(Math.max(zoom, minimum), maxZoom) / view.zoom;+ return {+ ...view,+ zoom: view.zoom * ratio,+ pan: [+ focal[0] + (view.pan[0] - focal[0]) * ratio,+ focal[1] + (view.pan[1] - focal[1]) * ratio,+ ],+ };}export function fitScale(content: Size, viewport: Size) {- return Math.min(- viewport[0] / content[0],- viewport[1] / content[1],- 2 / devicePixelRatio,- );+ return Math.min(+ viewport[0] / content[0],+ viewport[1] / content[1],+ 2 / devicePixelRatio,+ );}/** Axes smaller than the viewport stay centered; larger ones cannot pan past their edge. */function clamp(view: View, content: Size, viewport: Size): View {- const scale = fitScale(content, viewport) * view.zoom;- const axis = (i: 0 | 1) => {- const room = Math.max(0, (content[i] * scale - viewport[i]) / 2);- return Math.min(room, Math.max(-room, view.pan[i]));- };- return {- zoom: view.zoom,- pan: [axis(0), axis(1)],- };+ const scale = fitScale(content, viewport) * view.zoom;+ const axis = (i: 0 | 1) => {+ const room = Math.max(0, (content[i] * scale - viewport[i]) / 2);+ return Math.min(room, Math.max(-room, view.pan[i]));+ };+ return {+ zoom: view.zoom,+ pan: [axis(0), axis(1)],+ };}/**@@ -71,189 +71,189 @@ function clamp(view: View, content: Size, viewport: Size): View {* Wheel/drag pans, ctrl/cmd+wheel zooms at the cursor, two pointers pinch and pan, double-click resets.*/export function usePanZoom(- state: Camera,- content: Size,- { constrain = true } = {},+ state: Camera,+ content: Size,+ { constrain = true } = {},) {- const ref = useRef<HTMLDivElement>(null);- const pointers = useRef(new Map<number, Point>());- const boundedDrag = useRef(true);- const fitZoom = useRef(1);- const view = useStore(state);- const [viewport, setViewport] = useState<Point>([0, 0]);- const [panMode, setPanMode] = useState(false);+ const ref = useRef<HTMLDivElement>(null);+ const pointers = useRef(new Map<number, Point>());+ const boundedDrag = useRef(true);+ const fitZoom = useRef(1);+ const view = useStore(state);+ const [viewport, setViewport] = useState<Point>([0, 0]);+ const [panMode, setPanMode] = useState(false);- useEffect(() => {- const controller = new AbortController();- const { signal } = controller;- function keyDown(event: KeyboardEvent) {- if (- event.code !== "Space" ||- event.ctrlKey ||- event.metaKey ||- event.altKey- ) {- return;- }- const target = event.target;- if (- target instanceof HTMLElement &&- (target.isContentEditable ||- target.closest(- 'input:not([type="range"]), textarea, select, dialog, [role="dialog"]',- ))- ) {- return;- }- event.preventDefault();- setPanMode(true);- }- function keyUp(event: KeyboardEvent) {- if (event.code === "Space") {- setPanMode(false);- }- }- function blur() {- setPanMode(false);- pointers.current.clear();- }- window.addEventListener("keydown", keyDown, { signal });- window.addEventListener("keyup", keyUp, { signal });- window.addEventListener("blur", blur, { signal });- return () => controller.abort();- }, []);+ useEffect(() => {+ const controller = new AbortController();+ const { signal } = controller;+ function keyDown(event: KeyboardEvent) {+ if (+ event.code !== "Space" ||+ event.ctrlKey ||+ event.metaKey ||+ event.altKey+ ) {+ return;+ }+ const target = event.target;+ if (+ target instanceof HTMLElement &&+ (target.isContentEditable ||+ target.closest(+ 'input:not([type="range"]), textarea, select, dialog, [role="dialog"]',+ ))+ ) {+ return;+ }+ event.preventDefault();+ setPanMode(true);+ }+ function keyUp(event: KeyboardEvent) {+ if (event.code === "Space") {+ setPanMode(false);+ }+ }+ function blur() {+ setPanMode(false);+ pointers.current.clear();+ }+ window.addEventListener("keydown", keyDown, { signal });+ window.addEventListener("keyup", keyUp, { signal });+ window.addEventListener("blur", blur, { signal });+ return () => controller.abort();+ }, []);- const update = useCallback(- (next: (view: View) => View, bounded = constrain) => {- const element = ref.current;- if (element) {- const viewport: Size = [element.clientWidth, element.clientHeight];- state.setState((view) => {- const result = next(view);- return bounded ? clamp(result, content, viewport) : result;- }, true);- }- },- [state, content, constrain],- );+ const update = useCallback(+ (next: (view: View) => View, bounded = constrain) => {+ const element = ref.current;+ if (element) {+ const viewport: Size = [element.clientWidth, element.clientHeight];+ state.setState((view) => {+ const result = next(view);+ return bounded ? clamp(result, content, viewport) : result;+ }, true);+ }+ },+ [state, content, constrain],+ );- useLayoutEffect(() => update((view) => view), [update, viewport]);+ useLayoutEffect(() => update((view) => view), [update, viewport]);- useLayoutEffect(() => {- const element = ref.current;- if (!element) {- return;- }- const measure = () => {- setViewport([element.clientWidth, element.clientHeight]);- };- measure();- const observer = new ResizeObserver(measure);- observer.observe(element);- const wheel = (event: WheelEvent) => {- event.preventDefault();- const { left, top, width, height } = element.getBoundingClientRect();- const focal: Point = [- event.clientX - left - width / 2,- event.clientY - top - height / 2,- ];- update((view) => {- if (event.ctrlKey || event.metaKey) {- return zoomAt(- view,- focal,- view.zoom * Math.exp(-event.deltaY / 100),- constrain ? 1 : fitZoom.current * 0.1,- );- }- return pan(view, -event.deltaX, -event.deltaY);- });- };- element.addEventListener("wheel", wheel, { passive: false });- return () => {- observer.disconnect();- element.removeEventListener("wheel", wheel);- };- }, [update, constrain]);+ useLayoutEffect(() => {+ const element = ref.current;+ if (!element) {+ return;+ }+ const measure = () => {+ setViewport([element.clientWidth, element.clientHeight]);+ };+ measure();+ const observer = new ResizeObserver(measure);+ observer.observe(element);+ const wheel = (event: WheelEvent) => {+ event.preventDefault();+ const { left, top, width, height } = element.getBoundingClientRect();+ const focal: Point = [+ event.clientX - left - width / 2,+ event.clientY - top - height / 2,+ ];+ update((view) => {+ if (event.ctrlKey || event.metaKey) {+ return zoomAt(+ view,+ focal,+ view.zoom * Math.exp(-event.deltaY / 100),+ constrain ? 1 : fitZoom.current * 0.1,+ );+ }+ return pan(view, -event.deltaX, -event.deltaY);+ });+ };+ element.addEventListener("wheel", wheel, { passive: false });+ return () => {+ observer.disconnect();+ element.removeEventListener("wheel", wheel);+ };+ }, [update, constrain]);- const release = (event: PointerEvent<HTMLElement>) =>- pointers.current.delete(event.pointerId);- const resetView = (next = fit) => {- fitZoom.current = next.zoom;- state.setState(next, true);- };- const zoomBy = (factor: number) =>- update((view) =>- zoomAt(- view,- [0, 0],- view.zoom * factor,- constrain ? 1 : fitZoom.current * 0.1,- ),- );- function startDrag(event: PointerEvent<HTMLElement>) {- if (event.button !== 0 || pointers.current.size === 2) {- return;- }- if (pointers.current.size === 0) {- boundedDrag.current = constrain && !panMode;- }- pointers.current.set(event.pointerId, [event.clientX, event.clientY]);- event.currentTarget.setPointerCapture(event.pointerId);- }- const handlers = {- onPointerDownCapture: (event: PointerEvent<HTMLElement>) => {- if (panMode && event.button === 0) {- event.preventDefault();- event.stopPropagation();- startDrag(event);- }- },- onPointerDown: startDrag,- onPointerMove: (event: PointerEvent<HTMLElement>) => {- const points = pointers.current;- if (!points.has(event.pointerId)) {- return;- }- const previous = measureGesture(points.values());- points.set(event.pointerId, [event.clientX, event.clientY]);- const next = measureGesture(points.values());- const { left, top, width, height } =- event.currentTarget.getBoundingClientRect();- const focal: Point = [- previous.center[0] - left - width / 2,- previous.center[1] - top - height / 2,- ];- const ratio =- previous.distance > 0 ? next.distance / previous.distance : 1;- update((view) => {- const zoomed = zoomAt(- view,- focal,- view.zoom * ratio,- constrain ? 1 : fitZoom.current * 0.1,- );- return pan(- zoomed,- next.center[0] - previous.center[0],- next.center[1] - previous.center[1],- );- }, boundedDrag.current);- },- onPointerUp: release,- onPointerCancel: release,- onLostPointerCapture: release,- onDoubleClick: () => resetView(),- };+ const release = (event: PointerEvent<HTMLElement>) =>+ pointers.current.delete(event.pointerId);+ const resetView = (next = fit) => {+ fitZoom.current = next.zoom;+ state.setState(next, true);+ };+ const zoomBy = (factor: number) =>+ update((view) =>+ zoomAt(+ view,+ [0, 0],+ view.zoom * factor,+ constrain ? 1 : fitZoom.current * 0.1,+ ),+ );+ function startDrag(event: PointerEvent<HTMLElement>) {+ if (event.button !== 0 || pointers.current.size === 2) {+ return;+ }+ if (pointers.current.size === 0) {+ boundedDrag.current = constrain && !panMode;+ }+ pointers.current.set(event.pointerId, [event.clientX, event.clientY]);+ event.currentTarget.setPointerCapture(event.pointerId);+ }+ const handlers = {+ onPointerDownCapture: (event: PointerEvent<HTMLElement>) => {+ if (panMode && event.button === 0) {+ event.preventDefault();+ event.stopPropagation();+ startDrag(event);+ }+ },+ onPointerDown: startDrag,+ onPointerMove: (event: PointerEvent<HTMLElement>) => {+ const points = pointers.current;+ if (!points.has(event.pointerId)) {+ return;+ }+ const previous = measureGesture(points.values());+ points.set(event.pointerId, [event.clientX, event.clientY]);+ const next = measureGesture(points.values());+ const { left, top, width, height } =+ event.currentTarget.getBoundingClientRect();+ const focal: Point = [+ previous.center[0] - left - width / 2,+ previous.center[1] - top - height / 2,+ ];+ const ratio =+ previous.distance > 0 ? next.distance / previous.distance : 1;+ update((view) => {+ const zoomed = zoomAt(+ view,+ focal,+ view.zoom * ratio,+ constrain ? 1 : fitZoom.current * 0.1,+ );+ return pan(+ zoomed,+ next.center[0] - previous.center[0],+ next.center[1] - previous.center[1],+ );+ }, boundedDrag.current);+ },+ onPointerUp: release,+ onPointerCancel: release,+ onLostPointerCapture: release,+ onDoubleClick: () => resetView(),+ };- return {- ref,- view,- viewport,- handlers,- resetView,- zoomBy,- panMode,- scale: fitScale(content, viewport) * view.zoom,- };+ return {+ ref,+ view,+ viewport,+ handlers,+ resetView,+ zoomBy,+ panMode,+ scale: fitScale(content, viewport) * view.zoom,+ };}diff --git a/src/hooks/use-pointer.ts b/src/hooks/use-pointer.tsindex 645e911..f46d907 100644--- a/src/hooks/use-pointer.ts+++ b/src/hooks/use-pointer.ts@@ -5,27 +5,27 @@ type Pointer = { x: number; y: number; mode: Mode };/** Where the mouse or a dragged file last was, as fractions of the viewport. */export default function usePointer() {- const pointer = useRef<Pointer>({ x: 0, y: 0, mode: "none" });+ const pointer = useRef<Pointer>({ x: 0, y: 0, mode: "none" });- useEffect(() => {- const controller = new AbortController();- const { signal } = controller;- const track =- (mode: Mode) =>- ({ clientX, clientY }: MouseEvent) => {- pointer.current = {- x: clientX / innerWidth,- y: clientY / innerHeight,- mode,- };- };- document.addEventListener("pointermove", track("hover"), { signal });- document.addEventListener("pointerleave", track("none"), { signal });- document.addEventListener("dragover", track("drag"), { signal });- document.addEventListener("dragleave", track("none"), { signal });- document.addEventListener("drop", track("none"), { signal });- return () => controller.abort();- }, []);+ useEffect(() => {+ const controller = new AbortController();+ const { signal } = controller;+ const track =+ (mode: Mode) =>+ ({ clientX, clientY }: MouseEvent) => {+ pointer.current = {+ x: clientX / innerWidth,+ y: clientY / innerHeight,+ mode,+ };+ };+ document.addEventListener("pointermove", track("hover"), { signal });+ document.addEventListener("pointerleave", track("none"), { signal });+ document.addEventListener("dragover", track("drag"), { signal });+ document.addEventListener("dragleave", track("none"), { signal });+ document.addEventListener("drop", track("none"), { signal });+ return () => controller.abort();+ }, []);- return pointer;+ return pointer;}diff --git a/src/hooks/use-shortcuts.ts b/src/hooks/use-shortcuts.tsindex a1a4d37..7892b75 100644--- a/src/hooks/use-shortcuts.ts+++ b/src/hooks/use-shortcuts.ts@@ -2,37 +2,37 @@ import { useEffect, useEffectEvent } from "react";/** View-scoped keyboard actions. Text fields opt in explicitly. */export function useShortcuts(- actions: Record<string, () => void>,- { inputs = false } = {},+ actions: Record<string, () => void>,+ { inputs = false } = {},) {- const invoke = useEffectEvent((event: KeyboardEvent) => {- const modifier = event.ctrlKey || event.metaKey ? "mod+" : "";- const shift = modifier && event.shiftKey ? "shift+" : "";- if ((event.repeat && !modifier) || event.isComposing || event.altKey) {- return;- }- const target = event.target;- if (window.document.querySelector(":popover-open")) {- return;- }- if (- !inputs &&- target instanceof HTMLElement &&- (target.isContentEditable ||- target.closest(- 'input:not([type="range"]), textarea, select, dialog, [role="dialog"]',- ))- ) {- return;- }- const action = actions[`${modifier}${shift}${event.key.toLowerCase()}`];- if (action) {- event.preventDefault();- action();- }- });- useEffect(() => {- window.addEventListener("keydown", invoke);- return () => window.removeEventListener("keydown", invoke);- }, []);+ const invoke = useEffectEvent((event: KeyboardEvent) => {+ const modifier = event.ctrlKey || event.metaKey ? "mod+" : "";+ const shift = modifier && event.shiftKey ? "shift+" : "";+ if ((event.repeat && !modifier) || event.isComposing || event.altKey) {+ return;+ }+ const target = event.target;+ if (window.document.querySelector(":popover-open")) {+ return;+ }+ if (+ !inputs &&+ target instanceof HTMLElement &&+ (target.isContentEditable ||+ target.closest(+ 'input:not([type="range"]), textarea, select, dialog, [role="dialog"]',+ ))+ ) {+ return;+ }+ const action = actions[`${modifier}${shift}${event.key.toLowerCase()}`];+ if (action) {+ event.preventDefault();+ action();+ }+ });+ useEffect(() => {+ window.addEventListener("keydown", invoke);+ return () => window.removeEventListener("keydown", invoke);+ }, []);}diff --git a/src/index.css b/src/index.cssindex 76a9c7f..a5af2c4 100644--- a/src/index.css+++ b/src/index.css@@ -1,53 +1,53 @@@import "tailwindcss";@theme {- --color-panel: var(--color-neutral-800);- --font-sans: "Geist Variable", system-ui, sans-serif;+ --color-panel: var(--color-neutral-800);+ --font-sans: "Geist Variable", system-ui, sans-serif;}/* `optional` never swaps after first paint, so the font can't cause layout shift. */@font-face {- font-family: "Geist Variable";- font-style: normal;- font-display: optional;- font-weight: 100 900;- src: url("@fontsource-variable/geist/files/geist-latin-wght-normal.woff2")- format("woff2-variations");+ font-family: "Geist Variable";+ font-style: normal;+ font-display: optional;+ font-weight: 100 900;+ src: url("@fontsource-variable/geist/files/geist-latin-wght-normal.woff2")+ format("woff2-variations");}@layer base {- html,- body,- #root {- height: 100%;- }+ html,+ body,+ #root {+ height: 100%;+ }- body {- overflow: hidden;- font-family: var(--font-sans);- font-size: var(--text-xs);- line-height: var(--text-xs--line-height);- color: var(--color-neutral-100);- background: var(--color-neutral-900);- text-shadow: 0 1px 1px rgb(0 0 0 / 0.25);- }+ body {+ overflow: hidden;+ font-family: var(--font-sans);+ font-size: var(--text-xs);+ line-height: var(--text-xs--line-height);+ color: var(--color-neutral-100);+ background: var(--color-neutral-900);+ text-shadow: 0 1px 1px rgb(0 0 0 / 0.25);+ }}/* Raised-surface relief: light catching the inner top edge. Composes through --tw-shadow. */@utility shadow-ridge {- --tw-shadow: inset 0 1px 0 rgb(255 255 255 / 0.07);- box-shadow:- var(--tw-inset-shadow, 0 0 #0000), var(--tw-inset-ring-shadow, 0 0 #0000),- var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),- var(--tw-shadow);+ --tw-shadow: inset 0 1px 0 rgb(255 255 255 / 0.07);+ box-shadow:+ var(--tw-inset-shadow, 0 0 #0000), var(--tw-inset-ring-shadow, 0 0 #0000),+ var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),+ var(--tw-shadow);}/* Composes through --tw-shadow so it stacks with ring utilities. */@utility shadow-groove {- --tw-shadow:- inset 0 1px 2px rgb(0 0 0 / 0.25), 0 1px 0 rgb(255 255 255 / 0.07);- box-shadow:- var(--tw-inset-shadow, 0 0 #0000), var(--tw-inset-ring-shadow, 0 0 #0000),- var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),- var(--tw-shadow);+ --tw-shadow:+ inset 0 1px 2px rgb(0 0 0 / 0.25), 0 1px 0 rgb(255 255 255 / 0.07);+ box-shadow:+ var(--tw-inset-shadow, 0 0 #0000), var(--tw-inset-ring-shadow, 0 0 #0000),+ var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),+ var(--tw-shadow);}diff --git a/src/lib/math.ts b/src/lib/math.tsindex 6de2c3b..6a5a1c9 100644--- a/src/lib/math.ts+++ b/src/lib/math.ts@@ -1,82 +1,82 @@type Point = { readonly x: number; readonly y: number };export function clamp(value: number, min = 0, max = 1) {- return Math.min(max, Math.max(min, value));+ return Math.min(max, Math.max(min, value));}/** One-sided PCHIP endpoint slope, limited to preserve the segment's shape. */function endpointSlope(- width: number,- nextWidth: number,- slope: number,- nextSlope: number,+ width: number,+ nextWidth: number,+ slope: number,+ nextSlope: number,) {- const tangent =- ((2 * width + nextWidth) * slope - width * nextSlope) / (width + nextWidth);- if (Math.sign(tangent) !== Math.sign(slope)) {- return 0;- }- if (- Math.sign(slope) !== Math.sign(nextSlope) &&- Math.abs(tangent) > 3 * Math.abs(slope)- ) {- return 3 * slope;- }- return tangent;+ const tangent =+ ((2 * width + nextWidth) * slope - width * nextSlope) / (width + nextWidth);+ if (Math.sign(tangent) !== Math.sign(slope)) {+ return 0;+ }+ if (+ Math.sign(slope) !== Math.sign(nextSlope) &&+ Math.abs(tangent) > 3 * Math.abs(slope)+ ) {+ return 3 * slope;+ }+ return tangent;}/** Shape-preserving cubic interpolation of at least two points with strictly increasing x. */export function interpolatePchip(points: readonly Point[]) {- const widths = points.slice(1).map((point, i) => point.x - points[i].x);- const slopes = widths.map(- (width, i) => (points[i + 1].y - points[i].y) / width,- );- const last = slopes.length - 1;- const tangents = points.map((_, i) => {- if (last === 0) {- return slopes[0];- }- if (i === 0) {- return endpointSlope(widths[0], widths[1], slopes[0], slopes[1]);- }- if (i === points.length - 1) {- return endpointSlope(- widths[last],- widths[last - 1],- slopes[last],- slopes[last - 1],- );- }- const before = slopes[i - 1];- const after = slopes[i];- if (before * after <= 0) {- return 0;- }- const leftWeight = 2 * widths[i] + widths[i - 1];- const rightWeight = widths[i] + 2 * widths[i - 1];- return (- (leftWeight + rightWeight) / (leftWeight / before + rightWeight / after)- );- });- return (x: number) => {- if (x <= points[0].x) {- return points[0].y;- }- if (x >= points[points.length - 1].x) {- return points[points.length - 1].y;- }- let i = 0;- while (x > points[i + 1].x) {- i++;- }- const t = (x - points[i].x) / widths[i];- const t2 = t * t;- const t3 = t2 * t;- return (- (2 * t3 - 3 * t2 + 1) * points[i].y +- (t3 - 2 * t2 + t) * widths[i] * tangents[i] +- (3 * t2 - 2 * t3) * points[i + 1].y +- (t3 - t2) * widths[i] * tangents[i + 1]- );- };+ const widths = points.slice(1).map((point, i) => point.x - points[i].x);+ const slopes = widths.map(+ (width, i) => (points[i + 1].y - points[i].y) / width,+ );+ const last = slopes.length - 1;+ const tangents = points.map((_, i) => {+ if (last === 0) {+ return slopes[0];+ }+ if (i === 0) {+ return endpointSlope(widths[0], widths[1], slopes[0], slopes[1]);+ }+ if (i === points.length - 1) {+ return endpointSlope(+ widths[last],+ widths[last - 1],+ slopes[last],+ slopes[last - 1],+ );+ }+ const before = slopes[i - 1];+ const after = slopes[i];+ if (before * after <= 0) {+ return 0;+ }+ const leftWeight = 2 * widths[i] + widths[i - 1];+ const rightWeight = widths[i] + 2 * widths[i - 1];+ return (+ (leftWeight + rightWeight) / (leftWeight / before + rightWeight / after)+ );+ });+ return (x: number) => {+ if (x <= points[0].x) {+ return points[0].y;+ }+ if (x >= points[points.length - 1].x) {+ return points[points.length - 1].y;+ }+ let i = 0;+ while (x > points[i + 1].x) {+ i++;+ }+ const t = (x - points[i].x) / widths[i];+ const t2 = t * t;+ const t3 = t2 * t;+ return (+ (2 * t3 - 3 * t2 + 1) * points[i].y ++ (t3 - 2 * t2 + t) * widths[i] * tangents[i] ++ (3 * t2 - 2 * t3) * points[i + 1].y ++ (t3 - t2) * widths[i] * tangents[i + 1]+ );+ };}diff --git a/src/main.tsx b/src/main.tsxindex 6170fee..35d18d6 100644--- a/src/main.tsx+++ b/src/main.tsx@@ -9,13 +9,13 @@ import "./index.css";const root = document.getElementById("root");if (root) {- createRoot(root).render(- <>- <GpuProvider>- <App />- </GpuProvider>- <Analytics />- <SpeedInsights />- </>,- );+ createRoot(root).render(+ <>+ <GpuProvider>+ <App />+ </GpuProvider>+ <Analytics />+ <SpeedInsights />+ </>,+ );}diff --git a/tests/clarity.e2e.ts b/tests/clarity.e2e.tsindex 8c60222..3d91a93 100644--- a/tests/clarity.e2e.ts+++ b/tests/clarity.e2e.ts@@ -2,154 +2,154 @@ import { expect, test } from "./fixtures";// Full-resolution Gaussian reference, independent of GPU passes and working-space conversion.function expectedStep(- x: number,- left: number,- right: number,- amount: number,- sigma: number,+ x: number,+ left: number,+ right: number,+ amount: number,+ sigma: number,) {- let sum = 0;- let weights = 0;- const radius = Math.ceil(3 * sigma);- for (let offset = -radius; offset <= radius; offset++) {- const weight = Math.exp(-0.5 * (offset / sigma) ** 2);- sum += (x + offset < 512 ? left : right) * weight;- weights += weight;- }- const original = x < 512 ? left : right;- return Math.max(- 0,- Math.min(255, original + amount * (original - sum / weights)),- );+ let sum = 0;+ let weights = 0;+ const radius = Math.ceil(3 * sigma);+ for (let offset = -radius; offset <= radius; offset++) {+ const weight = Math.exp(-0.5 * (offset / sigma) ** 2);+ sum += (x + offset < 512 ? left : right) * weight;+ weights += weight;+ }+ const original = x < 512 ? left : right;+ return Math.max(+ 0,+ Math.min(255, original + amount * (original - sum / weights)),+ );}test("detail filters follow Gaussian unsharp masking and preserve flat fields and alpha", async ({- page,+ page,}) => {- await page.goto("/");- await page.waitForFunction(() => window.openlight);- const xs = [- 0, 256, 384, 448, 504, 509, 510, 511, 512, 513, 514, 519, 576, 640, 768,- 1023,- ];- const result = await page.evaluate(async (xs) => {- const api = window.openlight;- const load = async (width: number, height: number, shapes: string) => {- await api.loadImage(- new File(- [- `<svg xmlns="http://www.w3.org/2000/svg" width="${width}" height="${height}">${shapes}</svg>`,- ],- "probe.svg",- { type: "image/svg+xml" },- ),- );- };- const read = async (positions: number[][]) => {- const image = await createImageBitmap(await api.exportImage());- const canvas = new OffscreenCanvas(image.width, image.height);- const context = canvas.getContext("2d");- if (!context) throw new Error("Cannot read clarity probe.");- context.drawImage(image, 0, 0);- image.close();- return positions.map(([x, y]) => [- ...context.getImageData(x, y, 1, 1).data,- ]);- };- const steps = [];- for (const [left, right] of [- [64, 192],- [0, 128],- ]) {- await load(- 1024,- 129,- [left, right]- .map(- (value, i) =>- `<rect x="${i * 512}" width="512" height="129" fill="rgb(${value},${value},${value})"/>`,- )- .join(""),- );- const settings = [- ...[-100, -50, 0, 50, 100].map((clarity) => ({- clarity,- sharpening: 0,- sharpenRadius: 1,- })),- ...[0.5, 1, 1.7, 3].flatMap((sharpenRadius) =>- [0, 50, 100, 150].map((sharpening) => ({- clarity: 0,- sharpening,- sharpenRadius,- })),- ),- ];- for (const adjustment of settings) {- api.setDetails(adjustment);- steps.push({- left,- right,- amount: adjustment.sharpening- ? adjustment.sharpening / 50- : adjustment.clarity / 200,- sigma: adjustment.sharpening ? adjustment.sharpenRadius : 64,- pixels: await read(xs.map((x) => [x, 64])),- });- }- }- await load(127, 65, '<rect width="127" height="65" fill="#737373"/>');- const flat = [];- for (const clarity of [-100, 0, 100]) {- api.setDetails({ clarity, sharpening: 150, sharpenRadius: 3 });- flat.push(- ...(await read([- [0, 0],- [63, 32],- [126, 64],- ])),- );- }- await load(- 127,- 65,- '<rect width="64" height="65" fill="#737373" fill-opacity="0.5"/>',- );- const positions = [- [10, 32],- [63, 32],- [64, 32],- [126, 64],- ];- const neutral = await read(positions);- const alpha = [];- for (const clarity of [-100, 100]) {- api.setDetails({ clarity, sharpening: 150, sharpenRadius: 3 });- alpha.push(await read(positions));- }- return { steps, flat, neutral, alpha };- }, xs);- for (const { left, right, amount, sigma, pixels } of result.steps) {- for (const [i, pixel] of pixels.entries()) {- for (const channel of pixel.slice(0, 3))- expect(- Math.abs(channel - expectedStep(xs[i], left, right, amount, sigma)),- ).toBeLessThanOrEqual(2);- expect(pixel[3]).toBe(255);- }- }- for (const pixel of result.flat) {- for (const channel of pixel.slice(0, 3))- expect(Math.abs(channel - 115)).toBeLessThanOrEqual(1);- expect(pixel[3]).toBe(255);- }- for (const pixels of result.alpha) {- for (const [i, pixel] of pixels.entries()) {- expect(pixel[3]).toBe(result.neutral[i][3]);- for (const [channel, value] of pixel.entries())- expect(- Math.abs(value - result.neutral[i][channel]),- ).toBeLessThanOrEqual(2);- }- }+ await page.goto("/");+ await page.waitForFunction(() => window.openlight);+ const xs = [+ 0, 256, 384, 448, 504, 509, 510, 511, 512, 513, 514, 519, 576, 640, 768,+ 1023,+ ];+ const result = await page.evaluate(async (xs) => {+ const api = window.openlight;+ const load = async (width: number, height: number, shapes: string) => {+ await api.loadImage(+ new File(+ [+ `<svg xmlns="http://www.w3.org/2000/svg" width="${width}" height="${height}">${shapes}</svg>`,+ ],+ "probe.svg",+ { type: "image/svg+xml" },+ ),+ );+ };+ const read = async (positions: number[][]) => {+ const image = await createImageBitmap(await api.exportImage());+ const canvas = new OffscreenCanvas(image.width, image.height);+ const context = canvas.getContext("2d");+ if (!context) throw new Error("Cannot read clarity probe.");+ context.drawImage(image, 0, 0);+ image.close();+ return positions.map(([x, y]) => [+ ...context.getImageData(x, y, 1, 1).data,+ ]);+ };+ const steps = [];+ for (const [left, right] of [+ [64, 192],+ [0, 128],+ ]) {+ await load(+ 1024,+ 129,+ [left, right]+ .map(+ (value, i) =>+ `<rect x="${i * 512}" width="512" height="129" fill="rgb(${value},${value},${value})"/>`,+ )+ .join(""),+ );+ const settings = [+ ...[-100, -50, 0, 50, 100].map((clarity) => ({+ clarity,+ sharpening: 0,+ sharpenRadius: 1,+ })),+ ...[0.5, 1, 1.7, 3].flatMap((sharpenRadius) =>+ [0, 50, 100, 150].map((sharpening) => ({+ clarity: 0,+ sharpening,+ sharpenRadius,+ })),+ ),+ ];+ for (const adjustment of settings) {+ api.setDetails(adjustment);+ steps.push({+ left,+ right,+ amount: adjustment.sharpening+ ? adjustment.sharpening / 50+ : adjustment.clarity / 200,+ sigma: adjustment.sharpening ? adjustment.sharpenRadius : 64,+ pixels: await read(xs.map((x) => [x, 64])),+ });+ }+ }+ await load(127, 65, '<rect width="127" height="65" fill="#737373"/>');+ const flat = [];+ for (const clarity of [-100, 0, 100]) {+ api.setDetails({ clarity, sharpening: 150, sharpenRadius: 3 });+ flat.push(+ ...(await read([+ [0, 0],+ [63, 32],+ [126, 64],+ ])),+ );+ }+ await load(+ 127,+ 65,+ '<rect width="64" height="65" fill="#737373" fill-opacity="0.5"/>',+ );+ const positions = [+ [10, 32],+ [63, 32],+ [64, 32],+ [126, 64],+ ];+ const neutral = await read(positions);+ const alpha = [];+ for (const clarity of [-100, 100]) {+ api.setDetails({ clarity, sharpening: 150, sharpenRadius: 3 });+ alpha.push(await read(positions));+ }+ return { steps, flat, neutral, alpha };+ }, xs);+ for (const { left, right, amount, sigma, pixels } of result.steps) {+ for (const [i, pixel] of pixels.entries()) {+ for (const channel of pixel.slice(0, 3))+ expect(+ Math.abs(channel - expectedStep(xs[i], left, right, amount, sigma)),+ ).toBeLessThanOrEqual(2);+ expect(pixel[3]).toBe(255);+ }+ }+ for (const pixel of result.flat) {+ for (const channel of pixel.slice(0, 3))+ expect(Math.abs(channel - 115)).toBeLessThanOrEqual(1);+ expect(pixel[3]).toBe(255);+ }+ for (const pixels of result.alpha) {+ for (const [i, pixel] of pixels.entries()) {+ expect(pixel[3]).toBe(result.neutral[i][3]);+ for (const [channel, value] of pixel.entries())+ expect(+ Math.abs(value - result.neutral[i][channel]),+ ).toBeLessThanOrEqual(2);+ }+ }});diff --git a/tests/color-mixer-editing.ts b/tests/color-mixer-editing.tsindex c369fa6..22a6f6a 100644--- a/tests/color-mixer-editing.ts+++ b/tests/color-mixer-editing.ts@@ -3,83 +3,83 @@ import { expect, test } from "./fixtures";import { box, drag } from "./pointer";export async function colorMixerEditing(page: Page) {- const state = () => page.evaluate(() => window.openlight.getState());- 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- .locator("[popover]:popover-open")- .getByRole("button", { name: "Color Mixer", exact: true })- .click();- const before = (await state()).history.undoCount;- 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);- expect(bounds.height).toBeGreaterThan(bounds.width * 3);- await hue.press("ArrowUp");- await expect(hue).toHaveValue("1");- expect((await state()).history.undoCount).toBe(before + 1);- await page.keyboard.press("ControlOrMeta+z");- await expect(hue).toHaveValue("0");- const beforeTabs = await state();- await page- .getByRole("tab", { name: "Hue", exact: true })- .press("ArrowRight");- await expect(- page.getByRole("tab", { name: "Saturation", exact: true }),- ).toHaveAttribute("aria-selected", "true");- expect(await state()).toEqual(beforeTabs);- const saturation = page.getByRole("slider", {- name: "Blue saturation",- exact: true,- });- const track = await box(saturation);- await drag(- page,- [track.x + track.width / 2, track.y + track.height / 2],- [track.x + track.width / 2, track.y + track.height / 4],- );- const dragged = (await state()).colorMixer.saturation[5];- expect(dragged).toBeGreaterThan(0);- expect((await state()).history.undoCount).toBe(before + 1);- await page.keyboard.press("ControlOrMeta+z");- await expect(saturation).toHaveValue("0");- await page.keyboard.press("ControlOrMeta+Shift+z");- await expect(saturation).toHaveValue(String(dragged));- const numeric = page.getByRole("textbox", {- name: "Blue saturation value",- exact: true,- });- await numeric.fill("-100");- await numeric.press("Enter");- await expect(saturation).toHaveValue("-100");- const pixel = await page.evaluate(async () => {- const bitmap = await createImageBitmap(- await window.openlight.exportImage(),- );- const canvas = new OffscreenCanvas(bitmap.width, bitmap.height);- const context = canvas.getContext("2d");- if (!context) throw new Error("Cannot read color mixer export.");- context.drawImage(bitmap, 0, 0);- bitmap.close();- return [...context.getImageData(350, 200, 1, 1).data];- });- for (const channel of pixel.slice(0, 3)) {- expect(Math.abs(channel - 79)).toBeLessThanOrEqual(2);- }- expect(pixel[3]).toBe(255);- await page.getByRole("tab", { name: "Luminance", exact: true }).click();- await expect(- page.getByRole("slider", { name: "Blue luminance", exact: true }),- ).toHaveValue("0");- await page.getByRole("tab", { name: "Saturation", exact: true }).click();- await expect(saturation).toHaveValue("-100");- await saturation.dblclick();- await expect(saturation).toHaveValue("0");- await page.keyboard.press("ControlOrMeta+z");- await expect(saturation).toHaveValue("-100");- await page.keyboard.press("ControlOrMeta+Shift+z");- await expect(saturation).toHaveValue("0");- });- await page.getByRole("button", { name: "photo.svg", exact: true }).click();+ const state = () => page.evaluate(() => window.openlight.getState());+ 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+ .locator("[popover]:popover-open")+ .getByRole("button", { name: "Color Mixer", exact: true })+ .click();+ const before = (await state()).history.undoCount;+ 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);+ expect(bounds.height).toBeGreaterThan(bounds.width * 3);+ await hue.press("ArrowUp");+ await expect(hue).toHaveValue("1");+ expect((await state()).history.undoCount).toBe(before + 1);+ await page.keyboard.press("ControlOrMeta+z");+ await expect(hue).toHaveValue("0");+ const beforeTabs = await state();+ await page+ .getByRole("tab", { name: "Hue", exact: true })+ .press("ArrowRight");+ await expect(+ page.getByRole("tab", { name: "Saturation", exact: true }),+ ).toHaveAttribute("aria-selected", "true");+ expect(await state()).toEqual(beforeTabs);+ const saturation = page.getByRole("slider", {+ name: "Blue saturation",+ exact: true,+ });+ const track = await box(saturation);+ await drag(+ page,+ [track.x + track.width / 2, track.y + track.height / 2],+ [track.x + track.width / 2, track.y + track.height / 4],+ );+ const dragged = (await state()).colorMixer.saturation[5];+ expect(dragged).toBeGreaterThan(0);+ expect((await state()).history.undoCount).toBe(before + 1);+ await page.keyboard.press("ControlOrMeta+z");+ await expect(saturation).toHaveValue("0");+ await page.keyboard.press("ControlOrMeta+Shift+z");+ await expect(saturation).toHaveValue(String(dragged));+ const numeric = page.getByRole("textbox", {+ name: "Blue saturation value",+ exact: true,+ });+ await numeric.fill("-100");+ await numeric.press("Enter");+ await expect(saturation).toHaveValue("-100");+ const pixel = await page.evaluate(async () => {+ const bitmap = await createImageBitmap(+ await window.openlight.exportImage(),+ );+ const canvas = new OffscreenCanvas(bitmap.width, bitmap.height);+ const context = canvas.getContext("2d");+ if (!context) throw new Error("Cannot read color mixer export.");+ context.drawImage(bitmap, 0, 0);+ bitmap.close();+ return [...context.getImageData(350, 200, 1, 1).data];+ });+ for (const channel of pixel.slice(0, 3)) {+ expect(Math.abs(channel - 79)).toBeLessThanOrEqual(2);+ }+ expect(pixel[3]).toBe(255);+ await page.getByRole("tab", { name: "Luminance", exact: true }).click();+ await expect(+ page.getByRole("slider", { name: "Blue luminance", exact: true }),+ ).toHaveValue("0");+ await page.getByRole("tab", { name: "Saturation", exact: true }).click();+ await expect(saturation).toHaveValue("-100");+ await saturation.dblclick();+ await expect(saturation).toHaveValue("0");+ await page.keyboard.press("ControlOrMeta+z");+ await expect(saturation).toHaveValue("-100");+ await page.keyboard.press("ControlOrMeta+Shift+z");+ await expect(saturation).toHaveValue("0");+ });+ await page.getByRole("button", { name: "photo.svg", exact: true }).click();}diff --git a/tests/color-mixer-gpu.ts b/tests/color-mixer-gpu.tsindex 474df04..4b8f688 100644--- a/tests/color-mixer-gpu.ts+++ b/tests/color-mixer-gpu.ts@@ -1,110 +1,110 @@import { effect, frame, init, target } from "vgpu";import type { ColorMixer } from "@/core/document";import {- createRenderGraph,- input as inputNode,- pipeline,+ createRenderGraph,+ input as inputNode,+ pipeline,} from "@/core/renderer";import { colors, defaultMixer } from "@/features/color-mixer/model";import { colorMixer } from "@/features/color-mixer/pass";function working(rgb: number[], scale = 1) {- const [r, g, b] = rgb.map((value) =>- value <= 0.04045 ? value / 12.92 : ((value + 0.055) / 1.055) ** 2.4,- );- return [- (0.6274 * r + 0.3293 * g + 0.0433 * b) * scale,- (0.0691 * r + 0.9195 * g + 0.0114 * b) * scale,- (0.0164 * r + 0.088 * g + 0.8956 * b) * scale,- 0.5,- ];+ const [r, g, b] = rgb.map((value) =>+ value <= 0.04045 ? value / 12.92 : ((value + 0.055) / 1.055) ** 2.4,+ );+ return [+ (0.6274 * r + 0.3293 * g + 0.0433 * b) * scale,+ (0.0691 * r + 0.9195 * g + 0.0114 * b) * scale,+ (0.0164 * r + 0.088 * g + 0.8956 * b) * scale,+ 0.5,+ ];}/** Exercise the actual shader in the editor's float16 working space, before display clipping. */export async function probeColorMixer() {- const gpu = await init();- const samples = [- ...[- [1, 0, 0],- [1, 0.5, 0],- [1, 1, 0],- [0, 1, 0],- [0, 1, 1],- [0, 0, 1],- [0.5, 0, 1],- [1, 0, 1],- ].map((rgb) => working(rgb)),- [0, 0, 0, 0],- [0.18, 0.18, 0.18, 1],- [2, 2, 2, 1],- working([1, 0, 0], 4),- working([0, 1, 1], 4),- [0, 1, 0, 1],- ];- const ramp = Array.from({ length: 360 }, (_, hue) => {- const rgb = [0, 8, 4].map((offset) => {- const k = (offset + hue / 30) % 12;- return 0.5 - 0.3 * Math.max(-1, Math.min(k - 3, 9 - k, 1));- });- return working(rgb);- });- const input = target(gpu, {- size: [samples.length + ramp.length, 1],- format: "rgba16float",- });- const data = gpu.device.createBuffer({- size: input.size[0] * 16,- usage: ["storage", "copy_dst"],- });- data.write(new Float32Array([...samples, ...ramp].flat()));- const fill = effect(- gpu,- `+ const gpu = await init();+ const samples = [+ ...[+ [1, 0, 0],+ [1, 0.5, 0],+ [1, 1, 0],+ [0, 1, 0],+ [0, 1, 1],+ [0, 0, 1],+ [0.5, 0, 1],+ [1, 0, 1],+ ].map((rgb) => working(rgb)),+ [0, 0, 0, 0],+ [0.18, 0.18, 0.18, 1],+ [2, 2, 2, 1],+ working([1, 0, 0], 4),+ working([0, 1, 1], 4),+ [0, 1, 0, 1],+ ];+ const ramp = Array.from({ length: 360 }, (_, hue) => {+ const rgb = [0, 8, 4].map((offset) => {+ const k = (offset + hue / 30) % 12;+ return 0.5 - 0.3 * Math.max(-1, Math.min(k - 3, 9 - k, 1));+ });+ return working(rgb);+ });+ const input = target(gpu, {+ size: [samples.length + ramp.length, 1],+ format: "rgba16float",+ });+ const data = gpu.device.createBuffer({+ size: input.size[0] * 16,+ usage: ["storage", "copy_dst"],+ });+ data.write(new Float32Array([...samples, ...ramp].flat()));+ const fill = effect(+ gpu,+ `@group(0) @binding(0) var<storage, read> samples: array<vec4f>;@fragment fn fs_main(@builtin(position) p: vec4f) -> @location(0) vec4f {return samples[u32(p.x)];}`,- { set: { samples: data } },- );- const graph = createRenderGraph(gpu);- const uniform = (channel: keyof ColorMixer, value: number): ColorMixer => ({- ...defaultMixer,- [channel]: colors.map(() => value),- });- const selected = (- index: number,- channel: keyof ColorMixer,- value: number,- ): ColorMixer => ({- ...defaultMixer,- [channel]: colors.map((_, i) => (i === index ? value : 0)),- });- try {- frame(gpu, (f) => f.pass(input, fill));- await gpu.gpu.queue.onSubmittedWorkDone();- const original = [...(await input.readFloats())];- const outputs = [];- for (const settings of [- defaultMixer,- uniform("hue", 100),- uniform("hue", -100),- uniform("saturation", -100),- uniform("luminance", 100),- uniform("luminance", -100),- selected(5, "saturation", -100),- selected(0, "hue", 100),- ]) {- const [output] = graph.render([- pipeline(inputNode(input), [colorMixer(settings)]),- ]);- outputs.push([...(await output.readFloats())]);- }- return { original, outputs, sampleCount: samples.length };- } finally {- graph.dispose();- input.color.dispose();- data.dispose();- gpu.dispose();- }+ { set: { samples: data } },+ );+ const graph = createRenderGraph(gpu);+ const uniform = (channel: keyof ColorMixer, value: number): ColorMixer => ({+ ...defaultMixer,+ [channel]: colors.map(() => value),+ });+ const selected = (+ index: number,+ channel: keyof ColorMixer,+ value: number,+ ): ColorMixer => ({+ ...defaultMixer,+ [channel]: colors.map((_, i) => (i === index ? value : 0)),+ });+ try {+ frame(gpu, (f) => f.pass(input, fill));+ await gpu.gpu.queue.onSubmittedWorkDone();+ const original = [...(await input.readFloats())];+ const outputs = [];+ for (const settings of [+ defaultMixer,+ uniform("hue", 100),+ uniform("hue", -100),+ uniform("saturation", -100),+ uniform("luminance", 100),+ uniform("luminance", -100),+ selected(5, "saturation", -100),+ selected(0, "hue", 100),+ ]) {+ const [output] = graph.render([+ pipeline(inputNode(input), [colorMixer(settings)]),+ ]);+ outputs.push([...(await output.readFloats())]);+ }+ return { original, outputs, sampleCount: samples.length };+ } finally {+ graph.dispose();+ input.color.dispose();+ data.dispose();+ gpu.dispose();+ }}diff --git a/tests/color-mixer.e2e.ts b/tests/color-mixer.e2e.tsindex 0bd67e2..f79dbcc 100644--- a/tests/color-mixer.e2e.ts+++ b/tests/color-mixer.e2e.ts@@ -1,71 +1,71 @@import { expect, test } from "./fixtures";function luminance(rgb: number[]) {- return rgb[0] * 0.2627 + rgb[1] * 0.678 + rgb[2] * 0.0593;+ return rgb[0] * 0.2627 + rgb[1] * 0.678 + rgb[2] * 0.0593;}test("color mixing preserves luminance, neutrals, alpha and HDR, isolates ranges and joins the hue seam", async ({- page,+ page,}) => {- await page.goto("/tests/gpu.html");- const { original, outputs, sampleCount } = await page.evaluate(async () => {- const path = "/tests/color-mixer-gpu.ts";- const { probeColorMixer } = (await import(- path- )) as typeof import("./color-mixer-gpu");- return probeColorMixer();- });- const [neutral, hueUp, hueDown, gray, lighter, darker, blue, red] = outputs;- expect(neutral).toEqual(original);- for (const output of outputs) {- expect(output.every(Number.isFinite)).toBe(true);- for (let i = 3; i < output.length; i += 4) {- expect(output[i]).toBe(original[i]);- }- for (const index of [8, 9, 10]) {- expect(output.slice(index * 4, index * 4 + 4)).toEqual(- original.slice(index * 4, index * 4 + 4),- );- }- }- for (let index = 0; index < sampleCount; index++) {- const input = original.slice(index * 4, index * 4 + 3);- const light = luminance(input);- for (const output of [hueUp, hueDown, gray]) {- expect(- Math.abs(luminance(output.slice(index * 4, index * 4 + 3)) - light),- ).toBeLessThan(0.003);- }- if (index >= 8 && index <= 10) continue;- for (let channel = 0; channel < 3; channel++) {- expect(Math.abs(gray[index * 4 + channel] - light)).toBeLessThan(0.003);- expect(- Math.abs(lighter[index * 4 + channel] - input[channel] * 2),- ).toBeLessThan(0.006);- expect(- Math.abs(darker[index * 4 + channel] - input[channel] / 2),- ).toBeLessThan(0.003);- }- }- for (const index of [0, 1, 2, 3, 4, 7]) {- for (let channel = 0; channel < 3; channel++) {- expect(- Math.abs(blue[index * 4 + channel] - original[index * 4 + channel]),- ).toBeLessThan(0.003);- }- }- const blueLight = luminance(original.slice(20, 23));- for (const channel of blue.slice(20, 23)) {- expect(Math.abs(channel - blueLight)).toBeLessThan(0.003);- }- expect(Math.max(...lighter.slice(44, 47))).toBeGreaterThan(4);- expect(hueUp[1]).toBeGreaterThan(original[1]);- expect(hueDown[2]).toBeGreaterThan(original[2]);- for (let i = 0; i < 360; i++) {- for (let channel = 0; channel < 3; channel++) {- const a = red[(sampleCount + i) * 4 + channel];- const b = red[(sampleCount + ((i + 1) % 360)) * 4 + channel];- expect(Math.abs(a - b)).toBeLessThan(0.035);- }- }+ await page.goto("/tests/gpu.html");+ const { original, outputs, sampleCount } = await page.evaluate(async () => {+ const path = "/tests/color-mixer-gpu.ts";+ const { probeColorMixer } = (await import(+ path+ )) as typeof import("./color-mixer-gpu");+ return probeColorMixer();+ });+ const [neutral, hueUp, hueDown, gray, lighter, darker, blue, red] = outputs;+ expect(neutral).toEqual(original);+ for (const output of outputs) {+ expect(output.every(Number.isFinite)).toBe(true);+ for (let i = 3; i < output.length; i += 4) {+ expect(output[i]).toBe(original[i]);+ }+ for (const index of [8, 9, 10]) {+ expect(output.slice(index * 4, index * 4 + 4)).toEqual(+ original.slice(index * 4, index * 4 + 4),+ );+ }+ }+ for (let index = 0; index < sampleCount; index++) {+ const input = original.slice(index * 4, index * 4 + 3);+ const light = luminance(input);+ for (const output of [hueUp, hueDown, gray]) {+ expect(+ Math.abs(luminance(output.slice(index * 4, index * 4 + 3)) - light),+ ).toBeLessThan(0.003);+ }+ if (index >= 8 && index <= 10) continue;+ for (let channel = 0; channel < 3; channel++) {+ expect(Math.abs(gray[index * 4 + channel] - light)).toBeLessThan(0.003);+ expect(+ Math.abs(lighter[index * 4 + channel] - input[channel] * 2),+ ).toBeLessThan(0.006);+ expect(+ Math.abs(darker[index * 4 + channel] - input[channel] / 2),+ ).toBeLessThan(0.003);+ }+ }+ for (const index of [0, 1, 2, 3, 4, 7]) {+ for (let channel = 0; channel < 3; channel++) {+ expect(+ Math.abs(blue[index * 4 + channel] - original[index * 4 + channel]),+ ).toBeLessThan(0.003);+ }+ }+ const blueLight = luminance(original.slice(20, 23));+ for (const channel of blue.slice(20, 23)) {+ expect(Math.abs(channel - blueLight)).toBeLessThan(0.003);+ }+ expect(Math.max(...lighter.slice(44, 47))).toBeGreaterThan(4);+ expect(hueUp[1]).toBeGreaterThan(original[1]);+ expect(hueDown[2]).toBeGreaterThan(original[2]);+ for (let i = 0; i < 360; i++) {+ for (let channel = 0; channel < 3; channel++) {+ const a = red[(sampleCount + i) * 4 + channel];+ const b = red[(sampleCount + ((i + 1) % 360)) * 4 + channel];+ expect(Math.abs(a - b)).toBeLessThan(0.035);+ }+ }});diff --git a/tests/color-mixer.test.ts b/tests/color-mixer.test.tsindex cf595b8..6dacb51 100644--- a/tests/color-mixer.test.ts+++ b/tests/color-mixer.test.ts@@ -9,90 +9,90 @@ import { resetColorMixer, setColorMixer } from "@/features/color-mixer/edits";import { defaultMixer } from "@/features/color-mixer/model";test("color edits validate, group, cancel and reset while renderers reuse and release their outputs", async () => {- const gpu = await init();- const image = target(gpu, { size: [32, 16], format: "rgba16float" });- const source = createImageSource(image);- const document = createDocument({- frame: imageFrame(image.size),- layers: [- {- ...createImageLayer("photo", "Photo"),- id: "base",- children: [{ ...createLayer("color-mixer"), id: "mixer" }],- },- ],- });- const renderer = createEditorRenderer(gpu, source);- try {- await renderer.update(document.scene.getState());- setColorMixer(document, "blue", { hue: 0 }, "mixer");- resetColorMixer(document, "mixer");- expect(document.history.status.getState().undoCount).toBe(0);- document.history.begin();- setColorMixer(document, "blue", { hue: 10 }, "mixer");- setColorMixer(document, "blue", { hue: 25, saturation: -20 }, "mixer");- document.history.commit();- expect(document.history.status.getState().undoCount).toBe(1);- const scene = document.scene.getState();- const mixer = scene.layers[0].children[0];- expect(mixer?.kind === "color-mixer" && mixer.colorMixer.hue[5]).toBe(25);- expect(- mixer?.kind === "color-mixer" && mixer.colorMixer.saturation[5],- ).toBe(-20);- await renderer.update(scene);- expect(renderer.inspect().passes).toEqual(["layer/mixer/color-mixer"]);- const edited = renderer.outputImage();- expect(edited.format).toBe("rgba16float");- const calls = getMockGPUDeviceInstrumentation(gpu.gpu).calls;- const pipelines = calls.createRenderPipeline;- setColorMixer(document, "blue", { hue: 25 }, "mixer");- expect(document.history.status.getState().undoCount).toBe(1);- document.history.begin();- setColorMixer(document, "red", { luminance: 100 }, "mixer");- document.history.cancel();- expect(document.scene.getState()).toEqual(scene);- document.history.undo();- await renderer.update(document.scene.getState());- expect(renderer.inspect().passes).toEqual([]);- document.history.redo();- await renderer.update(document.scene.getState());- expect(renderer.inspect().passes).toEqual(["layer/mixer/color-mixer"]);- expect(calls.createRenderPipeline).toBe(pipelines);- for (const value of [NaN, Infinity, -101, 101]) {- expect(() =>- setColorMixer(document, "red", { hue: value }, "mixer"),- ).toThrow("Invalid");- }- expect(() =>- Reflect.apply(setColorMixer, undefined, [- document,- "pink",- { hue: 2 },- "mixer",- ]),- ).toThrow("Invalid");- expect(() =>- Reflect.apply(setColorMixer, undefined, [- document,- "red",- { contrast: 2 },- "mixer",- ]),- ).toThrow("Invalid");- expect(document.scene.getState()).toEqual(scene);- resetColorMixer(document, "mixer");- expect(document.scene.getState().layers[0].children[0]).toMatchObject({- colorMixer: defaultMixer,- });- document.history.undo();- expect(document.scene.getState()).toEqual(scene);- renderer.dispose();- expect(() => edited.color.view).toThrow("destroyed");- expect(() => image.color.view).not.toThrow();- } finally {- renderer.dispose();- document.dispose();- source.dispose();- gpu.dispose();- }+ const gpu = await init();+ const image = target(gpu, { size: [32, 16], format: "rgba16float" });+ const source = createImageSource(image);+ const document = createDocument({+ frame: imageFrame(image.size),+ layers: [+ {+ ...createImageLayer("photo", "Photo"),+ id: "base",+ children: [{ ...createLayer("color-mixer"), id: "mixer" }],+ },+ ],+ });+ const renderer = createEditorRenderer(gpu, source);+ try {+ await renderer.update(document.scene.getState());+ setColorMixer(document, "blue", { hue: 0 }, "mixer");+ resetColorMixer(document, "mixer");+ expect(document.history.status.getState().undoCount).toBe(0);+ document.history.begin();+ setColorMixer(document, "blue", { hue: 10 }, "mixer");+ setColorMixer(document, "blue", { hue: 25, saturation: -20 }, "mixer");+ document.history.commit();+ expect(document.history.status.getState().undoCount).toBe(1);+ const scene = document.scene.getState();+ const mixer = scene.layers[0].children[0];+ expect(mixer?.kind === "color-mixer" && mixer.colorMixer.hue[5]).toBe(25);+ expect(+ mixer?.kind === "color-mixer" && mixer.colorMixer.saturation[5],+ ).toBe(-20);+ await renderer.update(scene);+ expect(renderer.inspect().passes).toEqual(["layer/mixer/color-mixer"]);+ const edited = renderer.outputImage();+ expect(edited.format).toBe("rgba16float");+ const calls = getMockGPUDeviceInstrumentation(gpu.gpu).calls;+ const pipelines = calls.createRenderPipeline;+ setColorMixer(document, "blue", { hue: 25 }, "mixer");+ expect(document.history.status.getState().undoCount).toBe(1);+ document.history.begin();+ setColorMixer(document, "red", { luminance: 100 }, "mixer");+ document.history.cancel();+ expect(document.scene.getState()).toEqual(scene);+ document.history.undo();+ await renderer.update(document.scene.getState());+ expect(renderer.inspect().passes).toEqual([]);+ document.history.redo();+ await renderer.update(document.scene.getState());+ expect(renderer.inspect().passes).toEqual(["layer/mixer/color-mixer"]);+ expect(calls.createRenderPipeline).toBe(pipelines);+ for (const value of [NaN, Infinity, -101, 101]) {+ expect(() =>+ setColorMixer(document, "red", { hue: value }, "mixer"),+ ).toThrow("Invalid");+ }+ expect(() =>+ Reflect.apply(setColorMixer, undefined, [+ document,+ "pink",+ { hue: 2 },+ "mixer",+ ]),+ ).toThrow("Invalid");+ expect(() =>+ Reflect.apply(setColorMixer, undefined, [+ document,+ "red",+ { contrast: 2 },+ "mixer",+ ]),+ ).toThrow("Invalid");+ expect(document.scene.getState()).toEqual(scene);+ resetColorMixer(document, "mixer");+ expect(document.scene.getState().layers[0].children[0]).toMatchObject({+ colorMixer: defaultMixer,+ });+ document.history.undo();+ expect(document.scene.getState()).toEqual(scene);+ renderer.dispose();+ expect(() => edited.color.view).toThrow("destroyed");+ expect(() => image.color.view).not.toThrow();+ } finally {+ renderer.dispose();+ document.dispose();+ source.dispose();+ gpu.dispose();+ }});diff --git a/tests/crop.test.ts b/tests/crop.test.tsindex b19e4cd..4e6a360 100644--- a/tests/crop.test.ts+++ b/tests/crop.test.ts@@ -1,109 +1,109 @@import { expect, test } from "bun:test";import {- frameTransform,- type ImageFrame,- imageFrame,- type Point,- validateFrame,+ frameTransform,+ type ImageFrame,+ imageFrame,+ type Point,+ validateFrame,} from "@/core/image/frame";import {- fitRatio,- flip,- move,- resize,- rotate,- turn,+ fitRatio,+ flip,+ move,+ resize,+ rotate,+ turn,} from "@/features/crop/geometry";const source: Point = [1200, 800];function sample(frame: ImageFrame, x: number, y: number) {- const { origin, xAxis, yAxis } = frameTransform(frame, source);- return origin.map((value, axis) => value + x * xAxis[axis] + y * yAxis[axis]);+ const { origin, xAxis, yAxis } = frameTransform(frame, source);+ return origin.map((value, axis) => value + x * xAxis[axis] + y * yAxis[axis]);}function expectCovered(frame: ImageFrame) {- for (const x of [0, 1]) {- for (const y of [0, 1]) {- for (const value of sample(frame, x, y)) {- expect(value).toBeGreaterThanOrEqual(-1e-9);- expect(value).toBeLessThanOrEqual(1 + 1e-9);- }- }- }+ for (const x of [0, 1]) {+ for (const y of [0, 1]) {+ for (const value of sample(frame, x, y)) {+ expect(value).toBeGreaterThanOrEqual(-1e-9);+ expect(value).toBeLessThanOrEqual(1 + 1e-9);+ }+ }+ }}test("crop preserves source coverage, opposite anchors, flips, and sliding along edges", () => {- const edge: ImageFrame = {- ...imageFrame(source),- center: [900, 400],- size: [600, 400],- };- expect(move(edge, 120, 80, source).center).toEqual([900, 480]);- const minimum = resize(imageFrame(source), "se", -1200, -800, null, source);- for (const ratio of [16 / 9, 9 / 16, 4 / 3, 3 / 4, 1]) {- const next = fitRatio(minimum, ratio);- expect(() => validateFrame(next)).not.toThrow();- expect(next.size[0] / next.size[1]).toBeCloseTo(ratio, 10);- expect(next.center).toEqual(minimum.center);- expectCovered(next);- }- for (const rotation of [0, 90, 180, 270]) {- for (const angle of [-45, -30, 0, 30, 45]) {- const before = rotate(- { ...edge, center: [480, 360], rotation },- angle,- source,- );- for (const axis of [0, 1]) {- const flipped = flip(before, axis);- expectCovered(flipped);- for (const x of [0, 0.3, 1]) {- for (const y of [0, 0.7, 1]) {- const expected = sample(- before,- axis === 0 ? 1 - x : x,- axis === 1 ? 1 - y : y,- );- for (const [i, value] of sample(flipped, x, y).entries()) {- expect(value).toBeCloseTo(expected[i], 10);- }- }- }- for (const direction of [-1, 1]) {- const turned = turn(flipped, direction);- expectCovered(turned);- expect(turn(turned, -direction)).toEqual(flipped);- }- for (const [handle, x, y] of [- ["nw", 1, 1],- ["ne", 0, 1],- ["sw", 1, 0],- ["se", 0, 0],- ["n", 0.5, 1],- ["s", 0.5, 0],- ["w", 1, 0.5],- ["e", 0, 0.5],- ] as const) {- for (const delta of [-1200, 1200]) {- for (const ratio of [before.size[0] / before.size[1], null]) {- const next = resize(flipped, handle, delta, delta, ratio, source);- expectCovered(next);- if (ratio)- expect(next.size[0] / next.size[1]).toBeCloseTo(ratio, 8);- if (!ratio && x === 0.5)- expect(next.size[0]).toBe(flipped.size[0]);- if (!ratio && y === 0.5)- expect(next.size[1]).toBe(flipped.size[1]);- const anchor = sample(flipped, x, y);- for (const [i, value] of sample(next, x, y).entries()) {- expect(value).toBeCloseTo(anchor[i], 8);- }- expect(next.scale).toBe(flipped.scale);- expectCovered(move(next, delta, delta, source));- expectCovered(rotate(next, -angle, source));- }- }- }- }- }- }+ const edge: ImageFrame = {+ ...imageFrame(source),+ center: [900, 400],+ size: [600, 400],+ };+ expect(move(edge, 120, 80, source).center).toEqual([900, 480]);+ const minimum = resize(imageFrame(source), "se", -1200, -800, null, source);+ for (const ratio of [16 / 9, 9 / 16, 4 / 3, 3 / 4, 1]) {+ const next = fitRatio(minimum, ratio);+ expect(() => validateFrame(next)).not.toThrow();+ expect(next.size[0] / next.size[1]).toBeCloseTo(ratio, 10);+ expect(next.center).toEqual(minimum.center);+ expectCovered(next);+ }+ for (const rotation of [0, 90, 180, 270]) {+ for (const angle of [-45, -30, 0, 30, 45]) {+ const before = rotate(+ { ...edge, center: [480, 360], rotation },+ angle,+ source,+ );+ for (const axis of [0, 1]) {+ const flipped = flip(before, axis);+ expectCovered(flipped);+ for (const x of [0, 0.3, 1]) {+ for (const y of [0, 0.7, 1]) {+ const expected = sample(+ before,+ axis === 0 ? 1 - x : x,+ axis === 1 ? 1 - y : y,+ );+ for (const [i, value] of sample(flipped, x, y).entries()) {+ expect(value).toBeCloseTo(expected[i], 10);+ }+ }+ }+ for (const direction of [-1, 1]) {+ const turned = turn(flipped, direction);+ expectCovered(turned);+ expect(turn(turned, -direction)).toEqual(flipped);+ }+ for (const [handle, x, y] of [+ ["nw", 1, 1],+ ["ne", 0, 1],+ ["sw", 1, 0],+ ["se", 0, 0],+ ["n", 0.5, 1],+ ["s", 0.5, 0],+ ["w", 1, 0.5],+ ["e", 0, 0.5],+ ] as const) {+ for (const delta of [-1200, 1200]) {+ for (const ratio of [before.size[0] / before.size[1], null]) {+ const next = resize(flipped, handle, delta, delta, ratio, source);+ expectCovered(next);+ if (ratio)+ expect(next.size[0] / next.size[1]).toBeCloseTo(ratio, 8);+ if (!ratio && x === 0.5)+ expect(next.size[0]).toBe(flipped.size[0]);+ if (!ratio && y === 0.5)+ expect(next.size[1]).toBe(flipped.size[1]);+ const anchor = sample(flipped, x, y);+ for (const [i, value] of sample(next, x, y).entries()) {+ expect(value).toBeCloseTo(anchor[i], 8);+ }+ expect(next.scale).toBe(flipped.scale);+ expectCovered(move(next, delta, delta, source));+ expectCovered(rotate(next, -angle, source));+ }+ }+ }+ }+ }+ }});diff --git a/tests/curves.test.ts b/tests/curves.test.tsindex e924842..94608e2 100644--- a/tests/curves.test.ts+++ b/tests/curves.test.ts@@ -3,51 +3,51 @@ import { sampleCurve } from "@/features/tone-curves/curve";import { interpolatePchip } from "@/lib/math";test("curves interpolate smoothly through their handles without overshoot", () => {- const identity = [- { x: 0, y: 0 },- { x: 1, y: 1 },- ];- const samples = sampleCurve(identity, 257);- expect(samples).toBeInstanceOf(Float32Array);- for (let i = 0; i < samples.length; i++) {- expect(samples[i]).toBeCloseTo(i / 256, 7);- }+ const identity = [+ { x: 0, y: 0 },+ { x: 1, y: 1 },+ ];+ const samples = sampleCurve(identity, 257);+ expect(samples).toBeInstanceOf(Float32Array);+ for (let i = 0; i < samples.length; i++) {+ expect(samples[i]).toBeCloseTo(i / 256, 7);+ }- const lift = interpolatePchip([- { x: 0, y: 0 },- { x: 0.5, y: 0.75 },- { x: 1, y: 1 },- ]);- expect(lift(0.25)).toBeCloseTo(0.453125, 7);- expect(lift(0.5)).toBe(0.75);- expect(lift(0.75)).toBeCloseTo(0.921875, 7);- expect(lift(-1)).toBe(0);- expect(lift(2)).toBe(1);- const leftSlope = (lift(0.5) - lift(0.5 - 0.00001)) / 0.00001;- const rightSlope = (lift(0.5 + 0.00001) - lift(0.5)) / 0.00001;- expect(leftSlope).toBeCloseTo(rightSlope, 3);- const points = [- { x: 0, y: 0 },- { x: 0.02, y: 0.4 },- { x: 0.3, y: 0.4 },- { x: 0.7, y: 0.2 },- { x: 0.99, y: 0.95 },- { x: 1, y: 1 },- ];- const evaluate = interpolatePchip(points);- for (let i = 0; i < points.length - 1; i++) {- const start = points[i];- const end = points[i + 1];- expect(evaluate(start.x)).toBeCloseTo(start.y, 10);- let previous = start.y;- for (let step = 1; step <= 100; step++) {- const value = evaluate(start.x + ((end.x - start.x) * step) / 100);- expect(value).toBeGreaterThanOrEqual(Math.min(start.y, end.y) - 1e-12);- expect(value).toBeLessThanOrEqual(Math.max(start.y, end.y) + 1e-12);- expect(- (value - previous) * Math.sign(end.y - start.y),- ).toBeGreaterThanOrEqual(-1e-12);- previous = value;- }- }+ const lift = interpolatePchip([+ { x: 0, y: 0 },+ { x: 0.5, y: 0.75 },+ { x: 1, y: 1 },+ ]);+ expect(lift(0.25)).toBeCloseTo(0.453125, 7);+ expect(lift(0.5)).toBe(0.75);+ expect(lift(0.75)).toBeCloseTo(0.921875, 7);+ expect(lift(-1)).toBe(0);+ expect(lift(2)).toBe(1);+ const leftSlope = (lift(0.5) - lift(0.5 - 0.00001)) / 0.00001;+ const rightSlope = (lift(0.5 + 0.00001) - lift(0.5)) / 0.00001;+ expect(leftSlope).toBeCloseTo(rightSlope, 3);+ const points = [+ { x: 0, y: 0 },+ { x: 0.02, y: 0.4 },+ { x: 0.3, y: 0.4 },+ { x: 0.7, y: 0.2 },+ { x: 0.99, y: 0.95 },+ { x: 1, y: 1 },+ ];+ const evaluate = interpolatePchip(points);+ for (let i = 0; i < points.length - 1; i++) {+ const start = points[i];+ const end = points[i + 1];+ expect(evaluate(start.x)).toBeCloseTo(start.y, 10);+ let previous = start.y;+ for (let step = 1; step <= 100; step++) {+ const value = evaluate(start.x + ((end.x - start.x) * step) / 100);+ expect(value).toBeGreaterThanOrEqual(Math.min(start.y, end.y) - 1e-12);+ expect(value).toBeLessThanOrEqual(Math.max(start.y, end.y) + 1e-12);+ expect(+ (value - previous) * Math.sign(end.y - start.y),+ ).toBeGreaterThanOrEqual(-1e-12);+ previous = value;+ }+ }});diff --git a/tests/documents.test.ts b/tests/documents.test.tsindex f2cae55..f5ec023 100644--- a/tests/documents.test.ts+++ b/tests/documents.test.ts@@ -11,166 +11,166 @@ import { defaultCurve } from "@/features/tone-curves/curve";import { setToneCurve } from "@/features/tone-curves/edits";function document() {- return createDocument({- frame: imageFrame([32, 32]),- layers: [{ ...createImageLayer("image-1", "Photo"), id: "base" }],- });+ return createDocument({+ frame: imageFrame([32, 32]),+ layers: [{ ...createImageLayer("image-1", "Photo"), id: "base" }],+ });}test("documents edit independently without React, retain bounded history, and reject edits after replacement", async () => {- const first = document();- const second = document();- for (const change of [- { sharpening: -1 },- { sharpening: 151 },- { sharpenRadius: 0 },- { sharpenRadius: 3.1 },- { sharpenRadius: NaN },- ]) {- expect(() => validateDetails(change)).toThrow("Invalid detail adjustment");- }+ const first = document();+ const second = document();+ for (const change of [+ { sharpening: -1 },+ { sharpening: 151 },+ { sharpenRadius: 0 },+ { sharpenRadius: 3.1 },+ { sharpenRadius: NaN },+ ]) {+ expect(() => validateDetails(change)).toThrow("Invalid detail adjustment");+ }- setAdjustments(first, { exposure: 1 });- const points = [- { x: 0, y: 0 },- { x: 0.5, y: 0.7 },- { x: 1, y: 1 },- ];- setToneCurve(first, points);- points[1].y = 0.2;- expect(first.scene.getState().layers[0]).toMatchObject({- toneCurve: [- { x: 0, y: 0 },- { x: 0.5, y: 0.7 },- { x: 1, y: 1 },- ],- });- expect(second.scene.getState().layers[0].adjustments.exposure).toBe(0);- expect(second.history.status.getState().undoCount).toBe(0);- const unchanged = first.scene.getState();- for (const curve of [- [],- [{ x: 0, y: 0 }],- [- { x: 0, y: 0 },- { x: 0, y: 1 },- ],- [- { x: 0, y: 0 },- { x: 1 / 2048, y: 1 },- ],- [- { x: 0, y: 0 },- { x: 0.8, y: 0.5 },- { x: 0.5, y: 1 },- ],- [- { x: 0, y: 0 },- { x: 1, y: Number.NaN },- ],- [- { x: 0, y: -1 },- { x: 1, y: 1 },- ],- [- { x: 0.1, y: 0.1 },- { x: 1, y: 1 },- ],- [- { x: 0, y: 0 },- { x: 0.9, y: 0.9 },- ],- ]) {- expect(() => setToneCurve(first, curve)).toThrow();- }- expect(first.scene.getState()).toBe(unchanged);- first.history.undo();- expect(first.scene.getState().layers[0]).toMatchObject({- toneCurve: defaultCurve,- });- for (let i = 0; i < 150; i++) setAdjustments(first, { exposure: i % 2 });- expect(first.history.status.getState().undoCount).toBe(100);- for (let i = 0; i < 100; i++) first.history.undo();- expect(first.history.status.getState()).toEqual({- undoCount: 0,- redoCount: 100,- });- setAdjustments(first, { contrast: 10 });- expect(first.history.status.getState()).toEqual({- undoCount: 1,- redoCount: 0,- });- const workspace = createWorkspace();- await workspace.open("first", async () => first);- const stale = document();- let release = () => {};- const pending = new Promise<typeof stale>((resolve) => {- release = () => resolve(stale);- });- const loading = workspace.open("slow", () => pending);- await workspace.open("second", async () => second);- release();- await loading;- expect(() => setAdjustments(stale, { exposure: 2 })).toThrow("closed");- expect(workspace.getDocument()).toBe(second);- expect(() => setAdjustments(first, { exposure: 2 })).toThrow("closed");- workspace.dispose();- expect(() => setAdjustments(second, { exposure: 2 })).toThrow("closed");+ setAdjustments(first, { exposure: 1 });+ const points = [+ { x: 0, y: 0 },+ { x: 0.5, y: 0.7 },+ { x: 1, y: 1 },+ ];+ setToneCurve(first, points);+ points[1].y = 0.2;+ expect(first.scene.getState().layers[0]).toMatchObject({+ toneCurve: [+ { x: 0, y: 0 },+ { x: 0.5, y: 0.7 },+ { x: 1, y: 1 },+ ],+ });+ expect(second.scene.getState().layers[0].adjustments.exposure).toBe(0);+ expect(second.history.status.getState().undoCount).toBe(0);+ const unchanged = first.scene.getState();+ for (const curve of [+ [],+ [{ x: 0, y: 0 }],+ [+ { x: 0, y: 0 },+ { x: 0, y: 1 },+ ],+ [+ { x: 0, y: 0 },+ { x: 1 / 2048, y: 1 },+ ],+ [+ { x: 0, y: 0 },+ { x: 0.8, y: 0.5 },+ { x: 0.5, y: 1 },+ ],+ [+ { x: 0, y: 0 },+ { x: 1, y: Number.NaN },+ ],+ [+ { x: 0, y: -1 },+ { x: 1, y: 1 },+ ],+ [+ { x: 0.1, y: 0.1 },+ { x: 1, y: 1 },+ ],+ [+ { x: 0, y: 0 },+ { x: 0.9, y: 0.9 },+ ],+ ]) {+ expect(() => setToneCurve(first, curve)).toThrow();+ }+ expect(first.scene.getState()).toBe(unchanged);+ first.history.undo();+ expect(first.scene.getState().layers[0]).toMatchObject({+ toneCurve: defaultCurve,+ });+ for (let i = 0; i < 150; i++) setAdjustments(first, { exposure: i % 2 });+ expect(first.history.status.getState().undoCount).toBe(100);+ for (let i = 0; i < 100; i++) first.history.undo();+ expect(first.history.status.getState()).toEqual({+ undoCount: 0,+ redoCount: 100,+ });+ setAdjustments(first, { contrast: 10 });+ expect(first.history.status.getState()).toEqual({+ undoCount: 1,+ redoCount: 0,+ });+ const workspace = createWorkspace();+ await workspace.open("first", async () => first);+ const stale = document();+ let release = () => {};+ const pending = new Promise<typeof stale>((resolve) => {+ release = () => resolve(stale);+ });+ const loading = workspace.open("slow", () => pending);+ await workspace.open("second", async () => second);+ release();+ await loading;+ expect(() => setAdjustments(stale, { exposure: 2 })).toThrow("closed");+ expect(workspace.getDocument()).toBe(second);+ expect(() => setAdjustments(first, { exposure: 2 })).toThrow("closed");+ workspace.dispose();+ expect(() => setAdjustments(second, { exposure: 2 })).toThrow("closed");- // Resources survive undo and are released after cancellation, branching, and eviction.- const gpu = await init();- const resources = createResources();- const file = new File(["fixture"], "image.png");- const add = () =>- resources.add(file, createImageSource(target(gpu, { size: [2, 2] })));- const source = add();- const doc = createDocument(- {- ...document().scene.getState(),- layers: [{ ...document().scene.getState().layers[0], source }],- },- resources,- );- const replace = (source: string) =>- doc.edit({- ...doc.scene.getState(),- layers: [{ ...doc.scene.getState().layers[0], source }],- });- const canceled = add();- doc.history.begin();- replace(canceled);- expect(resources.get(source)).toBeDefined();- doc.history.cancel();- expect(() => resources.get(canceled)).toThrow("unavailable");- const branch = add();- replace(branch);- doc.history.undo();- expect(resources.get(branch)).toBeDefined();- doc.history.redo();- expect(doc.scene.getState().layers[0].source).toBe(branch);- doc.history.undo();- setAdjustments(doc, { exposure: 1 });- expect(() => resources.get(branch)).toThrow("unavailable");- const replacement = add();- replace(replacement);- for (let i = 0; i < 100; i++) {- setAdjustments(doc, { exposure: i % 2 });- }- expect(() => resources.get(source)).toThrow("unavailable");- expect(resources.get(replacement)).toBeDefined();- const frame = doc.scene.getState().frame;- for (const invalid of [- { ...frame, size: [0, 1] as const },- { ...frame, scale: [0, 1] as const },- { ...frame, angle: Number.NaN },- ]) {- expect(() => doc.edit({ ...doc.scene.getState(), frame: invalid })).toThrow(- "Invalid image frame",- );- }- expect(doc.scene.getState().frame).toBe(frame);+ // Resources survive undo and are released after cancellation, branching, and eviction.+ const gpu = await init();+ const resources = createResources();+ const file = new File(["fixture"], "image.png");+ const add = () =>+ resources.add(file, createImageSource(target(gpu, { size: [2, 2] })));+ const source = add();+ const doc = createDocument(+ {+ ...document().scene.getState(),+ layers: [{ ...document().scene.getState().layers[0], source }],+ },+ resources,+ );+ const replace = (source: string) =>+ doc.edit({+ ...doc.scene.getState(),+ layers: [{ ...doc.scene.getState().layers[0], source }],+ });+ const canceled = add();+ doc.history.begin();+ replace(canceled);+ expect(resources.get(source)).toBeDefined();+ doc.history.cancel();+ expect(() => resources.get(canceled)).toThrow("unavailable");+ const branch = add();+ replace(branch);+ doc.history.undo();+ expect(resources.get(branch)).toBeDefined();+ doc.history.redo();+ expect(doc.scene.getState().layers[0].source).toBe(branch);+ doc.history.undo();+ setAdjustments(doc, { exposure: 1 });+ expect(() => resources.get(branch)).toThrow("unavailable");+ const replacement = add();+ replace(replacement);+ for (let i = 0; i < 100; i++) {+ setAdjustments(doc, { exposure: i % 2 });+ }+ expect(() => resources.get(source)).toThrow("unavailable");+ expect(resources.get(replacement)).toBeDefined();+ const frame = doc.scene.getState().frame;+ for (const invalid of [+ { ...frame, size: [0, 1] as const },+ { ...frame, scale: [0, 1] as const },+ { ...frame, angle: Number.NaN },+ ]) {+ expect(() => doc.edit({ ...doc.scene.getState(), frame: invalid })).toThrow(+ "Invalid image frame",+ );+ }+ expect(doc.scene.getState().frame).toBe(frame);- doc.dispose();- expect(() => resources.get(replacement)).toThrow("unavailable");- gpu.dispose();+ doc.dispose();+ expect(() => resources.get(replacement)).toThrow("unavailable");+ gpu.dispose();});diff --git a/tests/editing.e2e.ts b/tests/editing.e2e.tsindex 495629c..13ac75f 100644--- a/tests/editing.e2e.ts+++ b/tests/editing.e2e.ts@@ -8,1047 +8,1047 @@ import { readImage, readPixel, readPreview } from "./images";import { box, drag } from "./pointer";function expectCentered(- actual: { x: number; y: number; width: number; height: number },- expected: typeof actual,+ actual: { x: number; y: number; width: number; height: number },+ expected: typeof actual,) {- expect(actual.x + actual.width / 2).toBeCloseTo(- expected.x + expected.width / 2,- 0,- );- expect(actual.y + actual.height / 2).toBeCloseTo(- expected.y + expected.height / 2,- 0,- );+ expect(actual.x + actual.width / 2).toBeCloseTo(+ expected.x + expected.width / 2,+ 0,+ );+ expect(actual.y + actual.height / 2).toBeCloseTo(+ expected.y + expected.height / 2,+ 0,+ );}async function zoom(page: Page, factor: number) {- await page.keyboard.down("Control");- await page.mouse.wheel(0, -Math.log(factor) * 100);- await page.keyboard.up("Control");+ await page.keyboard.down("Control");+ await page.mouse.wheel(0, -Math.log(factor) * 100);+ await page.keyboard.up("Control");}test("edit a photo, inspect the preview and histograms, undo changes, and export", async ({- page,- browser,+ page,+ browser,}) => {- test.setTimeout(180_000);- const state = () => page.evaluate(() => window.openlight.getState());- await page.goto("/");- await expect(page.getByRole("button", { name: "Open image" })).toBeVisible();- await page- .locator('input[type="file"]')- .setInputFiles("tests/fixtures/photo.svg");- const canvas = page- .getByRole("region", { name: "Image canvas" })- .locator("canvas");- const output = page- .getByLabel("output histogram", { exact: true })- .locator("polyline")- .first();- await expect(- page.getByLabel("output histogram", { exact: true }).locator("polygon"),- ).toHaveCount(3);- await expect(output).toHaveAttribute("points", /,\d{1,2}\./);- const original = await canvas.screenshot();- const histogram = await output.getAttribute("points");- const initial = await state();- expect((await readImage(page)).center).toEqual([128, 128, 128, 255]);+ test.setTimeout(180_000);+ const state = () => page.evaluate(() => window.openlight.getState());+ await page.goto("/");+ await expect(page.getByRole("button", { name: "Open image" })).toBeVisible();+ await page+ .locator('input[type="file"]')+ .setInputFiles("tests/fixtures/photo.svg");+ const canvas = page+ .getByRole("region", { name: "Image canvas" })+ .locator("canvas");+ const output = page+ .getByLabel("output histogram", { exact: true })+ .locator("polyline")+ .first();+ await expect(+ page.getByLabel("output histogram", { exact: true }).locator("polygon"),+ ).toHaveCount(3);+ await expect(output).toHaveAttribute("points", /,\d{1,2}\./);+ const original = await canvas.screenshot();+ const histogram = await output.getAttribute("points");+ const initial = await state();+ expect((await readImage(page)).center).toEqual([128, 128, 128, 255]);- await test.step("image adjustments share a single section", async () => {- await expect(- page.getByRole("heading", { name: "Adjustments", exact: true }),- ).toBeVisible();- await expect(- page.getByRole("slider", { name: "Clarity", exact: true }),- ).toHaveCount(0);- await expect(- page.getByRole("slider", { name: "Exposure", exact: true }),- ).toBeVisible();- await expect(- page.getByRole("slider", { name: "Temp", exact: true }),- ).toBeVisible();- });+ await test.step("image adjustments share a single section", async () => {+ await expect(+ page.getByRole("heading", { name: "Adjustments", exact: true }),+ ).toBeVisible();+ await expect(+ page.getByRole("slider", { name: "Clarity", exact: true }),+ ).toHaveCount(0);+ await expect(+ page.getByRole("slider", { name: "Exposure", exact: true }),+ ).toBeVisible();+ await expect(+ page.getByRole("slider", { name: "Temp", exact: true }),+ ).toBeVisible();+ });- await test.step("zoomed rendering reaches the edges of the editor viewport", async () => {- const viewport = await page- .getByRole("region", { name: "Image canvas" })- .boundingBox();- if (!viewport) throw new Error("Missing editor viewport.");- expect(await canvas.boundingBox()).toEqual(viewport);- await canvas.hover();- await zoom(page, 2);- const edge = {- x: viewport.x + viewport.width / 2,- y: viewport.y + 4,- width: 1,- height: 1,- };- await expect- .poll(async () => await readPixel(page, edge))- .toEqual([128, 128, 128, 255]);- await canvas.dblclick();- await expect.poll(() => canvas.screenshot()).toEqual(original);- });+ await test.step("zoomed rendering reaches the edges of the editor viewport", async () => {+ const viewport = await page+ .getByRole("region", { name: "Image canvas" })+ .boundingBox();+ if (!viewport) throw new Error("Missing editor viewport.");+ expect(await canvas.boundingBox()).toEqual(viewport);+ await canvas.hover();+ await zoom(page, 2);+ const edge = {+ x: viewport.x + viewport.width / 2,+ y: viewport.y + 4,+ width: 1,+ height: 1,+ };+ await expect+ .poll(async () => await readPixel(page, edge))+ .toEqual([128, 128, 128, 255]);+ await canvas.dblclick();+ await expect.poll(() => canvas.screenshot()).toEqual(original);+ });- await test.step("Space panning continues smoothly after releasing the key mid-drag", async () => {- const viewport = await canvas.boundingBox();- if (!viewport) throw new Error("Missing canvas.");- const scale = Math.min(- (viewport.width - 48) / 1200,- (viewport.height - 48) / 800,- 2,- );- const sample = {- x: viewport.x + viewport.width / 2 + (430 - 600) * scale,- y: viewport.y + viewport.height / 2 + (150 - 400) * scale,- width: 1,- height: 1,- };- expect(await readPixel(page, sample)).toEqual([48, 80, 128, 255]);- await canvas.hover();- await page.keyboard.down("Space");- await page.mouse.down();- await page.mouse.move(- viewport.x + viewport.width / 2 + 100,- viewport.y + viewport.height / 2,- );- await page.keyboard.up("Space");- await page.mouse.move(- viewport.x + viewport.width / 2 + 101,- viewport.y + viewport.height / 2,- );- await page.mouse.up();- await expect- .poll(async () => await readPixel(page, { ...sample, x: sample.x + 101 }))- .toEqual([48, 80, 128, 255]);- expect(await state()).toEqual(initial);- await canvas.dblclick();- await expect.poll(() => canvas.screenshot()).toEqual(original);- });+ await test.step("Space panning continues smoothly after releasing the key mid-drag", async () => {+ const viewport = await canvas.boundingBox();+ if (!viewport) throw new Error("Missing canvas.");+ const scale = Math.min(+ (viewport.width - 48) / 1200,+ (viewport.height - 48) / 800,+ 2,+ );+ const sample = {+ x: viewport.x + viewport.width / 2 + (430 - 600) * scale,+ y: viewport.y + viewport.height / 2 + (150 - 400) * scale,+ width: 1,+ height: 1,+ };+ expect(await readPixel(page, sample)).toEqual([48, 80, 128, 255]);+ await canvas.hover();+ await page.keyboard.down("Space");+ await page.mouse.down();+ await page.mouse.move(+ viewport.x + viewport.width / 2 + 100,+ viewport.y + viewport.height / 2,+ );+ await page.keyboard.up("Space");+ await page.mouse.move(+ viewport.x + viewport.width / 2 + 101,+ viewport.y + viewport.height / 2,+ );+ await page.mouse.up();+ await expect+ .poll(async () => await readPixel(page, { ...sample, x: sample.x + 101 }))+ .toEqual([48, 80, 128, 255]);+ expect(await state()).toEqual(initial);+ await canvas.dblclick();+ await expect.poll(() => canvas.screenshot()).toEqual(original);+ });- await test.step("exposure moves the preview and RGB histogram, then resets", async () => {- const exposure = page.getByRole("slider", {- name: "Exposure",- exact: true,- });- await exposure.focus();- await page.keyboard.down("ArrowRight");- await page.keyboard.press("ArrowRight");- await page.keyboard.up("ArrowRight");- expect((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.");- await drag(- page,- [bounds.x + bounds.width / 2, bounds.y + bounds.height / 2],- [bounds.x + bounds.width * 0.6, bounds.y + bounds.height / 2],- 8,- );- expect((await state()).history.undoCount).toBe(1);- await expect.poll(() => canvas.screenshot()).not.toEqual(original);- await expect(output).not.toHaveAttribute("points", histogram ?? "");- expect((await readImage(page)).center[0]).toBeGreaterThan(160);- await page.keyboard.press("ControlOrMeta+z");- await 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 expect(exposure).toHaveValue("0");- await expect(output).toHaveAttribute("points", histogram ?? "");- await expect.poll(() => canvas.screenshot()).toEqual(original);- });+ await test.step("exposure moves the preview and RGB histogram, then resets", async () => {+ const exposure = page.getByRole("slider", {+ name: "Exposure",+ exact: true,+ });+ await exposure.focus();+ await page.keyboard.down("ArrowRight");+ await page.keyboard.press("ArrowRight");+ await page.keyboard.up("ArrowRight");+ expect((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.");+ await drag(+ page,+ [bounds.x + bounds.width / 2, bounds.y + bounds.height / 2],+ [bounds.x + bounds.width * 0.6, bounds.y + bounds.height / 2],+ 8,+ );+ expect((await state()).history.undoCount).toBe(1);+ await expect.poll(() => canvas.screenshot()).not.toEqual(original);+ await expect(output).not.toHaveAttribute("points", histogram ?? "");+ expect((await readImage(page)).center[0]).toBeGreaterThan(160);+ await page.keyboard.press("ControlOrMeta+z");+ await 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 expect(exposure).toHaveValue("0");+ await expect(output).toHaveAttribute("points", histogram ?? "");+ await expect.poll(() => canvas.screenshot()).toEqual(original);+ });- await test.step("compare and clipping change only the preview", async () => {- await page.evaluate(() => {- window.openlight.setAdjustments({ exposure: 3 });- window.openlight.setToneCurve([- { x: 0, y: 0 },- { x: 0.5, y: 1 },- { x: 1, y: 1 },- ]);- });- const before = page.getByRole("button", {- name: "Compare before and after",- exact: true,- });- const shadows = page.getByRole("button", { name: "Show clipped shadows" });- const highlights = page.getByRole("button", {- name: "Show clipped highlights",- });- const edited = await readImage(page);- const history = (await state()).history;- const bins = await output.getAttribute("points");- await before.focus();- await page.keyboard.down("Backslash");- await expect(before).toHaveAttribute("aria-pressed", "true");- await expect- .poll(async () => (await readPreview(page)).center)- .toEqual([128, 128, 128, 255]);- await page.keyboard.up("Backslash");- await expect- .poll(async () => (await readPreview(page)).center)- .toEqual([255, 255, 255, 255]);- await before.click();- const divider = page.getByRole("slider", {- name: "Before and after divider",- });- await expect(divider).toHaveAttribute("aria-valuenow", "50");- const bounds = await canvas.boundingBox();- if (!bounds) throw new Error("Preview is missing.");- await divider.hover();- await page.mouse.down();- await page.mouse.move(- bounds.x + bounds.width * 0.8,- bounds.y + bounds.height / 2,- { steps: 8 },- );- await page.mouse.up();- await expect(divider).toHaveAttribute("aria-valuenow", "80");- await expect- .poll(async () => (await readPreview(page)).center)- .toEqual([128, 128, 128, 255]);- await divider.press("Home");- await expect- .poll(async () => (await readPreview(page)).center)- .toEqual([255, 255, 255, 255]);- await divider.press("End");- await expect- .poll(async () => (await readPreview(page)).center)- .toEqual([128, 128, 128, 255]);- await divider.press("Shift+ArrowLeft");- await expect(divider).toHaveAttribute("aria-valuenow", "90");- await page.keyboard.down("Backslash");- await expect(divider).toBeHidden();- await page.keyboard.up("Backslash");- await expect(divider).toHaveAttribute("aria-valuenow", "90");- await before.click();- await expect(divider).toBeHidden();- await page.keyboard.down("Backslash");- await page.evaluate(() => window.dispatchEvent(new Event("blur")));- await expect(before).toHaveAttribute("aria-pressed", "false");- await page.keyboard.up("Backslash");- const field = page.getByRole("textbox", { name: "Exposure", exact: true });- await field.focus();- await page.keyboard.press("Backslash");- await expect(before).toHaveAttribute("aria-pressed", "false");- await field.press("Escape");- await shadows.click();- await expect- .poll(async () => (await readPreview(page)).blue)- .toBeGreaterThan(100);- await highlights.click();- await expect- .poll(async () => (await readPreview(page)).center)- .toEqual([255, 0, 0, 255]);- await expect- .poll(async () => (await readPreview(page)).blue)- .toBeGreaterThan(100);- await before.click();- await expect- .poll(async () => (await readPreview(page)).center)- .toEqual([128, 128, 128, 255]);- expect(await readImage(page)).toEqual(edited);- expect((await state()).history).toEqual(history);- await expect(output).toHaveAttribute("points", bins ?? "");- await page.evaluate(() =>- window.openlight.setPreview({- comparison: "edited",- shadows: false,- highlights: false,- }),- );- await expect(highlights).toHaveAttribute("aria-pressed", "false");- await expect.poll(async () => (await readPreview(page)).blue).toBe(0);- await page.evaluate(() => {- window.openlight.setAdjustments({ exposure: 0 });- window.openlight.setToneCurve();- });- await expect.poll(() => canvas.screenshot()).toEqual(original);- });+ await test.step("compare and clipping change only the preview", async () => {+ await page.evaluate(() => {+ window.openlight.setAdjustments({ exposure: 3 });+ window.openlight.setToneCurve([+ { x: 0, y: 0 },+ { x: 0.5, y: 1 },+ { x: 1, y: 1 },+ ]);+ });+ const before = page.getByRole("button", {+ name: "Compare before and after",+ exact: true,+ });+ const shadows = page.getByRole("button", { name: "Show clipped shadows" });+ const highlights = page.getByRole("button", {+ name: "Show clipped highlights",+ });+ const edited = await readImage(page);+ const history = (await state()).history;+ const bins = await output.getAttribute("points");+ await before.focus();+ await page.keyboard.down("Backslash");+ await expect(before).toHaveAttribute("aria-pressed", "true");+ await expect+ .poll(async () => (await readPreview(page)).center)+ .toEqual([128, 128, 128, 255]);+ await page.keyboard.up("Backslash");+ await expect+ .poll(async () => (await readPreview(page)).center)+ .toEqual([255, 255, 255, 255]);+ await before.click();+ const divider = page.getByRole("slider", {+ name: "Before and after divider",+ });+ await expect(divider).toHaveAttribute("aria-valuenow", "50");+ const bounds = await canvas.boundingBox();+ if (!bounds) throw new Error("Preview is missing.");+ await divider.hover();+ await page.mouse.down();+ await page.mouse.move(+ bounds.x + bounds.width * 0.8,+ bounds.y + bounds.height / 2,+ { steps: 8 },+ );+ await page.mouse.up();+ await expect(divider).toHaveAttribute("aria-valuenow", "80");+ await expect+ .poll(async () => (await readPreview(page)).center)+ .toEqual([128, 128, 128, 255]);+ await divider.press("Home");+ await expect+ .poll(async () => (await readPreview(page)).center)+ .toEqual([255, 255, 255, 255]);+ await divider.press("End");+ await expect+ .poll(async () => (await readPreview(page)).center)+ .toEqual([128, 128, 128, 255]);+ await divider.press("Shift+ArrowLeft");+ await expect(divider).toHaveAttribute("aria-valuenow", "90");+ await page.keyboard.down("Backslash");+ await expect(divider).toBeHidden();+ await page.keyboard.up("Backslash");+ await expect(divider).toHaveAttribute("aria-valuenow", "90");+ await before.click();+ await expect(divider).toBeHidden();+ await page.keyboard.down("Backslash");+ await page.evaluate(() => window.dispatchEvent(new Event("blur")));+ await expect(before).toHaveAttribute("aria-pressed", "false");+ await page.keyboard.up("Backslash");+ const field = page.getByRole("textbox", { name: "Exposure", exact: true });+ await field.focus();+ await page.keyboard.press("Backslash");+ await expect(before).toHaveAttribute("aria-pressed", "false");+ await field.press("Escape");+ await shadows.click();+ await expect+ .poll(async () => (await readPreview(page)).blue)+ .toBeGreaterThan(100);+ await highlights.click();+ await expect+ .poll(async () => (await readPreview(page)).center)+ .toEqual([255, 0, 0, 255]);+ await expect+ .poll(async () => (await readPreview(page)).blue)+ .toBeGreaterThan(100);+ await before.click();+ await expect+ .poll(async () => (await readPreview(page)).center)+ .toEqual([128, 128, 128, 255]);+ expect(await readImage(page)).toEqual(edited);+ expect((await state()).history).toEqual(history);+ await expect(output).toHaveAttribute("points", bins ?? "");+ await page.evaluate(() =>+ window.openlight.setPreview({+ comparison: "edited",+ shadows: false,+ highlights: false,+ }),+ );+ await expect(highlights).toHaveAttribute("aria-pressed", "false");+ await expect.poll(async () => (await readPreview(page)).blue).toBe(0);+ await page.evaluate(() => {+ window.openlight.setAdjustments({ exposure: 0 });+ window.openlight.setToneCurve();+ });+ await expect.poll(() => canvas.screenshot()).toEqual(original);+ });- await test.step("light and color controls render together and reset", async () => {- for (const [label, value] of [- ["Highlights", -50],- ["Shadows", 50],- ["Whites", 25],- ["Blacks", -25],- ] as const) {- const field = page.getByRole("textbox", { name: label, exact: true });- await field.fill(String(value));- await field.press("Enter");- await expect(- page.getByRole("slider", { name: label, exact: true }),- ).toHaveValue(String(value));- }- await page.evaluate(() =>- window.openlight.setAdjustments({- contrast: 20,- incrementalTemperature: 15,- incrementalTint: -10,- vibrance: 30,- saturation: -20,- }),- );- await expect.poll(() => canvas.screenshot()).not.toEqual(original);- await expect(output).not.toHaveAttribute("points", histogram ?? "");- const edited = await readImage(page);- expect(edited.center).not.toEqual([128, 128, 128, 255]);- await page.evaluate(- (adjustments) => window.openlight.setAdjustments(adjustments),- initial.adjustments,- );- await expect.poll(() => canvas.screenshot()).toEqual(original);- });+ await test.step("light and color controls render together and reset", async () => {+ for (const [label, value] of [+ ["Highlights", -50],+ ["Shadows", 50],+ ["Whites", 25],+ ["Blacks", -25],+ ] as const) {+ const field = page.getByRole("textbox", { name: label, exact: true });+ await field.fill(String(value));+ await field.press("Enter");+ await expect(+ page.getByRole("slider", { name: label, exact: true }),+ ).toHaveValue(String(value));+ }+ await page.evaluate(() =>+ window.openlight.setAdjustments({+ contrast: 20,+ incrementalTemperature: 15,+ incrementalTint: -10,+ vibrance: 30,+ saturation: -20,+ }),+ );+ await expect.poll(() => canvas.screenshot()).not.toEqual(original);+ await expect(output).not.toHaveAttribute("points", histogram ?? "");+ const edited = await readImage(page);+ expect(edited.center).not.toEqual([128, 128, 128, 255]);+ await page.evaluate(+ (adjustments) => window.openlight.setAdjustments(adjustments),+ initial.adjustments,+ );+ await expect.poll(() => canvas.screenshot()).toEqual(original);+ });- await colorMixerEditing(page);+ await colorMixerEditing(page);- await test.step("clarity changes local contrast and histogram, then undoes and resets", async () => {- await page.getByRole("button", { name: "Add effect", exact: true }).click();- await page- .locator("[popover]:popover-open")- .getByRole("button", { name: "Details", exact: true })- .click();- const field = page.getByRole("textbox", { name: "Clarity", exact: true });- const slider = page.getByRole("slider", { name: "Clarity", exact: true });- await field.fill("100");- await field.press("Enter");- await expect(slider).toHaveValue("100");- await expect(output).not.toHaveAttribute("points", histogram ?? "");- const positive = await readImage(page);- expect(positive.center).toEqual([128, 128, 128, 255]);- expect(positive.corner).toEqual([0, 0, 0, 255]);- await page.getByRole("button", { name: "Undo", exact: true }).click();- await expect(slider).toHaveValue("0");- expect((await readImage(page)).center).toEqual([128, 128, 128, 255]);- await field.fill("-100");- await 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 expect(slider).toHaveValue("0");- await expect(output).toHaveAttribute("points", histogram ?? "");- });+ await test.step("clarity changes local contrast and histogram, then undoes and resets", async () => {+ await page.getByRole("button", { name: "Add effect", exact: true }).click();+ await page+ .locator("[popover]:popover-open")+ .getByRole("button", { name: "Details", exact: true })+ .click();+ const field = page.getByRole("textbox", { name: "Clarity", exact: true });+ const slider = page.getByRole("slider", { name: "Clarity", exact: true });+ await field.fill("100");+ await field.press("Enter");+ await expect(slider).toHaveValue("100");+ await expect(output).not.toHaveAttribute("points", histogram ?? "");+ const positive = await readImage(page);+ expect(positive.center).toEqual([128, 128, 128, 255]);+ expect(positive.corner).toEqual([0, 0, 0, 255]);+ await page.getByRole("button", { name: "Undo", exact: true }).click();+ await expect(slider).toHaveValue("0");+ expect((await readImage(page)).center).toEqual([128, 128, 128, 255]);+ await field.fill("-100");+ await 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 expect(slider).toHaveValue("0");+ await expect(output).toHaveAttribute("points", histogram ?? "");+ });- await test.step("sharpening amount and radius edit, undo, and reset", async () => {- const amount = page.getByRole("textbox", {- name: "Sharpening",- exact: true,- });- const radius = page.getByRole("textbox", { name: "Radius", exact: true });- await amount.fill("100");- await amount.press("Enter");- await radius.fill("3");- await radius.press("Enter");- await expect(output).not.toHaveAttribute("points", histogram ?? "");- expect((await readImage(page)).center).toEqual([128, 128, 128, 255]);- await page.getByRole("button", { name: "Undo", exact: true }).click();- await expect(radius).toHaveValue("1.0");- await page.getByRole("button", { name: "Undo", exact: true }).click();- await expect(amount).toHaveValue("0");- await expect(output).toHaveAttribute("points", histogram ?? "");- await amount.fill("150");- await amount.press("Enter");- await page- .getByRole("slider", { name: "Sharpening", exact: true })- .dblclick();- await expect(amount).toHaveValue("0");- });+ await test.step("sharpening amount and radius edit, undo, and reset", async () => {+ const amount = page.getByRole("textbox", {+ name: "Sharpening",+ exact: true,+ });+ const radius = page.getByRole("textbox", { name: "Radius", exact: true });+ await amount.fill("100");+ await amount.press("Enter");+ await radius.fill("3");+ await radius.press("Enter");+ await expect(output).not.toHaveAttribute("points", histogram ?? "");+ expect((await readImage(page)).center).toEqual([128, 128, 128, 255]);+ await page.getByRole("button", { name: "Undo", exact: true }).click();+ await expect(radius).toHaveValue("1.0");+ await page.getByRole("button", { name: "Undo", exact: true }).click();+ await expect(amount).toHaveValue("0");+ await expect(output).toHaveAttribute("points", histogram ?? "");+ await amount.fill("150");+ await amount.press("Enter");+ await page+ .getByRole("slider", { name: "Sharpening", exact: true })+ .dblclick();+ await expect(amount).toHaveValue("0");+ });- await test.step("curve gestures change output after adjustments and undo as one edit", async () => {- await page.evaluate(() =>- window.openlight.setAdjustments({ exposure: -1 }),- );- const adjusted = await readImage(page);- await page.getByRole("button", { name: "photo.svg", exact: true }).click();- const graph = page.getByRole("application", { name: "Tone curve" });- const curveHistogram = page- .getByLabel("curve input histogram", { exact: true })- .locator("polyline");- await graph.scrollIntoViewIfNeeded();- await expect(curveHistogram).toHaveAttribute("points", /,\d{1,2}\./);- const curveInput = await curveHistogram.getAttribute("points");- const before = await page.evaluate(- () => window.openlight.getState().history.undoCount,- );- const bounds = await graph.boundingBox();- if (!bounds) throw new Error("Curve graph is missing.");- await drag(- page,- [bounds.x + bounds.width / 2, bounds.y + bounds.height / 2],- [bounds.x + bounds.width / 2, bounds.y + bounds.height / 4],- 8,- );- await expect(graph.locator("circle")).toHaveCount(3);- await expect(curveHistogram).toHaveAttribute("points", curveInput ?? "");- expect((await state()).history.undoCount).toBe(before + 1);- const curved = await readImage(page);- const curve = await page.evaluate(- () => window.openlight.getState().toneCurve,- );- const expected = interpolatePchip(curve)(adjusted.center[0] / 255) * 255;- expect(Math.abs(curved.center[0] - expected)).toBeLessThan(2);- await page.keyboard.press("ControlOrMeta+z");- expect(await readImage(page)).toEqual(adjusted);- await page.keyboard.press("ControlOrMeta+Shift+z");- expect(await readImage(page)).toEqual(curved);- await graph.press("Shift+ArrowDown");- await graph.press("Delete");- await expect(graph.locator("circle")).toHaveCount(2);- expect(await readImage(page)).toEqual(adjusted);- await graph.press("Enter");- await graph.press("ArrowUp");- await expect(graph.locator("circle")).toHaveCount(3);- await page.getByRole("button", { name: "Reset curve" }).click();- await expect(graph.locator("circle")).toHaveCount(2);- await page.evaluate(() => window.openlight.setAdjustments({ exposure: 0 }));- await expect.poll(() => canvas.screenshot()).toEqual(original);- for (const { from, to, sample, expected } of [- { from: [0, 1], to: [0, 0.75], sample: "corner", expected: 64 },- { from: [1, 0], to: [0.1, 0], sample: "center", expected: 255 },- ] as const) {- await graph.scrollIntoViewIfNeeded();- const bounds = await box(graph);- await drag(- page,- [- bounds.x + 1 + from[0] * (bounds.width - 2),- bounds.y + 1 + from[1] * (bounds.height - 2),- ],- [bounds.x + to[0] * bounds.width, bounds.y + to[1] * bounds.height],- 5,- );- expect(- Math.abs((await readImage(page))[sample][0] - expected),- ).toBeLessThan(2);- await graph.dblclick({- position: { x: to[0] * bounds.width, y: to[1] * bounds.height },- });- expect(- await page.evaluate(() => window.openlight.getState().toneCurve),- ).toEqual(initial.toneCurve);- }- });+ await test.step("curve gestures change output after adjustments and undo as one edit", async () => {+ await page.evaluate(() =>+ window.openlight.setAdjustments({ exposure: -1 }),+ );+ const adjusted = await readImage(page);+ await page.getByRole("button", { name: "photo.svg", exact: true }).click();+ const graph = page.getByRole("application", { name: "Tone curve" });+ const curveHistogram = page+ .getByLabel("curve input histogram", { exact: true })+ .locator("polyline");+ await graph.scrollIntoViewIfNeeded();+ await expect(curveHistogram).toHaveAttribute("points", /,\d{1,2}\./);+ const curveInput = await curveHistogram.getAttribute("points");+ const before = await page.evaluate(+ () => window.openlight.getState().history.undoCount,+ );+ const bounds = await graph.boundingBox();+ if (!bounds) throw new Error("Curve graph is missing.");+ await drag(+ page,+ [bounds.x + bounds.width / 2, bounds.y + bounds.height / 2],+ [bounds.x + bounds.width / 2, bounds.y + bounds.height / 4],+ 8,+ );+ await expect(graph.locator("circle")).toHaveCount(3);+ await expect(curveHistogram).toHaveAttribute("points", curveInput ?? "");+ expect((await state()).history.undoCount).toBe(before + 1);+ const curved = await readImage(page);+ const curve = await page.evaluate(+ () => window.openlight.getState().toneCurve,+ );+ const expected = interpolatePchip(curve)(adjusted.center[0] / 255) * 255;+ expect(Math.abs(curved.center[0] - expected)).toBeLessThan(2);+ await page.keyboard.press("ControlOrMeta+z");+ expect(await readImage(page)).toEqual(adjusted);+ await page.keyboard.press("ControlOrMeta+Shift+z");+ expect(await readImage(page)).toEqual(curved);+ await graph.press("Shift+ArrowDown");+ await graph.press("Delete");+ await expect(graph.locator("circle")).toHaveCount(2);+ expect(await readImage(page)).toEqual(adjusted);+ await graph.press("Enter");+ await graph.press("ArrowUp");+ await expect(graph.locator("circle")).toHaveCount(3);+ await page.getByRole("button", { name: "Reset curve" }).click();+ await expect(graph.locator("circle")).toHaveCount(2);+ await page.evaluate(() => window.openlight.setAdjustments({ exposure: 0 }));+ await expect.poll(() => canvas.screenshot()).toEqual(original);+ for (const { from, to, sample, expected } of [+ { from: [0, 1], to: [0, 0.75], sample: "corner", expected: 64 },+ { from: [1, 0], to: [0.1, 0], sample: "center", expected: 255 },+ ] as const) {+ await graph.scrollIntoViewIfNeeded();+ const bounds = await box(graph);+ await drag(+ page,+ [+ bounds.x + 1 + from[0] * (bounds.width - 2),+ bounds.y + 1 + from[1] * (bounds.height - 2),+ ],+ [bounds.x + to[0] * bounds.width, bounds.y + to[1] * bounds.height],+ 5,+ );+ expect(+ Math.abs((await readImage(page))[sample][0] - expected),+ ).toBeLessThan(2);+ await graph.dblclick({+ position: { x: to[0] * bounds.width, y: to[1] * bounds.height },+ });+ expect(+ await page.evaluate(() => window.openlight.getState().toneCurve),+ ).toEqual(initial.toneCurve);+ }+ });- await page.getByRole("button", { name: "photo.svg", exact: true }).click();- await test.step("a mask's curve input clears while the mask is hidden and returns on undo", async () => {- await page.evaluate(() => {- const api = window.openlight;- const mask = api.addLayer("mask");- api.setLayer(mask, { name: "Curve input mask" });- api.setAdjustments({ exposure: 1 }, mask);- });- const plot = page- .getByLabel("curve input histogram", { exact: true })- .locator("polyline");- await expect(plot).toHaveAttribute("points", /,\d{1,2}\./);- const points = await plot.getAttribute("points");- await page- .getByRole("button", { name: "Show Curve input mask", exact: true })- .click();- await expect(plot).toHaveAttribute("points", "");- await page.getByRole("button", { name: "Undo", exact: true }).click();- await expect(plot).toHaveAttribute("points", points ?? "");- await page.evaluate(() => {- const api = window.openlight;- const mask = api.getState().selectedLayerId;- if (!mask) throw Error("Missing mask selection.");- api.deleteLayer(mask);- });- });- await page.getByRole("button", { name: "photo.svg", exact: true }).click();- await test.step("mode bar switches panels by click, arrow keys, and letters", async () => {- const modes = page.getByRole("tablist", { name: "Editor mode" });- const selected = modes.getByRole("tab", { selected: true });- await expect(selected).toHaveAccessibleName("Adjust");- const exportButton = page.getByRole("button", {- name: "Export",- exact: true,- });- await exportButton.click();- await expect(exportButton).toHaveAttribute("aria-pressed", "true");- await expect(- page.getByRole("region", { name: "Export settings" }),- ).toBeVisible();- await expect(- page.getByRole("region", { name: "Layers", exact: true }),- ).toHaveCount(0);- await page.getByRole("button", { name: "Close", exact: true }).click();- await expect(selected).toHaveAccessibleName("Adjust");- await expect(- page.getByRole("region", { name: "Layers", exact: true }),- ).toBeVisible();- await modes.getByRole("tab", { name: "Crop" }).click();- await expect(selected).toHaveAccessibleName("Crop");- await page.keyboard.press("ArrowLeft");- await expect(selected).toHaveAccessibleName("Adjust");- await expect(selected).toBeFocused();- await page.keyboard.press("e");- await expect(exportButton).toHaveAttribute("aria-pressed", "true");- await page.keyboard.press("a");- await expect(selected).toHaveAccessibleName("Adjust");- await expect(page.getByRole("slider", { name: "Exposure" })).toBeVisible();- });+ await page.getByRole("button", { name: "photo.svg", exact: true }).click();+ await test.step("a mask's curve input clears while the mask is hidden and returns on undo", async () => {+ await page.evaluate(() => {+ const api = window.openlight;+ const mask = api.addLayer("mask");+ api.setLayer(mask, { name: "Curve input mask" });+ api.setAdjustments({ exposure: 1 }, mask);+ });+ const plot = page+ .getByLabel("curve input histogram", { exact: true })+ .locator("polyline");+ await expect(plot).toHaveAttribute("points", /,\d{1,2}\./);+ const points = await plot.getAttribute("points");+ await page+ .getByRole("button", { name: "Show Curve input mask", exact: true })+ .click();+ await expect(plot).toHaveAttribute("points", "");+ await page.getByRole("button", { name: "Undo", exact: true }).click();+ await expect(plot).toHaveAttribute("points", points ?? "");+ await page.evaluate(() => {+ const api = window.openlight;+ const mask = api.getState().selectedLayerId;+ if (!mask) throw Error("Missing mask selection.");+ api.deleteLayer(mask);+ });+ });+ await page.getByRole("button", { name: "photo.svg", exact: true }).click();+ await test.step("mode bar switches panels by click, arrow keys, and letters", async () => {+ const modes = page.getByRole("tablist", { name: "Editor mode" });+ const selected = modes.getByRole("tab", { selected: true });+ await expect(selected).toHaveAccessibleName("Adjust");+ const exportButton = page.getByRole("button", {+ name: "Export",+ exact: true,+ });+ await exportButton.click();+ await expect(exportButton).toHaveAttribute("aria-pressed", "true");+ await expect(+ page.getByRole("region", { name: "Export settings" }),+ ).toBeVisible();+ await expect(+ page.getByRole("region", { name: "Layers", exact: true }),+ ).toHaveCount(0);+ await page.getByRole("button", { name: "Close", exact: true }).click();+ await expect(selected).toHaveAccessibleName("Adjust");+ await expect(+ page.getByRole("region", { name: "Layers", exact: true }),+ ).toBeVisible();+ await modes.getByRole("tab", { name: "Crop" }).click();+ await expect(selected).toHaveAccessibleName("Crop");+ await page.keyboard.press("ArrowLeft");+ await expect(selected).toHaveAccessibleName("Adjust");+ await expect(selected).toBeFocused();+ await page.keyboard.press("e");+ await expect(exportButton).toHaveAttribute("aria-pressed", "true");+ await page.keyboard.press("a");+ await expect(selected).toHaveAccessibleName("Adjust");+ await expect(page.getByRole("slider", { name: "Exposure" })).toBeVisible();+ });- const open = page.getByRole("tab", { name: "Crop" });- const panel = page.getByRole("region", { name: "Crop tool" });- const selection = page.getByRole("application", { name: "Crop selection" });- const corner = page.getByRole("button", { name: "Resize crop bottom right" });- const move = page.getByRole("button", { name: "Move crop" });- const reset = panel.getByRole("button", { name: "Reset", exact: true });- const aspect = panel.getByRole("combobox", { name: "Aspect ratio" });- const rotation = panel.getByRole("slider", { name: "Rotation", exact: true });- async function setFrame(change: Partial<ImageFrame> = {}) {- const frame = { ...imageFrame([1200, 800]), ...change };- await page.evaluate((frame) => window.openlight.setFrame(frame), frame);- }+ const open = page.getByRole("tab", { name: "Crop" });+ const panel = page.getByRole("region", { name: "Crop tool" });+ const selection = page.getByRole("application", { name: "Crop selection" });+ const corner = page.getByRole("button", { name: "Resize crop bottom right" });+ const move = page.getByRole("button", { name: "Move crop" });+ const reset = panel.getByRole("button", { name: "Reset", exact: true });+ const aspect = panel.getByRole("combobox", { name: "Aspect ratio" });+ const rotation = panel.getByRole("slider", { name: "Rotation", exact: true });+ async function setFrame(change: Partial<ImageFrame> = {}) {+ const frame = { ...imageFrame([1200, 800]), ...change };+ await page.evaluate((frame) => window.openlight.setFrame(frame), frame);+ }- async function expectImage(size: number[], corner: number) {- expect(await readImage(page)).toEqual({- size,- center: [128, 128, 128, 255],- corner: [corner, corner, corner, 255],- });- }+ async function expectImage(size: number[], corner: number) {+ expect(await readImage(page)).toEqual({+ size,+ center: [128, 128, 128, 255],+ corner: [corner, corner, corner, 255],+ });+ }- await test.step("Enter activates focused crop panel buttons", async () => {- const before = await state();- await open.click();- await aspect.selectOption({ label: "Square" });- await page- .getByRole("button", { name: "Close", exact: true })- .press("Enter");- await expect(panel).toBeHidden();- expect((await state()).frame).toEqual(before.frame);- expect((await state()).history).toEqual(before.history);- await open.click();- await panel- .getByRole("button", { name: "Rotate clockwise" })- .press("Enter");- await expect(panel).toBeVisible();- expect((await state()).frame).toEqual(before.frame);- await reset.press("Enter");- await page.getByRole("button", { name: "Apply crop" }).press("Enter");- await expect(panel).toBeHidden();- expect((await state()).frame).toEqual(before.frame);- expect((await state()).history).toEqual(before.history);- });+ await test.step("Enter activates focused crop panel buttons", async () => {+ const before = await state();+ await open.click();+ await aspect.selectOption({ label: "Square" });+ await page+ .getByRole("button", { name: "Close", exact: true })+ .press("Enter");+ await expect(panel).toBeHidden();+ expect((await state()).frame).toEqual(before.frame);+ expect((await state()).history).toEqual(before.history);+ await open.click();+ await panel+ .getByRole("button", { name: "Rotate clockwise" })+ .press("Enter");+ await expect(panel).toBeVisible();+ expect((await state()).frame).toEqual(before.frame);+ await reset.press("Enter");+ await page.getByRole("button", { name: "Apply crop" }).press("Enter");+ await expect(panel).toBeHidden();+ expect((await state()).frame).toEqual(before.frame);+ expect((await state()).history).toEqual(before.history);+ });- await test.step("locked crop corners resize continuously when the drag changes direction", async () => {- await setFrame({ size: [600, 400] });- await open.click();- const grip = await box(corner);- const x = grip.x + grip.width / 2;- const y = grip.y + grip.height / 2;- await page.mouse.move(x, y);- await page.mouse.down();- await page.mouse.move(x - 30, y + 19, { steps: 6 });- const before = await box(selection);- await page.mouse.move(x - 30, y + 21);- const after = await box(selection);- expect(Math.abs(after.width - before.width)).toBeLessThan(6);- expectCentered(after, before);- await page.keyboard.press("Escape");- await page.mouse.up();- await page.keyboard.press("c");- const reopened = await box(selection);- await page.mouse.move(x - 40, y - 40);- expect(await box(selection)).toEqual(reopened);- await page.keyboard.press("Escape");- await setFrame();- });+ await test.step("locked crop corners resize continuously when the drag changes direction", async () => {+ await setFrame({ size: [600, 400] });+ await open.click();+ const grip = await box(corner);+ const x = grip.x + grip.width / 2;+ const y = grip.y + grip.height / 2;+ await page.mouse.move(x, y);+ await page.mouse.down();+ await page.mouse.move(x - 30, y + 19, { steps: 6 });+ const before = await box(selection);+ await page.mouse.move(x - 30, y + 21);+ const after = await box(selection);+ expect(Math.abs(after.width - before.width)).toBeLessThan(6);+ expectCentered(after, before);+ await page.keyboard.press("Escape");+ await page.mouse.up();+ await page.keyboard.press("c");+ const reopened = await box(selection);+ await page.mouse.move(x - 40, y - 40);+ expect(await box(selection)).toEqual(reopened);+ await page.keyboard.press("Escape");+ await setFrame();+ });- await test.step("44px edge targets resize along one axis and preserve locked ratios", async () => {- for (const locked of [false, true]) {- for (const [label, sx, sy] of [- ["top", 0, -1],- ["right", 1, 0],- ["bottom", 0, 1],- ["left", -1, 0],- ] as const) {- await setFrame({ size: [300, 200] });- await open.click();- if (!locked) await aspect.selectOption({ label: "Free" });- const bounds = await box(selection);- const edge = page.getByRole("button", {- name: `Resize crop ${label}`,- exact: true,- });- const target = await box(edge);- expect(sx ? target.width : target.height).toBe(44);- const grip = await box(corner);- expect([grip.width, grip.height]).toEqual([44, 44]);- const x =- bounds.x + bounds.width * (sx ? (sx + 1) / 2 : 0.35) + sx * 20;- const y =- bounds.y + bounds.height * (sy ? (sy + 1) / 2 : 0.35) + sy * 20;- await drag(- page,- [x, y],- [x - sx * 30 + Math.abs(sy) * 15, y - sy * 30 + Math.abs(sx) * 15],- );- const resized = await box(selection);- const widthChange = sx ? 60 : Number(locked) * 90;- const heightChange = sy ? 60 : Number(locked) * 40;- expect(resized.width).toBeCloseTo(bounds.width - widthChange, 0);- expect(resized.height).toBeCloseTo(bounds.height - heightChange, 0);- expectCentered(resized, bounds);- await page.getByRole("button", { name: "Apply crop" }).click();- const frame = (await state()).frame;- if (!frame) throw new Error("Missing cropped frame");- const exported = await readImage(page);- expect(exported.size).toEqual(frame.size.map(Math.round));- expect(exported.center).toEqual([128, 128, 128, 255]);- }- }- await setFrame();- });+ await test.step("44px edge targets resize along one axis and preserve locked ratios", async () => {+ for (const locked of [false, true]) {+ for (const [label, sx, sy] of [+ ["top", 0, -1],+ ["right", 1, 0],+ ["bottom", 0, 1],+ ["left", -1, 0],+ ] as const) {+ await setFrame({ size: [300, 200] });+ await open.click();+ if (!locked) await aspect.selectOption({ label: "Free" });+ const bounds = await box(selection);+ const edge = page.getByRole("button", {+ name: `Resize crop ${label}`,+ exact: true,+ });+ const target = await box(edge);+ expect(sx ? target.width : target.height).toBe(44);+ const grip = await box(corner);+ expect([grip.width, grip.height]).toEqual([44, 44]);+ const x =+ bounds.x + bounds.width * (sx ? (sx + 1) / 2 : 0.35) + sx * 20;+ const y =+ bounds.y + bounds.height * (sy ? (sy + 1) / 2 : 0.35) + sy * 20;+ await drag(+ page,+ [x, y],+ [x - sx * 30 + Math.abs(sy) * 15, y - sy * 30 + Math.abs(sx) * 15],+ );+ const resized = await box(selection);+ const widthChange = sx ? 60 : Number(locked) * 90;+ const heightChange = sy ? 60 : Number(locked) * 40;+ expect(resized.width).toBeCloseTo(bounds.width - widthChange, 0);+ expect(resized.height).toBeCloseTo(bounds.height - heightChange, 0);+ expectCentered(resized, bounds);+ await page.getByRole("button", { name: "Apply crop" }).click();+ const frame = (await state()).frame;+ if (!frame) throw new Error("Missing cropped frame");+ const exported = await readImage(page);+ expect(exported.size).toEqual(frame.size.map(Math.round));+ expect(exported.center).toEqual([128, 128, 128, 255]);+ }+ }+ await setFrame();+ });- await test.step("crop drafts cancel, apply once, rotate and straighten without losing the source", async () => {- const before = await state();- await expect(output).toHaveAttribute("points", histogram ?? "");- await open.click();- await expect(aspect).toHaveValue("1.5");- await aspect.selectOption({ label: "Square" });- const bounds = await box(selection);- await drag(- page,- [bounds.x + bounds.width, bounds.y + bounds.height],- [bounds.x + bounds.width * 0.8, bounds.y + bounds.height * 0.8],- );- const beforeZoom = await box(selection);- expect(beforeZoom.width).toBeLessThan(bounds.width);- expect(beforeZoom.width).toBeCloseTo(beforeZoom.height, 4);- expectCentered(beforeZoom, bounds);- await corner.hover();- await zoom(page, Math.exp(0.4));- await expect- .poll(async () => (await box(selection)).width)- .toBeGreaterThan(beforeZoom.width * 1.4);- const zoomed = await box(selection);- const grip = await box(corner);- await drag(- page,- [grip.x + grip.width / 2, grip.y + grip.height / 2],- [grip.x + grip.width / 2 - 20, grip.y + grip.height / 2 - 20],- 4,- );- const resized = await box(selection);- expect(resized.width).toBeCloseTo(zoomed.width - 40, 0);- const beforePan = await box(selection);- expectCentered(beforePan, zoomed);- await page.mouse.wheel(30, 20);- await expect- .poll(async () => (await box(selection)).x)- .not.toBe(beforePan.x);- expect((await box(selection)).width).toBe(resized.width);- await move.press("Shift+ArrowRight");- for (const gap of [20, 24]) {- const frame = await box(selection);- const x = frame.x + frame.width + gap;- const y = frame.y + frame.height / 2;- await page.mouse.move(x, y);- expect(- await page.evaluate(- ({ x, y }) => {- const element = document.elementFromPoint(x, y);- return element && getComputedStyle(element).cursor;- },- { x, y },- ),- ).toContain(gap < 22 ? "ew-resize" : "url(");- await page.mouse.down();- await page.mouse.move(- x,- y + (frame.width / 2 + gap) * Math.tan(Math.PI / 6),- { steps: 8 },- );- await page.mouse.up();- const angle = await rotation.inputValue();- expect(Number(angle)).toBeCloseTo(gap < 22 ? 0 : 30, 0);- expect(await box(selection)).toEqual(frame);- await page.mouse.move(x + 20, y);- await expect(rotation).toHaveValue(angle);- }- expect((await readImage(page)).size).toEqual([1200, 800]);- await page.keyboard.press("Escape");- expect((await state()).frame).toEqual(before.frame);- expect((await state()).history).toEqual(before.history);- await open.focus();- await page.keyboard.press("c");- await aspect.selectOption({ label: "Square" });- await corner.press("Enter");- await expect(panel).toBeHidden();- await expectImage([800, 800], 128);- await expect(output).not.toHaveAttribute("points", histogram ?? "");- expect((await state()).history.undoCount).toBe(- before.history.undoCount + 1,- );- await page.getByRole("button", { name: "Undo", exact: true }).click();- expect((await readImage(page)).size).toEqual([1200, 800]);- await page.getByRole("button", { name: "Redo", exact: true }).click();- expect((await readImage(page)).size).toEqual([800, 800]);- await open.click();- await reset.click();- await panel- .getByRole("button", { name: "Rotate counterclockwise" })- .click();- await corner.press("Enter");- await expectImage([800, 1200], 224);- await open.click();- await panel.getByRole("button", { name: "Rotate clockwise" }).click();- await panel.getByRole("button", { name: "Rotate clockwise" }).click();- await page.getByRole("button", { name: "Apply crop" }).click();- await expectImage([800, 1200], 32);- await open.click();- await reset.click();- const angle = panel.getByRole("textbox", {- name: "Rotation",- exact: true,- });- await angle.fill("30");- await angle.press("Enter");- await expect(panel).toBeHidden();- await expectImage([1200, 800], 32);- await open.click();- await reset.click();- await page.getByRole("button", { name: "Apply crop" }).click();- await expect.poll(() => canvas.screenshot()).toEqual(original);- });+ await test.step("crop drafts cancel, apply once, rotate and straighten without losing the source", async () => {+ const before = await state();+ await expect(output).toHaveAttribute("points", histogram ?? "");+ await open.click();+ await expect(aspect).toHaveValue("1.5");+ await aspect.selectOption({ label: "Square" });+ const bounds = await box(selection);+ await drag(+ page,+ [bounds.x + bounds.width, bounds.y + bounds.height],+ [bounds.x + bounds.width * 0.8, bounds.y + bounds.height * 0.8],+ );+ const beforeZoom = await box(selection);+ expect(beforeZoom.width).toBeLessThan(bounds.width);+ expect(beforeZoom.width).toBeCloseTo(beforeZoom.height, 4);+ expectCentered(beforeZoom, bounds);+ await corner.hover();+ await zoom(page, Math.exp(0.4));+ await expect+ .poll(async () => (await box(selection)).width)+ .toBeGreaterThan(beforeZoom.width * 1.4);+ const zoomed = await box(selection);+ const grip = await box(corner);+ await drag(+ page,+ [grip.x + grip.width / 2, grip.y + grip.height / 2],+ [grip.x + grip.width / 2 - 20, grip.y + grip.height / 2 - 20],+ 4,+ );+ const resized = await box(selection);+ expect(resized.width).toBeCloseTo(zoomed.width - 40, 0);+ const beforePan = await box(selection);+ expectCentered(beforePan, zoomed);+ await page.mouse.wheel(30, 20);+ await expect+ .poll(async () => (await box(selection)).x)+ .not.toBe(beforePan.x);+ expect((await box(selection)).width).toBe(resized.width);+ await move.press("Shift+ArrowRight");+ for (const gap of [20, 24]) {+ const frame = await box(selection);+ const x = frame.x + frame.width + gap;+ const y = frame.y + frame.height / 2;+ await page.mouse.move(x, y);+ expect(+ await page.evaluate(+ ({ x, y }) => {+ const element = document.elementFromPoint(x, y);+ return element && getComputedStyle(element).cursor;+ },+ { x, y },+ ),+ ).toContain(gap < 22 ? "ew-resize" : "url(");+ await page.mouse.down();+ await page.mouse.move(+ x,+ y + (frame.width / 2 + gap) * Math.tan(Math.PI / 6),+ { steps: 8 },+ );+ await page.mouse.up();+ const angle = await rotation.inputValue();+ expect(Number(angle)).toBeCloseTo(gap < 22 ? 0 : 30, 0);+ expect(await box(selection)).toEqual(frame);+ await page.mouse.move(x + 20, y);+ await expect(rotation).toHaveValue(angle);+ }+ expect((await readImage(page)).size).toEqual([1200, 800]);+ await page.keyboard.press("Escape");+ expect((await state()).frame).toEqual(before.frame);+ expect((await state()).history).toEqual(before.history);+ await open.focus();+ await page.keyboard.press("c");+ await aspect.selectOption({ label: "Square" });+ await corner.press("Enter");+ await expect(panel).toBeHidden();+ await expectImage([800, 800], 128);+ await expect(output).not.toHaveAttribute("points", histogram ?? "");+ expect((await state()).history.undoCount).toBe(+ before.history.undoCount + 1,+ );+ await page.getByRole("button", { name: "Undo", exact: true }).click();+ expect((await readImage(page)).size).toEqual([1200, 800]);+ await page.getByRole("button", { name: "Redo", exact: true }).click();+ expect((await readImage(page)).size).toEqual([800, 800]);+ await open.click();+ await reset.click();+ await panel+ .getByRole("button", { name: "Rotate counterclockwise" })+ .click();+ await corner.press("Enter");+ await expectImage([800, 1200], 224);+ await open.click();+ await panel.getByRole("button", { name: "Rotate clockwise" }).click();+ await panel.getByRole("button", { name: "Rotate clockwise" }).click();+ await page.getByRole("button", { name: "Apply crop" }).click();+ await expectImage([800, 1200], 32);+ await open.click();+ await reset.click();+ const angle = panel.getByRole("textbox", {+ name: "Rotation",+ exact: true,+ });+ await angle.fill("30");+ await angle.press("Enter");+ await expect(panel).toBeHidden();+ await expectImage([1200, 800], 32);+ await open.click();+ await reset.click();+ await page.getByRole("button", { name: "Apply crop" }).click();+ await expect.poll(() => canvas.screenshot()).toEqual(original);+ });- await test.step("flip controls mirror pixels, preserve framing, and support undo", async () => {- for (const [axis, value] of [- ["horizontal", 224],- ["vertical", 224],- ["horizontal", 32],- ["vertical", 0],- ] as const) {- const pixel = [value, value, value, 255];- await open.click();- const bounds = await box(selection);- await page.getByRole("button", { name: `Flip ${axis}` }).click();- expect(await box(selection)).toEqual(bounds);- const corner = {- x: bounds.x + 10,- y: bounds.y + 10,- };- await expect- .poll(async () => await readPixel(page, corner))- .toEqual(pixel);- await page.getByRole("button", { name: "Apply crop" }).click();- expect((await readImage(page)).corner).toEqual(pixel);- await page.getByRole("button", { name: "Undo", exact: true }).click();- await page.getByRole("button", { name: "Redo", exact: true }).click();- expect((await readImage(page)).corner).toEqual(pixel);- }- });+ await test.step("flip controls mirror pixels, preserve framing, and support undo", async () => {+ for (const [axis, value] of [+ ["horizontal", 224],+ ["vertical", 224],+ ["horizontal", 32],+ ["vertical", 0],+ ] as const) {+ const pixel = [value, value, value, 255];+ await open.click();+ const bounds = await box(selection);+ await page.getByRole("button", { name: `Flip ${axis}` }).click();+ expect(await box(selection)).toEqual(bounds);+ const corner = {+ x: bounds.x + 10,+ y: bounds.y + 10,+ };+ await expect+ .poll(async () => await readPixel(page, corner))+ .toEqual(pixel);+ await page.getByRole("button", { name: "Apply crop" }).click();+ expect((await readImage(page)).corner).toEqual(pixel);+ await page.getByRole("button", { name: "Undo", exact: true }).click();+ await page.getByRole("button", { name: "Redo", exact: true }).click();+ expect((await readImage(page)).corner).toEqual(pixel);+ }+ });- await test.step("cropping preserves framing, moves the image, and rotates around the crop center", async () => {- const sidebar = page.getByRole("complementary");- const sidebarBefore = await box(sidebar);- await drag(- page,- [sidebarBefore.x - 2, sidebarBefore.y + 40],- [sidebarBefore.x - 82, sidebarBefore.y + 40],- );- const resizedSidebar = await box(sidebar);- expect(resizedSidebar.width).toBe(sidebarBefore.width + 80);- await setFrame({ center: [360, 200], size: [240, 240] });- const viewport = await box(canvas);- await open.click();- expect(await box(sidebar)).toEqual(resizedSidebar);- const bounds = await box(selection);- // A 240px crop starts at 200%, centered exactly where it was before opening the tool.- expect(bounds.width).toBeCloseTo(480, 0);- expect(bounds.height).toBeCloseTo(480, 0);- expect(bounds.x).toBeCloseTo(viewport.x + (viewport.width - 480) / 2, 0);- expect(bounds.y).toBeCloseTo(viewport.y + (viewport.height - 480) / 2, 0);- const sample = {- x: bounds.x + 40,- y: bounds.y + bounds.height / 2,- };- expect(await readPixel(page, sample)).toEqual([48, 80, 128, 255]);- const x = bounds.x + bounds.width / 2;- const y = bounds.y + bounds.height / 2;- const beforePan = await state();- for (const [startX, startY] of [- [x, y],- [bounds.x, bounds.y],- [bounds.x + bounds.width, y],- [bounds.x + bounds.width + 12, y],- [bounds.x + bounds.width + 60, y],- ]) {- await page.mouse.move(startX, startY);- await page.keyboard.down("Space");- await expect(- page.getByRole("button", { name: "Resize crop top left" }),- ).toHaveCSS("cursor", "grab");- await page.mouse.down();- await page.mouse.move(startX + 40, startY + 20, { steps: 4 });- await page.mouse.up();- await page.keyboard.up("Space");- expect(await box(selection)).toEqual({- ...bounds,- x: bounds.x + 40,- y: bounds.y + 20,- });- expect(await state()).toEqual(beforePan);- expect(- await readPixel(page, {- ...sample,- x: sample.x + 40,- y: sample.y + 20,- }),- ).toEqual([48, 80, 128, 255]);- await page.keyboard.down("Space");- await page.mouse.down();- await page.mouse.move(startX, startY, { steps: 4 });- await page.mouse.up();- await page.keyboard.up("Space");- }- await page.mouse.move(x, y);- await expect(move).toHaveCSS("cursor", "grab");- await page.mouse.down();- await expect(move).toHaveCSS("cursor", "grabbing");- await page.mouse.move(x + 80, y + 30, { steps: 8 });- await page.mouse.up();- expect(await box(selection)).toEqual(bounds);- expect(await readPixel(page, sample)).toEqual([128, 128, 128, 255]);- await drag(- page,- [bounds.x + bounds.width + 60, y],- [- bounds.x + bounds.width + 60,- y + (bounds.width / 2 + 60) * Math.tan(Math.PI / 6),- ],- 8,- );- expect(await box(selection)).toEqual(bounds);- expect(Number(await rotation.inputValue())).toBeCloseTo(30, 0);- const center = { x, y };- expect(await readPixel(page, center)).toEqual([48, 80, 128, 255]);- await page.keyboard.press("Enter");- expect(await box(sidebar)).toEqual(resizedSidebar);- expect((await readImage(page)).center).toEqual([48, 80, 128, 255]);- await canvas.hover();- await zoom(page, 2.5);- await page.mouse.wheel(30, 20);- const before = await readPixel(page, center);- await open.click();- const zoomed = await box(selection);- expect(zoomed.width).toBeCloseTo(1200, 0);- expect(zoomed.x).toBeCloseTo(- viewport.x + (viewport.width - 1200) / 2 - 30,- 0,- );- expect(zoomed.y).toBeCloseTo(- viewport.y + (viewport.height - 1200) / 2 - 20,- 0,- );- expect(await readPixel(page, center)).toEqual(before);- await drag(page, [x, y], [x + 80, y + 30], 8);- await page.keyboard.press("Enter");- await open.click();- expect(await box(selection)).toEqual(bounds);- await page.keyboard.press("Escape");- expect(await box(sidebar)).toEqual(resizedSidebar);- await drag(- page,- [resizedSidebar.x - 2, resizedSidebar.y + 40],- [sidebarBefore.x - 2, sidebarBefore.y + 40],- );- await setFrame();- });+ await test.step("cropping preserves framing, moves the image, and rotates around the crop center", async () => {+ const sidebar = page.getByRole("complementary");+ const sidebarBefore = await box(sidebar);+ await drag(+ page,+ [sidebarBefore.x - 2, sidebarBefore.y + 40],+ [sidebarBefore.x - 82, sidebarBefore.y + 40],+ );+ const resizedSidebar = await box(sidebar);+ expect(resizedSidebar.width).toBe(sidebarBefore.width + 80);+ await setFrame({ center: [360, 200], size: [240, 240] });+ const viewport = await box(canvas);+ await open.click();+ expect(await box(sidebar)).toEqual(resizedSidebar);+ const bounds = await box(selection);+ // A 240px crop starts at 200%, centered exactly where it was before opening the tool.+ expect(bounds.width).toBeCloseTo(480, 0);+ expect(bounds.height).toBeCloseTo(480, 0);+ expect(bounds.x).toBeCloseTo(viewport.x + (viewport.width - 480) / 2, 0);+ expect(bounds.y).toBeCloseTo(viewport.y + (viewport.height - 480) / 2, 0);+ const sample = {+ x: bounds.x + 40,+ y: bounds.y + bounds.height / 2,+ };+ expect(await readPixel(page, sample)).toEqual([48, 80, 128, 255]);+ const x = bounds.x + bounds.width / 2;+ const y = bounds.y + bounds.height / 2;+ const beforePan = await state();+ for (const [startX, startY] of [+ [x, y],+ [bounds.x, bounds.y],+ [bounds.x + bounds.width, y],+ [bounds.x + bounds.width + 12, y],+ [bounds.x + bounds.width + 60, y],+ ]) {+ await page.mouse.move(startX, startY);+ await page.keyboard.down("Space");+ await expect(+ page.getByRole("button", { name: "Resize crop top left" }),+ ).toHaveCSS("cursor", "grab");+ await page.mouse.down();+ await page.mouse.move(startX + 40, startY + 20, { steps: 4 });+ await page.mouse.up();+ await page.keyboard.up("Space");+ expect(await box(selection)).toEqual({+ ...bounds,+ x: bounds.x + 40,+ y: bounds.y + 20,+ });+ expect(await state()).toEqual(beforePan);+ expect(+ await readPixel(page, {+ ...sample,+ x: sample.x + 40,+ y: sample.y + 20,+ }),+ ).toEqual([48, 80, 128, 255]);+ await page.keyboard.down("Space");+ await page.mouse.down();+ await page.mouse.move(startX, startY, { steps: 4 });+ await page.mouse.up();+ await page.keyboard.up("Space");+ }+ await page.mouse.move(x, y);+ await expect(move).toHaveCSS("cursor", "grab");+ await page.mouse.down();+ await expect(move).toHaveCSS("cursor", "grabbing");+ await page.mouse.move(x + 80, y + 30, { steps: 8 });+ await page.mouse.up();+ expect(await box(selection)).toEqual(bounds);+ expect(await readPixel(page, sample)).toEqual([128, 128, 128, 255]);+ await drag(+ page,+ [bounds.x + bounds.width + 60, y],+ [+ bounds.x + bounds.width + 60,+ y + (bounds.width / 2 + 60) * Math.tan(Math.PI / 6),+ ],+ 8,+ );+ expect(await box(selection)).toEqual(bounds);+ expect(Number(await rotation.inputValue())).toBeCloseTo(30, 0);+ const center = { x, y };+ expect(await readPixel(page, center)).toEqual([48, 80, 128, 255]);+ await page.keyboard.press("Enter");+ expect(await box(sidebar)).toEqual(resizedSidebar);+ expect((await readImage(page)).center).toEqual([48, 80, 128, 255]);+ await canvas.hover();+ await zoom(page, 2.5);+ await page.mouse.wheel(30, 20);+ const before = await readPixel(page, center);+ await open.click();+ const zoomed = await box(selection);+ expect(zoomed.width).toBeCloseTo(1200, 0);+ expect(zoomed.x).toBeCloseTo(+ viewport.x + (viewport.width - 1200) / 2 - 30,+ 0,+ );+ expect(zoomed.y).toBeCloseTo(+ viewport.y + (viewport.height - 1200) / 2 - 20,+ 0,+ );+ expect(await readPixel(page, center)).toEqual(before);+ await drag(page, [x, y], [x + 80, y + 30], 8);+ await page.keyboard.press("Enter");+ await open.click();+ expect(await box(selection)).toEqual(bounds);+ await page.keyboard.press("Escape");+ expect(await box(sidebar)).toEqual(resizedSidebar);+ await drag(+ page,+ [resizedSidebar.x - 2, resizedSidebar.y + 40],+ [sidebarBefore.x - 2, sidebarBefore.y + 40],+ );+ await setFrame();+ });- await test.step("straightened crops leave empty space outside the source and reset restores geometry and camera", async () => {- await setFrame({ size: [600, 400], angle: 30 });- await open.click();- await move.hover();- await zoom(page, 0.5);- const bounds = await box(selection);- const outside = {- x: bounds.x - bounds.width * 0.46,- y: bounds.y - bounds.height * 0.46,- };- const pixel = async () => await readPixel(page, outside);- await expect.poll(pixel).toEqual([9, 9, 9, 255]);- await zoom(page, 0.5);- const smaller = await box(selection);- // Known light patch rotated beyond the original source rectangle.- const revealed = {- x: smaller.x + smaller.width * 1.535,- y: smaller.y + smaller.height * 0.542,- };- await expect- .poll(async () => await readPixel(page, revealed))- .toEqual([90, 90, 90, 255]);- await reset.click();- await expect.poll(pixel).toEqual([0, 0, 0, 255]);- const fitted = await box(selection);- const viewport = await box(canvas);- const fit = Math.min(- (viewport.width - 48) / 1200,- (viewport.height - 48) / 800,- 2,- );- expect(fitted.width).toBeCloseTo(1200 * fit, 0);- expect(fitted.height).toBeCloseTo(800 * fit, 0);- expectCentered(fitted, viewport);- await page.getByRole("button", { name: "Rotate clockwise" }).click();- await move.hover();- await zoom(page, Math.exp(0.8));- await page.mouse.wheel(60, 40);- await reset.click();- expect(await box(selection)).toEqual(fitted);- await expect(- page.getByRole("slider", { name: "Rotation", exact: true }),- ).toHaveValue("0");- await expect(aspect).toHaveValue("1.5");- await aspect.selectOption({ label: "Square" });- const fixed = await box(selection);- for (const direction of [- "ArrowLeft",- "ArrowRight",- "ArrowUp",- "ArrowDown",- ]) {- for (let i = 0; i < 20; i++) await move.press(`Shift+${direction}`);- const actual = await box(selection);- expect(actual.x).toBeCloseTo(fixed.x, 0);- expect(actual.y).toBeCloseTo(fixed.y, 0);- }- await page.keyboard.press("Escape");- await setFrame();- });+ await test.step("straightened crops leave empty space outside the source and reset restores geometry and camera", async () => {+ await setFrame({ size: [600, 400], angle: 30 });+ await open.click();+ await move.hover();+ await zoom(page, 0.5);+ const bounds = await box(selection);+ const outside = {+ x: bounds.x - bounds.width * 0.46,+ y: bounds.y - bounds.height * 0.46,+ };+ const pixel = async () => await readPixel(page, outside);+ await expect.poll(pixel).toEqual([9, 9, 9, 255]);+ await zoom(page, 0.5);+ const smaller = await box(selection);+ // Known light patch rotated beyond the original source rectangle.+ const revealed = {+ x: smaller.x + smaller.width * 1.535,+ y: smaller.y + smaller.height * 0.542,+ };+ await expect+ .poll(async () => await readPixel(page, revealed))+ .toEqual([90, 90, 90, 255]);+ await reset.click();+ await expect.poll(pixel).toEqual([0, 0, 0, 255]);+ const fitted = await box(selection);+ const viewport = await box(canvas);+ const fit = Math.min(+ (viewport.width - 48) / 1200,+ (viewport.height - 48) / 800,+ 2,+ );+ expect(fitted.width).toBeCloseTo(1200 * fit, 0);+ expect(fitted.height).toBeCloseTo(800 * fit, 0);+ expectCentered(fitted, viewport);+ await page.getByRole("button", { name: "Rotate clockwise" }).click();+ await move.hover();+ await zoom(page, Math.exp(0.8));+ await page.mouse.wheel(60, 40);+ await reset.click();+ expect(await box(selection)).toEqual(fitted);+ await expect(+ page.getByRole("slider", { name: "Rotation", exact: true }),+ ).toHaveValue("0");+ await expect(aspect).toHaveValue("1.5");+ await aspect.selectOption({ label: "Square" });+ const fixed = await box(selection);+ for (const direction of [+ "ArrowLeft",+ "ArrowRight",+ "ArrowUp",+ "ArrowDown",+ ]) {+ for (let i = 0; i < 20; i++) await move.press(`Shift+${direction}`);+ const actual = await box(selection);+ expect(actual.x).toBeCloseTo(fixed.x, 0);+ expect(actual.y).toBeCloseTo(fixed.y, 0);+ }+ await page.keyboard.press("Escape");+ await setFrame();+ });- await test.step("export retains edits and original dimensions independently of viewport zoom", async () => {- await page.evaluate(() => {- window.openlight.beginEdit();- window.openlight.setAdjustments({- exposure: 1,- highlights: -20,- shadows: 30,- whites: 10,- blacks: -5,- });- window.openlight.setDetails({- clarity: -50,- sharpening: 100,- sharpenRadius: 1,- });- window.openlight.setToneCurve([- { x: 0, y: 0 },- { x: 0.5, y: 0.75 },- { x: 1, y: 1 },- ]);- window.openlight.commitEdit();- });- const expected = await readImage(page);- expect(expected.center[0]).toBeGreaterThan(190);- expect(expected.center[0]).toBeLessThan(255);- expect(expected.corner[0]).toBeGreaterThan(0);- expect(expected.corner[3]).toBe(255);- await canvas.hover();- await zoom(page, Math.E);- const panel = page.getByRole("region", { name: "Export settings" });- await page.getByRole("button", { name: "Export", exact: true }).click();- const quality = panel.getByRole("textbox", { name: "Quality" });- async function save(name: string) {- const pending = page.waitForEvent("download");- await panel.getByRole("button", { name: "Save image" }).click();- const download = await pending;- expect(download.suggestedFilename()).toBe(name);- const path = await download.path();- if (!path) throw new Error("Missing image download.");- return readFile(path);- }- const format = panel.getByRole("combobox", { name: "Format" });- await format.selectOption("png");- await expect(panel.getByRole("textbox", { name: "Width" })).toHaveValue(- "1200",- );- await expect(panel.getByText(/kB|MB/)).toBeVisible();- expect(await readImage(page, await save("photo.png"))).toEqual(expected);- await format.selectOption("jpeg");- await expect(format).toHaveValue("jpeg");- await quality.fill("20");- await quality.press("Enter");- const small = await save("photo.jpg");- await quality.fill("95");- await quality.press("Enter");- const large = await save("photo.jpg");- for (const bytes of [small, large]) {- const actual = await readImage(page, bytes);- expect(actual.size).toEqual([1200, 800]);- expect(- Math.abs(actual.center[0] - expected.center[0]),- ).toBeLessThanOrEqual(3);- }- expect(large.length).toBeGreaterThan(small.length);- await format.selectOption("webp");- const width = panel.getByRole("textbox", { name: "Width" });- await width.fill("600");- await width.press("Enter");- await expect(panel.getByRole("textbox", { name: "Height" })).toHaveValue(- "400",- );- const resized = await readImage(page, await save("photo.webp"));- expect(resized.size).toEqual([600, 400]);- expect(- Math.abs(resized.center[0] - expected.center[0]),- ).toBeLessThanOrEqual(3);- await expect(quality).toHaveValue("95");- await page.keyboard.press("a");- await expect(panel).toBeHidden();- });+ await test.step("export retains edits and original dimensions independently of viewport zoom", async () => {+ await page.evaluate(() => {+ window.openlight.beginEdit();+ window.openlight.setAdjustments({+ exposure: 1,+ highlights: -20,+ shadows: 30,+ whites: 10,+ blacks: -5,+ });+ window.openlight.setDetails({+ clarity: -50,+ sharpening: 100,+ sharpenRadius: 1,+ });+ window.openlight.setToneCurve([+ { x: 0, y: 0 },+ { x: 0.5, y: 0.75 },+ { x: 1, y: 1 },+ ]);+ window.openlight.commitEdit();+ });+ const expected = await readImage(page);+ expect(expected.center[0]).toBeGreaterThan(190);+ expect(expected.center[0]).toBeLessThan(255);+ expect(expected.corner[0]).toBeGreaterThan(0);+ expect(expected.corner[3]).toBe(255);+ await canvas.hover();+ await zoom(page, Math.E);+ const panel = page.getByRole("region", { name: "Export settings" });+ await page.getByRole("button", { name: "Export", exact: true }).click();+ const quality = panel.getByRole("textbox", { name: "Quality" });+ async function save(name: string) {+ const pending = page.waitForEvent("download");+ await panel.getByRole("button", { name: "Save image" }).click();+ const download = await pending;+ expect(download.suggestedFilename()).toBe(name);+ const path = await download.path();+ if (!path) throw new Error("Missing image download.");+ return readFile(path);+ }+ const format = panel.getByRole("combobox", { name: "Format" });+ await format.selectOption("png");+ await expect(panel.getByRole("textbox", { name: "Width" })).toHaveValue(+ "1200",+ );+ await expect(panel.getByText(/kB|MB/)).toBeVisible();+ expect(await readImage(page, await save("photo.png"))).toEqual(expected);+ await format.selectOption("jpeg");+ await expect(format).toHaveValue("jpeg");+ await quality.fill("20");+ await quality.press("Enter");+ const small = await save("photo.jpg");+ await quality.fill("95");+ await quality.press("Enter");+ const large = await save("photo.jpg");+ for (const bytes of [small, large]) {+ const actual = await readImage(page, bytes);+ expect(actual.size).toEqual([1200, 800]);+ expect(+ Math.abs(actual.center[0] - expected.center[0]),+ ).toBeLessThanOrEqual(3);+ }+ expect(large.length).toBeGreaterThan(small.length);+ await format.selectOption("webp");+ const width = panel.getByRole("textbox", { name: "Width" });+ await width.fill("600");+ await width.press("Enter");+ await expect(panel.getByRole("textbox", { name: "Height" })).toHaveValue(+ "400",+ );+ const resized = await readImage(page, await save("photo.webp"));+ expect(resized.size).toEqual([600, 400]);+ expect(+ Math.abs(resized.center[0] - expected.center[0]),+ ).toBeLessThanOrEqual(3);+ await expect(quality).toHaveValue("95");+ await page.keyboard.press("a");+ await expect(panel).toBeHidden();+ });- await test.step("mobile slider targets accept taps above and below the visible track", async () => {- const context = await browser.newContext({- viewport: { width: 390, height: 844 },- isMobile: true,- hasTouch: true,- deviceScaleFactor: 2,- });- try {- const mobile = await context.newPage();- await mobile.goto(page.url());- await mobile- .locator('input[type="file"]')- .setInputFiles("tests/fixtures/photo.svg");- const exposure = mobile.getByRole("slider", {- name: "Exposure",- exact: true,- });- await exposure.scrollIntoViewIfNeeded();- for (const slider of await mobile.getByRole("slider").all()) {- const bounds = await box(slider);- expect(bounds.width).toBeGreaterThanOrEqual(44);- expect(bounds.height).toBeGreaterThanOrEqual(44);- const track = await box(slider.locator(".."));- 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);- 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 expect(exposure).toHaveValue("-5");- const undo = mobile.getByRole("button", { name: "Undo", exact: true });- await undo.tap();- await expect(exposure).toHaveValue("5");- await undo.tap();- await expect(exposure).toHaveValue("0");- expect((await readImage(mobile)).center).toEqual([128, 128, 128, 255]);- const field = mobile.getByRole("textbox", {- name: "Exposure",- exact: true,- });- await field.tap();- await expect(field).toBeFocused();- } finally {- await context.close();- }- });+ await test.step("mobile slider targets accept taps above and below the visible track", async () => {+ const context = await browser.newContext({+ viewport: { width: 390, height: 844 },+ isMobile: true,+ hasTouch: true,+ deviceScaleFactor: 2,+ });+ try {+ const mobile = await context.newPage();+ await mobile.goto(page.url());+ await mobile+ .locator('input[type="file"]')+ .setInputFiles("tests/fixtures/photo.svg");+ const exposure = mobile.getByRole("slider", {+ name: "Exposure",+ exact: true,+ });+ await exposure.scrollIntoViewIfNeeded();+ for (const slider of await mobile.getByRole("slider").all()) {+ const bounds = await box(slider);+ expect(bounds.width).toBeGreaterThanOrEqual(44);+ expect(bounds.height).toBeGreaterThanOrEqual(44);+ const track = await box(slider.locator(".."));+ 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);+ 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 expect(exposure).toHaveValue("-5");+ const undo = mobile.getByRole("button", { name: "Undo", exact: true });+ await undo.tap();+ await expect(exposure).toHaveValue("5");+ await undo.tap();+ await expect(exposure).toHaveValue("0");+ expect((await readImage(mobile)).center).toEqual([128, 128, 128, 255]);+ const field = mobile.getByRole("textbox", {+ name: "Exposure",+ exact: true,+ });+ await field.tap();+ await expect(field).toBeFocused();+ } finally {+ await context.close();+ }+ });});diff --git a/tests/fixtures.ts b/tests/fixtures.tsindex 176689d..b8d8f53 100644--- a/tests/fixtures.ts+++ b/tests/fixtures.ts@@ -3,18 +3,18 @@ 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 },- ],+ 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/gpu.html b/tests/gpu.htmlindex 802cfc6..494c7e1 100644--- a/tests/gpu.html+++ b/tests/gpu.html@@ -1,9 +1,9 @@<!doctype html><html lang="en">- <head>- <meta charset="utf-8" />- <link rel="icon" href="data:," />- <title>GPU tests</title>- </head>- <body></body>+ <head>+ <meta charset="utf-8" />+ <link rel="icon" href="data:," />+ <title>GPU tests</title>+ </head>+ <body></body></html>diff --git a/tests/heic.e2e.ts b/tests/heic.e2e.tsindex f89a736..ae5861f 100644--- a/tests/heic.e2e.ts+++ b/tests/heic.e2e.ts@@ -2,58 +2,58 @@ import { readFile } from "node:fs/promises";import { expect, test } from "./fixtures";test("loads a HEIC image with the expected dimensions and pixels", async ({- page,+ page,}) => {- const bytes = await readFile(- new URL("./fixtures/patches.heic", import.meta.url),- );- await page.goto("/");- await page.waitForFunction(() => window.openlight);- const supported = await page.evaluate(async () => {- if (!("VideoDecoder" in window)) {- return false;- }- // Main Still Picture profile used by patches.heic.- return (await VideoDecoder.isConfigSupported({ codec: "hvc1.3.e.L30" }))- .supported;- });- test.skip(!supported, "This browser has no HEVC Main Still Picture decoder.");- const result = await page.evaluate(- async (bytes) => {- await window.openlight.loadImage(- new File([new Uint8Array(bytes)], "patches.heic", {- type: "image/heic",- }),- );- 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 exported image.");- context.drawImage(image, 0, 0);- image.close();- return {- size: [canvas.width, canvas.height],- pixels: [- [16, 16],- [48, 16],- [16, 48],- [48, 48],- ].flatMap(([x, y]) => [...context.getImageData(x, y, 1, 1).data]),- };- },- [...bytes],- );+ const bytes = await readFile(+ new URL("./fixtures/patches.heic", import.meta.url),+ );+ await page.goto("/");+ await page.waitForFunction(() => window.openlight);+ const supported = await page.evaluate(async () => {+ if (!("VideoDecoder" in window)) {+ return false;+ }+ // Main Still Picture profile used by patches.heic.+ return (await VideoDecoder.isConfigSupported({ codec: "hvc1.3.e.L30" }))+ .supported;+ });+ test.skip(!supported, "This browser has no HEVC Main Still Picture decoder.");+ const result = await page.evaluate(+ async (bytes) => {+ await window.openlight.loadImage(+ new File([new Uint8Array(bytes)], "patches.heic", {+ type: "image/heic",+ }),+ );+ 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 exported image.");+ context.drawImage(image, 0, 0);+ image.close();+ return {+ size: [canvas.width, canvas.height],+ pixels: [+ [16, 16],+ [48, 16],+ [16, 48],+ [48, 48],+ ].flatMap(([x, y]) => [...context.getImageData(x, y, 1, 1).data]),+ };+ },+ [...bytes],+ );- expect(result.size).toEqual([64, 64]);- // Reference pixels decoded independently with libheif.- const expected = [- 176, 96, 95, 255, 97, 176, 97, 255, 94, 95, 175, 255, 128, 128, 128, 255,- ];- result.pixels.forEach((value, i) => {- expect(Math.abs(value - expected[i]), `Channel ${i}`).toBeLessThanOrEqual(- 3,- );- });+ expect(result.size).toEqual([64, 64]);+ // Reference pixels decoded independently with libheif.+ const expected = [+ 176, 96, 95, 255, 97, 176, 97, 255, 94, 95, 175, 255, 128, 128, 128, 255,+ ];+ result.pixels.forEach((value, i) => {+ expect(Math.abs(value - expected[i]), `Channel ${i}`).toBeLessThanOrEqual(+ 3,+ );+ });});diff --git a/tests/images.ts b/tests/images.tsindex e14927f..28fc892 100644--- a/tests/images.ts+++ b/tests/images.ts@@ -2,82 +2,82 @@ import type { Page } from "@playwright/test";/** 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])[],+ page: Page,+ bytes?: Uint8Array,+ points?: readonly (readonly [number, number])[],) {- return page.evaluate(- async ([bytes, points]) => {- const file = bytes- ? new Blob([new Uint8Array(bytes)])- : await window.openlight.exportImage();- const image = await createImageBitmap(file);- const canvas = new OffscreenCanvas(image.width, image.height);- const context = canvas.getContext("2d");- if (!context) throw new Error("Cannot read image pixels.");- context.drawImage(image, 0, 0);- image.close();- return {- size: [canvas.width, canvas.height],- center: [- ...context.getImageData(canvas.width / 2, canvas.height / 2, 1, 1)- .data,- ],- corner: [...context.getImageData(10, 10, 1, 1).data],- samples: points?.map(([x, y]) => [- ...context.getImageData(x, y, 1, 1).data,- ]),- };- },- [bytes ? [...bytes] : null, points] as const,- );+ return page.evaluate(+ async ([bytes, points]) => {+ const file = bytes+ ? new Blob([new Uint8Array(bytes)])+ : await window.openlight.exportImage();+ const image = await createImageBitmap(file);+ const canvas = new OffscreenCanvas(image.width, image.height);+ const context = canvas.getContext("2d");+ if (!context) throw new Error("Cannot read image pixels.");+ context.drawImage(image, 0, 0);+ image.close();+ return {+ size: [canvas.width, canvas.height],+ center: [+ ...context.getImageData(canvas.width / 2, canvas.height / 2, 1, 1)+ .data,+ ],+ corner: [...context.getImageData(10, 10, 1, 1).data],+ samples: points?.map(([x, y]) => [+ ...context.getImageData(x, y, 1, 1).data,+ ]),+ };+ },+ [bytes ? [...bytes] : null, points] as const,+ );}/** Sample the displayed canvas, including preview-only overlays; `offset` moves the sampled pixel from the center. */export async function readPreview(page: Page, offset = [0, 0]) {- const bytes = await page- .getByRole("region", { name: "Image canvas" })- .locator("canvas")- .screenshot();- return page.evaluate(- async ([bytes, offset]) => {- const image = await createImageBitmap(new Blob([new Uint8Array(bytes)]));- const canvas = new OffscreenCanvas(image.width, image.height);- const context = canvas.getContext("2d");- if (!context) throw new Error("Cannot read preview pixels.");- context.drawImage(image, 0, 0);- image.close();- const { data } = context.getImageData(0, 0, canvas.width, canvas.height);- let red = 0;- let blue = 0;- for (let i = 0; i < data.length; i += 4) {- if (data[i] === 255 && data[i + 1] === 0 && data[i + 2] === 0) {- red++;- }- if (data[i] === 0 && data[i + 1] === 0 && data[i + 2] === 255) {- blue++;- }- }- return {- center: [- ...context.getImageData(- canvas.width / 2 + offset[0],- canvas.height / 2 + offset[1],- 1,- 1,- ).data,- ],- red,- blue,- };- },- [[...bytes], offset] as const,- );+ const bytes = await page+ .getByRole("region", { name: "Image canvas" })+ .locator("canvas")+ .screenshot();+ return page.evaluate(+ async ([bytes, offset]) => {+ const image = await createImageBitmap(new Blob([new Uint8Array(bytes)]));+ const canvas = new OffscreenCanvas(image.width, image.height);+ const context = canvas.getContext("2d");+ if (!context) throw new Error("Cannot read preview pixels.");+ context.drawImage(image, 0, 0);+ image.close();+ const { data } = context.getImageData(0, 0, canvas.width, canvas.height);+ let red = 0;+ let blue = 0;+ for (let i = 0; i < data.length; i += 4) {+ if (data[i] === 255 && data[i + 1] === 0 && data[i + 2] === 0) {+ red++;+ }+ if (data[i] === 0 && data[i + 1] === 0 && data[i + 2] === 255) {+ blue++;+ }+ }+ return {+ center: [+ ...context.getImageData(+ canvas.width / 2 + offset[0],+ canvas.height / 2 + offset[1],+ 1,+ 1,+ ).data,+ ],+ red,+ blue,+ };+ },+ [[...bytes], offset] as const,+ );}export async function readPixel(page: Page, point: { x: number; y: number }) {- const bytes = await page.screenshot({- clip: { ...point, width: 1, height: 1 },- });- return (await readImage(page, bytes)).center;+ const bytes = await page.screenshot({+ clip: { ...point, width: 1, height: 1 },+ });+ return (await readImage(page, bytes)).center;}diff --git a/tests/layer-drop.test.ts b/tests/layer-drop.test.tsindex d9e129d..2cff1bb 100644--- a/tests/layer-drop.test.ts+++ b/tests/layer-drop.test.ts@@ -10,90 +10,90 @@ const exposure = { ...createLayer("exposure"), id: "exposure" };const vignette = { ...createLayer("vignette"), id: "vignette" };const details = { ...createLayer("details"), id: "details" };const mask = {- ...createMask(gradient),- id: "mask",- children: [exposure, vignette],+ ...createMask(gradient),+ id: "mask",+ children: [exposure, vignette],};const other = { ...createMask(gradient), id: "other", children: [details] };const top = { ...createLayer("exposure"), id: "top" };const scene: Scene = {- frame: imageFrame([32, 16]),- layers: [- { ...createImageLayer("photo", "Photo"), id: "image" },- mask,- other,- top,- ],+ frame: imageFrame([32, 16]),+ layers: [+ { ...createImageLayer("photo", "Photo"), id: "image" },+ mask,+ other,+ top,+ ],};// Drop positions are visual, top to bottom; results are bottom-to-top sibling indices.test.each<[string, LayerDrop, ReturnType<typeof layerDrop>]>([- [- "above a root sibling",- { id: "top", target: "mask", position: "before" },- { index: 2 },- ],- [- "below a root sibling",- { id: "top", target: "mask", position: "after" },- { index: 1 },- ],- [- "above the image",- { id: "vignette", target: "image", position: "before" },- { index: 1 },- ],- [- "into a mask",- { id: "top", target: "mask", position: "inside" },- { parentId: "mask", index: 2 },- ],- [- "above a nested sibling",- { id: "top", target: "exposure", position: "before" },- { parentId: "mask", index: 1 },- ],- [- "below a nested sibling",- { id: "top", target: "exposure", position: "after" },- { parentId: "mask", index: 0 },- ],- [- "below the image",- { id: "vignette", target: "image", position: "after" },- undefined,- ],- [- "into the image",- { id: "top", target: "image", position: "inside" },- undefined,- ],- [- "the image itself",- { id: "image", target: "top", position: "before" },- undefined,- ],- [- "a parent into its child",- { id: "mask", target: "exposure", position: "inside" },- undefined,- ],- [- "a parent into another mask",- { id: "mask", target: "other", position: "inside" },- undefined,- ],- [- "a parent beside a nested layer",- { id: "mask", target: "details", position: "before" },- undefined,- ],- ["onto itself", { id: "top", target: "top", position: "inside" }, undefined],- [- "an unknown target",- { id: "top", target: "missing", position: "before" },- undefined,- ],+ [+ "above a root sibling",+ { id: "top", target: "mask", position: "before" },+ { index: 2 },+ ],+ [+ "below a root sibling",+ { id: "top", target: "mask", position: "after" },+ { index: 1 },+ ],+ [+ "above the image",+ { id: "vignette", target: "image", position: "before" },+ { index: 1 },+ ],+ [+ "into a mask",+ { id: "top", target: "mask", position: "inside" },+ { parentId: "mask", index: 2 },+ ],+ [+ "above a nested sibling",+ { id: "top", target: "exposure", position: "before" },+ { parentId: "mask", index: 1 },+ ],+ [+ "below a nested sibling",+ { id: "top", target: "exposure", position: "after" },+ { parentId: "mask", index: 0 },+ ],+ [+ "below the image",+ { id: "vignette", target: "image", position: "after" },+ undefined,+ ],+ [+ "into the image",+ { id: "top", target: "image", position: "inside" },+ undefined,+ ],+ [+ "the image itself",+ { id: "image", target: "top", position: "before" },+ undefined,+ ],+ [+ "a parent into its child",+ { id: "mask", target: "exposure", position: "inside" },+ undefined,+ ],+ [+ "a parent into another mask",+ { id: "mask", target: "other", position: "inside" },+ undefined,+ ],+ [+ "a parent beside a nested layer",+ { id: "mask", target: "details", position: "before" },+ undefined,+ ],+ ["onto itself", { id: "top", target: "top", position: "inside" }, undefined],+ [+ "an unknown target",+ { id: "top", target: "missing", position: "before" },+ undefined,+ ],])("layerDrop rejects or resolves %s", (_, drop, expected) => {- expect(layerDrop(scene, drop)).toEqual(expected);+ expect(layerDrop(scene, drop)).toEqual(expected);});diff --git a/tests/layers.e2e.ts b/tests/layers.e2e.tsindex 86fda40..a17cfd6 100644--- a/tests/layers.e2e.ts+++ b/tests/layers.e2e.ts@@ -5,428 +5,428 @@ import { readImage, readPreview } from "./images";import { box, drag } from "./pointer";async function samples(page: Page) {- const { samples } = await readImage(page, undefined, [- [600, 100],- [600, 700],- ]);- return samples ?? [];+ 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 ({- page,+ page,}, info) => {- test.setTimeout(90_000);- await page.setViewportSize({ width: 1440, height: 1000 });- const state = () => page.evaluate(() => window.openlight.getState());- async function setField(name: string, value: string) {- const field = page.getByRole("textbox", { name, exact: true });- await field.fill(value);- await field.press("Enter");- }- async function action(name: string, command: string) {- await page- .getByRole("button", { name: `${name} actions`, exact: true })- .click();- await page- .locator("[popover]:popover-open")- .getByRole("button", { name: command, exact: true })- .click();- }- async function dragLayer(name: string, target: string, fraction: number) {- const from = await box(- page- .getByRole("region", { name: "Layers", exact: true })- .getByRole("button", { name, exact: true }),- );- const row = page- .locator("[data-selected]")- .filter({ has: page.getByRole("button", { name: target, exact: true }) });- const to = await box(row);- await drag(- page,- [from.x + from.width / 2, from.y + from.height / 2],- [to.x + to.width / 2, to.y + to.height * fraction],- );- }- async function saveExport(name: string) {- const bytes = await page.evaluate(async () => [- ...new Uint8Array(- await (await window.openlight.exportImage()).arrayBuffer(),- ),- ]);- await writeFile(info.outputPath(name), new Uint8Array(bytes));- }- await page.goto("/");- await page- .locator('input[type="file"]')- .setInputFiles("tests/fixtures/photo.svg");- await expect(- page.getByRole("textbox", { name: "Exposure", exact: true }),- ).toHaveValue("0.00");- await test.step("Details is an optional effect, separate from image adjustments", async () => {- await expect(- page.getByRole("heading", { name: "Adjustments", exact: true }),- ).toBeVisible();- await expect(- page.getByRole("textbox", { name: "Clarity", exact: true }),- ).toHaveCount(0);- await page.getByRole("button", { name: "Add effect", exact: true }).click();- await page- .locator("[popover]:popover-open")- .getByRole("button", { name: "Details", exact: true })- .click();- await setField("Clarity", "-100");- expect((await readImage(page)).corner[0]).toBeGreaterThan(0);- await page.getByRole("button", { name: "Undo", exact: true }).click();- expect((await readImage(page)).corner).toEqual([0, 0, 0, 255]);- await page.getByRole("button", { name: "Undo", exact: true }).click();- });- 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 = 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 }));- expect((await tones())[0]).toBeGreaterThan(200);- await page.evaluate(() => {- const api = window.openlight;- const mask = api.addLayer("mask");- api.setLayerMask(mask, {- kind: "radial",- center: [850, 700],- radius: [400, 200],- angle: 0,- feather: 0,- });- api.setAdjustments({ exposure: -2 }, mask);- });- const recovered = await tones();- expect(Math.abs(recovered[0] - gray)).toBeLessThan(30);- expect(Math.abs(recovered[1] - band)).toBeLessThan(30);- expect(recovered[1] - recovered[0]).toBeGreaterThan(0.6 * (band - gray));- expect((await samples(page))[0][0]).toBeGreaterThan(200);- await page.evaluate(() => {- for (let i = 0; i < 4; i++) window.openlight.undo();- });- expect(await samples(page)).toEqual(original);- });- await page.screenshot({ path: info.outputPath("layers-before-ui.png") });- await saveExport("layers-before-export.png");- await page- .getByRole("button", { name: "Add linear mask", exact: true })- .click();- const overlay = page.getByLabel("Gradient mask canvas", { exact: true });- const bounds = await box(overlay);- const scale = Math.min(bounds.width / 1200, bounds.height / 800, 2);- const center = [bounds.x + bounds.width / 2, bounds.y + bounds.height / 2];- const from = [center[0], center[1] - 200 * scale];- const to = [center[0], center[1] + 200 * scale];- await test.step("cancellation is empty; drawing creates a mask with its own adjustments", async () => {- await page.mouse.move(from[0], from[1]);- await page.mouse.down();- await page.mouse.move(to[0], to[1]);- await page.keyboard.press("Escape");- await page.mouse.up();- expect((await state()).scene?.layers).toHaveLength(1);- // Sample above the center, clear of the guide lines and the move handle.- async function maskPreview() {- const { center } = await readPreview(page, [0, -100 * scale]);- return {- shown: (await state()).preview?.maskOverlay !== undefined,- tinted: center[0] > center[1] + 30,- };- }- await page.keyboard.press("l");- await drag(page, from, to);- await expect.poll(maskPreview).toEqual({ shown: true, tinted: true });- await page.keyboard.press("Escape");- expect((await state()).scene?.layers).toHaveLength(1);- await expect.poll(maskPreview).toEqual({ shown: false, tinted: false });- await page.keyboard.press("l");- await drag(page, from, to);- await expect.poll(maskPreview).toEqual({ shown: true, tinted: true });- await page.keyboard.press("Enter");- await expect.poll(maskPreview).toEqual({ shown: false, tinted: false });- await page.keyboard.press("o");- await expect.poll(maskPreview).toEqual({ shown: true, tinted: true });- const layers = (await state()).scene?.layers;- expect(layers).toHaveLength(2);- expect(layers?.[1]).toMatchObject({- kind: "mask",- children: [],- });- await setField("Exposure", "1");- await expect.poll(maskPreview).toEqual({ shown: false, tinted: false });- const [top, bottom] = await samples(page);- expect(top[0]).toBeGreaterThan(170);- expect(bottom).toEqual([128, 128, 128, 255]);- await setField("Temp", "20");- const warmed = await samples(page);- expect(warmed[0][0]).toBeGreaterThan(warmed[0][2]);- await page.getByRole("button", { name: "Undo", exact: true }).click();- expect(await samples(page)).toEqual([top, bottom]);- await setField("Exposure", "2");- expect((await samples(page))[0][0]).toBeGreaterThan(top[0] + 20);- });- await test.step("selected gradient guides move, resize and rotate with atomic undo and cancellation", async () => {- const before = await state();- const pixels = await samples(page);- await drag(page, center, [center[0], center[1] - 150 * scale]);- expect((await state()).history.undoCount).toBe(- before.history.undoCount + 1,- );- expect(await samples(page)).not.toEqual(pixels);- await page.keyboard.press("ControlOrMeta+z");- expect((await state()).scene).toEqual(before.scene);- expect(await samples(page)).toEqual(pixels);- await drag(page, from, [from[0], from[1] - 50 * scale]);- expect((await state()).scene).not.toEqual(before.scene);- await page.keyboard.press("ControlOrMeta+z");- await drag(page, [center[0] + 80, center[1]], [center[0], center[1] + 80]);- const rotated = (await state()).scene?.layers[1];- expect(rotated?.kind).toBe("mask");- if (rotated?.kind === "mask" && rotated.mask.kind === "linear") {- expect(- Math.abs(rotated.mask.end[1] - rotated.mask.start[1]),- ).toBeLessThan(1);- }- await page.keyboard.press("ControlOrMeta+z");- await page.mouse.move(center[0], center[1]);- await page.mouse.down();- await page.mouse.move(center[0] + 50, center[1] + 50);- await page.keyboard.press("Escape");- await page.mouse.up();- expect((await state()).scene).toEqual(before.scene);- await page.keyboard.press("Delete");- expect((await state()).scene?.layers).toHaveLength(1);- await page.keyboard.press("ControlOrMeta+z");- expect((await state()).scene).toEqual(before.scene);- });- await test.step("mask opacity and visibility apply to the complete branch", async () => {- await page- .getByRole("button", { name: "Linear Gradient", exact: true })- .dblclick();- await setField("Layer name", "Sky");- const masked = await samples(page);- await setField("Opacity", "0");- expect(await samples(page)).toEqual(original);- await page.getByRole("button", { name: "Undo", exact: true }).click();- expect(await samples(page)).toEqual(masked);- await page.getByRole("button", { name: "Show Sky", exact: true }).click();- expect(await samples(page)).toEqual(original);- await page.getByRole("button", { name: "Show Sky", exact: true }).click();- expect(await samples(page)).toEqual(masked);- });- await test.step("a subtracting child changes coverage and Add restores the masked region", async () => {- const masked = await samples(page);- await page- .getByRole("button", { name: "Subtract from mask", exact: true })- .click();- await page- .locator("[popover]:popover-open")- .getByRole("button", { name: "Linear gradient", exact: true })- .click();- await drag(page, from, to);- expect((await samples(page))[0]).toEqual(original[0]);- const operation = page.getByRole("combobox", {- name: "Mask operation",- exact: true,- });- await operation.selectOption("add");- expect((await samples(page))[0]).toEqual(masked[0]);- await page.getByRole("button", { name: "Undo", exact: true }).click();- expect((await samples(page))[0]).toEqual(original[0]);- await page.getByRole("button", { name: "Undo", exact: true }).click();- expect(await samples(page)).toEqual(masked);- await page.getByRole("button", { name: "Sky", exact: true }).click();- });+ test.setTimeout(90_000);+ await page.setViewportSize({ width: 1440, height: 1000 });+ const state = () => page.evaluate(() => window.openlight.getState());+ async function setField(name: string, value: string) {+ const field = page.getByRole("textbox", { name, exact: true });+ await field.fill(value);+ await field.press("Enter");+ }+ async function action(name: string, command: string) {+ await page+ .getByRole("button", { name: `${name} actions`, exact: true })+ .click();+ await page+ .locator("[popover]:popover-open")+ .getByRole("button", { name: command, exact: true })+ .click();+ }+ async function dragLayer(name: string, target: string, fraction: number) {+ const from = await box(+ page+ .getByRole("region", { name: "Layers", exact: true })+ .getByRole("button", { name, exact: true }),+ );+ const row = page+ .locator("[data-selected]")+ .filter({ has: page.getByRole("button", { name: target, exact: true }) });+ const to = await box(row);+ await drag(+ page,+ [from.x + from.width / 2, from.y + from.height / 2],+ [to.x + to.width / 2, to.y + to.height * fraction],+ );+ }+ async function saveExport(name: string) {+ const bytes = await page.evaluate(async () => [+ ...new Uint8Array(+ await (await window.openlight.exportImage()).arrayBuffer(),+ ),+ ]);+ await writeFile(info.outputPath(name), new Uint8Array(bytes));+ }+ await page.goto("/");+ await page+ .locator('input[type="file"]')+ .setInputFiles("tests/fixtures/photo.svg");+ await expect(+ page.getByRole("textbox", { name: "Exposure", exact: true }),+ ).toHaveValue("0.00");+ await test.step("Details is an optional effect, separate from image adjustments", async () => {+ await expect(+ page.getByRole("heading", { name: "Adjustments", exact: true }),+ ).toBeVisible();+ await expect(+ page.getByRole("textbox", { name: "Clarity", exact: true }),+ ).toHaveCount(0);+ await page.getByRole("button", { name: "Add effect", exact: true }).click();+ await page+ .locator("[popover]:popover-open")+ .getByRole("button", { name: "Details", exact: true })+ .click();+ await setField("Clarity", "-100");+ expect((await readImage(page)).corner[0]).toBeGreaterThan(0);+ await page.getByRole("button", { name: "Undo", exact: true }).click();+ expect((await readImage(page)).corner).toEqual([0, 0, 0, 255]);+ await page.getByRole("button", { name: "Undo", exact: true }).click();+ });+ 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 = 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 }));+ expect((await tones())[0]).toBeGreaterThan(200);+ await page.evaluate(() => {+ const api = window.openlight;+ const mask = api.addLayer("mask");+ api.setLayerMask(mask, {+ kind: "radial",+ center: [850, 700],+ radius: [400, 200],+ angle: 0,+ feather: 0,+ });+ api.setAdjustments({ exposure: -2 }, mask);+ });+ const recovered = await tones();+ expect(Math.abs(recovered[0] - gray)).toBeLessThan(30);+ expect(Math.abs(recovered[1] - band)).toBeLessThan(30);+ expect(recovered[1] - recovered[0]).toBeGreaterThan(0.6 * (band - gray));+ expect((await samples(page))[0][0]).toBeGreaterThan(200);+ await page.evaluate(() => {+ for (let i = 0; i < 4; i++) window.openlight.undo();+ });+ expect(await samples(page)).toEqual(original);+ });+ await page.screenshot({ path: info.outputPath("layers-before-ui.png") });+ await saveExport("layers-before-export.png");+ await page+ .getByRole("button", { name: "Add linear mask", exact: true })+ .click();+ const overlay = page.getByLabel("Gradient mask canvas", { exact: true });+ const bounds = await box(overlay);+ const scale = Math.min(bounds.width / 1200, bounds.height / 800, 2);+ const center = [bounds.x + bounds.width / 2, bounds.y + bounds.height / 2];+ const from = [center[0], center[1] - 200 * scale];+ const to = [center[0], center[1] + 200 * scale];+ await test.step("cancellation is empty; drawing creates a mask with its own adjustments", async () => {+ await page.mouse.move(from[0], from[1]);+ await page.mouse.down();+ await page.mouse.move(to[0], to[1]);+ await page.keyboard.press("Escape");+ await page.mouse.up();+ expect((await state()).scene?.layers).toHaveLength(1);+ // Sample above the center, clear of the guide lines and the move handle.+ async function maskPreview() {+ const { center } = await readPreview(page, [0, -100 * scale]);+ return {+ shown: (await state()).preview?.maskOverlay !== undefined,+ tinted: center[0] > center[1] + 30,+ };+ }+ await page.keyboard.press("l");+ await drag(page, from, to);+ await expect.poll(maskPreview).toEqual({ shown: true, tinted: true });+ await page.keyboard.press("Escape");+ expect((await state()).scene?.layers).toHaveLength(1);+ await expect.poll(maskPreview).toEqual({ shown: false, tinted: false });+ await page.keyboard.press("l");+ await drag(page, from, to);+ await expect.poll(maskPreview).toEqual({ shown: true, tinted: true });+ await page.keyboard.press("Enter");+ await expect.poll(maskPreview).toEqual({ shown: false, tinted: false });+ await page.keyboard.press("o");+ await expect.poll(maskPreview).toEqual({ shown: true, tinted: true });+ const layers = (await state()).scene?.layers;+ expect(layers).toHaveLength(2);+ expect(layers?.[1]).toMatchObject({+ kind: "mask",+ children: [],+ });+ await setField("Exposure", "1");+ await expect.poll(maskPreview).toEqual({ shown: false, tinted: false });+ const [top, bottom] = await samples(page);+ expect(top[0]).toBeGreaterThan(170);+ expect(bottom).toEqual([128, 128, 128, 255]);+ await setField("Temp", "20");+ const warmed = await samples(page);+ expect(warmed[0][0]).toBeGreaterThan(warmed[0][2]);+ await page.getByRole("button", { name: "Undo", exact: true }).click();+ expect(await samples(page)).toEqual([top, bottom]);+ await setField("Exposure", "2");+ expect((await samples(page))[0][0]).toBeGreaterThan(top[0] + 20);+ });+ await test.step("selected gradient guides move, resize and rotate with atomic undo and cancellation", async () => {+ const before = await state();+ const pixels = await samples(page);+ await drag(page, center, [center[0], center[1] - 150 * scale]);+ expect((await state()).history.undoCount).toBe(+ before.history.undoCount + 1,+ );+ expect(await samples(page)).not.toEqual(pixels);+ await page.keyboard.press("ControlOrMeta+z");+ expect((await state()).scene).toEqual(before.scene);+ expect(await samples(page)).toEqual(pixels);+ await drag(page, from, [from[0], from[1] - 50 * scale]);+ expect((await state()).scene).not.toEqual(before.scene);+ await page.keyboard.press("ControlOrMeta+z");+ await drag(page, [center[0] + 80, center[1]], [center[0], center[1] + 80]);+ const rotated = (await state()).scene?.layers[1];+ expect(rotated?.kind).toBe("mask");+ if (rotated?.kind === "mask" && rotated.mask.kind === "linear") {+ expect(+ Math.abs(rotated.mask.end[1] - rotated.mask.start[1]),+ ).toBeLessThan(1);+ }+ await page.keyboard.press("ControlOrMeta+z");+ await page.mouse.move(center[0], center[1]);+ await page.mouse.down();+ await page.mouse.move(center[0] + 50, center[1] + 50);+ await page.keyboard.press("Escape");+ await page.mouse.up();+ expect((await state()).scene).toEqual(before.scene);+ await page.keyboard.press("Delete");+ expect((await state()).scene?.layers).toHaveLength(1);+ await page.keyboard.press("ControlOrMeta+z");+ expect((await state()).scene).toEqual(before.scene);+ });+ await test.step("mask opacity and visibility apply to the complete branch", async () => {+ await page+ .getByRole("button", { name: "Linear Gradient", exact: true })+ .dblclick();+ await setField("Layer name", "Sky");+ const masked = await samples(page);+ await setField("Opacity", "0");+ expect(await samples(page)).toEqual(original);+ await page.getByRole("button", { name: "Undo", exact: true }).click();+ expect(await samples(page)).toEqual(masked);+ await page.getByRole("button", { name: "Show Sky", exact: true }).click();+ expect(await samples(page)).toEqual(original);+ await page.getByRole("button", { name: "Show Sky", exact: true }).click();+ expect(await samples(page)).toEqual(masked);+ });+ await test.step("a subtracting child changes coverage and Add restores the masked region", async () => {+ const masked = await samples(page);+ await page+ .getByRole("button", { name: "Subtract from mask", exact: true })+ .click();+ await page+ .locator("[popover]:popover-open")+ .getByRole("button", { name: "Linear gradient", exact: true })+ .click();+ await drag(page, from, to);+ expect((await samples(page))[0]).toEqual(original[0]);+ const operation = page.getByRole("combobox", {+ name: "Mask operation",+ exact: true,+ });+ await operation.selectOption("add");+ expect((await samples(page))[0]).toEqual(masked[0]);+ await page.getByRole("button", { name: "Undo", exact: true }).click();+ expect((await samples(page))[0]).toEqual(original[0]);+ await page.getByRole("button", { name: "Undo", exact: true }).click();+ expect(await samples(page)).toEqual(masked);+ await page.getByRole("button", { name: "Sky", exact: true }).click();+ });- await test.step("child effects can leave the mask, reorder and return through undo", async () => {- const masked = await samples(page);- await page.getByRole("button", { name: "Add effect", exact: true }).click();- await page.keyboard.press("Escape");- await expect(page.locator("[popover]:popover-open")).toHaveCount(0);- await page.getByRole("button", { name: "Add effect", exact: true }).click();- await page- .locator("[popover]:popover-open")- .getByRole("button", { name: "Vignette", exact: true })- .click();- expect(- (await state()).scene?.layers[1].children.map((layer) => layer.kind),- ).toEqual(["vignette"]);- await setField("Intensity", "80");- const nested = await samples(page);- expect(nested[0][0]).toBeLessThan(masked[0][0]);- expect(nested[1]).toEqual(masked[1]);- const beforeMove = (await state()).history.undoCount;- await dragLayer("Vignette", "Sky", 0.1);- expect((await state()).history.undoCount).toBe(beforeMove + 1);- expect((await state()).scene?.layers).toHaveLength(3);- expect((await samples(page))[1][0]).toBeLessThan(masked[1][0]);- await dragLayer("Vignette", "photo.svg", 0.1);- expect((await state()).scene?.layers[1].kind).toBe("vignette");- await dragLayer("Vignette", "Sky", 0.5);- expect(await samples(page)).toEqual(nested);- await page.getByRole("button", { name: "Undo", exact: true }).click();- await page.getByRole("button", { name: "Undo", exact: true }).click();- await page.getByRole("button", { name: "Undo", exact: true }).click();- expect(await samples(page)).toEqual(nested);- await action("Vignette", "Delete");- expect(await samples(page)).toEqual(masked);- await page.getByRole("button", { name: "Undo", exact: true }).click();- expect((await state()).scene?.layers[1].children).toHaveLength(1);- });- await page.getByRole("button", { name: "Sky", exact: true }).click();- await page.screenshot({ path: info.outputPath("layers-after-ui.png") });- await saveExport("layers-after-export.png");- await test.step("radial masks edit locally, resize, feather, rotate, subtract and undo", async () => {- const before = await readImage(page);- const beforeSamples = await samples(page);- await page.keyboard.press("r");- await drag(page, center, [- center[0] + 220 * scale,- center[1] + 120 * scale,- ]);- await setField("Exposure", "1");- expect((await readImage(page)).center[0]).toBeGreaterThan(- before.center[0] + 20,- );- expect((await samples(page))[1]).toEqual(beforeSamples[1]);- await page.screenshot({ path: info.outputPath("radial-ui.png") });- await saveExport("radial-export.png");- const edited = await state();- await page.mouse.move(center[0] + 40, center[1] + 30);- await expect(- page.getByLabel("Move radial gradient", { exact: true }),- ).toHaveCSS("cursor", "grab");- await page.mouse.down();- await expect(overlay).toHaveCSS("cursor", "grabbing");- await page.mouse.move(center[0] + 40 + 300 * scale, center[1] + 30, {- steps: 8,- });- const preview = (await state()).scene;- await page.mouse.up();- expect((await state()).scene).toEqual(preview);- expect((await state()).history.undoCount).toBe(- edited.history.undoCount + 1,- );- expect((await readImage(page)).center).toEqual(before.center);- await page.keyboard.press("ControlOrMeta+z");- expect((await state()).scene).toEqual(edited.scene);- await expect(- page.getByLabel("Radial right radius", { exact: true }),- ).toHaveCSS("cursor", "ew-resize");- await expect(- page.getByLabel("Rotate radial gradient", { exact: true }),- ).toHaveCSS("cursor", /url/);- const radius = await box(- page.getByLabel("Radial right radius", { exact: true }),- );- await drag(- page,- [radius.x + radius.width / 2, radius.y + radius.height / 2],- [radius.x + radius.width / 2 - 60, radius.y + radius.height / 2],- );- expect((await state()).scene).not.toEqual(edited.scene);- await page.keyboard.press("ControlOrMeta+z");- const options = page.getByRole("group", { name: "Layer options" });- await expect(- options.getByRole("slider", { name: "Opacity", exact: true }),- ).toBeVisible();- await expect(- options.getByRole("slider", { name: "Feather", exact: true }),- ).toBeVisible();- await expect(- options.getByRole("textbox", { name: "Feather", exact: true }),- ).toBeVisible();- const panel = page.getByRole("region", { name: "Editor controls" });- await expect(- panel.getByRole("heading", { name: "Adjustments", exact: true }),- ).toBeVisible();- await expect(- panel.getByRole("textbox", { name: "Feather", exact: true }),- ).toHaveCount(0);- await setField("Feather", "80");- await page.getByRole("button", { name: "Undo", exact: true }).click();- await expect(- page.getByRole("textbox", { name: "Feather", exact: true }),- ).toHaveValue("50");- const rotation = await box(- page.getByLabel("Rotate radial gradient", { exact: true }),- );- await drag(- page,- [rotation.x + rotation.width / 2, rotation.y + rotation.height / 2],- [center[0] + 150 * scale, center[1]],- );- const rotated = (await state()).scene?.layers.at(-1);- expect(- rotated?.kind === "mask" &&- rotated.mask.kind === "radial" &&- Math.abs(rotated.mask.angle - 90) < 1,- ).toBe(true);- await page.keyboard.press("ControlOrMeta+z");- await page- .getByRole("button", { name: "Subtract from mask", exact: true })- .click();- await page- .locator("[popover]:popover-open")- .getByRole("button", { name: "Radial gradient", exact: true })- .click();- await drag(page, center, [- center[0] + 220 * scale,- center[1] + 120 * scale,- ]);- expect((await readImage(page)).center).toEqual(before.center);- await page.keyboard.press("Delete");- expect((await readImage(page)).center[0]).toBeGreaterThan(- before.center[0] + 20,- );- await page.keyboard.press("ControlOrMeta+z");- expect((await readImage(page)).center).toEqual(before.center);- });- await test.step("guide clicks and mobile drawing keep the preview stable", async () => {- await page- .getByRole("button", { name: "Select Radial Gradient", exact: true })- .first()- .click();- await page.getByRole("button", { name: "Zoom in", exact: true }).click();- const zoom = page.getByTitle("Fit to view");- const percent = await zoom.innerText();- await page.getByLabel("Move gradient", { exact: true }).dblclick();- await expect(zoom).toHaveText(percent);- await zoom.click();- await page.setViewportSize({ width: 390, height: 844 });- await page.getByRole("button", { name: "photo.svg", exact: true }).click();- await page.keyboard.press("r");- await expect(overlay).toHaveCSS("cursor", "crosshair");- const view = await box(overlay);- const x = view.x + view.width / 2,- y = view.y + view.height / 2;- await page.mouse.move(x, y);- await page.mouse.down();- await page.keyboard.down("Shift");- await page.mouse.move(x + 65, y + 35);- const pin = page.getByLabel("Move gradient", { exact: true });- const drawn = await box(pin);- await page.keyboard.up("Shift");- await page.mouse.up();- expect(await box(pin)).toEqual(drawn);- const result = await state();- const layer = result.scene?.layers.find(- (item) => item.id === result.selectedLayerId,- );- expect(- layer?.kind === "mask" &&- layer.mask.kind === "radial" &&- layer.mask.radius[0] === layer.mask.radius[1],- ).toBe(true);- });+ await test.step("child effects can leave the mask, reorder and return through undo", async () => {+ const masked = await samples(page);+ await page.getByRole("button", { name: "Add effect", exact: true }).click();+ await page.keyboard.press("Escape");+ await expect(page.locator("[popover]:popover-open")).toHaveCount(0);+ await page.getByRole("button", { name: "Add effect", exact: true }).click();+ await page+ .locator("[popover]:popover-open")+ .getByRole("button", { name: "Vignette", exact: true })+ .click();+ expect(+ (await state()).scene?.layers[1].children.map((layer) => layer.kind),+ ).toEqual(["vignette"]);+ await setField("Intensity", "80");+ const nested = await samples(page);+ expect(nested[0][0]).toBeLessThan(masked[0][0]);+ expect(nested[1]).toEqual(masked[1]);+ const beforeMove = (await state()).history.undoCount;+ await dragLayer("Vignette", "Sky", 0.1);+ expect((await state()).history.undoCount).toBe(beforeMove + 1);+ expect((await state()).scene?.layers).toHaveLength(3);+ expect((await samples(page))[1][0]).toBeLessThan(masked[1][0]);+ await dragLayer("Vignette", "photo.svg", 0.1);+ expect((await state()).scene?.layers[1].kind).toBe("vignette");+ await dragLayer("Vignette", "Sky", 0.5);+ expect(await samples(page)).toEqual(nested);+ await page.getByRole("button", { name: "Undo", exact: true }).click();+ await page.getByRole("button", { name: "Undo", exact: true }).click();+ await page.getByRole("button", { name: "Undo", exact: true }).click();+ expect(await samples(page)).toEqual(nested);+ await action("Vignette", "Delete");+ expect(await samples(page)).toEqual(masked);+ await page.getByRole("button", { name: "Undo", exact: true }).click();+ expect((await state()).scene?.layers[1].children).toHaveLength(1);+ });+ await page.getByRole("button", { name: "Sky", exact: true }).click();+ await page.screenshot({ path: info.outputPath("layers-after-ui.png") });+ await saveExport("layers-after-export.png");+ await test.step("radial masks edit locally, resize, feather, rotate, subtract and undo", async () => {+ const before = await readImage(page);+ const beforeSamples = await samples(page);+ await page.keyboard.press("r");+ await drag(page, center, [+ center[0] + 220 * scale,+ center[1] + 120 * scale,+ ]);+ await setField("Exposure", "1");+ expect((await readImage(page)).center[0]).toBeGreaterThan(+ before.center[0] + 20,+ );+ expect((await samples(page))[1]).toEqual(beforeSamples[1]);+ await page.screenshot({ path: info.outputPath("radial-ui.png") });+ await saveExport("radial-export.png");+ const edited = await state();+ await page.mouse.move(center[0] + 40, center[1] + 30);+ await expect(+ page.getByLabel("Move radial gradient", { exact: true }),+ ).toHaveCSS("cursor", "grab");+ await page.mouse.down();+ await expect(overlay).toHaveCSS("cursor", "grabbing");+ await page.mouse.move(center[0] + 40 + 300 * scale, center[1] + 30, {+ steps: 8,+ });+ const preview = (await state()).scene;+ await page.mouse.up();+ expect((await state()).scene).toEqual(preview);+ expect((await state()).history.undoCount).toBe(+ edited.history.undoCount + 1,+ );+ expect((await readImage(page)).center).toEqual(before.center);+ await page.keyboard.press("ControlOrMeta+z");+ expect((await state()).scene).toEqual(edited.scene);+ await expect(+ page.getByLabel("Radial right radius", { exact: true }),+ ).toHaveCSS("cursor", "ew-resize");+ await expect(+ page.getByLabel("Rotate radial gradient", { exact: true }),+ ).toHaveCSS("cursor", /url/);+ const radius = await box(+ page.getByLabel("Radial right radius", { exact: true }),+ );+ await drag(+ page,+ [radius.x + radius.width / 2, radius.y + radius.height / 2],+ [radius.x + radius.width / 2 - 60, radius.y + radius.height / 2],+ );+ expect((await state()).scene).not.toEqual(edited.scene);+ await page.keyboard.press("ControlOrMeta+z");+ const options = page.getByRole("group", { name: "Layer options" });+ await expect(+ options.getByRole("slider", { name: "Opacity", exact: true }),+ ).toBeVisible();+ await expect(+ options.getByRole("slider", { name: "Feather", exact: true }),+ ).toBeVisible();+ await expect(+ options.getByRole("textbox", { name: "Feather", exact: true }),+ ).toBeVisible();+ const panel = page.getByRole("region", { name: "Editor controls" });+ await expect(+ panel.getByRole("heading", { name: "Adjustments", exact: true }),+ ).toBeVisible();+ await expect(+ panel.getByRole("textbox", { name: "Feather", exact: true }),+ ).toHaveCount(0);+ await setField("Feather", "80");+ await page.getByRole("button", { name: "Undo", exact: true }).click();+ await expect(+ page.getByRole("textbox", { name: "Feather", exact: true }),+ ).toHaveValue("50");+ const rotation = await box(+ page.getByLabel("Rotate radial gradient", { exact: true }),+ );+ await drag(+ page,+ [rotation.x + rotation.width / 2, rotation.y + rotation.height / 2],+ [center[0] + 150 * scale, center[1]],+ );+ const rotated = (await state()).scene?.layers.at(-1);+ expect(+ rotated?.kind === "mask" &&+ rotated.mask.kind === "radial" &&+ Math.abs(rotated.mask.angle - 90) < 1,+ ).toBe(true);+ await page.keyboard.press("ControlOrMeta+z");+ await page+ .getByRole("button", { name: "Subtract from mask", exact: true })+ .click();+ await page+ .locator("[popover]:popover-open")+ .getByRole("button", { name: "Radial gradient", exact: true })+ .click();+ await drag(page, center, [+ center[0] + 220 * scale,+ center[1] + 120 * scale,+ ]);+ expect((await readImage(page)).center).toEqual(before.center);+ await page.keyboard.press("Delete");+ expect((await readImage(page)).center[0]).toBeGreaterThan(+ before.center[0] + 20,+ );+ await page.keyboard.press("ControlOrMeta+z");+ expect((await readImage(page)).center).toEqual(before.center);+ });+ await test.step("guide clicks and mobile drawing keep the preview stable", async () => {+ await page+ .getByRole("button", { name: "Select Radial Gradient", exact: true })+ .first()+ .click();+ await page.getByRole("button", { name: "Zoom in", exact: true }).click();+ const zoom = page.getByTitle("Fit to view");+ const percent = await zoom.innerText();+ await page.getByLabel("Move gradient", { exact: true }).dblclick();+ await expect(zoom).toHaveText(percent);+ await zoom.click();+ await page.setViewportSize({ width: 390, height: 844 });+ await page.getByRole("button", { name: "photo.svg", exact: true }).click();+ await page.keyboard.press("r");+ await expect(overlay).toHaveCSS("cursor", "crosshair");+ const view = await box(overlay);+ const x = view.x + view.width / 2,+ y = view.y + view.height / 2;+ await page.mouse.move(x, y);+ await page.mouse.down();+ await page.keyboard.down("Shift");+ await page.mouse.move(x + 65, y + 35);+ const pin = page.getByLabel("Move gradient", { exact: true });+ const drawn = await box(pin);+ await page.keyboard.up("Shift");+ await page.mouse.up();+ expect(await box(pin)).toEqual(drawn);+ const result = await state();+ const layer = result.scene?.layers.find(+ (item) => item.id === result.selectedLayerId,+ );+ expect(+ layer?.kind === "mask" &&+ layer.mask.kind === "radial" &&+ layer.mask.radius[0] === layer.mask.radius[1],+ ).toBe(true);+ });});diff --git a/tests/layers.test.ts b/tests/layers.test.tsindex e8986c1..1d8ea05 100644--- a/tests/layers.test.ts+++ b/tests/layers.test.ts@@ -5,191 +5,191 @@ import { createImageLayer, createLayer, createMask } from "@/app/editor/layers";import { createEditorRenderer } from "@/app/editor/renderer";import { createWorkspace } from "@/app/workspace";import {- createDocument,- createResources,- findLayer,- walkLayers,+ createDocument,+ createResources,+ findLayer,+ walkLayers,} from "@/core/document";import { createImageSource } from "@/core/image";import { imageFrame } from "@/core/image/frame";import { layerDrop } from "@/features/layers/drop";import {- addLayer,- deleteLayer,- duplicateLayer,- moveLayer,- setExposure,- setLayer,- setLayerMask,+ addLayer,+ deleteLayer,+ duplicateLayer,+ moveLayer,+ setExposure,+ setLayer,+ setLayerMask,} from "@/features/layers/edits";import { defaultGradient } from "@/features/layers/gradient";test("nested layers compose in order, move atomically, and duplicate with independent IDs", async () => {- const gpu = await init();- const source = createImageSource(- target(gpu, { size: [32, 16], format: "rgba16float" }),- );- const resources = createResources();- const sourceId = resources.add(new File([], "photo.png"), source);- const document = createDocument(- {- frame: imageFrame(source.image.size),- layers: [{ ...createImageLayer(sourceId, "Photo"), id: "base" }],- },- resources,- );- const workspace = createWorkspace();- await workspace.open("photo.png", async () => document);- const controls = createControls(gpu, workspace);- const renderer = createEditorRenderer(gpu, source);- try {- const original = document.scene.getState();- controls.beginEdit();- controls.setAdjustments({ exposure: 1 });- controls.setColorMixer("blue", { saturation: -20 });- expect(() => controls.setToneCurve([])).toThrow();- controls.cancelEdit();- expect(document.scene.getState()).toEqual(original);- expect(document.history.status.getState()).toEqual({- undoCount: 0,- redoCount: 0,- });- expect(document.selection.getState().layerId).toBe("base");- controls.setVignette({ softness: 75 });- expect(document.scene.getState().layers[1]).toMatchObject({- vignette: { intensity: 50, softness: 75 },- });- controls.undo();- for (const field of ["center", "size", "scale"]) {- for (const value of [[8], [8, 8, 8], [], [8, NaN], null]) {- expect(() =>- Reflect.apply(controls.setFrame, undefined, [- { ...original.frame, [field]: value },- ]),- ).toThrow("Invalid image frame");- }- }- const size: [number, number] = [8, 8];- const frame = { ...original.frame, size };- controls.setFrame(frame);- const cropped = document.scene.getState();- frame.size[0] = 99;- expect(cropped.frame.size).toEqual([8, 8]);- controls.setFrame(structuredClone(cropped.frame));- expect(document.scene.getState()).toBe(cropped);- const defaultMask = controls.addLayer("mask");- expect(- findLayer(document.scene.getState().layers, defaultMask),- ).toMatchObject({ mask: { start: [6.4, 8], end: [25.6, 8] } });- controls.undo();- controls.undo();- const mask = addLayer(document, createMask(defaultGradient([32, 16])));- const exposure = addLayer(document, createLayer("exposure"), {- inside: mask,- });- const vignette = addLayer(document, createLayer("vignette"), {- inside: mask,- });- expect(document.scene.getState().layers[0]).toBe(original.layers[0]);- const unchangedScene = document.scene.getState();- document.edit(structuredClone(unchangedScene));- expect(document.scene.getState()).toBe(unchangedScene);- document.history.begin();- setExposure(document, exposure, 2);- setExposure(document, exposure, 3);- document.selectLayer("base");- document.history.undo();- expect(findLayer(document.scene.getState().layers, exposure)).toMatchObject(- { exposure: 1 },- );- expect(document.selection.getState().layerId).toBe("base");- await renderer.update(document.scene.getState());- expect(renderer.inspect().passes).toEqual([- `layer/${exposure}/exposure`,- `layer/${vignette}/vignette`,- `layer/${mask}/mix`,- ]);- 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([]);- setLayer(document, mask, { visible: true, opacity: 0.5 });- await renderer.update(document.scene.getState());- expect(calls.createRenderPipeline).toBe(compiled);- const duplicate = duplicateLayer(document, mask);- const copy = findLayer(document.scene.getState().layers, duplicate);- expect(copy?.children.map((layer) => layer.kind)).toEqual([- "exposure",- "vignette",- ]);- const ids = walkLayers(document.scene.getState().layers).map(- (layer) => layer.id,- );- expect(new Set(ids).size).toBe(ids.length);- moveLayer(document, exposure, 1);- expect(document.scene.getState().layers[1].id).toBe(exposure);- expect(- findLayer(document.scene.getState().layers, mask)?.children.map(- (layer) => layer.id,- ),- ).toEqual([vignette]);- document.history.undo();- expect(- findLayer(document.scene.getState().layers, mask)?.children[0].id,- ).toBe(exposure);- const unchanged = document.scene.getState();- expect(() =>- addLayer(document, createLayer("vignette"), { inside: exposure }),- ).toThrow("two levels");- expect(() => moveLayer(document, mask, 0, exposure)).toThrow("itself");- expect(() => moveLayer(document, exposure, 0, "base")).toThrow("image");- expect(- layerDrop(document.scene.getState(), {- id: exposure,- target: "base",- position: "inside",- }),- ).toBeUndefined();- expect(() => moveLayer(document, exposure, 0)).toThrow("position");- expect(() =>- setLayerMask(document, mask, {- kind: "linear",- start: [0, 0],- end: [0, 0],- }),- ).toThrow("distinct");- expect(() => setExposure(document, exposure, NaN)).toThrow("Exposure");- expect(() => deleteLayer(document, "base")).toThrow("unavailable");- expect(document.scene.getState()).toBe(unchanged);- const added = addLayer(document, createLayer("vignette"), {- above: exposure,- });- expect(- findLayer(document.scene.getState().layers, mask)?.children.map(- (layer) => layer.id,- ),- ).toEqual([exposure, added, vignette]);- const top = addLayer(document, createLayer("vignette"));- expect(document.scene.getState().layers.at(-1)?.id).toBe(top);- expect(() =>- addLayer(document, createLayer("vignette"), { above: "missing" }),- ).toThrow("unavailable");- document.history.undo();- document.history.undo();- expect(document.scene.getState()).toBe(unchanged);- document.selectLayer(exposure);- deleteLayer(document, mask);- expect(document.selection.getState().layerId).toBe("base");- expect(- findLayer(document.scene.getState().layers, exposure),- ).toBeUndefined();- document.history.undo();- expect(findLayer(document.scene.getState().layers, exposure)).toBeDefined();- expect(renderer.outputImage().format).toBe("rgba16float");- } finally {- renderer.dispose();- workspace.dispose();- gpu.dispose();- }+ const gpu = await init();+ const source = createImageSource(+ target(gpu, { size: [32, 16], format: "rgba16float" }),+ );+ const resources = createResources();+ const sourceId = resources.add(new File([], "photo.png"), source);+ const document = createDocument(+ {+ frame: imageFrame(source.image.size),+ layers: [{ ...createImageLayer(sourceId, "Photo"), id: "base" }],+ },+ resources,+ );+ const workspace = createWorkspace();+ await workspace.open("photo.png", async () => document);+ const controls = createControls(gpu, workspace);+ const renderer = createEditorRenderer(gpu, source);+ try {+ const original = document.scene.getState();+ controls.beginEdit();+ controls.setAdjustments({ exposure: 1 });+ controls.setColorMixer("blue", { saturation: -20 });+ expect(() => controls.setToneCurve([])).toThrow();+ controls.cancelEdit();+ expect(document.scene.getState()).toEqual(original);+ expect(document.history.status.getState()).toEqual({+ undoCount: 0,+ redoCount: 0,+ });+ expect(document.selection.getState().layerId).toBe("base");+ controls.setVignette({ softness: 75 });+ expect(document.scene.getState().layers[1]).toMatchObject({+ vignette: { intensity: 50, softness: 75 },+ });+ controls.undo();+ for (const field of ["center", "size", "scale"]) {+ for (const value of [[8], [8, 8, 8], [], [8, NaN], null]) {+ expect(() =>+ Reflect.apply(controls.setFrame, undefined, [+ { ...original.frame, [field]: value },+ ]),+ ).toThrow("Invalid image frame");+ }+ }+ const size: [number, number] = [8, 8];+ const frame = { ...original.frame, size };+ controls.setFrame(frame);+ const cropped = document.scene.getState();+ frame.size[0] = 99;+ expect(cropped.frame.size).toEqual([8, 8]);+ controls.setFrame(structuredClone(cropped.frame));+ expect(document.scene.getState()).toBe(cropped);+ const defaultMask = controls.addLayer("mask");+ expect(+ findLayer(document.scene.getState().layers, defaultMask),+ ).toMatchObject({ mask: { start: [6.4, 8], end: [25.6, 8] } });+ controls.undo();+ controls.undo();+ const mask = addLayer(document, createMask(defaultGradient([32, 16])));+ const exposure = addLayer(document, createLayer("exposure"), {+ inside: mask,+ });+ const vignette = addLayer(document, createLayer("vignette"), {+ inside: mask,+ });+ expect(document.scene.getState().layers[0]).toBe(original.layers[0]);+ const unchangedScene = document.scene.getState();+ document.edit(structuredClone(unchangedScene));+ expect(document.scene.getState()).toBe(unchangedScene);+ document.history.begin();+ setExposure(document, exposure, 2);+ setExposure(document, exposure, 3);+ document.selectLayer("base");+ document.history.undo();+ expect(findLayer(document.scene.getState().layers, exposure)).toMatchObject(+ { exposure: 1 },+ );+ expect(document.selection.getState().layerId).toBe("base");+ await renderer.update(document.scene.getState());+ expect(renderer.inspect().passes).toEqual([+ `layer/${exposure}/exposure`,+ `layer/${vignette}/vignette`,+ `layer/${mask}/mix`,+ ]);+ 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([]);+ setLayer(document, mask, { visible: true, opacity: 0.5 });+ await renderer.update(document.scene.getState());+ expect(calls.createRenderPipeline).toBe(compiled);+ const duplicate = duplicateLayer(document, mask);+ const copy = findLayer(document.scene.getState().layers, duplicate);+ expect(copy?.children.map((layer) => layer.kind)).toEqual([+ "exposure",+ "vignette",+ ]);+ const ids = walkLayers(document.scene.getState().layers).map(+ (layer) => layer.id,+ );+ expect(new Set(ids).size).toBe(ids.length);+ moveLayer(document, exposure, 1);+ expect(document.scene.getState().layers[1].id).toBe(exposure);+ expect(+ findLayer(document.scene.getState().layers, mask)?.children.map(+ (layer) => layer.id,+ ),+ ).toEqual([vignette]);+ document.history.undo();+ expect(+ findLayer(document.scene.getState().layers, mask)?.children[0].id,+ ).toBe(exposure);+ const unchanged = document.scene.getState();+ expect(() =>+ addLayer(document, createLayer("vignette"), { inside: exposure }),+ ).toThrow("two levels");+ expect(() => moveLayer(document, mask, 0, exposure)).toThrow("itself");+ expect(() => moveLayer(document, exposure, 0, "base")).toThrow("image");+ expect(+ layerDrop(document.scene.getState(), {+ id: exposure,+ target: "base",+ position: "inside",+ }),+ ).toBeUndefined();+ expect(() => moveLayer(document, exposure, 0)).toThrow("position");+ expect(() =>+ setLayerMask(document, mask, {+ kind: "linear",+ start: [0, 0],+ end: [0, 0],+ }),+ ).toThrow("distinct");+ expect(() => setExposure(document, exposure, NaN)).toThrow("Exposure");+ expect(() => deleteLayer(document, "base")).toThrow("unavailable");+ expect(document.scene.getState()).toBe(unchanged);+ const added = addLayer(document, createLayer("vignette"), {+ above: exposure,+ });+ expect(+ findLayer(document.scene.getState().layers, mask)?.children.map(+ (layer) => layer.id,+ ),+ ).toEqual([exposure, added, vignette]);+ const top = addLayer(document, createLayer("vignette"));+ expect(document.scene.getState().layers.at(-1)?.id).toBe(top);+ expect(() =>+ addLayer(document, createLayer("vignette"), { above: "missing" }),+ ).toThrow("unavailable");+ document.history.undo();+ document.history.undo();+ expect(document.scene.getState()).toBe(unchanged);+ document.selectLayer(exposure);+ deleteLayer(document, mask);+ expect(document.selection.getState().layerId).toBe("base");+ expect(+ findLayer(document.scene.getState().layers, exposure),+ ).toBeUndefined();+ document.history.undo();+ expect(findLayer(document.scene.getState().layers, exposure)).toBeDefined();+ expect(renderer.outputImage().format).toBe("rgba16float");+ } finally {+ renderer.dispose();+ workspace.dispose();+ gpu.dispose();+ }});diff --git a/tests/loaders.e2e.ts b/tests/loaders.e2e.tsindex ea1959d..10dd001 100644--- a/tests/loaders.e2e.ts+++ b/tests/loaders.e2e.ts@@ -3,90 +3,90 @@ import { expect, test } from "./fixtures";import { readImage } from "./images";test("decode an image, apply XMP, recover from failure, and replace a document during export", async ({- page,+ page,}) => {- await page.goto("/");- await page.waitForFunction(() => window.openlight);- await page.evaluate(() =>- window.openlight.loadImage(new File(["invalid"], "broken.png")),- );- await expect(- page.getByText("Couldn't open broken.png:", { exact: false }),- ).toBeVisible();- await page.evaluate(- (text) =>- window.openlight.loadImage(- new File([text], "photo.svg", { type: "image/svg+xml" }),- ),- await readFile("tests/fixtures/photo.svg", "utf8"),- );- const baseline = await readImage(page);- expect(baseline.center).toEqual([128, 128, 128, 255]);- await page.evaluate(() =>- window.openlight.importXmp(- new File(- [- '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><rdf:Description xmlns:crs="http://ns.adobe.com/camera-raw-settings/1.0/" crs:Exposure2012="-1" /></rdf:RDF>',- ],- "photo.xmp",- ),- ),- );- await expect(- page.getByRole("textbox", { name: "Exposure", exact: true }),- ).toHaveValue("-1.00");- const expected = await readImage(page);- expect(expected.center[0]).toBeLessThan(baseline.center[0]);- const before = await page.evaluate(() => window.openlight.getState());- await page.evaluate(() => {- const frame = window.openlight.getState().frame;- if (!frame) throw new Error("Missing loaded frame");- frame.angle = 30;- Reflect.set(frame.center, 0, 0);- });- expect(- (await page.evaluate(() => window.openlight.getState())).frame,- ).toEqual(before.frame);- await page.evaluate(() => window.openlight.undo());- expect(await readImage(page)).toEqual(baseline);- await page.evaluate(() => window.openlight.redo());- expect(await readImage(page)).toEqual(expected);- await page.getByRole("tab", { name: "Crop" }).click();- await page- .getByRole("combobox", { name: "Aspect ratio" })- .selectOption({ label: "Square" });- const exported = await page.evaluate(async () => {- const api = window.openlight;- const convert = OffscreenCanvas.prototype.convertToBlob;- let release = () => {};- const gate = new Promise<void>((resolve) => {- release = resolve;- });- OffscreenCanvas.prototype.convertToBlob = async function (options) {- await gate;- return convert.call(this, options);- };- try {- const pending = api.exportImage();- await api.loadImage(- new File(- ['<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"/>'],- "replacement.svg",- { type: "image/svg+xml" },- ),- );- release();- return [...new Uint8Array(await (await pending).arrayBuffer())];- } finally {- release();- OffscreenCanvas.prototype.convertToBlob = convert;- }- });- expect(await readImage(page, new Uint8Array(exported))).toEqual(expected);- const replaced = await page.evaluate(() => window.openlight.getState());- await expect(page.getByRole("region", { name: "Crop tool" })).toBeHidden();- expect(replaced.frame?.size).toEqual([32, 32]);- expect(replaced.documentId).not.toBe(before.documentId);- expect(replaced.history).toEqual({ undoCount: 0, redoCount: 0 });- expect(replaced.adjustments.exposure).toBe(0);+ await page.goto("/");+ await page.waitForFunction(() => window.openlight);+ await page.evaluate(() =>+ window.openlight.loadImage(new File(["invalid"], "broken.png")),+ );+ await expect(+ page.getByText("Couldn't open broken.png:", { exact: false }),+ ).toBeVisible();+ await page.evaluate(+ (text) =>+ window.openlight.loadImage(+ new File([text], "photo.svg", { type: "image/svg+xml" }),+ ),+ await readFile("tests/fixtures/photo.svg", "utf8"),+ );+ const baseline = await readImage(page);+ expect(baseline.center).toEqual([128, 128, 128, 255]);+ await page.evaluate(() =>+ window.openlight.importXmp(+ new File(+ [+ '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><rdf:Description xmlns:crs="http://ns.adobe.com/camera-raw-settings/1.0/" crs:Exposure2012="-1" /></rdf:RDF>',+ ],+ "photo.xmp",+ ),+ ),+ );+ await expect(+ page.getByRole("textbox", { name: "Exposure", exact: true }),+ ).toHaveValue("-1.00");+ const expected = await readImage(page);+ expect(expected.center[0]).toBeLessThan(baseline.center[0]);+ const before = await page.evaluate(() => window.openlight.getState());+ await page.evaluate(() => {+ const frame = window.openlight.getState().frame;+ if (!frame) throw new Error("Missing loaded frame");+ frame.angle = 30;+ Reflect.set(frame.center, 0, 0);+ });+ expect(+ (await page.evaluate(() => window.openlight.getState())).frame,+ ).toEqual(before.frame);+ await page.evaluate(() => window.openlight.undo());+ expect(await readImage(page)).toEqual(baseline);+ await page.evaluate(() => window.openlight.redo());+ expect(await readImage(page)).toEqual(expected);+ await page.getByRole("tab", { name: "Crop" }).click();+ await page+ .getByRole("combobox", { name: "Aspect ratio" })+ .selectOption({ label: "Square" });+ const exported = await page.evaluate(async () => {+ const api = window.openlight;+ const convert = OffscreenCanvas.prototype.convertToBlob;+ let release = () => {};+ const gate = new Promise<void>((resolve) => {+ release = resolve;+ });+ OffscreenCanvas.prototype.convertToBlob = async function (options) {+ await gate;+ return convert.call(this, options);+ };+ try {+ const pending = api.exportImage();+ await api.loadImage(+ new File(+ ['<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"/>'],+ "replacement.svg",+ { type: "image/svg+xml" },+ ),+ );+ release();+ return [...new Uint8Array(await (await pending).arrayBuffer())];+ } finally {+ release();+ OffscreenCanvas.prototype.convertToBlob = convert;+ }+ });+ expect(await readImage(page, new Uint8Array(exported))).toEqual(expected);+ const replaced = await page.evaluate(() => window.openlight.getState());+ await expect(page.getByRole("region", { name: "Crop tool" })).toBeHidden();+ expect(replaced.frame?.size).toEqual([32, 32]);+ expect(replaced.documentId).not.toBe(before.documentId);+ expect(replaced.history).toEqual({ undoCount: 0, redoCount: 0 });+ expect(replaced.adjustments.exposure).toBe(0);});diff --git a/tests/loaders.test.ts b/tests/loaders.test.tsindex c17c9f7..42a6787 100644--- a/tests/loaders.test.ts+++ b/tests/loaders.test.ts@@ -12,175 +12,175 @@ import { addLayer } from "@/features/layers/edits";import { defaultGradient } from "@/features/layers/gradient";function settings(attributes: string, name = "photo.xmp") {- return new File(- [- `<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><rdf:Description xmlns:crs="http://ns.adobe.com/camera-raw-settings/1.0/" ${attributes} /></rdf:RDF>`,- ],- name,- );+ return new File(+ [+ `<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><rdf:Description xmlns:crs="http://ns.adobe.com/camera-raw-settings/1.0/" ${attributes} /></rdf:RDF>`,+ ],+ name,+ );}test("file batches preserve ordering, group imports, recover from failures, and discard stale settings", async () => {- for (const name of ["mamiya.MEF", "epson.erf", "fuji.raf", "iphone.dng"]) {- expect(canDecode(new File([], name))).toBe(true);- }- const workspace = createWorkspace();- // Substitute decoding only; the registry, workspace, XMP parser, and documents are real.- const image: FileLoader = {- kind: "document",- accepts: (file) => file.name.endsWith(".png"),- load: (file) =>- workspace.open(file.name, async () => {- if (file.name === "broken.png") throw new Error("Decode failed");- return createDocument({- frame: imageFrame([32, 32]),- layers: [{ ...createImageLayer(file.name, "Photo"), id: "base" }],- });- }),- };- const xmp = createCameraRawXmpLoader(workspace);- const registry = createLoaderRegistry(- [xmp, image],- () => workspace.state.getState().status === "ready",- );- const photo = new File([], "photo.png");- const exposure = settings('crs:Exposure2012="1.25"');- try {- await registry.openFiles([new File([], "notes.txt"), exposure]);- expect(workspace.state.getState()).toEqual({ status: "empty" });- for (const settingsFirst of [true, false]) {- const parameters = settings(- 'crs:Exposure2012="1.25" crs:Contrast2012="-20" crs:Highlights2012="-50" crs:Shadows2012="50" crs:Whites2012="25" crs:Blacks2012="-25" crs:Vibrance="30" crs:Saturation="-10"',- settingsFirst ? "photo.xml" : "photo.xmp",- );- const images = [photo, new File([], "broken.png")];- await registry.openFiles(- settingsFirst ? [parameters, ...images] : [...images, parameters],- );- const document = workspace.getDocument();- expect(workspace.state.getState().file).toBe("photo.png");- const imported = {- ...defaultAdjustments,- exposure: 1.25,- contrast: -20,- highlights: -50,- shadows: 50,- whites: 25,- blacks: -25,- vibrance: 30,- saturation: -10,- };- expect(document.scene.getState().layers[0].adjustments).toEqual(imported);- await registry.openFiles([- settings('crs:Exposure2012="3"'),- settings('crs:Exposure2012="-1"'),- ]);- expect(document.scene.getState().layers[0].adjustments).toEqual({- ...imported,- exposure: -1,- });- document.history.undo();- expect(document.scene.getState().layers[0].adjustments.exposure).toBe(3);- document.history.redo();- document.history.begin();- setAdjustments(document, { contrast: 20 });- setAdjustments(document, { contrast: 30 });- await registry.openFiles([- settings(- 'crs:Highlights2012="0" crs:Shadows2012="0" crs:Whites2012="0" crs:Blacks2012="0"',- ),- ]);- expect(document.history.status.getState()).toEqual({- undoCount: 5,- redoCount: 0,- });- expect(document.scene.getState().layers[0].adjustments).toMatchObject({- highlights: 0,- shadows: 0,- whites: 0,- blacks: 0,- });- document.history.undo();- expect(document.scene.getState().layers[0].adjustments).toEqual({- ...imported,- exposure: -1,- contrast: 30,- });- document.history.undo();- expect(document.scene.getState().layers[0].adjustments.contrast).toBe(- -20,- );- }- const document = workspace.getDocument();- const maskId = addLayer(document, createMask(defaultGradient([32, 32])));- addLayer(document, createLayer("details"), { inside: maskId });- const beforeDetails = document.scene.getState();- await xmp.load(settings('crs:Exposure2012="0.5" crs:Clarity2012="35"'));- expect(document.scene.getState().layers[2]).toMatchObject({- kind: "details",- details: { clarity: 35 },- });- expect(document.scene.getState().layers[0].adjustments.exposure).toBe(0.5);- expect(document.scene.getState().layers[1]).toBe(beforeDetails.layers[1]);- document.history.undo();- expect(document.scene.getState()).toEqual(beforeDetails);- document.history.redo();- await xmp.load(settings('crs:Clarity2012="0"'));- expect(document.scene.getState().layers).toHaveLength(3);- expect(document.scene.getState().layers[2]).toMatchObject({- details: { clarity: 0 },- });- expect(document.scene.getState().layers[1]).toBe(beforeDetails.layers[1]);- await Promise.all([- registry.openFiles([exposure, new File([], "first.png")]),- registry.openFiles([- new File([], "second.png"),- settings('crs:Contrast2012="20"'),- ]),- ]);- expect(workspace.state.getState().file).toBe("second.png");- expect(- workspace.getDocument().scene.getState().layers[0].adjustments,- ).toEqual({- ...defaultAdjustments,- contrast: 20,- });- await registry.openFiles([exposure, new File([], "broken.png")]);- expect(workspace.state.getState()).toMatchObject({- status: "error",- file: "broken.png",- error: "Error: Decode failed",- });- await registry.openFiles([exposure, photo]);- const recovered = workspace.getDocument();- expect(recovered.scene.getState().layers[0].adjustments.exposure).toBe(- 1.25,- );- await expect(- registry.openFiles([settings('crs:Exposure2012="99"')]),- ).rejects.toThrow("Invalid adjustment");- await registry.openFiles([- settings('crs:Contrast2012="10" crs:Exposure2012="NaN"'),- ]);- expect(recovered.scene.getState().layers[0].adjustments).toEqual({- ...defaultAdjustments,- exposure: 1.25,- contrast: 10,- });+ for (const name of ["mamiya.MEF", "epson.erf", "fuji.raf", "iphone.dng"]) {+ expect(canDecode(new File([], name))).toBe(true);+ }+ const workspace = createWorkspace();+ // Substitute decoding only; the registry, workspace, XMP parser, and documents are real.+ const image: FileLoader = {+ kind: "document",+ accepts: (file) => file.name.endsWith(".png"),+ load: (file) =>+ workspace.open(file.name, async () => {+ if (file.name === "broken.png") throw new Error("Decode failed");+ return createDocument({+ frame: imageFrame([32, 32]),+ layers: [{ ...createImageLayer(file.name, "Photo"), id: "base" }],+ });+ }),+ };+ const xmp = createCameraRawXmpLoader(workspace);+ const registry = createLoaderRegistry(+ [xmp, image],+ () => workspace.state.getState().status === "ready",+ );+ const photo = new File([], "photo.png");+ const exposure = settings('crs:Exposure2012="1.25"');+ try {+ await registry.openFiles([new File([], "notes.txt"), exposure]);+ expect(workspace.state.getState()).toEqual({ status: "empty" });+ for (const settingsFirst of [true, false]) {+ const parameters = settings(+ 'crs:Exposure2012="1.25" crs:Contrast2012="-20" crs:Highlights2012="-50" crs:Shadows2012="50" crs:Whites2012="25" crs:Blacks2012="-25" crs:Vibrance="30" crs:Saturation="-10"',+ settingsFirst ? "photo.xml" : "photo.xmp",+ );+ const images = [photo, new File([], "broken.png")];+ await registry.openFiles(+ settingsFirst ? [parameters, ...images] : [...images, parameters],+ );+ const document = workspace.getDocument();+ expect(workspace.state.getState().file).toBe("photo.png");+ const imported = {+ ...defaultAdjustments,+ exposure: 1.25,+ contrast: -20,+ highlights: -50,+ shadows: 50,+ whites: 25,+ blacks: -25,+ vibrance: 30,+ saturation: -10,+ };+ expect(document.scene.getState().layers[0].adjustments).toEqual(imported);+ await registry.openFiles([+ settings('crs:Exposure2012="3"'),+ settings('crs:Exposure2012="-1"'),+ ]);+ expect(document.scene.getState().layers[0].adjustments).toEqual({+ ...imported,+ exposure: -1,+ });+ document.history.undo();+ expect(document.scene.getState().layers[0].adjustments.exposure).toBe(3);+ document.history.redo();+ document.history.begin();+ setAdjustments(document, { contrast: 20 });+ setAdjustments(document, { contrast: 30 });+ await registry.openFiles([+ settings(+ 'crs:Highlights2012="0" crs:Shadows2012="0" crs:Whites2012="0" crs:Blacks2012="0"',+ ),+ ]);+ expect(document.history.status.getState()).toEqual({+ undoCount: 5,+ redoCount: 0,+ });+ expect(document.scene.getState().layers[0].adjustments).toMatchObject({+ highlights: 0,+ shadows: 0,+ whites: 0,+ blacks: 0,+ });+ document.history.undo();+ expect(document.scene.getState().layers[0].adjustments).toEqual({+ ...imported,+ exposure: -1,+ contrast: 30,+ });+ document.history.undo();+ expect(document.scene.getState().layers[0].adjustments.contrast).toBe(+ -20,+ );+ }+ const document = workspace.getDocument();+ const maskId = addLayer(document, createMask(defaultGradient([32, 32])));+ addLayer(document, createLayer("details"), { inside: maskId });+ const beforeDetails = document.scene.getState();+ await xmp.load(settings('crs:Exposure2012="0.5" crs:Clarity2012="35"'));+ expect(document.scene.getState().layers[2]).toMatchObject({+ kind: "details",+ details: { clarity: 35 },+ });+ expect(document.scene.getState().layers[0].adjustments.exposure).toBe(0.5);+ expect(document.scene.getState().layers[1]).toBe(beforeDetails.layers[1]);+ document.history.undo();+ expect(document.scene.getState()).toEqual(beforeDetails);+ document.history.redo();+ await xmp.load(settings('crs:Clarity2012="0"'));+ expect(document.scene.getState().layers).toHaveLength(3);+ expect(document.scene.getState().layers[2]).toMatchObject({+ details: { clarity: 0 },+ });+ expect(document.scene.getState().layers[1]).toBe(beforeDetails.layers[1]);+ await Promise.all([+ registry.openFiles([exposure, new File([], "first.png")]),+ registry.openFiles([+ new File([], "second.png"),+ settings('crs:Contrast2012="20"'),+ ]),+ ]);+ expect(workspace.state.getState().file).toBe("second.png");+ expect(+ workspace.getDocument().scene.getState().layers[0].adjustments,+ ).toEqual({+ ...defaultAdjustments,+ contrast: 20,+ });+ await registry.openFiles([exposure, new File([], "broken.png")]);+ expect(workspace.state.getState()).toMatchObject({+ status: "error",+ file: "broken.png",+ error: "Error: Decode failed",+ });+ await registry.openFiles([exposure, photo]);+ const recovered = workspace.getDocument();+ expect(recovered.scene.getState().layers[0].adjustments.exposure).toBe(+ 1.25,+ );+ await expect(+ registry.openFiles([settings('crs:Exposure2012="99"')]),+ ).rejects.toThrow("Invalid adjustment");+ await registry.openFiles([+ settings('crs:Contrast2012="10" crs:Exposure2012="NaN"'),+ ]);+ expect(recovered.scene.getState().layers[0].adjustments).toEqual({+ ...defaultAdjustments,+ exposure: 1.25,+ contrast: 10,+ });- // Hold file reading so replacement happens before the old import completes.- const text = Promise.withResolvers<string>();- const delayed = settings('crs:Exposure2012="4"');- delayed.text = () => text.promise;- const pending = xmp.load(delayed);- await registry.loadFile(image, photo);- text.resolve(await exposure.text());- await pending;- expect(workspace.getDocument()).not.toBe(recovered);- expect(- workspace.getDocument().scene.getState().layers[0].adjustments,- ).toEqual(defaultAdjustments);- } finally {- workspace.dispose();- }+ // Hold file reading so replacement happens before the old import completes.+ const text = Promise.withResolvers<string>();+ const delayed = settings('crs:Exposure2012="4"');+ delayed.text = () => text.promise;+ const pending = xmp.load(delayed);+ await registry.loadFile(image, photo);+ text.resolve(await exposure.text());+ await pending;+ expect(workspace.getDocument()).not.toBe(recovered);+ expect(+ workspace.getDocument().scene.getState().layers[0].adjustments,+ ).toEqual(defaultAdjustments);+ } finally {+ workspace.dispose();+ }});diff --git a/tests/pointer.ts b/tests/pointer.tsindex ce46d31..bf947f8 100644--- a/tests/pointer.ts+++ b/tests/pointer.ts@@ -1,21 +1,21 @@import type { Locator, Page } from "@playwright/test";export async function box(locator: Locator) {- const bounds = await locator.boundingBox();- if (!bounds) {- throw new Error(`Missing bounds for ${locator}`);- }- return bounds;+ const bounds = await locator.boundingBox();+ if (!bounds) {+ throw new Error(`Missing bounds for ${locator}`);+ }+ return bounds;}export async function drag(- page: Page,- from: number[],- to: number[],- steps = 8,+ page: Page,+ from: number[],+ to: number[],+ steps = 8,) {- await page.mouse.move(from[0], from[1]);- await page.mouse.down();- await page.mouse.move(to[0], to[1], { steps });- await page.mouse.up();+ await page.mouse.move(from[0], from[1]);+ await page.mouse.down();+ await page.mouse.move(to[0], to[1], { steps });+ await page.mouse.up();}diff --git a/tests/raw.e2e.ts b/tests/raw.e2e.tsindex 3a8e4db..e80f3f8 100644--- a/tests/raw.e2e.ts+++ b/tests/raw.e2e.ts@@ -3,78 +3,78 @@ import { expect, test } from "./fixtures";import { readImage, readPreview } from "./images";test("RAW Bayer and JPEG XL DNG preserve color, orientation, white balance, history and export", async ({- page,+ page,}) => {- await page.goto("/");- await page.waitForFunction(() => window.openlight);- const load = async (name: string) => {- const bytes = [...(await readFile(`tests/fixtures/raw/${name}`))];- await page.evaluate(- ({ bytes, name }) =>- window.openlight.loadImage(- new File([new Uint8Array(bytes)], name, { type: "image/tiff" }),- ),- { bytes, name },- );- };- for (const name of ["bayer.dng", "linear-jxl.dng"]) {- await test.step(name, async () => {- await load(name);- const image = await readImage(page);- expect(image.size).toEqual([96, 128]);- // The fixture's camera profile is sRGB with known linear samples .5, .25, .125.- for (const [i, expected] of [188, 137, 99, 255].entries()) {- expect(Math.abs(image.center[i] - expected)).toBeLessThanOrEqual(1);- }- const asShot = await page.evaluate(- () => window.openlight.getState().whiteBalance,- );- expect(asShot?.temperature).toBeGreaterThan(6000);- await expect(- page.getByRole("slider", { name: "Temperature (K)", exact: true }),- ).toBeVisible();- await page.evaluate(() =>- window.openlight.setWhiteBalance({ temperature: 4000, tint: 20 }),- );- const cool = await readImage(page);- // Full SDK camera calibration, including its white-point normalization.- for (const [i, expected] of [192, 161, 166, 255].entries()) {- expect(Math.abs(cool.center[i] - expected)).toBeLessThanOrEqual(1);- }- await expect- .poll(async () => (await readPreview(page)).center.slice(0, 3))- .toEqual(cool.center.slice(0, 3));- await page.evaluate(() => window.openlight.undo());- expect((await readImage(page)).center).toEqual(image.center);- await page.evaluate(() => window.openlight.redo());- expect((await readImage(page)).center).toEqual(cool.center);- await page.getByRole("button", { name: "As Shot", exact: true }).click();- expect(- await page.evaluate(() => window.openlight.getState().whiteBalance),- ).toEqual(asShot);- expect((await readImage(page)).center).toEqual(image.center);- });- }- // A renderer exporting a captured scene owns its source while the workspace replaces it.- const bytes = [...(await readFile("tests/fixtures/raw/bayer.dng"))];- const replacement = await page.evaluate(async (bytes) => {- window.openlight.setWhiteBalance({ temperature: 4000, tint: 20 });- const exporting = window.openlight.exportImage();- await window.openlight.loadImage(- new File([new Uint8Array(bytes)], "replacement.dng"),- );- const image = await createImageBitmap(await exporting);- const size = [image.width, image.height];- image.close();- return size;- }, bytes);- expect(replacement).toEqual([96, 128]);- await page.evaluate(() =>- window.openlight.loadImage(new File(["invalid RAW"], "broken.dng")),- );- await expect(- page.getByText("Couldn't open broken.dng:", { exact: false }),- ).toBeVisible();- await load("linear-jxl.dng");- expect((await readImage(page)).size).toEqual([96, 128]);+ await page.goto("/");+ await page.waitForFunction(() => window.openlight);+ const load = async (name: string) => {+ const bytes = [...(await readFile(`tests/fixtures/raw/${name}`))];+ await page.evaluate(+ ({ bytes, name }) =>+ window.openlight.loadImage(+ new File([new Uint8Array(bytes)], name, { type: "image/tiff" }),+ ),+ { bytes, name },+ );+ };+ for (const name of ["bayer.dng", "linear-jxl.dng"]) {+ await test.step(name, async () => {+ await load(name);+ const image = await readImage(page);+ expect(image.size).toEqual([96, 128]);+ // The fixture's camera profile is sRGB with known linear samples .5, .25, .125.+ for (const [i, expected] of [188, 137, 99, 255].entries()) {+ expect(Math.abs(image.center[i] - expected)).toBeLessThanOrEqual(1);+ }+ const asShot = await page.evaluate(+ () => window.openlight.getState().whiteBalance,+ );+ expect(asShot?.temperature).toBeGreaterThan(6000);+ await expect(+ page.getByRole("slider", { name: "Temperature (K)", exact: true }),+ ).toBeVisible();+ await page.evaluate(() =>+ window.openlight.setWhiteBalance({ temperature: 4000, tint: 20 }),+ );+ const cool = await readImage(page);+ // Full SDK camera calibration, including its white-point normalization.+ for (const [i, expected] of [192, 161, 166, 255].entries()) {+ expect(Math.abs(cool.center[i] - expected)).toBeLessThanOrEqual(1);+ }+ await expect+ .poll(async () => (await readPreview(page)).center.slice(0, 3))+ .toEqual(cool.center.slice(0, 3));+ await page.evaluate(() => window.openlight.undo());+ expect((await readImage(page)).center).toEqual(image.center);+ await page.evaluate(() => window.openlight.redo());+ expect((await readImage(page)).center).toEqual(cool.center);+ await page.getByRole("button", { name: "As Shot", exact: true }).click();+ expect(+ await page.evaluate(() => window.openlight.getState().whiteBalance),+ ).toEqual(asShot);+ expect((await readImage(page)).center).toEqual(image.center);+ });+ }+ // A renderer exporting a captured scene owns its source while the workspace replaces it.+ const bytes = [...(await readFile("tests/fixtures/raw/bayer.dng"))];+ const replacement = await page.evaluate(async (bytes) => {+ window.openlight.setWhiteBalance({ temperature: 4000, tint: 20 });+ const exporting = window.openlight.exportImage();+ await window.openlight.loadImage(+ new File([new Uint8Array(bytes)], "replacement.dng"),+ );+ const image = await createImageBitmap(await exporting);+ const size = [image.width, image.height];+ image.close();+ return size;+ }, bytes);+ expect(replacement).toEqual([96, 128]);+ await page.evaluate(() =>+ window.openlight.loadImage(new File(["invalid RAW"], "broken.dng")),+ );+ await expect(+ page.getByText("Couldn't open broken.dng:", { exact: false }),+ ).toBeVisible();+ await load("linear-jxl.dng");+ expect((await readImage(page)).size).toEqual([96, 128]);});diff --git a/tests/render-graph.test.ts b/tests/render-graph.test.tsindex 43ed212..fb99b8e 100644--- a/tests/render-graph.test.ts+++ b/tests/render-graph.test.ts@@ -1,12 +1,12 @@import { expect, test } from "bun:test";import { getMockGPUDeviceInstrumentation, init, target } from "vgpu/mock";import {- createRenderGraph,- input,- merge,- node,- pipeline,- split,+ createRenderGraph,+ input,+ merge,+ node,+ pipeline,+ split,} from "@/core/renderer";const shader = `@@ -14,116 +14,116 @@ const shader = `@group(0) @binding(1) var base: texture_2d<f32>;@group(0) @binding(2) var<storage, read> weights: array<f32>;@fragment fn fs_main(@builtin(position) p: vec4f) -> @location(0) vec4f {- return mix(textureLoad(source, vec2i(p.xy), 0), textureLoad(base, vec2i(p.xy), 0), weights[0]);+ return mix(textureLoad(source, vec2i(p.xy), 0), textureLoad(base, vec2i(p.xy), 0), weights[0]);}`;const options = { storage: { weights: new Float32Array([0.5]) } };test("pipeline and split preserve order, bypasses, and named merge inputs", async () => {- const gpu = await init();- const image = target(gpu, { size: [8, 4], format: "rgba16float" });- const source = input(image);- try {- const first = node("first", shader);- const last = node("last", shader);- const result = pipeline(source, [- first,- undefined,- (image) => pipeline(image, [last]),- ]);- expect(result).toMatchObject({- name: "last",- inputs: { source: { name: "first", inputs: { source } } },- });- expect(pipeline(source, [undefined])).toBe(source);- const [unchanged, small] = split(result, [- [],- [node("small", shader, { size: [2, 1] })],- ]);- expect(unchanged).toBe(result);- expect(small).toMatchObject({ inputs: { source: result }, size: [2, 1] });- const joined = merge({ base: source, source: small }, node("join", shader));- expect(joined.inputs.base).toBe(source);- expect(joined.inputs.source).toBe(small);- expect(joined.size).toEqual([8, 4]);- expect(joined.format).toBe("rgba16float");- expect(- getMockGPUDeviceInstrumentation(gpu.gpu).calls.createRenderPipeline ?? 0,- ).toBe(0);- } finally {- image.color.dispose();- gpu.dispose();- }+ const gpu = await init();+ const image = target(gpu, { size: [8, 4], format: "rgba16float" });+ const source = input(image);+ try {+ const first = node("first", shader);+ const last = node("last", shader);+ const result = pipeline(source, [+ first,+ undefined,+ (image) => pipeline(image, [last]),+ ]);+ expect(result).toMatchObject({+ name: "last",+ inputs: { source: { name: "first", inputs: { source } } },+ });+ expect(pipeline(source, [undefined])).toBe(source);+ const [unchanged, small] = split(result, [+ [],+ [node("small", shader, { size: [2, 1] })],+ ]);+ expect(unchanged).toBe(result);+ expect(small).toMatchObject({ inputs: { source: result }, size: [2, 1] });+ const joined = merge({ base: source, source: small }, node("join", shader));+ expect(joined.inputs.base).toBe(source);+ expect(joined.inputs.source).toBe(small);+ expect(joined.size).toEqual([8, 4]);+ expect(joined.format).toBe("rgba16float");+ expect(+ getMockGPUDeviceInstrumentation(gpu.gpu).calls.createRenderPipeline ?? 0,+ ).toBe(0);+ } finally {+ image.color.dispose();+ gpu.dispose();+ }});test("a shared branch renders once and reuses effects, buffers, and temporary storage", async () => {- const gpu = await init();- const image = target(gpu, { size: [8, 8], format: "rgba16float" });- const source = input(image);- const graph = createRenderGraph(gpu);- const shared = merge(- { source, base: source },- node("shared", shader, options),- );- const middle = merge(- { source: shared, base: shared },- node("middle", shader, options),- );- const branch = merge(- { source: middle, base: middle },- node("branch", shader, options),- );- const joined = merge(- { source: shared, base: branch },- node("join", shader, options),- );- try {- const [saved, output] = graph.render([shared, joined]);- expect(output).not.toBe(saved);- expect(graph.inspect().passes).toEqual([- "shared",- "middle",- "branch",- "join",- ]);- expect(graph.inspect().textures).toHaveLength(3);- const calls = getMockGPUDeviceInstrumentation(gpu.gpu).calls;- const buffers = calls.createBuffer;- const pipelines = calls.createRenderPipeline;- expect(graph.render([shared, joined])).toEqual([saved, output]);- expect(graph.render([joined, shared, joined])).toEqual([- output,- saved,- output,- ]);- expect(calls.createBuffer).toBe(buffers);- expect(calls.createRenderPipeline).toBe(pipelines);- // Bypassing releases scratch storage; a changed output size reuses the remaining target.- expect(graph.render([shared])[0]).toBe(saved);- expect(graph.inspect().textures).toHaveLength(1);- expect(() => output.color.view).toThrow("destroyed");- const small = merge(- { source, base: source },- node("shared", shader, {- ...options,- size: [4, 4],- }),- );- expect(graph.render([small])[0].size).toEqual([4, 4]);- expect(graph.inspect().textures).toHaveLength(1);- // Removing a composition retires its cached effect so its name can be reused.- graph.release("shared");- const replacement = merge(- { source, base: source },- node("shared", shader.replace("weights[0]", "1.0 - weights[0]"), options),- );- expect(() => graph.render([replacement])).not.toThrow();- graph.dispose();- expect(() => saved.color.view).toThrow("destroyed");- expect(() => image.color.view).not.toThrow();- expect(() => graph.render([shared])).toThrow("closed");- } finally {- graph.dispose();- image.color.dispose();- gpu.dispose();- }+ const gpu = await init();+ const image = target(gpu, { size: [8, 8], format: "rgba16float" });+ const source = input(image);+ const graph = createRenderGraph(gpu);+ const shared = merge(+ { source, base: source },+ node("shared", shader, options),+ );+ const middle = merge(+ { source: shared, base: shared },+ node("middle", shader, options),+ );+ const branch = merge(+ { source: middle, base: middle },+ node("branch", shader, options),+ );+ const joined = merge(+ { source: shared, base: branch },+ node("join", shader, options),+ );+ try {+ const [saved, output] = graph.render([shared, joined]);+ expect(output).not.toBe(saved);+ expect(graph.inspect().passes).toEqual([+ "shared",+ "middle",+ "branch",+ "join",+ ]);+ expect(graph.inspect().textures).toHaveLength(3);+ const calls = getMockGPUDeviceInstrumentation(gpu.gpu).calls;+ const buffers = calls.createBuffer;+ const pipelines = calls.createRenderPipeline;+ expect(graph.render([shared, joined])).toEqual([saved, output]);+ expect(graph.render([joined, shared, joined])).toEqual([+ output,+ saved,+ output,+ ]);+ expect(calls.createBuffer).toBe(buffers);+ expect(calls.createRenderPipeline).toBe(pipelines);+ // Bypassing releases scratch storage; a changed output size reuses the remaining target.+ expect(graph.render([shared])[0]).toBe(saved);+ expect(graph.inspect().textures).toHaveLength(1);+ expect(() => output.color.view).toThrow("destroyed");+ const small = merge(+ { source, base: source },+ node("shared", shader, {+ ...options,+ size: [4, 4],+ }),+ );+ expect(graph.render([small])[0].size).toEqual([4, 4]);+ expect(graph.inspect().textures).toHaveLength(1);+ // Removing a composition retires its cached effect so its name can be reused.+ graph.release("shared");+ const replacement = merge(+ { source, base: source },+ node("shared", shader.replace("weights[0]", "1.0 - weights[0]"), options),+ );+ expect(() => graph.render([replacement])).not.toThrow();+ graph.dispose();+ expect(() => saved.color.view).toThrow("destroyed");+ expect(() => image.color.view).not.toThrow();+ expect(() => graph.render([shared])).toThrow("closed");+ } finally {+ graph.dispose();+ image.color.dispose();+ gpu.dispose();+ }});diff --git a/tests/renderer.test.ts b/tests/renderer.test.tsindex 278ce77..ca53da2 100644--- a/tests/renderer.test.ts+++ b/tests/renderer.test.ts@@ -1,10 +1,10 @@import { expect, mock, test } from "bun:test";import type { Target } from "vgpu";import {- frame,- getMockGPUDeviceInstrumentation,- init,- target,+ frame,+ getMockGPUDeviceInstrumentation,+ init,+ target,} from "vgpu/mock";import { createImageLayer, createLayer } from "@/app/editor/layers";import { createEditorRenderer as createRenderer } from "@/app/editor/renderer";@@ -12,10 +12,10 @@ import { createDocument, createResources } from "@/core/document";import { createImageSource } from "@/core/image";import { imageFrame } from "@/core/image/frame";import {- createDisplay,- createRenderGraph,- input,- pipeline,+ createDisplay,+ createRenderGraph,+ input,+ pipeline,} from "@/core/renderer";import { setAdjustments } from "@/features/adjustments/edits";import { defaultAdjustments } from "@/features/adjustments/model";@@ -24,304 +24,304 @@ import { setToneCurve } from "@/features/tone-curves/edits";import { setWhiteBalance } from "@/features/white-balance/edits";test("RAW edits coalesce, recover from failure, and retain an exporting source after document replacement", async () => {- const gpu = await init();- const image = target(gpu, { size: [8, 8], format: "rgba16float" });- const asShot = { temperature: 5000, tint: 10 };- const requests: ReturnType<typeof Promise.withResolvers<void>>[] = [];- const outputs: Target[] = [];- const started = Promise.withResolvers<void>();- const close = mock(() => {});- const develop = mock(() => {- const request = Promise.withResolvers<void>();- requests.push(request);- started.resolve();- return request.promise;- });- const source = createImageSource(image, {- asShot,- createPass() {- const output = target(gpu, { size: image.size, format: image.format });- outputs.push(output);- return {- prepare: (balance) =>- balance.temperature === asShot.temperature &&- balance.tint === asShot.tint- ? Promise.resolve()- : develop(),- render: () => output,- dispose: () => output.color.dispose(),- };- },- dispose: close,- });- const resources = createResources();- const id = resources.add(new File([], "photo.nef"), source);- const document = createDocument(- {- frame: imageFrame(image.size),- layers: [{ ...createImageLayer(id, "Photo", asShot), id: "base" }],- },- resources,- );- const preview = createRenderer(gpu, source);- const exported = createRenderer(gpu, source);- const notify = mock(() => {});- preview.subscribe(notify);- try {- // An edit in the same tick as the initial render must not be lost.- const initial = preview.update(document.scene.getState());- setWhiteBalance(document, { temperature: 2000 });- preview.update(document.scene.getState());- await started.promise;- expect(develop).toHaveBeenCalledTimes(1);- setWhiteBalance(document, { temperature: 3000 });- preview.update(document.scene.getState());- setWhiteBalance(document);- preview.update(document.scene.getState());- requests[0].resolve();- await initial;- expect(develop).toHaveBeenCalledTimes(1);- expect(notify).toHaveBeenCalledTimes(2);- expect(outputs).toHaveLength(2);- document.history.undo();- expect(document.scene.getState().layers[0].whiteBalance?.temperature).toBe(- 3000,- );- const failed = preview.update(document.scene.getState());- requests[1].reject(Error("Decode failure"));- await expect(failed).rejects.toThrow("Decode failure");- const superseded = preview.update(document.scene.getState());- setWhiteBalance(document);- preview.update(document.scene.getState());- requests[2].reject(Error("Superseded failure"));- await superseded;- setWhiteBalance(document, { temperature: 6500 });- const recovered = preview.update(document.scene.getState());- requests[3].resolve();- await recovered;- expect(() => setWhiteBalance(document, { temperature: NaN })).toThrow(- "Invalid",- );- const exporting = exported.update(document.scene.getState());- preview.dispose();- document.dispose();- expect(close).not.toHaveBeenCalled();- expect(() => image.color.view).not.toThrow();- requests[4].resolve();- await exporting;- expect(exported.outputImage().size).toEqual([8, 8]);- exported.dispose();- expect(close).toHaveBeenCalledTimes(1);- expect(() => image.color.view).toThrow("destroyed");- for (const output of outputs) {- expect(() => output.color.view).toThrow("destroyed");- }- } finally {- preview.dispose();- exported.dispose();- document.dispose();- gpu.dispose();- }+ const gpu = await init();+ const image = target(gpu, { size: [8, 8], format: "rgba16float" });+ const asShot = { temperature: 5000, tint: 10 };+ const requests: ReturnType<typeof Promise.withResolvers<void>>[] = [];+ const outputs: Target[] = [];+ const started = Promise.withResolvers<void>();+ const close = mock(() => {});+ const develop = mock(() => {+ const request = Promise.withResolvers<void>();+ requests.push(request);+ started.resolve();+ return request.promise;+ });+ const source = createImageSource(image, {+ asShot,+ createPass() {+ const output = target(gpu, { size: image.size, format: image.format });+ outputs.push(output);+ return {+ prepare: (balance) =>+ balance.temperature === asShot.temperature &&+ balance.tint === asShot.tint+ ? Promise.resolve()+ : develop(),+ render: () => output,+ dispose: () => output.color.dispose(),+ };+ },+ dispose: close,+ });+ const resources = createResources();+ const id = resources.add(new File([], "photo.nef"), source);+ const document = createDocument(+ {+ frame: imageFrame(image.size),+ layers: [{ ...createImageLayer(id, "Photo", asShot), id: "base" }],+ },+ resources,+ );+ const preview = createRenderer(gpu, source);+ const exported = createRenderer(gpu, source);+ const notify = mock(() => {});+ preview.subscribe(notify);+ try {+ // An edit in the same tick as the initial render must not be lost.+ const initial = preview.update(document.scene.getState());+ setWhiteBalance(document, { temperature: 2000 });+ preview.update(document.scene.getState());+ await started.promise;+ expect(develop).toHaveBeenCalledTimes(1);+ setWhiteBalance(document, { temperature: 3000 });+ preview.update(document.scene.getState());+ setWhiteBalance(document);+ preview.update(document.scene.getState());+ requests[0].resolve();+ await initial;+ expect(develop).toHaveBeenCalledTimes(1);+ expect(notify).toHaveBeenCalledTimes(2);+ expect(outputs).toHaveLength(2);+ document.history.undo();+ expect(document.scene.getState().layers[0].whiteBalance?.temperature).toBe(+ 3000,+ );+ const failed = preview.update(document.scene.getState());+ requests[1].reject(Error("Decode failure"));+ await expect(failed).rejects.toThrow("Decode failure");+ const superseded = preview.update(document.scene.getState());+ setWhiteBalance(document);+ preview.update(document.scene.getState());+ requests[2].reject(Error("Superseded failure"));+ await superseded;+ setWhiteBalance(document, { temperature: 6500 });+ const recovered = preview.update(document.scene.getState());+ requests[3].resolve();+ await recovered;+ expect(() => setWhiteBalance(document, { temperature: NaN })).toThrow(+ "Invalid",+ );+ const exporting = exported.update(document.scene.getState());+ preview.dispose();+ document.dispose();+ expect(close).not.toHaveBeenCalled();+ expect(() => image.color.view).not.toThrow();+ requests[4].resolve();+ await exporting;+ expect(exported.outputImage().size).toEqual([8, 8]);+ exported.dispose();+ expect(close).toHaveBeenCalledTimes(1);+ expect(() => image.color.view).toThrow("destroyed");+ for (const output of outputs) {+ expect(() => output.color.view).toThrow("destroyed");+ }+ } finally {+ preview.dispose();+ exported.dispose();+ document.dispose();+ gpu.dispose();+ }});test.each([1, 16])(- "unsharp mask at reduction %s bypasses zero and shares graph storage",- async (reduction) => {- const gpu = await init();- const source = target(gpu, { size: [127, 65], format: "rgba16float" });- const graph = createRenderGraph(gpu);- let output = source;- const render = (amount: number) => {- [output] = graph.render([- pipeline(input(source), [- unsharpMask(- "detail",- amount / 200,- reduction === 1 ? 1 : 64,- reduction,- ),- ]),- ]);- };- try {- render(0);- expect(output).toBe(source);- const calls = getMockGPUDeviceInstrumentation(gpu.gpu).calls;- expect(calls.createRenderPipeline ?? 0).toBe(0);- render(100);- const filtered = output;- expect(filtered).not.toBe(source);- expect(filtered.size).toEqual(source.size);- const pipelines = calls.createRenderPipeline;- expect(graph.inspect().textures).toHaveLength(reduction === 1 ? 2 : 3);- for (const amount of [-100, -50, 25, 75]) {- render(amount);- expect(output).toBe(filtered);- }- expect(calls.createRenderPipeline).toBe(pipelines);- render(0);- expect(output).toBe(source);- expect(graph.inspect().textures).toHaveLength(0);- graph.dispose();- expect(() => filtered.color.view).toThrow("destroyed");- expect(() => source.color.view).not.toThrow();- } finally {- graph.dispose();- source.color.dispose();- gpu.dispose();- }- },+ "unsharp mask at reduction %s bypasses zero and shares graph storage",+ async (reduction) => {+ const gpu = await init();+ const source = target(gpu, { size: [127, 65], format: "rgba16float" });+ const graph = createRenderGraph(gpu);+ let output = source;+ const render = (amount: number) => {+ [output] = graph.render([+ pipeline(input(source), [+ unsharpMask(+ "detail",+ amount / 200,+ reduction === 1 ? 1 : 64,+ reduction,+ ),+ ]),+ ]);+ };+ try {+ render(0);+ expect(output).toBe(source);+ const calls = getMockGPUDeviceInstrumentation(gpu.gpu).calls;+ expect(calls.createRenderPipeline ?? 0).toBe(0);+ render(100);+ const filtered = output;+ expect(filtered).not.toBe(source);+ expect(filtered.size).toEqual(source.size);+ const pipelines = calls.createRenderPipeline;+ expect(graph.inspect().textures).toHaveLength(reduction === 1 ? 2 : 3);+ for (const amount of [-100, -50, 25, 75]) {+ render(amount);+ expect(output).toBe(filtered);+ }+ expect(calls.createRenderPipeline).toBe(pipelines);+ render(0);+ expect(output).toBe(source);+ expect(graph.inspect().textures).toHaveLength(0);+ graph.dispose();+ expect(() => filtered.color.view).toThrow("destroyed");+ expect(() => source.color.view).not.toThrow();+ } finally {+ graph.dispose();+ source.color.dispose();+ gpu.dispose();+ }+ },);test("rendering follows grouped edits and undo, reuses pipelines, and releases owned targets", async () => {- const gpu = await init();- const source = target(gpu, { size: [32, 16], format: "rgba16float" });- const canvas = Object.assign(target(gpu, { size: [64, 32] }), { dpr: 2 });- const document = createDocument({- frame: imageFrame([32, 16]),- layers: [- {- ...createImageLayer("photo", "Photo"),- id: "base",- adjustments: { ...defaultAdjustments, exposure: 0.25 },- },- ],- });- const resource = createImageSource(source);- const renderer = createRenderer(gpu, resource);- const notify = mock(() => {});- const detach = renderer.subscribe(notify);- const unsubscribe = document.scene.subscribe((scene) =>- renderer.update(scene),- );- const display = createDisplay(gpu);- const draw = () =>- frame(gpu, (frame) =>- display(frame, canvas, renderer.outputImage(), {- view: { pan: [4, 8], zoom: 2 },- }),- );- try {- expect(notify).not.toHaveBeenCalled();- await expect(- renderer.update({- ...document.scene.getState(),- get layers(): never {- throw Error("Render failure");- },- }),- ).rejects.toThrow("Render failure");- renderer.update(document.scene.getState());- const adjusted = renderer.outputImage();- expect(adjusted.size).toEqual(source.size);- expect(adjusted.format).toBe(source.format);- expect(renderer.outputImage()).toBe(adjusted);- document.history.begin();- setAdjustments(document, { exposure: 0.5 });- setAdjustments(document, { exposure: 1 });- setToneCurve(document, [- { x: 0, y: 0 },- { x: 0.5, y: 0.7 },- { x: 1, y: 1 },- ]);- document.history.commit();- const curved = renderer.outputImage();- expect(curved).not.toBe(adjusted);- expect(curved.size).toEqual(source.size);- expect(document.history.status.getState()).toEqual({- undoCount: 1,- redoCount: 0,- });- draw();- const calls = getMockGPUDeviceInstrumentation(gpu.gpu).calls;- const pipelines = calls.createRenderPipeline;- expect(pipelines).toBeGreaterThan(0);- const late = mock(() => {});- const detachLate = renderer.subscribe(late);- expect(late).toHaveBeenCalledTimes(1);- detachLate();- document.history.undo();- expect(renderer.outputImage()).toBe(adjusted);- expect(document.scene.getState().layers[0].adjustments.exposure).toBe(0.25);- document.history.redo();- expect(renderer.inspect().passes).toEqual([- "layer/base/exposure",- "layer/base/curves",- ]);- document.history.begin();- setToneCurve(document);- expect(renderer.outputImage()).toBe(adjusted);- document.history.cancel();- expect(renderer.inspect().passes).toEqual([- "layer/base/exposure",- "layer/base/curves",- ]);- draw();- expect(calls.createRenderPipeline).toBe(pipelines);- expect(notify).toHaveBeenCalledTimes(8);- expect(late).toHaveBeenCalledTimes(1);- detach();- const beforeInput = document.scene.getState();- const base = beforeInput.layers[0];- document.edit({- ...beforeInput,- layers: [- {- ...base,- children: [- { ...createLayer("exposure"), id: "exposure" },- ...base.children,- ],- },- ],- });- await renderer.update(document.scene.getState(), "base");- expect(renderer.inputImage("base")).toBeDefined();- expect(renderer.inputImage("base")).not.toBe(renderer.outputImage());- expect(renderer.inputImage("exposure")).toBeUndefined();- expect(renderer.inspect().passes).toEqual([- "layer/exposure/exposure",- "layer/base/exposure",- "layer/base/curves",- ]);- document.edit(beforeInput);- expect(renderer.inputImage("base")).toBeUndefined();- setAdjustments(document, { exposure: -1 });- const scene = document.scene.getState();- const [image, ...effects] = scene.layers;- document.edit({- ...scene,- layers: [- image,- {- ...createLayer("details"),- details: { clarity: 50, sharpening: 100, sharpenRadius: 2 },- },- ...effects,- ],- });- expect(notify).toHaveBeenCalledTimes(8);- document.edit({- ...document.scene.getState(),- frame: {- ...document.scene.getState().frame,- size: [16, 8],- angle: 10,- },- });- const croppedOutput = renderer.outputImage();- expect(croppedOutput.size).toEqual([16, 8]);- renderer.dispose();- expect(() => croppedOutput.color.view).toThrow("destroyed");- expect(() => adjusted.color.view).toThrow("destroyed");- expect(() => curved.color.view).toThrow("destroyed");- expect(() => source.color.view).not.toThrow();- } finally {- unsubscribe();- detach();- renderer.dispose();- document.dispose();- resource.dispose();- gpu.dispose();- }+ const gpu = await init();+ const source = target(gpu, { size: [32, 16], format: "rgba16float" });+ const canvas = Object.assign(target(gpu, { size: [64, 32] }), { dpr: 2 });+ const document = createDocument({+ frame: imageFrame([32, 16]),+ layers: [+ {+ ...createImageLayer("photo", "Photo"),+ id: "base",+ adjustments: { ...defaultAdjustments, exposure: 0.25 },+ },+ ],+ });+ const resource = createImageSource(source);+ const renderer = createRenderer(gpu, resource);+ const notify = mock(() => {});+ const detach = renderer.subscribe(notify);+ const unsubscribe = document.scene.subscribe((scene) =>+ renderer.update(scene),+ );+ const display = createDisplay(gpu);+ const draw = () =>+ frame(gpu, (frame) =>+ display(frame, canvas, renderer.outputImage(), {+ view: { pan: [4, 8], zoom: 2 },+ }),+ );+ try {+ expect(notify).not.toHaveBeenCalled();+ await expect(+ renderer.update({+ ...document.scene.getState(),+ get layers(): never {+ throw Error("Render failure");+ },+ }),+ ).rejects.toThrow("Render failure");+ renderer.update(document.scene.getState());+ const adjusted = renderer.outputImage();+ expect(adjusted.size).toEqual(source.size);+ expect(adjusted.format).toBe(source.format);+ expect(renderer.outputImage()).toBe(adjusted);+ document.history.begin();+ setAdjustments(document, { exposure: 0.5 });+ setAdjustments(document, { exposure: 1 });+ setToneCurve(document, [+ { x: 0, y: 0 },+ { x: 0.5, y: 0.7 },+ { x: 1, y: 1 },+ ]);+ document.history.commit();+ const curved = renderer.outputImage();+ expect(curved).not.toBe(adjusted);+ expect(curved.size).toEqual(source.size);+ expect(document.history.status.getState()).toEqual({+ undoCount: 1,+ redoCount: 0,+ });+ draw();+ const calls = getMockGPUDeviceInstrumentation(gpu.gpu).calls;+ const pipelines = calls.createRenderPipeline;+ expect(pipelines).toBeGreaterThan(0);+ const late = mock(() => {});+ const detachLate = renderer.subscribe(late);+ expect(late).toHaveBeenCalledTimes(1);+ detachLate();+ document.history.undo();+ expect(renderer.outputImage()).toBe(adjusted);+ expect(document.scene.getState().layers[0].adjustments.exposure).toBe(0.25);+ document.history.redo();+ expect(renderer.inspect().passes).toEqual([+ "layer/base/exposure",+ "layer/base/curves",+ ]);+ document.history.begin();+ setToneCurve(document);+ expect(renderer.outputImage()).toBe(adjusted);+ document.history.cancel();+ expect(renderer.inspect().passes).toEqual([+ "layer/base/exposure",+ "layer/base/curves",+ ]);+ draw();+ expect(calls.createRenderPipeline).toBe(pipelines);+ expect(notify).toHaveBeenCalledTimes(8);+ expect(late).toHaveBeenCalledTimes(1);+ detach();+ const beforeInput = document.scene.getState();+ const base = beforeInput.layers[0];+ document.edit({+ ...beforeInput,+ layers: [+ {+ ...base,+ children: [+ { ...createLayer("exposure"), id: "exposure" },+ ...base.children,+ ],+ },+ ],+ });+ await renderer.update(document.scene.getState(), "base");+ expect(renderer.inputImage("base")).toBeDefined();+ expect(renderer.inputImage("base")).not.toBe(renderer.outputImage());+ expect(renderer.inputImage("exposure")).toBeUndefined();+ expect(renderer.inspect().passes).toEqual([+ "layer/exposure/exposure",+ "layer/base/exposure",+ "layer/base/curves",+ ]);+ document.edit(beforeInput);+ expect(renderer.inputImage("base")).toBeUndefined();+ setAdjustments(document, { exposure: -1 });+ const scene = document.scene.getState();+ const [image, ...effects] = scene.layers;+ document.edit({+ ...scene,+ layers: [+ image,+ {+ ...createLayer("details"),+ details: { clarity: 50, sharpening: 100, sharpenRadius: 2 },+ },+ ...effects,+ ],+ });+ expect(notify).toHaveBeenCalledTimes(8);+ document.edit({+ ...document.scene.getState(),+ frame: {+ ...document.scene.getState().frame,+ size: [16, 8],+ angle: 10,+ },+ });+ const croppedOutput = renderer.outputImage();+ expect(croppedOutput.size).toEqual([16, 8]);+ renderer.dispose();+ expect(() => croppedOutput.color.view).toThrow("destroyed");+ expect(() => adjusted.color.view).toThrow("destroyed");+ expect(() => curved.color.view).toThrow("destroyed");+ expect(() => source.color.view).not.toThrow();+ } finally {+ unsubscribe();+ detach();+ renderer.dispose();+ document.dispose();+ resource.dispose();+ gpu.dispose();+ }});diff --git a/tests/rendering-benchmark.ts b/tests/rendering-benchmark.tsindex ca3e982..2505f15 100644--- a/tests/rendering-benchmark.ts+++ b/tests/rendering-benchmark.ts@@ -10,269 +10,269 @@ import { createHistogram } from "@/features/histogram/histogram";import { defaultCurve } from "@/features/tone-curves/curve";export type Workload =- | "neutral"- | "color-mixer"- | "vignette"- | "detail"- | "pipeline"- | "pipeline-input"- | "masked-exposure"- | "radial-exposure"- | "layer-stack";+ | "neutral"+ | "color-mixer"+ | "vignette"+ | "detail"+ | "pipeline"+ | "pipeline-input"+ | "masked-exposure"+ | "radial-exposure"+ | "layer-stack";function summarize(values: number[]) {- const sorted = values.toSorted((a, b) => a - b);- return {- samples: values,- median:- (sorted[Math.floor((sorted.length - 1) / 2)] +- sorted[Math.ceil((sorted.length - 1) / 2)]) /- 2,- p95: sorted[Math.ceil(sorted.length * 0.95) - 1],- };+ const sorted = values.toSorted((a, b) => a - b);+ return {+ samples: values,+ median:+ (sorted[Math.floor((sorted.length - 1) / 2)] ++ sorted[Math.ceil((sorted.length - 1) / 2)]) /+ 2,+ p95: sorted[Math.ceil(sorted.length * 0.95) - 1],+ };}/** Repeated processing of a resident texture; decoding, display, and export are outside timings. */export async function benchmarkRendering(- workload: Workload,- size: [number, number],- warmup: number,- samples: number,+ workload: Workload,+ size: [number, number],+ warmup: number,+ samples: number,) {- const adapter = await navigator.gpu.requestAdapter();- if (!adapter) {- throw new Error(- "No WebGPU adapter. Use the project's Playwright configuration.",- );- }- const timestamps = adapter.features.has("timestamp-query");- const gpu = await init({- requiredFeatures: timestamps ? ["timestamp-query"] : [],- });- const errors: Error[] = [];- gpu.onError((error) => errors.push(error));- const input = target(gpu, { size, format: "rgba16float" });- const source = createImageSource(input);- const clock = timestamps ? timer(gpu) : undefined;- const measurements: Record<string, number>[] = [];- clock?.onResults((results) => {- measurements.push(results);- });- const inputId = workload === "pipeline-input" ? "benchmark-image" : undefined;- const histogram = inputId ? createHistogram(gpu) : undefined;- const combined = workload === "pipeline" || workload === "pipeline-input";- const detail = combined || workload === "detail";- const effects: ProcessingLayer[] = [];- const common = { visible: true, opacity: 1, children: [] };- if (detail) {- effects.push({- ...common,- id: "benchmark-details",- name: "Details",- kind: "details",- details: { clarity: 50, sharpening: 75, sharpenRadius: 1 },- });- }- if (combined || workload === "color-mixer") {- effects.push({- ...common,- id: "benchmark-mixer",- name: "Color Mixer",- kind: "color-mixer",- colorMixer: {- hue: new Array<number>(8).fill(20),- saturation: new Array<number>(8).fill(25),- luminance: new Array<number>(8).fill(10),- },- });- }- if (- workload === "masked-exposure" ||- workload === "radial-exposure" ||- workload === "layer-stack"- ) {- const mask: Gradient =- workload === "radial-exposure"- ? {- kind: "radial",- center: [size[0] / 2, size[1] / 2],- radius: [size[0] * 0.3, size[1] * 0.35],- angle: 20,- feather: 0.5,- }- : {- kind: "linear",- start: [0, size[1] * 0.2],- end: [0, size[1] * 0.8],- };- effects.push({- ...common,- id: "benchmark-gradient",- name: "Gradient",- kind: "mask",- operation: "add",- adjustments: defaultAdjustments,- toneCurve: defaultCurve,- opacity: 0.75,- mask,- children: [- {- ...common,- id: "benchmark-exposure",- name: "Exposure",- kind: "exposure",- exposure: 1,- },- ],- });- }- if (combined || workload === "vignette" || workload === "layer-stack") {- effects.push({- ...common,- id: "benchmark-vignette",- name: "Vignette",- kind: "vignette",- opacity: workload === "layer-stack" ? 0.6 : 1,- vignette: { intensity: 80, softness: 60 },- });- }- const scene: Scene = {- frame: imageFrame(size),- layers: [- {- ...createImageLayer("benchmark", "Benchmark"),- id: "benchmark-image",- adjustments: {- ...defaultAdjustments,- exposure: 0.25,- contrast: 10,- },- toneCurve: combined- ? [- { x: 0, y: 0 },- { x: 0.5, y: 0.6 },- { x: 1, y: 1 },- ]- : defaultCurve,- },- ...effects,- ],- };- const setupStart = performance.now();- let renderer = createEditorRenderer(gpu, source);- const rendererSetupMs = performance.now() - setupStart;- async function measure() {- const encoding: number[] = [];- const completed: number[] = [];- const totals: number[] = [];- const nodes: Record<string, number[]> = {};- for (let i = 0; i < warmup + samples; i++) {- const start = performance.now();- await renderer.update(scene, inputId);- const inspected = inputId && renderer.inputImage(inputId);- if (inputId && !inspected) {- throw Error("Missing benchmark curve input.");- }- const reading = inspected && histogram?.read(inspected, true, 1);- const encoded = performance.now();- await gpu.gpu.queue.onSubmittedWorkDone();- const end = performance.now();- await reading;- await gpu.settled();- const spans = measurements.pop();- if (errors.length) {- throw errors[0];- }- if (i >= warmup) {- encoding.push(encoded - start);- completed.push(end - start);- if (spans) {- totals.push(Object.values(spans).reduce((sum, ms) => sum + ms, 0));- for (const [name, ms] of Object.entries(spans)) {- nodes[name] ??= [];- nodes[name].push(ms);- }- }- }- }- return {- cpuEncodeMs: summarize(encoding),- completedMs: summarize(completed),- gpuMs: totals.length ? summarize(totals) : null,- nodes: Object.fromEntries(- Object.entries(nodes).map(([name, values]) => [- name,- summarize(values),- ]),- ),- };- }- try {- // A deterministic linear Rec.2020 gradient spans saturated colors, neutrals, and HDR.- const fill = effect(- gpu,- `- @fragment fn fs_main(@builtin(position) p: vec4f) -> @location(0) vec4f {- let uv = p.xy / vec2f(${size[0]}.0, ${size[1]}.0);- let rgb = 0.5 + 0.5 * cos(uv.x * 6.2831853 + vec3f(0.0, -2.0943951, 2.0943951));- return vec4f(mix(vec3f(0.18), rgb * 2.0, uv.y), 1.0);- }`,- );- frame(gpu, (f) => f.pass(input, fill));- await gpu.gpu.queue.onSubmittedWorkDone();- const start = performance.now();- await renderer.update(scene, inputId);- await gpu.gpu.queue.onSubmittedWorkDone();- await gpu.settled();- const firstRenderMs = performance.now() - start;- const rendering = await measure();- const storage = renderer.inspect();- const pixels = await renderer.outputImage().readFloats();- if (!pixels.every(Number.isFinite)) {- throw new Error("Benchmark output contains non-finite pixels.");- }- const pixelHash = new Uint8Array(- await crypto.subtle.digest("SHA-256", pixels.slice()),- );- const blob = await encodeImage(gpu, renderer.outputImage(), {- longEdge: 960,- });- // Profile separately so timestamp queries/readback do not affect the latency comparison.- renderer.dispose();- renderer = createEditorRenderer(gpu, source, clock);- const profile = clock ? await measure() : null;- return {- workload,- size,- warmup,- samples,- timestamps,- adapter: {- vendor: adapter.info.vendor,- architecture: adapter.info.architecture,- device: adapter.info.device,- description: adapter.info.description,- },- rendererSetupMs,- firstRenderMs,- rendering,- profile,- storage,- pixelHash: [...pixelHash]- .map((value) => value.toString(16).padStart(2, "0"))- .join(""),- // All graph targets in these workloads are rgba16float. Source and driver memory excluded.- intermediateBytes: storage.textures.reduce(- (sum, { size }) => sum + size[0] * size[1] * 8,- 0,- ),- image: [...new Uint8Array(await blob.arrayBuffer())],- };- } finally {- histogram?.dispose();- renderer.dispose();- source.dispose();- clock?.dispose();- gpu.dispose();- }+ const adapter = await navigator.gpu.requestAdapter();+ if (!adapter) {+ throw new Error(+ "No WebGPU adapter. Use the project's Playwright configuration.",+ );+ }+ const timestamps = adapter.features.has("timestamp-query");+ const gpu = await init({+ requiredFeatures: timestamps ? ["timestamp-query"] : [],+ });+ const errors: Error[] = [];+ gpu.onError((error) => errors.push(error));+ const input = target(gpu, { size, format: "rgba16float" });+ const source = createImageSource(input);+ const clock = timestamps ? timer(gpu) : undefined;+ const measurements: Record<string, number>[] = [];+ clock?.onResults((results) => {+ measurements.push(results);+ });+ const inputId = workload === "pipeline-input" ? "benchmark-image" : undefined;+ const histogram = inputId ? createHistogram(gpu) : undefined;+ const combined = workload === "pipeline" || workload === "pipeline-input";+ const detail = combined || workload === "detail";+ const effects: ProcessingLayer[] = [];+ const common = { visible: true, opacity: 1, children: [] };+ if (detail) {+ effects.push({+ ...common,+ id: "benchmark-details",+ name: "Details",+ kind: "details",+ details: { clarity: 50, sharpening: 75, sharpenRadius: 1 },+ });+ }+ if (combined || workload === "color-mixer") {+ effects.push({+ ...common,+ id: "benchmark-mixer",+ name: "Color Mixer",+ kind: "color-mixer",+ colorMixer: {+ hue: new Array<number>(8).fill(20),+ saturation: new Array<number>(8).fill(25),+ luminance: new Array<number>(8).fill(10),+ },+ });+ }+ if (+ workload === "masked-exposure" ||+ workload === "radial-exposure" ||+ workload === "layer-stack"+ ) {+ const mask: Gradient =+ workload === "radial-exposure"+ ? {+ kind: "radial",+ center: [size[0] / 2, size[1] / 2],+ radius: [size[0] * 0.3, size[1] * 0.35],+ angle: 20,+ feather: 0.5,+ }+ : {+ kind: "linear",+ start: [0, size[1] * 0.2],+ end: [0, size[1] * 0.8],+ };+ effects.push({+ ...common,+ id: "benchmark-gradient",+ name: "Gradient",+ kind: "mask",+ operation: "add",+ adjustments: defaultAdjustments,+ toneCurve: defaultCurve,+ opacity: 0.75,+ mask,+ children: [+ {+ ...common,+ id: "benchmark-exposure",+ name: "Exposure",+ kind: "exposure",+ exposure: 1,+ },+ ],+ });+ }+ if (combined || workload === "vignette" || workload === "layer-stack") {+ effects.push({+ ...common,+ id: "benchmark-vignette",+ name: "Vignette",+ kind: "vignette",+ opacity: workload === "layer-stack" ? 0.6 : 1,+ vignette: { intensity: 80, softness: 60 },+ });+ }+ const scene: Scene = {+ frame: imageFrame(size),+ layers: [+ {+ ...createImageLayer("benchmark", "Benchmark"),+ id: "benchmark-image",+ adjustments: {+ ...defaultAdjustments,+ exposure: 0.25,+ contrast: 10,+ },+ toneCurve: combined+ ? [+ { x: 0, y: 0 },+ { x: 0.5, y: 0.6 },+ { x: 1, y: 1 },+ ]+ : defaultCurve,+ },+ ...effects,+ ],+ };+ const setupStart = performance.now();+ let renderer = createEditorRenderer(gpu, source);+ const rendererSetupMs = performance.now() - setupStart;+ async function measure() {+ const encoding: number[] = [];+ const completed: number[] = [];+ const totals: number[] = [];+ const nodes: Record<string, number[]> = {};+ for (let i = 0; i < warmup + samples; i++) {+ const start = performance.now();+ await renderer.update(scene, inputId);+ const inspected = inputId && renderer.inputImage(inputId);+ if (inputId && !inspected) {+ throw Error("Missing benchmark curve input.");+ }+ const reading = inspected && histogram?.read(inspected, true, 1);+ const encoded = performance.now();+ await gpu.gpu.queue.onSubmittedWorkDone();+ const end = performance.now();+ await reading;+ await gpu.settled();+ const spans = measurements.pop();+ if (errors.length) {+ throw errors[0];+ }+ if (i >= warmup) {+ encoding.push(encoded - start);+ completed.push(end - start);+ if (spans) {+ totals.push(Object.values(spans).reduce((sum, ms) => sum + ms, 0));+ for (const [name, ms] of Object.entries(spans)) {+ nodes[name] ??= [];+ nodes[name].push(ms);+ }+ }+ }+ }+ return {+ cpuEncodeMs: summarize(encoding),+ completedMs: summarize(completed),+ gpuMs: totals.length ? summarize(totals) : null,+ nodes: Object.fromEntries(+ Object.entries(nodes).map(([name, values]) => [+ name,+ summarize(values),+ ]),+ ),+ };+ }+ try {+ // A deterministic linear Rec.2020 gradient spans saturated colors, neutrals, and HDR.+ const fill = effect(+ gpu,+ `+ @fragment fn fs_main(@builtin(position) p: vec4f) -> @location(0) vec4f {+ let uv = p.xy / vec2f(${size[0]}.0, ${size[1]}.0);+ let rgb = 0.5 + 0.5 * cos(uv.x * 6.2831853 + vec3f(0.0, -2.0943951, 2.0943951));+ return vec4f(mix(vec3f(0.18), rgb * 2.0, uv.y), 1.0);+ }`,+ );+ frame(gpu, (f) => f.pass(input, fill));+ await gpu.gpu.queue.onSubmittedWorkDone();+ const start = performance.now();+ await renderer.update(scene, inputId);+ await gpu.gpu.queue.onSubmittedWorkDone();+ await gpu.settled();+ const firstRenderMs = performance.now() - start;+ const rendering = await measure();+ const storage = renderer.inspect();+ const pixels = await renderer.outputImage().readFloats();+ if (!pixels.every(Number.isFinite)) {+ throw new Error("Benchmark output contains non-finite pixels.");+ }+ const pixelHash = new Uint8Array(+ await crypto.subtle.digest("SHA-256", pixels.slice()),+ );+ const blob = await encodeImage(gpu, renderer.outputImage(), {+ longEdge: 960,+ });+ // Profile separately so timestamp queries/readback do not affect the latency comparison.+ renderer.dispose();+ renderer = createEditorRenderer(gpu, source, clock);+ const profile = clock ? await measure() : null;+ return {+ workload,+ size,+ warmup,+ samples,+ timestamps,+ adapter: {+ vendor: adapter.info.vendor,+ architecture: adapter.info.architecture,+ device: adapter.info.device,+ description: adapter.info.description,+ },+ rendererSetupMs,+ firstRenderMs,+ rendering,+ profile,+ storage,+ pixelHash: [...pixelHash]+ .map((value) => value.toString(16).padStart(2, "0"))+ .join(""),+ // All graph targets in these workloads are rgba16float. Source and driver memory excluded.+ intermediateBytes: storage.textures.reduce(+ (sum, { size }) => sum + size[0] * size[1] * 8,+ 0,+ ),+ image: [...new Uint8Array(await blob.arrayBuffer())],+ };+ } finally {+ histogram?.dispose();+ renderer.dispose();+ source.dispose();+ clock?.dispose();+ gpu.dispose();+ }}diff --git a/tests/rendering.bench.ts b/tests/rendering.bench.tsindex 7c81569..33e1115 100644--- a/tests/rendering.bench.ts+++ b/tests/rendering.bench.ts@@ -5,67 +5,67 @@ import { expect, test } from "./fixtures";import type { Workload } from "./rendering-benchmark";for (const workload of [- "neutral",- "color-mixer",- "vignette",- "detail",- "pipeline",- "pipeline-input",- "masked-exposure",- "radial-exposure",- "layer-stack",+ "neutral",+ "color-mixer",+ "vignette",+ "detail",+ "pipeline",+ "pipeline-input",+ "masked-exposure",+ "radial-exposure",+ "layer-stack",] as const) {- test(`rendering ${workload}`, async ({ page, browser }, info) => {- await page.goto("/tests/gpu.html");- const result = await page.evaluate(async (workload: Workload) => {- const path = "/tests/rendering-benchmark.ts";- const { benchmarkRendering } = (await import(- path- )) as typeof import("./rendering-benchmark");- return benchmarkRendering(workload, [2400, 1600], 8, 40);- }, workload);- const { image, ...timings } = result;- const report = {- revision: execFileSync("git", ["rev-parse", "HEAD"], {- encoding: "utf8",- }).trim(),- workingTreeChanged:- execFileSync("git", ["status", "--porcelain"], {- encoding: "utf8",- }).trim().length > 0,- browser: browser.version(),- platform: process.platform,- kernel: release(),- cpu: cpus()[0]?.model,- logicalCpus: cpus().length,- flags: info.project.use.launchOptions?.args,- ...timings,- };- expect(report.rendering.completedMs.samples).toHaveLength(report.samples);- if (report.timestamps) {- for (const name of report.storage.passes) {- expect(report.profile?.nodes[name]?.samples).toHaveLength(- report.samples,- );- }- }- await writeFile(- info.outputPath("timings.json"),- JSON.stringify(report, null, 2),- );- await writeFile(info.outputPath("render.png"), new Uint8Array(image));- await info.attach("render", {- path: info.outputPath("render.png"),- contentType: "image/png",- });- console.log(- JSON.stringify({- workload,- firstRenderMs: report.firstRenderMs,- completedMs: report.rendering.completedMs.median,- gpuMs: report.profile?.gpuMs?.median ?? null,- intermediateBytes: report.intermediateBytes,- }),- );- });+ test(`rendering ${workload}`, async ({ page, browser }, info) => {+ await page.goto("/tests/gpu.html");+ const result = await page.evaluate(async (workload: Workload) => {+ const path = "/tests/rendering-benchmark.ts";+ const { benchmarkRendering } = (await import(+ path+ )) as typeof import("./rendering-benchmark");+ return benchmarkRendering(workload, [2400, 1600], 8, 40);+ }, workload);+ const { image, ...timings } = result;+ const report = {+ revision: execFileSync("git", ["rev-parse", "HEAD"], {+ encoding: "utf8",+ }).trim(),+ workingTreeChanged:+ execFileSync("git", ["status", "--porcelain"], {+ encoding: "utf8",+ }).trim().length > 0,+ browser: browser.version(),+ platform: process.platform,+ kernel: release(),+ cpu: cpus()[0]?.model,+ logicalCpus: cpus().length,+ flags: info.project.use.launchOptions?.args,+ ...timings,+ };+ expect(report.rendering.completedMs.samples).toHaveLength(report.samples);+ if (report.timestamps) {+ for (const name of report.storage.passes) {+ expect(report.profile?.nodes[name]?.samples).toHaveLength(+ report.samples,+ );+ }+ }+ await writeFile(+ info.outputPath("timings.json"),+ JSON.stringify(report, null, 2),+ );+ await writeFile(info.outputPath("render.png"), new Uint8Array(image));+ await info.attach("render", {+ path: info.outputPath("render.png"),+ contentType: "image/png",+ });+ console.log(+ JSON.stringify({+ workload,+ firstRenderMs: report.firstRenderMs,+ completedMs: report.rendering.completedMs.median,+ gpuMs: report.profile?.gpuMs?.median ?? null,+ intermediateBytes: report.intermediateBytes,+ }),+ );+ });}diff --git a/tests/rendering.e2e.ts b/tests/rendering.e2e.tsindex 7c6d6c0..7552b10 100644--- a/tests/rendering.e2e.ts+++ b/tests/rendering.e2e.ts@@ -2,181 +2,181 @@ import { readFile } from "node:fs/promises";import { expect, test } from "./fixtures";function linear(value: number) {- const encoded = value / 255;- return encoded <= 0.04045- ? encoded / 12.92- : ((encoded + 0.055) / 1.055) ** 2.4;+ const encoded = value / 255;+ return encoded <= 0.04045+ ? encoded / 12.92+ : ((encoded + 0.055) / 1.055) ** 2.4;}test("tone adjustments preserve ramps, colors and alpha, compose, and reset", async ({- page,+ page,}) => {- await page.goto("/");- await page.waitForFunction(() => window.openlight);- const bytes = await readFile("tests/fixtures/tones.png");- const result = await page.evaluate(- async (bytes) => {- const api = window.openlight;- const file = new File([new Uint8Array(bytes)], "tones.png", {- type: "image/png",- });- await api.loadImage(file);- const defaults = api.getState().adjustments;- const canvas = new OffscreenCanvas(256, 128);- const context = canvas.getContext("2d");- if (!context) throw new Error("Cannot read tone chart.");- const read = async () => {- const image = await createImageBitmap(await api.exportImage());- context.clearRect(0, 0, 256, 128);- context.drawImage(image, 0, 0);- image.close();- return [...context.getImageData(0, 0, 256, 128).data];- };- const neutral = await read();- const outputs = [];- for (const change of [- {},- { whites: 100 },- { whites: -100 },- { blacks: -100 },- { blacks: 100 },- { whites: 100, blacks: -100 },- { whites: -100, blacks: 100 },- { highlights: -100 },- { highlights: -50 },- { highlights: 100 },- { shadows: 50 },- { shadows: 100 },- ]) {- api.setAdjustments({ ...defaults, ...change });- const pixels = await read();- outputs.push({- ramp: Array.from({ length: 256 }, (_, x) => pixels[x * 4]),- pastel: pixels.slice(126 * 256 * 4, 126 * 256 * 4 + 3),- patches: [64, 192].map((x) => pixels[(96 * 256 + x) * 4]),- colorEnds: [25, 255].map((x) =>- pixels.slice((125 * 256 + x) * 4, (125 * 256 + x) * 4 + 3),- ),- alphaMatches: pixels.every(- (value, i) => i % 4 !== 3 || value === neutral[i],- ),- grayMatches: pixels- .slice(0, 256 * 4)- .every(- (value, i) =>- i % 4 === 3 || Math.abs(value - pixels[i - (i % 4)]) <= 1,- ),- });- }- const prepared = {- ...defaults,- highlights: -75,- exposure: 0.4,- incrementalTemperature: 20,- incrementalTint: -12,- };- api.setAdjustments(prepared);- const edited = await read();- await api.loadImage(file);- api.setAdjustments(prepared);- const fresh = await read();- api.setAdjustments(defaults);- const reset = await read();- return {- outputs,- reloadMatches: edited.every((value, i) => value === fresh[i]),- resetMatches: neutral.every((value, i) => value === reset[i]),- };- },- [...bytes],- );- const [- original,- whiteClip,- whiteLower,- blackClip,- blackLift,- clipped,- compressed,- negative,- half,- positive,- halfShadows,- liftedShadows,- ] = result.outputs;- for (const output of result.outputs) {- expect(output.alphaMatches).toBe(true);- expect(output.grayMatches).toBe(true);- for (let x = 1; x < 256; x++) {- expect(output.ramp[x] - output.ramp[x - 1]).toBeGreaterThanOrEqual(-1);- expect(output.ramp[x] - output.ramp[x - 1]).toBeLessThanOrEqual(6);- }- }- for (const output of result.outputs.slice(0, 7))- expect(output.ramp[128]).toBe(128);- for (let x = 0; x < 256; x++) {- expect(original.ramp[x]).toBe(x);- if (x <= 127) {- expect(whiteClip.ramp[x]).toBe(x);- expect(whiteLower.ramp[x]).toBe(x);- } else {- expect(blackClip.ramp[x]).toBe(x);- expect(blackLift.ramp[x]).toBe(x);- }- expect(negative.ramp[x]).toBeLessThanOrEqual(half.ramp[x]);- expect(half.ramp[x]).toBeLessThanOrEqual(x);- expect(positive.ramp[x]).toBeGreaterThanOrEqual(x);- expect(halfShadows.ramp[x]).toBeGreaterThanOrEqual(x);- expect(halfShadows.ramp[x]).toBeLessThanOrEqual(liftedShadows.ramp[x]);- for (const [middle, full] of [- [half, negative],- [halfShadows, liftedShadows],- ]) {- expect(- Math.abs(- linear(middle.ramp[x]) - (linear(x) + linear(full.ramp[x])) / 2,- ),- ).toBeLessThan(0.01);- }- }- for (const output of [whiteClip, clipped]) {- expect(output.ramp[230]).toBe(255);- expect(output.colorEnds[1]).toEqual([255, 255, 255]);- }- for (const output of [blackClip, clipped]) {- expect(output.ramp[25]).toBe(0);- expect(output.colorEnds[0]).toEqual([0, 0, 0]);- }- for (const output of [blackLift, compressed]) {- expect(output.ramp[0]).toBeGreaterThanOrEqual(25);- expect(output.ramp[0]).toBeLessThanOrEqual(26);- }- for (const output of [whiteLower, compressed]) {- expect(output.ramp[255]).toBeGreaterThanOrEqual(229);- expect(output.ramp[255]).toBeLessThanOrEqual(230);- }- expect(original.patches).toEqual([240, 240]);- expect(negative.patches[0]).toBe(negative.patches[1]);- expect(negative.patches[0]).toBeLessThan(240);- expect(positive.patches[0]).toBe(positive.patches[1]);- expect(positive.patches[0]).toBeGreaterThan(240);- for (const output of [negative, half, positive, liftedShadows])- expect(output.ramp[0]).toBe(0);- expect(liftedShadows.ramp[255]).toBe(255);- expect(Math.abs(negative.pastel[0] - negative.pastel[2])).toBeLessThanOrEqual(- 1,- );- for (let channel = 0; channel < 3; channel++) {- expect(negative.pastel[channel]).toBeLessThan(original.pastel[channel]);- expect(- Math.abs(- linear(half.pastel[channel]) -- (linear(original.pastel[channel]) +- linear(negative.pastel[channel])) /- 2,- ),- ).toBeLessThan(0.01);- }- expect(result.reloadMatches).toBe(true);- expect(result.resetMatches).toBe(true);+ await page.goto("/");+ await page.waitForFunction(() => window.openlight);+ const bytes = await readFile("tests/fixtures/tones.png");+ const result = await page.evaluate(+ async (bytes) => {+ const api = window.openlight;+ const file = new File([new Uint8Array(bytes)], "tones.png", {+ type: "image/png",+ });+ await api.loadImage(file);+ const defaults = api.getState().adjustments;+ const canvas = new OffscreenCanvas(256, 128);+ const context = canvas.getContext("2d");+ if (!context) throw new Error("Cannot read tone chart.");+ const read = async () => {+ const image = await createImageBitmap(await api.exportImage());+ context.clearRect(0, 0, 256, 128);+ context.drawImage(image, 0, 0);+ image.close();+ return [...context.getImageData(0, 0, 256, 128).data];+ };+ const neutral = await read();+ const outputs = [];+ for (const change of [+ {},+ { whites: 100 },+ { whites: -100 },+ { blacks: -100 },+ { blacks: 100 },+ { whites: 100, blacks: -100 },+ { whites: -100, blacks: 100 },+ { highlights: -100 },+ { highlights: -50 },+ { highlights: 100 },+ { shadows: 50 },+ { shadows: 100 },+ ]) {+ api.setAdjustments({ ...defaults, ...change });+ const pixels = await read();+ outputs.push({+ ramp: Array.from({ length: 256 }, (_, x) => pixels[x * 4]),+ pastel: pixels.slice(126 * 256 * 4, 126 * 256 * 4 + 3),+ patches: [64, 192].map((x) => pixels[(96 * 256 + x) * 4]),+ colorEnds: [25, 255].map((x) =>+ pixels.slice((125 * 256 + x) * 4, (125 * 256 + x) * 4 + 3),+ ),+ alphaMatches: pixels.every(+ (value, i) => i % 4 !== 3 || value === neutral[i],+ ),+ grayMatches: pixels+ .slice(0, 256 * 4)+ .every(+ (value, i) =>+ i % 4 === 3 || Math.abs(value - pixels[i - (i % 4)]) <= 1,+ ),+ });+ }+ const prepared = {+ ...defaults,+ highlights: -75,+ exposure: 0.4,+ incrementalTemperature: 20,+ incrementalTint: -12,+ };+ api.setAdjustments(prepared);+ const edited = await read();+ await api.loadImage(file);+ api.setAdjustments(prepared);+ const fresh = await read();+ api.setAdjustments(defaults);+ const reset = await read();+ return {+ outputs,+ reloadMatches: edited.every((value, i) => value === fresh[i]),+ resetMatches: neutral.every((value, i) => value === reset[i]),+ };+ },+ [...bytes],+ );+ const [+ original,+ whiteClip,+ whiteLower,+ blackClip,+ blackLift,+ clipped,+ compressed,+ negative,+ half,+ positive,+ halfShadows,+ liftedShadows,+ ] = result.outputs;+ for (const output of result.outputs) {+ expect(output.alphaMatches).toBe(true);+ expect(output.grayMatches).toBe(true);+ for (let x = 1; x < 256; x++) {+ expect(output.ramp[x] - output.ramp[x - 1]).toBeGreaterThanOrEqual(-1);+ expect(output.ramp[x] - output.ramp[x - 1]).toBeLessThanOrEqual(6);+ }+ }+ for (const output of result.outputs.slice(0, 7))+ expect(output.ramp[128]).toBe(128);+ for (let x = 0; x < 256; x++) {+ expect(original.ramp[x]).toBe(x);+ if (x <= 127) {+ expect(whiteClip.ramp[x]).toBe(x);+ expect(whiteLower.ramp[x]).toBe(x);+ } else {+ expect(blackClip.ramp[x]).toBe(x);+ expect(blackLift.ramp[x]).toBe(x);+ }+ expect(negative.ramp[x]).toBeLessThanOrEqual(half.ramp[x]);+ expect(half.ramp[x]).toBeLessThanOrEqual(x);+ expect(positive.ramp[x]).toBeGreaterThanOrEqual(x);+ expect(halfShadows.ramp[x]).toBeGreaterThanOrEqual(x);+ expect(halfShadows.ramp[x]).toBeLessThanOrEqual(liftedShadows.ramp[x]);+ for (const [middle, full] of [+ [half, negative],+ [halfShadows, liftedShadows],+ ]) {+ expect(+ Math.abs(+ linear(middle.ramp[x]) - (linear(x) + linear(full.ramp[x])) / 2,+ ),+ ).toBeLessThan(0.01);+ }+ }+ for (const output of [whiteClip, clipped]) {+ expect(output.ramp[230]).toBe(255);+ expect(output.colorEnds[1]).toEqual([255, 255, 255]);+ }+ for (const output of [blackClip, clipped]) {+ expect(output.ramp[25]).toBe(0);+ expect(output.colorEnds[0]).toEqual([0, 0, 0]);+ }+ for (const output of [blackLift, compressed]) {+ expect(output.ramp[0]).toBeGreaterThanOrEqual(25);+ expect(output.ramp[0]).toBeLessThanOrEqual(26);+ }+ for (const output of [whiteLower, compressed]) {+ expect(output.ramp[255]).toBeGreaterThanOrEqual(229);+ expect(output.ramp[255]).toBeLessThanOrEqual(230);+ }+ expect(original.patches).toEqual([240, 240]);+ expect(negative.patches[0]).toBe(negative.patches[1]);+ expect(negative.patches[0]).toBeLessThan(240);+ expect(positive.patches[0]).toBe(positive.patches[1]);+ expect(positive.patches[0]).toBeGreaterThan(240);+ for (const output of [negative, half, positive, liftedShadows])+ expect(output.ramp[0]).toBe(0);+ expect(liftedShadows.ramp[255]).toBe(255);+ expect(Math.abs(negative.pastel[0] - negative.pastel[2])).toBeLessThanOrEqual(+ 1,+ );+ for (let channel = 0; channel < 3; channel++) {+ expect(negative.pastel[channel]).toBeLessThan(original.pastel[channel]);+ expect(+ Math.abs(+ linear(half.pastel[channel]) -+ (linear(original.pastel[channel]) ++ linear(negative.pastel[channel])) /+ 2,+ ),+ ).toBeLessThan(0.01);+ }+ expect(result.reloadMatches).toBe(true);+ expect(result.resetMatches).toBe(true);});diff --git a/tests/setup.ts b/tests/setup.tsindex 1e2ad67..34f7b94 100644--- a/tests/setup.ts+++ b/tests/setup.ts@@ -5,11 +5,11 @@ import { plugin } from "bun";Object.assign(globalThis, { DOMParser });await plugin({- name: "wgsl",- setup(build) {- build.onLoad({ filter: /\.wgsl$/ }, async ({ path }) => ({- contents: (await transformWgsl(await Bun.file(path).text(), path)).code,- loader: "js",- }));- },+ name: "wgsl",+ setup(build) {+ build.onLoad({ filter: /\.wgsl$/ }, async ({ path }) => ({+ contents: (await transformWgsl(await Bun.file(path).text(), path)).code,+ loader: "js",+ }));+ },});diff --git a/tests/tiff.e2e.ts b/tests/tiff.e2e.tsindex 95e76c9..45214b8 100644--- a/tests/tiff.e2e.ts+++ b/tests/tiff.e2e.ts@@ -5,82 +5,82 @@ import { readImage } from "./images";const directory = "tests/fixtures";test("TIFF files open through the loader with their color, orientation, headroom, alpha, and error recovery", async ({- page,+ page,}) => {- await page.goto("/");- await page.waitForFunction(() => window.openlight);- const load = async (name: string) => {- const bytes = [...(await readFile(`${directory}/${name}`))];- await page.evaluate(- ({ bytes, name }) =>- window.openlight.loadImage(new File([new Uint8Array(bytes)], name)),- { bytes, name },- );- };- // A gray profile file exported back to sRGB returns its encoded value: 16384 of 65535 is 64 of 255.- await load("gray16-para.tif");- const gray = await readImage(page);- expect(gray.size).toEqual([7, 5]);- for (const value of gray.center.slice(0, 3)) {- expect(Math.abs(value - 64)).toBeLessThanOrEqual(1);- }- await load("orientation-6.tif");- expect((await readImage(page)).size).toEqual([17, 19]);- // Row 1 of the float file holds linear 1, 2, and 4 at x = 4..6: all clip at first, then separate at -2 stops.- await load("float32-be.tif");- const row = () =>- 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 exported image.");- context.drawImage(image, 0, 0);- image.close();- return [...context.getImageData(0, 1, 7, 1).data].filter(- (_, i) => i % 4 === 0,- );- });- expect((await row()).slice(4)).toEqual([255, 255, 255]);- await page.evaluate(() => window.openlight.setAdjustments({ exposure: -2 }));- const recovered = await row();- expect(recovered[4]).toBeLessThan(150);- expect(recovered[5]).toBeGreaterThan(recovered[4]);- expect(recovered[6]).toBeGreaterThan(240);- // The blue pixel brightens without losing its hue, then approaches white.- await load("blue-float.tif");- const colors = [];- for (const exposure of [0, 2, 5]) {- await page.evaluate(- (exposure) => window.openlight.setAdjustments({ exposure }),- exposure,- );- colors.push((await readImage(page)).center.slice(0, 3));- }- for (const rgb of colors.slice(0, 2)) {- expect(rgb[2] - Math.max(rgb[0], rgb[1])).toBeGreaterThan(20);- }- const brightness = colors.map((rgb) =>- rgb.reduce((sum, value) => sum + value, 0),- );- expect(brightness[1]).toBeGreaterThan(brightness[0]);- const white = colors[2];- expect(Math.min(...white)).toBeGreaterThan(240);- expect(Math.max(...white) - Math.min(...white)).toBeLessThan(10);- await load("rgb8-jpeg.tif");- await expect(- page.getByText("Couldn't open rgb8-jpeg.tif:", { exact: false }),- ).toBeVisible();- // Recover in the same session after the package rejects an unsupported TIFF.- await load("alpha16.tif");- const alpha = await readImage(page);- expect(alpha.size).toEqual([7, 5]);- // Export composites 50% alpha over the editor's 0.09 display background.- for (const [i, expected] of [43, 75, 107, 255].entries()) {- expect(Math.abs(alpha.center[i] - expected)).toBeLessThanOrEqual(1);- }- await expect(- page.getByText("Couldn't open rgb8-jpeg.tif:", { exact: false }),- ).toBeHidden();+ await page.goto("/");+ await page.waitForFunction(() => window.openlight);+ const load = async (name: string) => {+ const bytes = [...(await readFile(`${directory}/${name}`))];+ await page.evaluate(+ ({ bytes, name }) =>+ window.openlight.loadImage(new File([new Uint8Array(bytes)], name)),+ { bytes, name },+ );+ };+ // A gray profile file exported back to sRGB returns its encoded value: 16384 of 65535 is 64 of 255.+ await load("gray16-para.tif");+ const gray = await readImage(page);+ expect(gray.size).toEqual([7, 5]);+ for (const value of gray.center.slice(0, 3)) {+ expect(Math.abs(value - 64)).toBeLessThanOrEqual(1);+ }+ await load("orientation-6.tif");+ expect((await readImage(page)).size).toEqual([17, 19]);+ // Row 1 of the float file holds linear 1, 2, and 4 at x = 4..6: all clip at first, then separate at -2 stops.+ await load("float32-be.tif");+ const row = () =>+ 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 exported image.");+ context.drawImage(image, 0, 0);+ image.close();+ return [...context.getImageData(0, 1, 7, 1).data].filter(+ (_, i) => i % 4 === 0,+ );+ });+ expect((await row()).slice(4)).toEqual([255, 255, 255]);+ await page.evaluate(() => window.openlight.setAdjustments({ exposure: -2 }));+ const recovered = await row();+ expect(recovered[4]).toBeLessThan(150);+ expect(recovered[5]).toBeGreaterThan(recovered[4]);+ expect(recovered[6]).toBeGreaterThan(240);+ // The blue pixel brightens without losing its hue, then approaches white.+ await load("blue-float.tif");+ const colors = [];+ for (const exposure of [0, 2, 5]) {+ await page.evaluate(+ (exposure) => window.openlight.setAdjustments({ exposure }),+ exposure,+ );+ colors.push((await readImage(page)).center.slice(0, 3));+ }+ for (const rgb of colors.slice(0, 2)) {+ expect(rgb[2] - Math.max(rgb[0], rgb[1])).toBeGreaterThan(20);+ }+ const brightness = colors.map((rgb) =>+ rgb.reduce((sum, value) => sum + value, 0),+ );+ expect(brightness[1]).toBeGreaterThan(brightness[0]);+ const white = colors[2];+ expect(Math.min(...white)).toBeGreaterThan(240);+ expect(Math.max(...white) - Math.min(...white)).toBeLessThan(10);+ await load("rgb8-jpeg.tif");+ await expect(+ page.getByText("Couldn't open rgb8-jpeg.tif:", { exact: false }),+ ).toBeVisible();+ // Recover in the same session after the package rejects an unsupported TIFF.+ await load("alpha16.tif");+ const alpha = await readImage(page);+ expect(alpha.size).toEqual([7, 5]);+ // Export composites 50% alpha over the editor's 0.09 display background.+ for (const [i, expected] of [43, 75, 107, 255].entries()) {+ expect(Math.abs(alpha.center[i] - expected)).toBeLessThanOrEqual(1);+ }+ await expect(+ page.getByText("Couldn't open rgb8-jpeg.tif:", { exact: false }),+ ).toBeHidden();});diff --git a/tests/tiff.test.ts b/tests/tiff.test.tsindex 296ccc3..1449e72 100644--- a/tests/tiff.test.ts+++ b/tests/tiff.test.ts@@ -6,49 +6,49 @@ const decode = mock();mock.module("raw-webgpu", () => ({ decodeTiff: decode }));test("TIFF transfer releases package pixels and owns or cleans up its destination", async () => {- const gpu = await init();- const input = target(gpu, { size: [7, 5], format: "rgba16float" });- const disposed: (typeof input.color)[] = [];- const disposeTexture = input.color.dispose;- const cleanup = spyOn(- Object.getPrototypeOf(input.color),- "dispose",- ).mockImplementation(function (this: typeof input.color) {- disposed.push(this);- disposeTexture.call(this);- });- const submit = spyOn(gpu.gpu.queue, "submit");- try {- for (const fail of [false, true]) {- disposed.length = 0;- const dispose = mock(() => {});- decode.mockResolvedValueOnce({- texture: input.color.gpu,- size: input.size,- dispose,- });- if (fail) {- submit.mockImplementationOnce(() => {- throw Error("Transfer failed");- });- }- const loading = decodeTiff(gpu, new File([], "photo.tif"));- if (fail) {- await expect(loading).rejects.toThrow("Transfer failed");- } else {- const source = await loading;- expect(disposed).toHaveLength(0);- expect(() => source.image.color.view).not.toThrow();- source.dispose();- }- expect(dispose).toHaveBeenCalledTimes(1);- expect(disposed).toHaveLength(1);- expect(() => disposed[0].view).toThrow("destroyed");- }- } finally {- cleanup.mockRestore();- submit.mockRestore();- input.color.dispose();- gpu.dispose();- }+ const gpu = await init();+ const input = target(gpu, { size: [7, 5], format: "rgba16float" });+ const disposed: (typeof input.color)[] = [];+ const disposeTexture = input.color.dispose;+ const cleanup = spyOn(+ Object.getPrototypeOf(input.color),+ "dispose",+ ).mockImplementation(function (this: typeof input.color) {+ disposed.push(this);+ disposeTexture.call(this);+ });+ const submit = spyOn(gpu.gpu.queue, "submit");+ try {+ for (const fail of [false, true]) {+ disposed.length = 0;+ const dispose = mock(() => {});+ decode.mockResolvedValueOnce({+ texture: input.color.gpu,+ size: input.size,+ dispose,+ });+ if (fail) {+ submit.mockImplementationOnce(() => {+ throw Error("Transfer failed");+ });+ }+ const loading = decodeTiff(gpu, new File([], "photo.tif"));+ if (fail) {+ await expect(loading).rejects.toThrow("Transfer failed");+ } else {+ const source = await loading;+ expect(disposed).toHaveLength(0);+ expect(() => source.image.color.view).not.toThrow();+ source.dispose();+ }+ expect(dispose).toHaveBeenCalledTimes(1);+ expect(disposed).toHaveLength(1);+ expect(() => disposed[0].view).toThrow("destroyed");+ }+ } finally {+ cleanup.mockRestore();+ submit.mockRestore();+ input.color.dispose();+ gpu.dispose();+ }});diff --git a/tests/vignette.e2e.ts b/tests/vignette.e2e.tsindex 85895f1..7563426 100644--- a/tests/vignette.e2e.ts+++ b/tests/vignette.e2e.ts@@ -2,52 +2,52 @@ import { expect, test } from "./fixtures";import { readImage } from "./images";test("vignette darkens a white image's edges, softens, undoes and disables", async ({- page,+ page,}) => {- await page.goto("/");- await page.locator('input[type="file"]').setInputFiles({- name: "white.svg",- mimeType: "image/svg+xml",- buffer: Buffer.from(- '<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><rect width="128" height="128" fill="white"/></svg>',- ),- });- await page.getByRole("button", { name: "Add effect", exact: true }).click();- await page- .locator("[popover]:popover-open")- .getByRole("button", { name: "Vignette", exact: true })- .click();- const intensity = page.getByRole("textbox", {- name: "Intensity",- exact: true,- });- await intensity.fill("0");- await intensity.press("Enter");- const exportBytes = () =>- page.evaluate(async () => [- ...new Uint8Array(- await (await window.openlight.exportImage()).arrayBuffer(),- ),- ]);- const original = await exportBytes();+ await page.goto("/");+ await page.locator('input[type="file"]').setInputFiles({+ name: "white.svg",+ mimeType: "image/svg+xml",+ buffer: Buffer.from(+ '<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><rect width="128" height="128" fill="white"/></svg>',+ ),+ });+ await page.getByRole("button", { name: "Add effect", exact: true }).click();+ await page+ .locator("[popover]:popover-open")+ .getByRole("button", { name: "Vignette", exact: true })+ .click();+ const intensity = page.getByRole("textbox", {+ name: "Intensity",+ exact: true,+ });+ await intensity.fill("0");+ await intensity.press("Enter");+ const exportBytes = () =>+ page.evaluate(async () => [+ ...new Uint8Array(+ await (await window.openlight.exportImage()).arrayBuffer(),+ ),+ ]);+ const original = await exportBytes();- await intensity.fill("80");- await intensity.press("Enter");- const vignetted = await readImage(page);- expect(vignetted.center).toEqual([255, 255, 255, 255]);- expect(vignetted.corner[0]).toBeLessThan(255);+ await intensity.fill("80");+ await intensity.press("Enter");+ const vignetted = await readImage(page);+ expect(vignetted.center).toEqual([255, 255, 255, 255]);+ expect(vignetted.corner[0]).toBeLessThan(255);- const softness = page.getByRole("textbox", { name: "Softness", exact: true });- await softness.fill("100");- await softness.press("Enter");- const softer = await readImage(page);- expect(softer.center).toEqual(vignetted.center);- expect(softer.corner[0]).toBeLessThan(vignetted.corner[0]);+ const softness = page.getByRole("textbox", { name: "Softness", exact: true });+ await softness.fill("100");+ await softness.press("Enter");+ const softer = await readImage(page);+ expect(softer.center).toEqual(vignetted.center);+ expect(softer.corner[0]).toBeLessThan(vignetted.corner[0]);- await page.getByRole("button", { name: "Undo", exact: true }).click();- expect(await readImage(page)).toEqual(vignetted);+ await page.getByRole("button", { name: "Undo", exact: true }).click();+ expect(await readImage(page)).toEqual(vignetted);- await intensity.fill("0");- await intensity.press("Enter");- expect(await exportBytes()).toEqual(original);+ await intensity.fill("0");+ await intensity.press("Enter");+ expect(await exportBytes()).toEqual(original);});diff --git a/tsconfig.json b/tsconfig.jsonindex 6c61b69..816ca13 100644--- a/tsconfig.json+++ b/tsconfig.json@@ -1,18 +1,18 @@{- "compilerOptions": {- "target": "ES2023",- "lib": ["ES2023", "DOM"],- "types": ["node", "bun"],- "module": "ESNext",- "moduleResolution": "bundler",- "jsx": "react-jsx",- "strict": true,- "noEmit": true,- "skipLibCheck": true,- "isolatedModules": true,- "paths": {- "@/*": ["./src/*"]- }- },- "include": ["src", "tests"]+ "compilerOptions": {+ "target": "ES2023",+ "lib": ["ES2023", "DOM"],+ "types": ["node", "bun"],+ "module": "ESNext",+ "moduleResolution": "bundler",+ "jsx": "react-jsx",+ "strict": true,+ "noEmit": true,+ "skipLibCheck": true,+ "isolatedModules": true,+ "paths": {+ "@/*": ["./src/*"]+ }+ },+ "include": ["src", "tests"]}diff --git a/vite.config.ts b/vite.config.tsindex 93444f6..680e1ec 100644--- a/vite.config.ts+++ b/vite.config.ts@@ -3,6 +3,6 @@ import { wgslVitePlugin } from "@vgpu/wgsl/loader-vite";import react from "@vitejs/plugin-react";export default {- plugins: [react(), tailwindcss(), wgslVitePlugin()],- resolve: { alias: { "@": "/src" } },+ plugins: [react(), tailwindcss(), wgslVitePlugin()],+ resolve: { alias: { "@": "/src" } },};