@pixerate/editor 0.187.0 → 0.188.0

package/dist/image-editor/index.js

@@ -298,6 +298,8 @@ import {
   selectionArea,
   selectionFromCoverage,
   selectionFromPixels,
+  selectionFromRegion,
+  selectionFromTiles,
   selectionToCoverage,
   selectionToPixels,
   selectionValueAt,
@@ -370,7 +372,7 @@ import {
   writePsd,
   xyToTempTint,
   xyToUv
-} from "../chunk-FW7N64XK.js";
+} from "../chunk-IGMNJM2H.js";
 import {
   parseCssColor
 } from "../chunk-3CI7FRMK.js";
@@ -2835,8 +2837,33 @@ var TypeToolGesture = class {
 
 // src/image-editor/selection/shapes.ts
 function polygonCoverage(points, width, height, antiAlias = true) {
+  const { box, coverage } = polygonCoverageBox(points, width, height, antiAlias);
+  if (!box || box.width === width && box.height === height) return box ? coverage : new Float32Array(width * height);
   const m = new Float32Array(width * height);
-  if (points.length < 3 || width <= 0 || height <= 0) return m;
+  for (let y = 0; y < box.height; y++) m.set(coverage.subarray(y * box.width, (y + 1) * box.width), (box.y + y) * width + box.x);
+  return m;
+}
+function polygonCoverageBox(points, width, height, antiAlias = true) {
+  const none = { box: null, coverage: new Float32Array(0) };
+  if (points.length < 3 || width <= 0 || height <= 0) return none;
+  let minX = Infinity;
+  let minY = Infinity;
+  let maxX = -Infinity;
+  let maxY = -Infinity;
+  for (const p of points) {
+    if (!Number.isFinite(p.x) || !Number.isFinite(p.y)) continue;
+    minX = Math.min(minX, p.x);
+    minY = Math.min(minY, p.y);
+    maxX = Math.max(maxX, p.x);
+    maxY = Math.max(maxY, p.y);
+  }
+  const bx0 = Math.max(0, Math.floor(minX));
+  const by0 = Math.max(0, Math.floor(minY));
+  const bx1 = Math.min(width, Math.ceil(maxX));
+  const by1 = Math.min(height, Math.ceil(maxY));
+  if (!(bx1 > bx0 && by1 > by0)) return none;
+  const bw = bx1 - bx0;
+  const m = new Float32Array(bw * (by1 - by0));
   const sub2 = antiAlias ? 4 : 1;
   const edges = [];
   for (let i = 0; i < points.length; i++) {
@@ -2850,8 +2877,8 @@ function polygonCoverage(points, width, height, antiAlias = true) {
   let next = 0;
   let active = [];
   const xs = [];
-  for (let py = 0; py < height; py++) {
-    const row = py * width;
+  for (let py = by0; py < by1; py++) {
+    const row = (py - by0) * bw - bx0;
     for (let s = 0; s < sub2; s++) {
       const y = py + (s + 0.5) / sub2;
       while (next < edges.length && edges[next].top <= y) active.push(edges[next++]);
@@ -2881,15 +2908,14 @@ function polygonCoverage(points, width, height, antiAlias = true) {
     }
   }
   for (let i = 0; i < m.length; i++) if (m[i] > 1) m[i] = 1;
-  return m;
+  return { box: { x: bx0, y: by0, width: bw, height: by1 - by0 }, coverage: m };
 }
-function toMask(width, height, coverage) {
+function polygonSelection(width, height, points, options = {}) {
+  const { box, coverage } = polygonCoverageBox(points, width, height, options.antiAlias ?? true);
+  if (!box) return createSelectionMask(width, height);
   const out = new Uint8Array(coverage.length);
   for (let i = 0; i < out.length; i++) out[i] = coverageToByte(coverage[i]);
-  return createSelectionMask(width, height, out);
-}
-function polygonSelection(width, height, points, options = {}) {
-  return toMask(width, height, polygonCoverage(points, width, height, options.antiAlias ?? true));
+  return selectionFromRegion(width, height, box, out);
 }
 function normalizeRect(rect) {
   const x = rect.width < 0 ? rect.x + rect.width : rect.x;
@@ -3531,9 +3557,7 @@ function selectionRing(sel, width, location) {
 var DEFAULT_CHANNEL_COLOR = "#ff0000";
 function describeChannel(channel) {
   const { mask, ...rest } = channel;
-  let sum = 0;
-  for (let i = 0; i < mask.data.length; i++) sum += mask.data[i];
-  const percent = Math.round(sum / 255 / Math.max(1, mask.data.length) * 1e4) / 100;
+  const percent = Math.round(selectionArea(mask) / Math.max(1, mask.width * mask.height) * 1e4) / 100;
   return { ...rest, bounds: mask.bounds, percent };
 }
 function serializeChannels(channels) {
@@ -4144,8 +4168,7 @@ var FreeTransformSession = class {
       const result = part.base ? compositeSurfaceOver(part.base, moved) : moved;
       if (part.what === "selection") {
         const { width, height } = this.host.canvas();
-        const data = new Uint8Array(readRegion(result, { x: 0, y: 0, width, height }).buffer);
-        const next = createSelectionMask(width, height, data);
+        const next = selectionFromTiles(width, height, result);
         selection = next.bounds ? next : null;
       } else if (part.what === "pixels") {
         layers = mapLayer(layers, targetId, (l) => {
@@ -5471,14 +5494,18 @@ var ImageEditorController = class {
     this.trimHistoryBytes();
   }
   /**
-   * Bytes of pixel tiles held only by undo / redo steps (not by the current state). The oldest
-   * undo steps are dropped while it exceeds `maxHistoryBytes`.
+   * Bytes of pixel, selection and channel tiles held only by undo / redo steps (not by the
+   * current state). The oldest undo steps are dropped while it exceeds `maxHistoryBytes`.
    */
   get historyBytes() {
     const live = /* @__PURE__ */ new Set();
     collectStateTiles(this.state.layers, live);
+    collectSelectionTiles(this.state.selection, this.state.channels, live);
     const held = /* @__PURE__ */ new Set();
-    for (const e of [...this.undoStack, ...this.redoStack]) collectStateTiles(e.layers, held);
+    for (const e of [...this.undoStack, ...this.redoStack]) {
+      collectStateTiles(e.layers, held);
+      collectSelectionTiles(e.selection, e.channels, held);
+    }
     let n = 0;
     for (const t of held) if (!live.has(t)) n += t.data.byteLength;
     return n;
@@ -7376,7 +7403,7 @@ var ImageEditorController = class {
   /** @internal Shows a stroke's live surface (no history). */
   _strokeUpdate(layerId, channel, surface, rects) {
     if (channel === "quick-mask") {
-      this.state.selection = this.selectionFromSurface(surface, this.state.selection ?? null, rects);
+      this.state.selection = this.selectionFromSurface(surface);
       this.notify();
       return;
     }
@@ -8454,35 +8481,18 @@ var ImageEditorController = class {
     const { width, height } = this.naturalSize;
     const sel = this.state.selection;
     if (!sel?.bounds) return emptySurface(1, 0);
-    const sized = sel.width === width && sel.height === height ? sel : resizeSelection(sel, width, height);
-    return surfaceFromPixels({ width, height, data: sized.data }, 1, 0, 0, 0);
+    return (sel.width === width && sel.height === height ? sel : resizeSelection(sel, width, height)).surface;
   }
-  /** The selection a painted Quick Mask surface stands for (`rects` changed since `base`). */
-  selectionFromSurface(surface, base = null, rects) {
+  /** The selection a painted Quick Mask surface stands for (it shares the surface's tiles). */
+  selectionFromSurface(surface) {
     const { width, height } = this.naturalSize;
-    let data;
-    if (base && rects && base.width === width && base.height === height) {
-      data = new Uint8Array(base.data);
-      for (const r of rects) {
-        const x0 = Math.max(0, Math.floor(r.x));
-        const y0 = Math.max(0, Math.floor(r.y));
-        const x1 = Math.min(width, Math.ceil(r.x + r.width));
-        const y1 = Math.min(height, Math.ceil(r.y + r.height));
-        if (x1 <= x0 || y1 <= y0) continue;
-        const part = readRegion(surface, { x: x0, y: y0, width: x1 - x0, height: y1 - y0 });
-        for (let y = y0; y < y1; y++) data.set(part.subarray((y - y0) * (x1 - x0), (y - y0 + 1) * (x1 - x0)), y * width + x0);
-      }
-    } else {
-      const all = readRegion(surface, { x: 0, y: 0, width, height });
-      data = new Uint8Array(all.buffer, all.byteOffset, all.length);
-    }
-    return normalizeSelection(createSelectionMask(width, height, data));
+    return normalizeSelection(selectionFromTiles(width, height, surface));
   }
   // --- Layer masks ---
   maskFromSelection(sel, props = {}) {
     const { width, height } = this.naturalSize;
     const sized = sel.width === width && sel.height === height ? sel : resizeSelection(sel, width, height);
-    const mask = { surface: surfaceFromPixels({ width, height, data: sized.data }, 1, 0, 0, 0), defaultValue: 0 };
+    const mask = { surface: sized.surface, defaultValue: 0 };
     return withMaskProps(mask, props);
   }
   /**
@@ -10154,6 +10164,10 @@ function isOpaqueInside(surface, width, height) {
   }
   return true;
 }
+function collectSelectionTiles(selection, channels, into) {
+  if (selection) collectTiles(selection.surface, into);
+  for (const c of channels ?? []) collectTiles(c.mask.surface, into);
+}
 function collectStateTiles(layers, into) {
   for (const l of flattenLayers(layers)) {
     if (l.type === "pixel" && l.source !== "document") collectTiles(l.surface, into);
@@ -11063,9 +11077,7 @@ var REFINE_EDGE_CONTROLS = [
 ];
 function describeSelection(mask) {
   if (!mask || !mask.bounds) return "No selection";
-  let sum = 0;
-  for (let i = 0; i < mask.data.length; i++) sum += mask.data[i];
-  const pct2 = sum / 255 / mask.data.length * 100;
+  const pct2 = selectionArea(mask) / (mask.width * mask.height) * 100;
   const shown = pct2 >= 10 ? Math.round(pct2) : Math.round(pct2 * 10) / 10;
   return `${mask.bounds.width} \xD7 ${mask.bounds.height} px selected (${shown}% of the image)`;
 }
@@ -18410,6 +18422,7 @@ export {
   pointerStrokeSample,
   pointerStrokeSamples,
   polygonCoverage,
+  polygonCoverageBox,
   polygonSelection,
   posterizeValue,
   presetWarp,
@@ -18509,6 +18522,8 @@ export {
   selectionArea,
   selectionFromCoverage,
   selectionFromPixels,
+  selectionFromRegion,
+  selectionFromTiles,
   selectionModeFromModifiers,
   selectionOutline,
   selectionRing,

package/dist/image-editor/selection/mask.d.cts

@@ -1,11 +1,17 @@
 import type { CropBox } from '../types.cjs';
+import { TiledSurface } from '../../raster/surface.cjs';
 /**
  * A selection: one 8-bit coverage value per image pixel (0 = not selected, 255 = fully
  * selected), row-major over the whole source image in natural pixels — the same space as the
  * crop box and annotations. Soft values are partial selection (feathered or anti-aliased edges).
  *
+ * The coverage is stored as 256 × 256 tiles (`surface`, one byte per pixel, missing tiles are 0
+ * and every pixel outside the image is 0), so an empty or fully selected area costs nothing and
+ * masks share the tiles an operation did not change. `data` is the same coverage as one array,
+ * built on first read and cached for the few masks read most recently.
+ *
  * Treat a mask as immutable: every operation returns a new one, so history entries can share
- * them without copying.
+ * them without copying. Never write to `data`.
  */
 export interface SelectionMask {
     readonly width: number;
@@ -13,6 +19,8 @@ export interface SelectionMask {
     readonly data: Uint8Array;
     /** Bounding box of the non-zero coverage, or `null` when nothing is selected. */
     readonly bounds: CropBox | null;
+    /** The coverage as tiles (1 channel, default 0), shared with other masks where equal. */
+    readonly surface: TiledSurface;
 }
 /** How a new selection combines with the current one. */
 export type SelectionMode = 'replace' | 'add' | 'subtract' | 'intersect';
@@ -35,8 +43,19 @@ export interface SerializedSelection {
 }
 /** Bounding box of non-zero bytes. */
 export declare function computeSelectionBounds(width: number, height: number, data: ArrayLike<number>): CropBox | null;
+/**
+ * A selection over `width × height` from a 1-channel tiled surface in image space (Quick Mask
+ * paint, a mask): its tiles are shared, and coverage outside the image is dropped. A surface
+ * whose default is not 0 is read out instead.
+ */
+export declare function selectionFromTiles(width: number, height: number, surface: TiledSurface): SelectionMask;
 /** Wraps coverage bytes (taken over, not copied) as a selection, computing its bounds. */
 export declare function createSelectionMask(width: number, height: number, data?: Uint8Array): SelectionMask;
+/**
+ * A selection that is `data` (`rect.width × rect.height` coverage bytes) inside `rect` and
+ * nothing elsewhere, without allocating the whole image. `rect` must lie inside the image.
+ */
+export declare function selectionFromRegion(width: number, height: number, rect: CropBox, data: ArrayLike<number>): SelectionMask;
 /** Select › All. */
 export declare function fullSelection(width: number, height: number): SelectionMask;
 export declare function isSelectionEmpty(mask: SelectionMask | null | undefined): boolean;

package/dist/image-editor/selection/mask.d.ts

@@ -1,11 +1,17 @@
 import type { CropBox } from '../types.js';
+import { TiledSurface } from '../../raster/surface.js';
 /**
  * A selection: one 8-bit coverage value per image pixel (0 = not selected, 255 = fully
  * selected), row-major over the whole source image in natural pixels — the same space as the
  * crop box and annotations. Soft values are partial selection (feathered or anti-aliased edges).
  *
+ * The coverage is stored as 256 × 256 tiles (`surface`, one byte per pixel, missing tiles are 0
+ * and every pixel outside the image is 0), so an empty or fully selected area costs nothing and
+ * masks share the tiles an operation did not change. `data` is the same coverage as one array,
+ * built on first read and cached for the few masks read most recently.
+ *
  * Treat a mask as immutable: every operation returns a new one, so history entries can share
- * them without copying.
+ * them without copying. Never write to `data`.
  */
 export interface SelectionMask {
     readonly width: number;
@@ -13,6 +19,8 @@ export interface SelectionMask {
     readonly data: Uint8Array;
     /** Bounding box of the non-zero coverage, or `null` when nothing is selected. */
     readonly bounds: CropBox | null;
+    /** The coverage as tiles (1 channel, default 0), shared with other masks where equal. */
+    readonly surface: TiledSurface;
 }
 /** How a new selection combines with the current one. */
 export type SelectionMode = 'replace' | 'add' | 'subtract' | 'intersect';
@@ -35,8 +43,19 @@ export interface SerializedSelection {
 }
 /** Bounding box of non-zero bytes. */
 export declare function computeSelectionBounds(width: number, height: number, data: ArrayLike<number>): CropBox | null;
+/**
+ * A selection over `width × height` from a 1-channel tiled surface in image space (Quick Mask
+ * paint, a mask): its tiles are shared, and coverage outside the image is dropped. A surface
+ * whose default is not 0 is read out instead.
+ */
+export declare function selectionFromTiles(width: number, height: number, surface: TiledSurface): SelectionMask;
 /** Wraps coverage bytes (taken over, not copied) as a selection, computing its bounds. */
 export declare function createSelectionMask(width: number, height: number, data?: Uint8Array): SelectionMask;
+/**
+ * A selection that is `data` (`rect.width × rect.height` coverage bytes) inside `rect` and
+ * nothing elsewhere, without allocating the whole image. `rect` must lie inside the image.
+ */
+export declare function selectionFromRegion(width: number, height: number, rect: CropBox, data: ArrayLike<number>): SelectionMask;
 /** Select › All. */
 export declare function fullSelection(width: number, height: number): SelectionMask;
 export declare function isSelectionEmpty(mask: SelectionMask | null | undefined): boolean;

package/dist/image-editor/selection/shapes.d.cts

@@ -11,6 +11,14 @@ export interface ShapeSelectionOptions {
  * their top), so the cost is about pixels + edges × rows they span.
  */
 export declare function polygonCoverage(points: readonly ImagePoint[], width: number, height: number, antiAlias?: boolean): Float32Array;
+/**
+ * {@link polygonCoverage} over just the polygon's bounding box (clipped to the image): `coverage`
+ * is `box.width × box.height`; `box` is `null` when the polygon covers no pixel row or column.
+ */
+export declare function polygonCoverageBox(points: readonly ImagePoint[], width: number, height: number, antiAlias?: boolean): {
+    box: CropBox | null;
+    coverage: Float32Array;
+};
 /** Lasso / polygonal lasso: an even-odd polygon in natural image pixels. */
 export declare function polygonSelection(width: number, height: number, points: readonly ImagePoint[], options?: ShapeSelectionOptions): SelectionMask;
 /** Normalises a rectangle with a negative width or height. */

package/dist/image-editor/selection/shapes.d.ts

@@ -11,6 +11,14 @@ export interface ShapeSelectionOptions {
  * their top), so the cost is about pixels + edges × rows they span.
  */
 export declare function polygonCoverage(points: readonly ImagePoint[], width: number, height: number, antiAlias?: boolean): Float32Array;
+/**
+ * {@link polygonCoverage} over just the polygon's bounding box (clipped to the image): `coverage`
+ * is `box.width × box.height`; `box` is `null` when the polygon covers no pixel row or column.
+ */
+export declare function polygonCoverageBox(points: readonly ImagePoint[], width: number, height: number, antiAlias?: boolean): {
+    box: CropBox | null;
+    coverage: Float32Array;
+};
 /** Lasso / polygonal lasso: an even-odd polygon in natural image pixels. */
 export declare function polygonSelection(width: number, height: number, points: readonly ImagePoint[], options?: ShapeSelectionOptions): SelectionMask;
 /** Normalises a rectangle with a negative width or height. */

package/dist/image-editor/selection/tool-options.d.cts

@@ -1,4 +1,4 @@
-import type { SelectionMask, SelectionMode } from './mask.cjs';
+import { type SelectionMask, type SelectionMode } from './mask.cjs';
 import type { ColorDistance, ColorRangePreset } from './wand.cjs';
 import type { RefineEdgeParams } from './refine.cjs';
 /** Selection tools of the image editor UI. */

package/dist/image-editor/selection/tool-options.d.ts

@@ -1,4 +1,4 @@
-import type { SelectionMask, SelectionMode } from './mask.js';
+import { type SelectionMask, type SelectionMode } from './mask.js';
 import type { ColorDistance, ColorRangePreset } from './wand.js';
 import type { RefineEdgeParams } from './refine.js';
 /** Selection tools of the image editor UI. */

package/dist/paint-editor/index.cjs

@@ -7,7 +7,7 @@ var _chunkZ64NRDEHcjs = require('../chunk-Z64NRDEH.cjs');
 
 
 
-var _chunkX2KQQZBTcjs = require('../chunk-X2KQQZBT.cjs');
+var _chunkJYV4R62Mcjs = require('../chunk-JYV4R62M.cjs');
 require('../chunk-A2IS7EHE.cjs');
 
 
@@ -1653,11 +1653,11 @@ function header(state, options) {
   return out;
 }
 function serializePaintDocument(state, options = {}) {
-  const { layers, assets } = _chunkX2KQQZBTcjs.serializeLayers.call(void 0, state.layers);
+  const { layers, assets } = _chunkJYV4R62Mcjs.serializeLayers.call(void 0, state.layers);
   return { ...header(state, options), layers, assets };
 }
 async function serializePaintDocumentExternal(state, store, options = {}) {
-  const { layers, assets } = await _chunkX2KQQZBTcjs.serializeLayersExternal.call(void 0, state.layers, store);
+  const { layers, assets } = await _chunkJYV4R62Mcjs.serializeLayersExternal.call(void 0, state.layers, store);
   return { ...header(state, options), layers, assets };
 }
 function paintLayersOnly(layers, problems) {
@@ -1694,7 +1694,7 @@ function deserializePaintDocument(raw) {
   const canvas = normalizeCanvas({ width: r.width, height: r.height, dpi: _nullishCoalesce(r.dpi, () => ( void 0)) });
   const paper = _chunkYQ5C5BVKcjs.normalizePaper.call(void 0, _nullishCoalesce(r.paper, () => ( {})));
   const assets = r.assets && typeof r.assets === "object" ? r.assets : {};
-  const layers = paintLayersOnly(_chunkX2KQQZBTcjs.deserializeLayers.call(void 0, r.layers, { assets, problems }), problems);
+  const layers = paintLayersOnly(_chunkJYV4R62Mcjs.deserializeLayers.call(void 0, r.layers, { assets, problems }), problems);
   const wanted = typeof r.activeLayerId === "string" ? r.activeLayerId : null;
   const activeLayerId = wanted && _chunkHGTDMKNEcjs.findLayer.call(void 0, layers, wanted) ? wanted : _nullishCoalesce(_optionalChain([_chunkHGTDMKNEcjs.flattenLayers.call(void 0, layers), 'access', _70 => _70.filter, 'call', _71 => _71((l) => l.type === "pixel"), 'access', _72 => _72.pop, 'call', _73 => _73(), 'optionalAccess', _74 => _74.id]), () => ( null));
   const wetEvents = Array.isArray(r.wetEvents) ? r.wetEvents.filter((e) => e && typeof e === "object" && Number.isInteger(e.clock) && typeof e.kind === "string") : [];
@@ -1710,7 +1710,7 @@ async function deserializePaintDocumentAsync(raw, store) {
   if (!raw || typeof raw !== "object") throw new Error("Not a paint document: expected a JSON object.");
   const r = raw;
   const problems = [];
-  const assets = await _chunkX2KQQZBTcjs.resolveExternalAssets.call(void 0, _nullishCoalesce(r.assets, () => ( {})), store, problems);
+  const assets = await _chunkJYV4R62Mcjs.resolveExternalAssets.call(void 0, _nullishCoalesce(r.assets, () => ( {})), store, problems);
   const loaded = deserializePaintDocument({ ...r, assets });
   return { ...loaded, problems: [...problems, ...loaded.problems] };
 }
@@ -5409,7 +5409,7 @@ var PaintEditorController = (_class10 = class _PaintEditorController {
       return next.type === "group" ? { ...next, children: toStandard(next.children) } : next;
     });
     const layers = toStandard(dried);
-    const result = _chunkX2KQQZBTcjs.exportPsd.call(void 0, { width, height, layers: [paperLayer, ...layers], merged, resolution: dpi });
+    const result = _chunkJYV4R62Mcjs.exportPsd.call(void 0, { width, height, layers: [paperLayer, ...layers], merged, resolution: dpi });
     for (const [mode, names] of changed) {
       const label = _nullishCoalesce(_optionalChain([_chunkCWM3CUUXcjs.BLEND_MODES, 'access', _271 => _271.find, 'call', _272 => _272((m) => m.id === mode), 'optionalAccess', _273 => _273.label]), () => ( mode));
       const std = _nullishCoalesce(_optionalChain([_chunkCWM3CUUXcjs.BLEND_MODES, 'access', _274 => _274.find, 'call', _275 => _275((m) => m.id === _chunkCWM3CUUXcjs.standardBlendMode.call(void 0, mode)), 'optionalAccess', _276 => _276.label]), () => ( _chunkCWM3CUUXcjs.standardBlendMode.call(void 0, mode)));

package/dist/paint-editor/index.js

@@ -7,7 +7,7 @@ import {
   resolveExternalAssets,
   serializeLayers,
   serializeLayersExternal
-} from "../chunk-FW7N64XK.js";
+} from "../chunk-IGMNJM2H.js";
 import "../chunk-3CI7FRMK.js";
 import {
   EffectRendererPool

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pixerate/editor",
-  "version": "0.187.0",
+  "version": "0.188.0",
   "description": "UI-agnostic rich text and media editing core library",
   "author": "Pixerate",
   "license": "MIT",