@pixerate/editor 0.266.2 → 0.267.0

package/dist/{brushstrokeRender-FSUWXUZY.cjs → brushstrokeRender-L7JYRR2R.cjs}

@@ -1,9 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
-var _chunkVRK322ZCcjs = require('./chunk-VRK322ZC.cjs');
+var _chunkHIO6E7LCcjs = require('./chunk-HIO6E7LC.cjs');
 
 
-var _chunkTOID45I2cjs = require('./chunk-TOID45I2.cjs');
+var _chunkJ2TNIZ55cjs = require('./chunk-J2TNIZ55.cjs');
 
 
 
@@ -14,8 +14,8 @@ var _chunkTOID45I2cjs = require('./chunk-TOID45I2.cjs');
 
 
 
-var _chunkRFJZGTHAcjs = require('./chunk-RFJZGTHA.cjs');
-require('./chunk-OTN6VB5S.cjs');
+var _chunkXVOP3CGQcjs = require('./chunk-XVOP3CGQ.cjs');
+require('./chunk-RDFHWAHL.cjs');
 
 
 
@@ -48,17 +48,17 @@ require('./chunk-5UEFBM2M.cjs');
 require('./chunk-IPJ3TEYR.cjs');
 
 // src/canvas/brushstrokeRender.ts
-var PRESETS = _chunkRFJZGTHAcjs.listPresets.call(void 0, _chunkRFJZGTHAcjs.CANVAS_PROFILE).map((spec) => _chunkRFJZGTHAcjs.BUILTIN_BRUSHES.find((b) => b.id === spec.id));
+var PRESETS = _chunkXVOP3CGQcjs.listPresets.call(void 0, _chunkXVOP3CGQcjs.CANVAS_PROFILE).map((spec) => _chunkXVOP3CGQcjs.BUILTIN_BRUSHES.find((b) => b.id === spec.id));
 var presetIds = () => PRESETS.map((b) => b.id).join(", ");
-var refusal = (brush) => _chunkRFJZGTHAcjs.checkBrush.call(void 0, brush, _chunkRFJZGTHAcjs.CANVAS_PROFILE).issues.filter((i) => i.severity === "error").map((i) => `${i.reason} ${i.fix}`).join(" ");
+var refusal = (brush) => _chunkXVOP3CGQcjs.checkBrush.call(void 0, brush, _chunkXVOP3CGQcjs.CANVAS_PROFILE).issues.filter((i) => i.severity === "error").map((i) => `${i.reason} ${i.fix}`).join(" ");
 function readCanvasBrushSpec(spec) {
   let brush;
   try {
-    brush = _chunkRFJZGTHAcjs.normalizeBrushSpec.call(void 0, spec);
+    brush = _chunkXVOP3CGQcjs.normalizeBrushSpec.call(void 0, spec);
   } catch (e) {
     throw new Error(`Not a brush: ${e.message}`);
   }
-  if (!_chunkRFJZGTHAcjs.checkBrush.call(void 0, brush, _chunkRFJZGTHAcjs.CANVAS_PROFILE).ok) throw new Error(`Brush '${brush.id}' (${brush.name}) can't brush a canvas stroke: ${refusal(brush)}`);
+  if (!_chunkXVOP3CGQcjs.checkBrush.call(void 0, brush, _chunkXVOP3CGQcjs.CANVAS_PROFILE).ok) throw new Error(`Brush '${brush.id}' (${brush.name}) can't brush a canvas stroke: ${refusal(brush)}`);
   return brush;
 }
 function listCanvasBrushes(user = []) {
@@ -66,12 +66,12 @@ function listCanvasBrushes(user = []) {
     const d = _optionalChain([spec, 'access', _2 => _2.colour, 'optionalAccess', _3 => _3.default]);
     return typeof d === "string" || _chunkMLLTWAXHcjs.isDualColor.call(void 0, d) ? { defaultColor: d } : {};
   };
-  const out = PRESETS.map((b) => ({ id: b.id, name: b.name, category: b.category, size: b.tip.size, builtin: true, ...colourOf(_chunkRFJZGTHAcjs.BRUSH_PRESETS.find((p) => p.id === b.id)) }));
+  const out = PRESETS.map((b) => ({ id: b.id, name: b.name, category: b.category, size: b.tip.size, builtin: true, ...colourOf(_chunkXVOP3CGQcjs.BRUSH_PRESETS.find((p) => p.id === b.id)) }));
   for (const raw of user) {
     try {
       const brush = readCanvasBrushSpec(raw);
       if (out.some((b) => b.id === brush.id)) continue;
-      out.push({ id: brush.id, name: brush.name, category: _chunkRFJZGTHAcjs.resolveCategory.call(void 0, brush), size: _chunkRFJZGTHAcjs.resolveBrush.call(void 0, brush).tip.size, builtin: false, spec: brush, ...colourOf(brush) });
+      out.push({ id: brush.id, name: brush.name, category: _chunkXVOP3CGQcjs.resolveCategory.call(void 0, brush), size: _chunkXVOP3CGQcjs.resolveBrush.call(void 0, brush).tip.size, builtin: false, spec: brush, ...colourOf(brush) });
     } catch (e2) {
     }
   }
@@ -82,15 +82,15 @@ function resolveCanvasBrush(brush, width, spec) {
   const sized = (b) => given === void 0 ? b : { ...b, tip: { ...b.tip, size: given } };
   if (typeof brush === "string") {
     if (spec !== void 0 && spec !== null) {
-      const saved = _chunkRFJZGTHAcjs.resolveBrush.call(void 0, readCanvasBrushSpec(spec));
+      const saved = _chunkXVOP3CGQcjs.resolveBrush.call(void 0, readCanvasBrushSpec(spec));
       if (!_chunkPXDIAYB6cjs.isBrushstrokeBrush.call(void 0, saved)) throw new Error(`Brush '${saved.id}' (${saved.name}) can't brush a canvas stroke: it is not a dry dab brush.`);
       return sized(saved);
     }
     const preset = PRESETS.find((b) => b.id === brush);
     if (preset) return sized(preset);
-    const other = _chunkRFJZGTHAcjs.BRUSH_PRESETS.find((b) => b.id === brush);
+    const other = _chunkXVOP3CGQcjs.BRUSH_PRESETS.find((b) => b.id === brush);
     if (other) throw new Error(`Brush '${brush}' (${other.name}) can't brush a canvas stroke: ${refusal(other)} Use one of: ${presetIds()}, or a saved brush the canvas can paint.`);
-    throw new Error(`Unknown brush '${brush}'. ${_chunkRFJZGTHAcjs.closest.call(void 0, brush, PRESETS.map((b) => b.id))}Use one of the dry presets (${presetIds()}), a saved brush from the brush library, or tip settings ({ hardness, spacing, flow, \u2026 }).`);
+    throw new Error(`Unknown brush '${brush}'. ${_chunkXVOP3CGQcjs.closest.call(void 0, brush, PRESETS.map((b) => b.id))}Use one of the dry presets (${presetIds()}), a saved brush from the brush library, or tip settings ({ hardness, spacing, flow, \u2026 }).`);
   }
   if (!brush || typeof brush !== "object" || Array.isArray(brush)) {
     throw new Error("A brush is a preset or saved brush id (see listCanvasBrushes / canvas.listBrushes) or an object of tip settings.");
@@ -126,7 +126,7 @@ function renderShapeBrushstrokeNow(shape, scale, place = {}) {
   const textured = typeof seed === "number" && Number.isFinite(seed);
   const size = _nullishCoalesce(shape.brush.size, () => ( (textured ? void 0 : _nullishCoalesce(shape.strokeWidth, () => ( 3)))));
   const brush = resolveCanvasBrush(shape.brush.brush, size, shape.brush.spec);
-  const points = _chunkTOID45I2cjs.pathDataToPolyline.call(void 0, shape.d);
+  const points = _chunkJ2TNIZ55cjs.pathDataToPolyline.call(void 0, shape.d);
   if (!points.length) return null;
   const { pressure, tiltX, tiltY } = shape.brush;
   const input = {
@@ -164,8 +164,8 @@ function brushedShapeSvgNow(shape, size, scale, place = {}) {
   return `<svg xmlns="http://www.w3.org/2000/svg" width="${f(size.width)}" height="${f(size.height)}" viewBox="0 0 ${f(size.width)} ${f(size.height)}">${content}</svg>`;
 }
 function swatchColour(brush, background, spec) {
-  const facets = typeof brush !== "string" ? null : spec ? readCanvasBrushSpec(spec) : _chunkRFJZGTHAcjs.BRUSH_PRESETS.find((b) => b.id === brush);
-  return background && facets ? _chunkVRK322ZCcjs.brushPreviewColours.call(void 0, facets, { paper: background, profile: _chunkRFJZGTHAcjs.CANVAS_PROFILE, keepPaper: true }).color : "#1f2937";
+  const facets = typeof brush !== "string" ? null : spec ? readCanvasBrushSpec(spec) : _chunkXVOP3CGQcjs.BRUSH_PRESETS.find((b) => b.id === brush);
+  return background && facets ? _chunkHIO6E7LCcjs.brushPreviewColours.call(void 0, facets, { paper: background, profile: _chunkXVOP3CGQcjs.CANVAS_PROFILE, keepPaper: true }).color : "#1f2937";
 }
 function brushSwatchNow(brush, options, spec) {
   const w = options.width && options.width > 8 ? options.width : 96;

package/dist/{brushstrokeRender-KD453OBX.js → brushstrokeRender-NLFPEBGI.js}

@@ -1,9 +1,9 @@
 import {
   brushPreviewColours
-} from "./chunk-4ODRXQRW.js";
+} from "./chunk-EYSHTYLG.js";
 import {
   pathDataToPolyline
-} from "./chunk-DXYHQ2VN.js";
+} from "./chunk-EF7LZAXQ.js";
 import {
   BRUSH_PRESETS,
   BUILTIN_BRUSHES,
@@ -14,8 +14,8 @@ import {
   normalizeBrushSpec,
   resolveBrush,
   resolveCategory
-} from "./chunk-CIJBSUM5.js";
-import "./chunk-ACFSFUQH.js";
+} from "./chunk-AGNUD5BI.js";
+import "./chunk-JL6YH5WD.js";
 import {
   formatNumber,
   getShapeSvg,

package/dist/canvas/brushTypes.d.cts

@@ -153,3 +153,15 @@ export interface CanvasBrushPreset {
     /** The preset's own tip diameter in canvas units: a new brushed stroke's default size. */
     size: number;
 }
+/** What the canvas brush picker is set to (`brushSettings()` of the draw controller). */
+export interface CanvasBrushChoice {
+    /** The preset or saved brush id the pen draws with by hand, or null for a plain vector stroke. */
+    brush: string | null;
+    /** The stroke colour, or null while strokes take a gradient. */
+    color: string | null;
+    colorScheme: 'light' | 'dark';
+    /** "Keep my colour": choosing a brush keeps the stroke colour. */
+    colorLocked: boolean;
+    /** The colour is a brush's light / dark default and changes with the scheme. */
+    colorFollowsScheme: boolean;
+}

package/dist/canvas/brushTypes.d.ts

@@ -153,3 +153,15 @@ export interface CanvasBrushPreset {
     /** The preset's own tip diameter in canvas units: a new brushed stroke's default size. */
     size: number;
 }
+/** What the canvas brush picker is set to (`brushSettings()` of the draw controller). */
+export interface CanvasBrushChoice {
+    /** The preset or saved brush id the pen draws with by hand, or null for a plain vector stroke. */
+    brush: string | null;
+    /** The stroke colour, or null while strokes take a gradient. */
+    color: string | null;
+    colorScheme: 'light' | 'dark';
+    /** "Keep my colour": choosing a brush keeps the stroke colour. */
+    colorLocked: boolean;
+    /** The colour is a brush's light / dark default and changes with the scheme. */
+    colorFollowsScheme: boolean;
+}

package/dist/canvas/brushstroke.d.cts

@@ -11,7 +11,7 @@ import type { Point } from './types.cjs';
 import type { CanvasBrush, CanvasBrushPaint, CanvasBrushPreset, CanvasBrushSpec, CanvasBrushstroke } from './brushTypes.cjs';
 import type { BrushLibrary } from '../brushes/library.cjs';
 import type { BrushPreviewRenderer } from '../brushes/tools.cjs';
-export type { CanvasBrush, CanvasBrushPaint, CanvasBrushPaintMapping, CanvasBrushPaintStop, CanvasBrushPaper, CanvasBrushPreset, CanvasBrushSettings, CanvasBrushSpec, CanvasBrushstroke } from './brushTypes.cjs';
+export type { CanvasBrush, CanvasBrushPaint, CanvasBrushPaintMapping, CanvasBrushPaintStop, CanvasBrushPaper, CanvasBrushChoice, CanvasBrushPreset, CanvasBrushSettings, CanvasBrushSpec, CanvasBrushstroke } from './brushTypes.cjs';
 export { brushstrokeScaleBucket };
 /** A brushed stroke's image, placed in the path's coordinates (the shape's view box). */
 export interface CanvasBrushstrokeImage {

package/dist/canvas/brushstroke.d.ts

@@ -11,7 +11,7 @@ import type { Point } from './types.js';
 import type { CanvasBrush, CanvasBrushPaint, CanvasBrushPreset, CanvasBrushSpec, CanvasBrushstroke } from './brushTypes.js';
 import type { BrushLibrary } from '../brushes/library.js';
 import type { BrushPreviewRenderer } from '../brushes/tools.js';
-export type { CanvasBrush, CanvasBrushPaint, CanvasBrushPaintMapping, CanvasBrushPaintStop, CanvasBrushPaper, CanvasBrushPreset, CanvasBrushSettings, CanvasBrushSpec, CanvasBrushstroke } from './brushTypes.js';
+export type { CanvasBrush, CanvasBrushPaint, CanvasBrushPaintMapping, CanvasBrushPaintStop, CanvasBrushPaper, CanvasBrushChoice, CanvasBrushPreset, CanvasBrushSettings, CanvasBrushSpec, CanvasBrushstroke } from './brushTypes.js';
 export { brushstrokeScaleBucket };
 /** A brushed stroke's image, placed in the path's coordinates (the shape's view box). */
 export interface CanvasBrushstrokeImage {

package/dist/canvas/drawController.d.cts

@@ -7,7 +7,7 @@ import type { CanvasNode, Point } from './types.cjs';
 import { type FreehandDrawOptions, type FreehandPenSample, type FreehandStroke, type FreehandStrokeStyle, type FreehandTool } from './freehand.cjs';
 import { type CanvasBrush } from './brushstroke.cjs';
 import type { BrushLibrary } from '../brushes/library.cjs';
-import type { CanvasBrushPreset } from './brushTypes.cjs';
+import type { CanvasBrushPreset, CanvasBrushChoice } from './brushTypes.cjs';
 /** A stroke drawn by code or an agent (`drawStroke`). */
 export interface DrawStrokeInput {
     /** Points in canvas (flow) coordinates, at least one. */
@@ -45,6 +45,8 @@ export interface CanvasDrawControllerOptions<TNode extends CanvasNode = CanvasNo
     brushLibrary?: Pick<BrushLibrary, 'list' | 'get' | 'isBuiltin'>;
     /** The host's colour scheme (default light): a brush's light / dark default colour resolves to its side. */
     colorScheme?: 'light' | 'dark';
+    /** Start with the colour locked: choosing a brush keeps the stroke colour (see `setColorLocked`). */
+    colorLocked?: boolean;
     getNodes: () => TNode[];
     setNodes: (nodes: TNode[]) => void;
     history?: ArrangeHistoryTarget;
@@ -54,6 +56,8 @@ export interface CanvasDrawControllerOptions<TNode extends CanvasNode = CanvasNo
     generateNodeId?: () => string;
     onToolChange?: (tool: FreehandTool) => void;
     onStyleChange?: (style: FreehandStrokeStyle) => void;
+    /** The colour lock changed (`setColorLocked`). */
+    onColorLockChange?: (locked: boolean) => void;
     onActiveStrokeChange?: (stroke: FreehandStroke | null) => void;
     onStrokeComplete?: (node: TNode) => void;
     onNodesErase?: (erasedNodes: TNode[]) => void;
@@ -82,14 +86,25 @@ export declare function createCanvasDrawController<TNode extends CanvasNode = Ca
     /**
      * A brush picker's choice: brushes the pen and highlighter with `id` (`null`: a plain vector
      * stroke) at the brush's own size, embedding a saved brush, and makes its default colour
-     * (resolved for the colour scheme) the stroke colour unless `keepColour`. Throws for a brush
-     * the canvas can't paint. Resolves with the brush chosen.
+     * (resolved for the colour scheme) the stroke colour unless `keepColour` or the colour is
+     * locked (`setColorLocked`). A light / dark default resolves again when the scheme changes,
+     * until another colour is set. Throws for a brush the canvas can't paint. Resolves with the
+     * brush chosen.
      */
     selectBrush(id: string | null, choice?: {
         keepColour?: boolean;
     }): Promise<CanvasBrushPreset | null>;
-    /** The host's colour scheme, for brushes' light / dark default colours. */
+    readonly colorScheme: "light" | "dark";
+    /**
+     * The host's colour scheme, for brushes' light / dark default colours: a stroke colour that
+     * came from one (`selectBrush`) resolves to the new side. Strokes already drawn keep theirs.
+     */
     setColorScheme(scheme: "light" | "dark"): void;
+    readonly colorLocked: boolean;
+    /** Locks the stroke colour ("Keep my colour"): choosing a brush with a default colour keeps it. */
+    setColorLocked(locked: boolean): void;
+    /** What the brush picker is set to: the brush, colour, scheme and lock (a snapshot). */
+    brushSettings(): CanvasBrushChoice;
     /** The saved brush to embed for a brush id (undefined for presets and tip settings); for a brush picker. */
     brushSpec: (brush: CanvasBrush) => Promise<import("./brushTypes.cjs").CanvasBrushSpec | undefined>;
 };

package/dist/canvas/drawController.d.ts

@@ -7,7 +7,7 @@ import type { CanvasNode, Point } from './types.js';
 import { type FreehandDrawOptions, type FreehandPenSample, type FreehandStroke, type FreehandStrokeStyle, type FreehandTool } from './freehand.js';
 import { type CanvasBrush } from './brushstroke.js';
 import type { BrushLibrary } from '../brushes/library.js';
-import type { CanvasBrushPreset } from './brushTypes.js';
+import type { CanvasBrushPreset, CanvasBrushChoice } from './brushTypes.js';
 /** A stroke drawn by code or an agent (`drawStroke`). */
 export interface DrawStrokeInput {
     /** Points in canvas (flow) coordinates, at least one. */
@@ -45,6 +45,8 @@ export interface CanvasDrawControllerOptions<TNode extends CanvasNode = CanvasNo
     brushLibrary?: Pick<BrushLibrary, 'list' | 'get' | 'isBuiltin'>;
     /** The host's colour scheme (default light): a brush's light / dark default colour resolves to its side. */
     colorScheme?: 'light' | 'dark';
+    /** Start with the colour locked: choosing a brush keeps the stroke colour (see `setColorLocked`). */
+    colorLocked?: boolean;
     getNodes: () => TNode[];
     setNodes: (nodes: TNode[]) => void;
     history?: ArrangeHistoryTarget;
@@ -54,6 +56,8 @@ export interface CanvasDrawControllerOptions<TNode extends CanvasNode = CanvasNo
     generateNodeId?: () => string;
     onToolChange?: (tool: FreehandTool) => void;
     onStyleChange?: (style: FreehandStrokeStyle) => void;
+    /** The colour lock changed (`setColorLocked`). */
+    onColorLockChange?: (locked: boolean) => void;
     onActiveStrokeChange?: (stroke: FreehandStroke | null) => void;
     onStrokeComplete?: (node: TNode) => void;
     onNodesErase?: (erasedNodes: TNode[]) => void;
@@ -82,14 +86,25 @@ export declare function createCanvasDrawController<TNode extends CanvasNode = Ca
     /**
      * A brush picker's choice: brushes the pen and highlighter with `id` (`null`: a plain vector
      * stroke) at the brush's own size, embedding a saved brush, and makes its default colour
-     * (resolved for the colour scheme) the stroke colour unless `keepColour`. Throws for a brush
-     * the canvas can't paint. Resolves with the brush chosen.
+     * (resolved for the colour scheme) the stroke colour unless `keepColour` or the colour is
+     * locked (`setColorLocked`). A light / dark default resolves again when the scheme changes,
+     * until another colour is set. Throws for a brush the canvas can't paint. Resolves with the
+     * brush chosen.
      */
     selectBrush(id: string | null, choice?: {
         keepColour?: boolean;
     }): Promise<CanvasBrushPreset | null>;
-    /** The host's colour scheme, for brushes' light / dark default colours. */
+    readonly colorScheme: "light" | "dark";
+    /**
+     * The host's colour scheme, for brushes' light / dark default colours: a stroke colour that
+     * came from one (`selectBrush`) resolves to the new side. Strokes already drawn keep theirs.
+     */
     setColorScheme(scheme: "light" | "dark"): void;
+    readonly colorLocked: boolean;
+    /** Locks the stroke colour ("Keep my colour"): choosing a brush with a default colour keeps it. */
+    setColorLocked(locked: boolean): void;
+    /** What the brush picker is set to: the brush, colour, scheme and lock (a snapshot). */
+    brushSettings(): CanvasBrushChoice;
     /** The saved brush to embed for a brush id (undefined for presets and tip settings); for a brush picker. */
     brushSpec: (brush: CanvasBrush) => Promise<import("./brushTypes.js").CanvasBrushSpec | undefined>;
 };