@weasel-js/core 1.11.1 → 1.13.0-rc.0

package/dist/features/pathEffects/useEffectSourcesLayer.js

@@ -0,0 +1,53 @@
+import { sceneDepLookup } from "../../canvas/derivedPath.js";
+import { sourcesHiddenBy } from "./effectSources.js";
+import { PATH_OVERLAY_ROLES } from "../../canvas/pathOverlay.js";
+import { chromeStateFrom } from "../../canvas/drawEnvelope.js";
+import { readEffectSource } from "./readSource.js";
+import { useMemo } from "react";
+import { useLatest } from "@weasel-js/react";
+
+//#region src/features/pathEffects/useEffectSourcesLayer.ts
+/**
+* The layer that shows what a selected path effect was made from: the outlines
+* of the sources it hides, drawn faintly under the selection chrome.
+*/
+var FAINT = .4;
+/** For each selected path-effect node, the outlines of the sources it holds hidden (`sourcesHiddenBy`) as the effect
+*  reads them, in a one-screen-pixel stroke of the `'chrome'` overlay color at 40% opacity. The selection comes off the draw envelope. */
+function useEffectSourcesLayer(scene) {
+	const sceneRef = useLatest(scene);
+	return useMemo(() => ({
+		id: "effect-sources",
+		label: "Hidden effect sources",
+		space: "world",
+		draw: (data) => {
+			const selected = chromeStateFrom(data)?.selection ?? [];
+			const sc = sceneRef.current;
+			const stroke = PATH_OVERLAY_ROLES["chrome"].stroke;
+			const depOf = sceneDepLookup(sc);
+			const lines = [];
+			for (const id of selected) for (const source of sourcesHiddenBy(sc, id)) {
+				if (!sc.isHidden(source)) continue;
+				const dep = depOf(source);
+				const path = dep === void 0 ? null : readEffectSource(dep)?.world ?? null;
+				if (path !== null) lines.push({
+					kind: "path",
+					path,
+					stroke: {
+						paint: stroke,
+						width: { px: 1 }
+					}
+				});
+			}
+			return lines.length === 0 ? [] : [{
+				kind: "group",
+				alpha: FAINT,
+				children: lines
+			}];
+		}
+	}), [sceneRef]);
+}
+
+//#endregion
+export { useEffectSourcesLayer };
+//# sourceMappingURL=useEffectSourcesLayer.js.map

package/dist/features/pathEffects/useEffectSourcesLayer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useEffectSourcesLayer.js","names":[],"sources":["../../../src/features/pathEffects/useEffectSourcesLayer.ts"],"sourcesContent":["/**\n * The layer that shows what a selected path effect was made from: the outlines\n * of the sources it hides, drawn faintly under the selection chrome.\n */\nimport { useMemo } from 'react';\nimport { useLatest } from '@weasel-js/react';\nimport type { DrawCommand } from '@weasel-js/renderer';\nimport { PATH_OVERLAY_ROLES } from 'canvas/pathOverlay';\nimport { sceneDepLookup } from 'canvas/derivedPath';\nimport { chromeStateFrom } from 'canvas/drawEnvelope';\nimport type { RenderLayer } from 'core/layers/render';\nimport { sourcesHiddenBy } from './effectSources';\nimport type { NodeId, Scene } from 'core/scene/types';\nimport { readEffectSource } from './readSource';\n\nconst FAINT = 0.4;\n\n/** For each selected path-effect node, the outlines of the sources it holds hidden (`sourcesHiddenBy`) as the effect\n *  reads them, in a one-screen-pixel stroke of the `'chrome'` overlay color at 40% opacity. The selection comes off the draw envelope. */\nexport function useEffectSourcesLayer<TData, TLayer extends string, TPose>(\n  scene: Scene<TData, TLayer, TPose>,\n): RenderLayer<unknown> {\n  const sceneRef = useLatest(scene);\n  return useMemo<RenderLayer<unknown>>(() => ({\n    id: 'effect-sources',\n    label: 'Hidden effect sources',\n    space: 'world',\n    draw: (data) => {\n      const selected = chromeStateFrom(data)?.selection ?? [];\n      const sc = sceneRef.current;\n      const stroke = PATH_OVERLAY_ROLES['chrome']!.stroke!;\n      const depOf = sceneDepLookup(sc);\n      const lines: DrawCommand[] = [];\n      for (const id of selected) {\n        for (const source of sourcesHiddenBy(sc, id as NodeId)) {\n          if (!sc.isHidden(source)) continue;\n          const dep = depOf(source);\n          const path = dep === undefined ? null : readEffectSource(dep as never)?.world ?? null;\n          if (path !== null) lines.push({ kind: 'path', path, stroke: { paint: stroke, width: { px: 1 } } });\n        }\n      }\n      return lines.length === 0 ? [] : [{ kind: 'group', alpha: FAINT, children: lines }];\n    },\n  }), [sceneRef]);\n}\n"],"mappings":";;;;;;;;;;;;;AAeA,IAAM,QAAQ;;;AAId,SAAgB,sBACd,OACsB;CACtB,MAAM,WAAW,UAAU,KAAK;CAChC,OAAO,eAAqC;EAC1C,IAAI;EACJ,OAAO;EACP,OAAO;EACP,OAAO,SAAS;GACd,MAAM,WAAW,gBAAgB,IAAI,CAAC,EAAE,aAAa,CAAC;GACtD,MAAM,KAAK,SAAS;GACpB,MAAM,SAAS,mBAAmB,SAAS,CAAE;GAC7C,MAAM,QAAQ,eAAe,EAAE;GAC/B,MAAM,QAAuB,CAAC;GAC9B,KAAK,MAAM,MAAM,UACf,KAAK,MAAM,UAAU,gBAAgB,IAAI,EAAY,GAAG;IACtD,IAAI,CAAC,GAAG,SAAS,MAAM,GAAG;IAC1B,MAAM,MAAM,MAAM,MAAM;IACxB,MAAM,OAAO,QAAQ,SAAY,OAAO,iBAAiB,GAAY,CAAC,EAAE,SAAS;IACjF,IAAI,SAAS,MAAM,MAAM,KAAK;KAAE,MAAM;KAAQ;KAAM,QAAQ;MAAE,OAAO;MAAQ,OAAO,EAAE,IAAI,EAAE;KAAE;IAAE,CAAC;GACnG;GAEF,OAAO,MAAM,WAAW,IAAI,CAAC,IAAI,CAAC;IAAE,MAAM;IAAS,OAAO;IAAO,UAAU;GAAM,CAAC;EACpF;CACF,IAAI,CAAC,QAAQ,CAAC;AAChB"}

package/dist/features/paths/editablePath.js

@@ -17,7 +17,7 @@ import { asPolygonPath, pathInWorld, rectPath, worldEditToStorage } from "@wease
 /** Whether `node` is a leaf whose only geometry is its rect pose, drawn by
 *  the kit's rect fallback. */
 function drawsPoseAlone(node) {
-	if (node.kind !== "leaf" || node.data?.path != null) return false;
+	if (node.kind !== "mark" || node.data?.path != null) return false;
 	return findNodeShape(node) === RECT_FALLBACK_PAINTER;
 }
 /** Resolve where a node's editable polygon lives. Returns null when the

package/dist/features/paths/editablePath.js.map

@@ -1 +1 @@
-{"version":3,"file":"editablePath.js","names":[],"sources":["../../../src/features/paths/editablePath.ts"],"sourcesContent":["/**\n * A node's editable polygon. It lives in one of two places: the pose itself\n * (`pose.kind === 'polygon'`), or `data.path` with a rect pose, stored pose-local.\n * A rect `data.path` is edited as its four corners and is stored as a polygon\n * from the first edit on; reading it changes nothing. A leaf drawn as its rect\n * pose alone reads as a rect `data.path` the size of its pose, and gains one\n * on the first edit.\n */\nimport { asPolygonPath, pathInWorld, rectPath, worldEditToStorage, type Path, type PolygonPath } from '@weasel-js/geom';\nimport type { GesturePreviewSource } from 'canvas/gestureBounds';\nimport { findNodeShape } from 'canvas/NodeShape';\nimport { RECT_FALLBACK_PAINTER } from 'canvas/nodeShapes/rectFallbackPainter';\nimport { pathFromPlane } from 'canvas/planeClips';\nimport { isRectPose } from 'core/geometry/autoPoseDescriptor';\nimport type { RectPose } from 'core/scene/types';\nimport type { PlaneMap } from 'core/viewport/parallax';\nimport type { PathEditExtension } from './pathEditExtension';\nimport { pathFormOf, representationOf, withoutPathForm, type AnchorMarkerShape } from './pathRepresentation';\n\n/** The fields of a node the editable path is read from. A node's `kind`\n *  says whether a rect pose with no path is a leaf drawn as that rect. */\nexport interface EditableShape {\n  pose: unknown;\n  data: unknown;\n  kind?: string;\n}\n\n/** Whether `node` is a leaf whose only geometry is its rect pose, drawn by\n *  the kit's rect fallback. */\nfunction drawsPoseAlone(node: EditableShape): boolean {\n  if (node.kind !== 'leaf' || (node.data as { path?: unknown } | null)?.path != null) return false;\n  return findNodeShape(node as never) === RECT_FALLBACK_PAINTER;\n}\n\n/** Resolve where a node's editable polygon lives. Returns null when the\n *  node has neither a polygon pose nor a polygon or rect on `data.path`.\n *  A rect comes back as the polygon it draws. */\nexport function classifyPathStorage(\n  node: EditableShape | undefined | null,\n): { kind: 'pose' } | { kind: 'data'; pose: RectPose; data: { path: PolygonPath } } | null {\n  if (!node) return null;\n  const pose = node.pose as { kind?: string } | undefined;\n  if (pose?.kind === 'polygon') return { kind: 'pose' };\n  if (isRectPose(node.pose) && drawsPoseAlone(node)) {\n    const { width, height } = node.pose;\n    return { kind: 'data', pose: node.pose, data: { ...(node.data as object), path: asPolygonPath(rectPath(0, 0, width, height)) } };\n  }\n  const data = node.data as { path?: Path } | null;\n  const kind = (data?.path as { kind?: string } | undefined)?.kind;\n  if (!data?.path || (kind !== 'polygon' && kind !== 'rect') || !isRectPose(node.pose)) return null;\n  const path = asPolygonPath(data.path);\n  return {\n    kind: 'data',\n    pose: node.pose,\n    data: (path === data.path ? data : { ...data, path }) as { path: PolygonPath },\n  };\n}\n\n/** Whether `node` has a path that path edit can show anchors for. */\nexport function hasEditablePath(node: EditableShape | undefined | null): boolean {\n  return classifyPathStorage(node) !== null;\n}\n\n/** A node's editable polygon in world coords. Does NOT consult any preview state —\n *  callers that want live state read in-flight handles themselves. */\nexport function resolveEditablePathOf(\n  node: EditableShape | undefined | null,\n): PolygonPath | null {\n  if (!node) return null;\n  const storage = classifyPathStorage(node);\n  if (!storage) return null;\n  // Pose-as-polygon: the pose IS the polygon (polygon poses can't carry\n  // rotation), so it's already world.\n  if (storage.kind === 'pose') return (node as { pose: PolygonPath }).pose;\n  // data.path: translate to the pose origin AND bake `pose.rotation`, so anchors render on\n  // the rotated contour the renderer draws.\n  return pathInWorld(storage.data.path, storage.pose) as PolygonPath;\n}\n\n/**\n * What path edit edits on a node, in world coords: the edit path of the form\n * the node's path was drawn from, where one of `extensions` reads it\n * (`PathRepresentation`), and otherwise its editable polygon. Null when the\n * node has no editable polygon.\n */\nexport function pathEditPathOf(\n  node: EditableShape | undefined | null,\n  extensions: readonly PathEditExtension[] = [],\n): PolygonPath | null {\n  const path = resolveEditablePathOf(node);\n  const held = path ? representationOf(extensions, node!.data) : null;\n  return (held && held.representation.editPath(path!, held.form)) ?? path;\n}\n\n/**\n * The pose and data that store `worldPath` where `node` stores its editable\n * polygon — the inverse of {@link resolveEditablePathOf}, so a `data.path`\n * node keeps its rotation. On a node whose path was drawn from a form one of\n * `extensions` reads, `worldPath` is an edit of what {@link pathEditPathOf}\n * gave, and the representation turns it into the drawn path; a form none\n * reads, or that no longer describes the path, is dropped. Null when `node`\n * has no editable polygon.\n */\nexport function storeEditablePath(\n  node: EditableShape | undefined | null,\n  worldPath: PolygonPath,\n  extensions: readonly PathEditExtension[] = [],\n): EditableShape | null {\n  const storage = classifyPathStorage(node);\n  if (!storage) return null;\n  let path = worldPath;\n  let data = node!.data;\n  if (pathFormOf(data)) {\n    const held = representationOf(extensions, data);\n    const solved = held ? held.representation.store(resolveEditablePathOf(node)!, held.form, worldPath) : null;\n    path = solved?.path ?? worldPath;\n    data = solved ? { ...(data as object), representation: solved.form } : withoutPathForm(data);\n  }\n  if (storage.kind === 'pose') return { pose: path, data };\n  const stored = worldEditToStorage(storage.pose, path);\n  return { pose: stored.pose, data: { ...(data as object), path: stored.path } };\n}\n\n/** `node` as the in-flight gestures in `previews` would leave it: a handle\n *  previewing `id` contributes its pose and its data. */\nfunction previewedShape(\n  id: string,\n  node: EditableShape,\n  previews: readonly GesturePreviewSource[],\n): EditableShape {\n  let pose = node.pose;\n  let data = node.data;\n  let touched = false;\n  const kind = node.kind;\n  for (const source of previews) {\n    const previewIds = source.previewIds?.();\n    if (!previewIds) continue;\n    let owns = false;\n    for (const pid of previewIds) {\n      if (pid === id) { owns = true; break; }\n    }\n    if (!owns) continue;\n    const p = source.previewPose?.(id);\n    if (p != null && !touched) { pose = p; touched = true; }\n    const d = source.previewData?.(id);\n    if (d != null) { data = d; touched = true; }\n  }\n  return { pose, data, kind };\n}\n\n/**\n * What path edit shows of node `id` right now ({@link pathEditPathOf}): following any\n * in-flight gesture in `previews`, and in the world of the camera whose\n * `plane` this is — a path on a parallax plane is stored in the plane's.\n */\nexport function liveEditablePath(\n  id: string,\n  node: EditableShape | undefined | null,\n  previews: readonly GesturePreviewSource[],\n  plane: PlaneMap | null,\n  extensions: readonly PathEditExtension[] = [],\n): PolygonPath | null {\n  if (!node) return null;\n  return pathFromPlane(pathEditPathOf(previewedShape(id, node, previews), extensions), plane);\n}\n\n/** The marker of each anchor {@link liveEditablePath} shows for node `id`, as\n *  the representation reading its form draws them; null for a node it reads\n *  none of. */\nexport function liveAnchorMarkers(\n  id: string,\n  node: EditableShape | undefined | null,\n  previews: readonly GesturePreviewSource[],\n  extensions: readonly PathEditExtension[],\n): readonly (AnchorMarkerShape | null)[] | null {\n  if (!node) return null;\n  const held = representationOf(extensions, previewedShape(id, node, previews).data);\n  return held?.representation.anchorMarkers?.(held.form) ?? null;\n}\n"],"mappings":"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"}
+{"version":3,"file":"editablePath.js","names":[],"sources":["../../../src/features/paths/editablePath.ts"],"sourcesContent":["/**\n * A node's editable polygon. It lives in one of two places: the pose itself\n * (`pose.kind === 'polygon'`), or `data.path` with a rect pose, stored pose-local.\n * A rect `data.path` is edited as its four corners and is stored as a polygon\n * from the first edit on; reading it changes nothing. A leaf drawn as its rect\n * pose alone reads as a rect `data.path` the size of its pose, and gains one\n * on the first edit.\n */\nimport { asPolygonPath, pathInWorld, rectPath, worldEditToStorage, type Path, type PolygonPath } from '@weasel-js/geom';\nimport type { GesturePreviewSource } from 'canvas/gestureBounds';\nimport { findNodeShape } from 'canvas/NodeShape';\nimport { RECT_FALLBACK_PAINTER } from 'canvas/nodeShapes/rectFallbackPainter';\nimport { pathFromPlane } from 'canvas/planeClips';\nimport { isRectPose } from 'core/geometry/autoPoseDescriptor';\nimport type { RectPose } from 'core/scene/types';\nimport type { PlaneMap } from 'core/viewport/parallax';\nimport type { PathEditExtension } from './pathEditExtension';\nimport { pathFormOf, representationOf, withoutPathForm, type AnchorMarkerShape } from './pathRepresentation';\n\n/** The fields of a node the editable path is read from. A node's `kind`\n *  says whether a rect pose with no path is a leaf drawn as that rect. */\nexport interface EditableShape {\n  pose: unknown;\n  data: unknown;\n  kind?: string;\n}\n\n/** Whether `node` is a leaf whose only geometry is its rect pose, drawn by\n *  the kit's rect fallback. */\nfunction drawsPoseAlone(node: EditableShape): boolean {\n  if (node.kind !== 'mark' || (node.data as { path?: unknown } | null)?.path != null) return false;\n  return findNodeShape(node as never) === RECT_FALLBACK_PAINTER;\n}\n\n/** Resolve where a node's editable polygon lives. Returns null when the\n *  node has neither a polygon pose nor a polygon or rect on `data.path`.\n *  A rect comes back as the polygon it draws. */\nexport function classifyPathStorage(\n  node: EditableShape | undefined | null,\n): { kind: 'pose' } | { kind: 'data'; pose: RectPose; data: { path: PolygonPath } } | null {\n  if (!node) return null;\n  const pose = node.pose as { kind?: string } | undefined;\n  if (pose?.kind === 'polygon') return { kind: 'pose' };\n  if (isRectPose(node.pose) && drawsPoseAlone(node)) {\n    const { width, height } = node.pose;\n    return { kind: 'data', pose: node.pose, data: { ...(node.data as object), path: asPolygonPath(rectPath(0, 0, width, height)) } };\n  }\n  const data = node.data as { path?: Path } | null;\n  const kind = (data?.path as { kind?: string } | undefined)?.kind;\n  if (!data?.path || (kind !== 'polygon' && kind !== 'rect') || !isRectPose(node.pose)) return null;\n  const path = asPolygonPath(data.path);\n  return {\n    kind: 'data',\n    pose: node.pose,\n    data: (path === data.path ? data : { ...data, path }) as { path: PolygonPath },\n  };\n}\n\n/** Whether `node` has a path that path edit can show anchors for. */\nexport function hasEditablePath(node: EditableShape | undefined | null): boolean {\n  return classifyPathStorage(node) !== null;\n}\n\n/** A node's editable polygon in world coords. Does NOT consult any preview state —\n *  callers that want live state read in-flight handles themselves. */\nexport function resolveEditablePathOf(\n  node: EditableShape | undefined | null,\n): PolygonPath | null {\n  if (!node) return null;\n  const storage = classifyPathStorage(node);\n  if (!storage) return null;\n  // Pose-as-polygon: the pose IS the polygon (polygon poses can't carry\n  // rotation), so it's already world.\n  if (storage.kind === 'pose') return (node as { pose: PolygonPath }).pose;\n  // data.path: translate to the pose origin AND bake `pose.rotation`, so anchors render on\n  // the rotated contour the renderer draws.\n  return pathInWorld(storage.data.path, storage.pose) as PolygonPath;\n}\n\n/**\n * What path edit edits on a node, in world coords: the edit path of the form\n * the node's path was drawn from, where one of `extensions` reads it\n * (`PathRepresentation`), and otherwise its editable polygon. Null when the\n * node has no editable polygon.\n */\nexport function pathEditPathOf(\n  node: EditableShape | undefined | null,\n  extensions: readonly PathEditExtension[] = [],\n): PolygonPath | null {\n  const path = resolveEditablePathOf(node);\n  const held = path ? representationOf(extensions, node!.data) : null;\n  return (held && held.representation.editPath(path!, held.form)) ?? path;\n}\n\n/**\n * The pose and data that store `worldPath` where `node` stores its editable\n * polygon — the inverse of {@link resolveEditablePathOf}, so a `data.path`\n * node keeps its rotation. On a node whose path was drawn from a form one of\n * `extensions` reads, `worldPath` is an edit of what {@link pathEditPathOf}\n * gave, and the representation turns it into the drawn path; a form none\n * reads, or that no longer describes the path, is dropped. Null when `node`\n * has no editable polygon.\n */\nexport function storeEditablePath(\n  node: EditableShape | undefined | null,\n  worldPath: PolygonPath,\n  extensions: readonly PathEditExtension[] = [],\n): EditableShape | null {\n  const storage = classifyPathStorage(node);\n  if (!storage) return null;\n  let path = worldPath;\n  let data = node!.data;\n  if (pathFormOf(data)) {\n    const held = representationOf(extensions, data);\n    const solved = held ? held.representation.store(resolveEditablePathOf(node)!, held.form, worldPath) : null;\n    path = solved?.path ?? worldPath;\n    data = solved ? { ...(data as object), representation: solved.form } : withoutPathForm(data);\n  }\n  if (storage.kind === 'pose') return { pose: path, data };\n  const stored = worldEditToStorage(storage.pose, path);\n  return { pose: stored.pose, data: { ...(data as object), path: stored.path } };\n}\n\n/** `node` as the in-flight gestures in `previews` would leave it: a handle\n *  previewing `id` contributes its pose and its data. */\nfunction previewedShape(\n  id: string,\n  node: EditableShape,\n  previews: readonly GesturePreviewSource[],\n): EditableShape {\n  let pose = node.pose;\n  let data = node.data;\n  let touched = false;\n  const kind = node.kind;\n  for (const source of previews) {\n    const previewIds = source.previewIds?.();\n    if (!previewIds) continue;\n    let owns = false;\n    for (const pid of previewIds) {\n      if (pid === id) { owns = true; break; }\n    }\n    if (!owns) continue;\n    const p = source.previewPose?.(id);\n    if (p != null && !touched) { pose = p; touched = true; }\n    const d = source.previewData?.(id);\n    if (d != null) { data = d; touched = true; }\n  }\n  return { pose, data, kind };\n}\n\n/**\n * What path edit shows of node `id` right now ({@link pathEditPathOf}): following any\n * in-flight gesture in `previews`, and in the world of the camera whose\n * `plane` this is — a path on a parallax plane is stored in the plane's.\n */\nexport function liveEditablePath(\n  id: string,\n  node: EditableShape | undefined | null,\n  previews: readonly GesturePreviewSource[],\n  plane: PlaneMap | null,\n  extensions: readonly PathEditExtension[] = [],\n): PolygonPath | null {\n  if (!node) return null;\n  return pathFromPlane(pathEditPathOf(previewedShape(id, node, previews), extensions), plane);\n}\n\n/** The marker of each anchor {@link liveEditablePath} shows for node `id`, as\n *  the representation reading its form draws them; null for a node it reads\n *  none of. */\nexport function liveAnchorMarkers(\n  id: string,\n  node: EditableShape | undefined | null,\n  previews: readonly GesturePreviewSource[],\n  extensions: readonly PathEditExtension[],\n): readonly (AnchorMarkerShape | null)[] | null {\n  if (!node) return null;\n  const held = representationOf(extensions, previewedShape(id, node, previews).data);\n  return held?.representation.anchorMarkers?.(held.form) ?? null;\n}\n"],"mappings":"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"}

package/dist/features/paths/pathEditState.js

@@ -1,3 +1,4 @@
+import { effectSourceFor } from "../pathEffects/effectSources.js";
 import { createEmitter } from "@weasel-js/registry";
 
 //#region src/features/paths/pathEditState.ts
@@ -10,9 +11,11 @@ import { createEmitter } from "@weasel-js/registry";
 var NO_IDS = /* @__PURE__ */ new Set();
 var NO_EXTENSIONS = [];
 var NO_ANCHORS = /* @__PURE__ */ new Set();
-/** Whether `id` names a node `scene` holds and `selection` includes. */
+/** Whether `id` names a node `scene` holds and `selection` includes, or the path a selected effect hides and is edited
+*  through. */
 function isSelectedNode(scene, selection, id) {
-	return scene.get(id) != null && selection.current.includes(id);
+	if (scene.get(id) == null) return false;
+	return selection.current.includes(id) || selection.current.some((sel) => effectSourceFor(scene, sel, "path") === id);
 }
 function createPathEditState(source = {}) {
 	let ownId = "";

package/dist/features/paths/pathEditState.js.map

@@ -1 +1 @@
-{"version":3,"file":"pathEditState.js","names":[],"sources":["../../../src/features/paths/pathEditState.ts"],"sourcesContent":["/**\n * Which path is being anchor-edited, which of its anchors are selected, and\n * the anchor marquee in flight: one object every reader shares — the\n * `editAnchors` dep, the anchor overlay, the selection overlay's suppressed\n * set, the chrome-caps rule context, and the select tool's shift-click lock.\n */\nimport { createEmitter } from '@weasel-js/registry';\nimport type { PathEditHost } from 'canvas/SceneCanvas/pathEditHost';\nimport type { HandleLocks } from 'interactions/actions/edit-anchors/params';\nimport type { PathEditExtension, PathEditMark } from './pathEditExtension';\n\n/** A world-coord rect. */\nexport interface AnchorMarquee {\n  x: number;\n  y: number;\n  width: number;\n  height: number;\n}\n\n/**\n * What decides whether a stored edit target is still one: its node exists and\n * is selected, and the mode permits anchor editing. Each is read at the\n * moment of the question.\n */\nexport interface PathEditSource {\n  /** Whether `id` names a node that exists and is selected. Absent means\n   *  every id does. */\n  isSelectedNode?(id: string): boolean;\n  /** A host that owns the id; the state then keeps none of its own. */\n  host?(): PathEditHost | undefined;\n  /**\n   * Whether anchor editing is permitted right now — whether the active mode\n   * allows the `edits-anchors` capability.\n   *\n   * **Omit this when no mode registry is wired.** Absent means \"no modality,\n   * so nothing revokes edit mode\"; a predicate built from an empty capability\n   * set would revoke edit mode instantly.\n   */\n  isAllowed?(): boolean;\n  /** The extensions it starts with; `setExtensions` replaces them. */\n  extensions?: readonly PathEditExtension[];\n}\n\nexport interface PathEditState {\n  /**\n   * The node whose anchors are editable now, or `''`: the stored id, or the\n   * host's, while `PathEditSource` still lets it stand. Masked rather than\n   * cleared: a host's mode machine can leave path-edit mode without running\n   * `exitPathEdit`, and nothing re-renders when it does, so there is no\n   * moment to write the id back.\n   */\n  getEditingId(): string;\n  /** `getEditingId()` as the set the selection overlay skips. */\n  getEditingIds(): ReadonlySet<string>;\n  setEditingId(id: string | null): void;\n  /** Selected anchors (flat indices) of the path being edited. */\n  getSelectedAnchors(): ReadonlySet<number>;\n  setSelectedAnchors(next: ReadonlySet<number>): void;\n  /** The in-flight anchor-marquee rect, in the edited path's world. */\n  getMarquee(): AnchorMarquee | null;\n  setMarquee(rect: AnchorMarquee | null): void;\n  /** The extension mark selected in place of anchors, or null. */\n  getSelectedMark(): PathEditMark | null;\n  setSelectedMark(mark: PathEditMark | null): void;\n  /** The canvas's path-edit extensions, in order. */\n  getExtensions(): readonly PathEditExtension[];\n  /** Replace the extensions; the overlay repaints when they change. */\n  setExtensions(next: readonly PathEditExtension[]): void;\n  /** The handle locks the `handleLock.*` toggles set; null until one is\n   *  pressed. Not tied to the edited path, so they outlast a change of it. */\n  getHandleLocks(): HandleLocks | null;\n  setHandleLocks(next: HandleLocks): void;\n  /**\n   * The path-edit tool in use, or null for plain anchor editing. Path edit has\n   * a set of named tools, one active at a time, each changing what a plain\n   * drag does: `'simplifyBrush'` brushes the path simpler. A tool belongs to\n   * the open path; with none open, or a different one, there is none.\n   */\n  getTool(): string | null;\n  /** Switch tool, or pass null to go back to plain anchor editing. Ignored\n   *  with no path open. */\n  setTool(id: string | null): void;\n  /** Notified when a write changes what the anchor overlay paints. A host\n   *  that owns the id announces its own changes. */\n  subscribe(listener: () => void): () => void;\n}\n\nconst NO_IDS: ReadonlySet<string> = new Set();\nconst NO_EXTENSIONS: readonly PathEditExtension[] = [];\nconst NO_ANCHORS: ReadonlySet<number> = new Set();\n\n/** Whether `id` names a node `scene` holds and `selection` includes. */\nexport function isSelectedNode(\n  scene: { get(id: never): unknown },\n  selection: { readonly current: readonly string[] },\n  id: string,\n): boolean {\n  return scene.get(id as never) != null && selection.current.includes(id);\n}\n\nexport function createPathEditState(source: PathEditSource = {}): PathEditState {\n  let ownId = '';\n  let selectedAnchors = NO_ANCHORS;\n  let marquee: AnchorMarquee | null = null;\n  let handleLocks: HandleLocks | null = null;\n  let ownTool: { id: string; on: string } | null = null;\n  let idSet = NO_IDS;\n  let selectedMark: PathEditMark | null = null;\n  let extensions = source.extensions ?? NO_EXTENSIONS;\n  const changed = createEmitter();\n  const notify = changed.emit;\n\n  const next = (id: string | null): string => id ?? '';\n  const getEditingId = (): string => {\n    const host = source.host?.();\n    const id = host ? host.editingId() ?? '' : ownId;\n    if (!id) return '';\n    if (source.isAllowed && !source.isAllowed()) return '';\n    if (source.isSelectedNode && !source.isSelectedNode(id)) return '';\n    return id;\n  };\n\n  return {\n    getEditingId,\n    getEditingIds() {\n      const id = getEditingId();\n      if (!id) return NO_IDS;\n      if (!idSet.has(id)) idSet = new Set([id]);\n      return idSet;\n    },\n    setEditingId(id) {\n      const host = source.host?.();\n      if (next(id) !== getEditingId()) ownTool = null;\n      if (host) { host.setEditingId(id); return; }\n      if (next(id) === ownId) return;\n      ownId = next(id);\n      notify();\n    },\n    getSelectedAnchors: () => {\n      const host = source.host?.();\n      return host?.selectedAnchors && host.setSelectedAnchors ? host.selectedAnchors() : selectedAnchors;\n    },\n    setSelectedAnchors(next) {\n      const host = source.host?.();\n      if (host?.selectedAnchors && host.setSelectedAnchors) { host.setSelectedAnchors(next); return; }\n      selectedAnchors = next;\n      notify();\n    },\n    getMarquee: () => marquee,\n    setMarquee(rect) {\n      marquee = rect;\n      notify();\n    },\n    getSelectedMark: () => selectedMark,\n    setSelectedMark(mark) {\n      if (mark?.owner === selectedMark?.owner && mark?.index === selectedMark?.index) return;\n      selectedMark = mark;\n      notify();\n    },\n    getExtensions: () => extensions,\n    setExtensions(next) {\n      if (next === extensions) return;\n      extensions = next;\n      notify();\n    },\n    getHandleLocks: () => handleLocks,\n    setHandleLocks(next) {\n      handleLocks = { angle: next.angle, length: next.length };\n      notify();\n    },\n    getTool() {\n      const on = getEditingId();\n      const host = source.host?.();\n      if (host?.tool) return on ? host.tool() : null;\n      // Dropped on the read that finds its path gone: a host can close the\n      // path without telling this state.\n      if (ownTool && ownTool.on !== on) ownTool = null;\n      return ownTool?.id ?? null;\n    },\n    setTool(id) {\n      const host = source.host?.();\n      if (host?.tool && host.setTool) { host.setTool(id); return; }\n      const on = getEditingId();\n      const tool = id && on ? { id, on } : null;\n      if (tool?.id === ownTool?.id && tool?.on === ownTool?.on) return;\n      ownTool = tool;\n      notify();\n    },\n    subscribe: changed.subscribe,\n  };\n}\n"],"mappings":";;;;;;;;;AAuFA,IAAM,yBAA8B,IAAI,IAAI;AAC5C,IAAM,gBAA8C,CAAC;AACrD,IAAM,6BAAkC,IAAI,IAAI;;AAGhD,SAAgB,eACd,OACA,WACA,IACS;CACT,OAAO,MAAM,IAAI,EAAW,KAAK,QAAQ,UAAU,QAAQ,SAAS,EAAE;AACxE;AAEA,SAAgB,oBAAoB,SAAyB,CAAC,GAAkB;CAC9E,IAAI,QAAQ;CACZ,IAAI,kBAAkB;CACtB,IAAI,UAAgC;CACpC,IAAI,cAAkC;CACtC,IAAI,UAA6C;CACjD,IAAI,QAAQ;CACZ,IAAI,eAAoC;CACxC,IAAI,aAAa,OAAO,cAAc;CACtC,MAAM,UAAU,cAAc;CAC9B,MAAM,SAAS,QAAQ;CAEvB,MAAM,QAAQ,OAA8B,MAAM;CAClD,MAAM,qBAA6B;EACjC,MAAM,OAAO,OAAO,OAAO;EAC3B,MAAM,KAAK,OAAO,KAAK,UAAU,KAAK,KAAK;EAC3C,IAAI,CAAC,IAAI,OAAO;EAChB,IAAI,OAAO,aAAa,CAAC,OAAO,UAAU,GAAG,OAAO;EACpD,IAAI,OAAO,kBAAkB,CAAC,OAAO,eAAe,EAAE,GAAG,OAAO;EAChE,OAAO;CACT;CAEA,OAAO;EACL;EACA,gBAAgB;GACd,MAAM,KAAK,aAAa;GACxB,IAAI,CAAC,IAAI,OAAO;GAChB,IAAI,CAAC,MAAM,IAAI,EAAE,GAAG,wBAAQ,IAAI,IAAI,CAAC,EAAE,CAAC;GACxC,OAAO;EACT;EACA,aAAa,IAAI;GACf,MAAM,OAAO,OAAO,OAAO;GAC3B,IAAI,KAAK,EAAE,MAAM,aAAa,GAAG,UAAU;GAC3C,IAAI,MAAM;IAAE,KAAK,aAAa,EAAE;IAAG;GAAQ;GAC3C,IAAI,KAAK,EAAE,MAAM,OAAO;GACxB,QAAQ,KAAK,EAAE;GACf,OAAO;EACT;EACA,0BAA0B;GACxB,MAAM,OAAO,OAAO,OAAO;GAC3B,OAAO,MAAM,mBAAmB,KAAK,qBAAqB,KAAK,gBAAgB,IAAI;EACrF;EACA,mBAAmB,MAAM;GACvB,MAAM,OAAO,OAAO,OAAO;GAC3B,IAAI,MAAM,mBAAmB,KAAK,oBAAoB;IAAE,KAAK,mBAAmB,IAAI;IAAG;GAAQ;GAC/F,kBAAkB;GAClB,OAAO;EACT;EACA,kBAAkB;EAClB,WAAW,MAAM;GACf,UAAU;GACV,OAAO;EACT;EACA,uBAAuB;EACvB,gBAAgB,MAAM;GACpB,IAAI,MAAM,UAAU,cAAc,SAAS,MAAM,UAAU,cAAc,OAAO;GAChF,eAAe;GACf,OAAO;EACT;EACA,qBAAqB;EACrB,cAAc,MAAM;GAClB,IAAI,SAAS,YAAY;GACzB,aAAa;GACb,OAAO;EACT;EACA,sBAAsB;EACtB,eAAe,MAAM;GACnB,cAAc;IAAE,OAAO,KAAK;IAAO,QAAQ,KAAK;GAAO;GACvD,OAAO;EACT;EACA,UAAU;GACR,MAAM,KAAK,aAAa;GACxB,MAAM,OAAO,OAAO,OAAO;GAC3B,IAAI,MAAM,MAAM,OAAO,KAAK,KAAK,KAAK,IAAI;GAG1C,IAAI,WAAW,QAAQ,OAAO,IAAI,UAAU;GAC5C,OAAO,SAAS,MAAM;EACxB;EACA,QAAQ,IAAI;GACV,MAAM,OAAO,OAAO,OAAO;GAC3B,IAAI,MAAM,QAAQ,KAAK,SAAS;IAAE,KAAK,QAAQ,EAAE;IAAG;GAAQ;GAC5D,MAAM,KAAK,aAAa;GACxB,MAAM,OAAO,MAAM,KAAK;IAAE;IAAI;GAAG,IAAI;GACrC,IAAI,MAAM,OAAO,SAAS,MAAM,MAAM,OAAO,SAAS,IAAI;GAC1D,UAAU;GACV,OAAO;EACT;EACA,WAAW,QAAQ;CACrB;AACF"}
+{"version":3,"file":"pathEditState.js","names":[],"sources":["../../../src/features/paths/pathEditState.ts"],"sourcesContent":["/**\n * Which path is being anchor-edited, which of its anchors are selected, and\n * the anchor marquee in flight: one object every reader shares — the\n * `editAnchors` dep, the anchor overlay, the selection overlay's suppressed\n * set, the chrome-caps rule context, and the select tool's shift-click lock.\n */\nimport { createEmitter } from '@weasel-js/registry';\nimport type { PathEditHost } from 'canvas/SceneCanvas/pathEditHost';\nimport type { HandleLocks } from 'interactions/actions/edit-anchors/params';\nimport type { PathEditExtension, PathEditMark } from './pathEditExtension';\nimport type { NodeId, Scene } from 'core/scene/types';\nimport { effectSourceFor } from 'features/pathEffects/effectSources';\n\n/** A world-coord rect. */\nexport interface AnchorMarquee {\n  x: number;\n  y: number;\n  width: number;\n  height: number;\n}\n\n/**\n * What decides whether a stored edit target is still one: its node exists and\n * is selected, and the mode permits anchor editing. Each is read at the\n * moment of the question.\n */\nexport interface PathEditSource {\n  /** Whether `id` names a node that exists and is selected. Absent means\n   *  every id does. */\n  isSelectedNode?(id: string): boolean;\n  /** A host that owns the id; the state then keeps none of its own. */\n  host?(): PathEditHost | undefined;\n  /**\n   * Whether anchor editing is permitted right now — whether the active mode\n   * allows the `edits-anchors` capability.\n   *\n   * **Omit this when no mode registry is wired.** Absent means \"no modality,\n   * so nothing revokes edit mode\"; a predicate built from an empty capability\n   * set would revoke edit mode instantly.\n   */\n  isAllowed?(): boolean;\n  /** The extensions it starts with; `setExtensions` replaces them. */\n  extensions?: readonly PathEditExtension[];\n}\n\nexport interface PathEditState {\n  /**\n   * The node whose anchors are editable now, or `''`: the stored id, or the\n   * host's, while `PathEditSource` still lets it stand. Masked rather than\n   * cleared: a host's mode machine can leave path-edit mode without running\n   * `exitPathEdit`, and nothing re-renders when it does, so there is no\n   * moment to write the id back.\n   */\n  getEditingId(): string;\n  /** `getEditingId()` as the set the selection overlay skips. */\n  getEditingIds(): ReadonlySet<string>;\n  setEditingId(id: string | null): void;\n  /** Selected anchors (flat indices) of the path being edited. */\n  getSelectedAnchors(): ReadonlySet<number>;\n  setSelectedAnchors(next: ReadonlySet<number>): void;\n  /** The in-flight anchor-marquee rect, in the edited path's world. */\n  getMarquee(): AnchorMarquee | null;\n  setMarquee(rect: AnchorMarquee | null): void;\n  /** The extension mark selected in place of anchors, or null. */\n  getSelectedMark(): PathEditMark | null;\n  setSelectedMark(mark: PathEditMark | null): void;\n  /** The canvas's path-edit extensions, in order. */\n  getExtensions(): readonly PathEditExtension[];\n  /** Replace the extensions; the overlay repaints when they change. */\n  setExtensions(next: readonly PathEditExtension[]): void;\n  /** The handle locks the `handleLock.*` toggles set; null until one is\n   *  pressed. Not tied to the edited path, so they outlast a change of it. */\n  getHandleLocks(): HandleLocks | null;\n  setHandleLocks(next: HandleLocks): void;\n  /**\n   * The path-edit tool in use, or null for plain anchor editing. Path edit has\n   * a set of named tools, one active at a time, each changing what a plain\n   * drag does: `'simplifyBrush'` brushes the path simpler. A tool belongs to\n   * the open path; with none open, or a different one, there is none.\n   */\n  getTool(): string | null;\n  /** Switch tool, or pass null to go back to plain anchor editing. Ignored\n   *  with no path open. */\n  setTool(id: string | null): void;\n  /** Notified when a write changes what the anchor overlay paints. A host\n   *  that owns the id announces its own changes. */\n  subscribe(listener: () => void): () => void;\n}\n\nconst NO_IDS: ReadonlySet<string> = new Set();\nconst NO_EXTENSIONS: readonly PathEditExtension[] = [];\nconst NO_ANCHORS: ReadonlySet<number> = new Set();\n\n/** Whether `id` names a node `scene` holds and `selection` includes, or the path a selected effect hides and is edited\n *  through. */\nexport function isSelectedNode(\n  scene: Pick<Scene<unknown, string, unknown>, 'get'>,\n  selection: { readonly current: readonly string[] },\n  id: string,\n): boolean {\n  if (scene.get(id as NodeId) == null) return false;\n  return selection.current.includes(id)\n    || selection.current.some((sel) => effectSourceFor(scene, sel as NodeId, 'path') === id);\n}\n\nexport function createPathEditState(source: PathEditSource = {}): PathEditState {\n  let ownId = '';\n  let selectedAnchors = NO_ANCHORS;\n  let marquee: AnchorMarquee | null = null;\n  let handleLocks: HandleLocks | null = null;\n  let ownTool: { id: string; on: string } | null = null;\n  let idSet = NO_IDS;\n  let selectedMark: PathEditMark | null = null;\n  let extensions = source.extensions ?? NO_EXTENSIONS;\n  const changed = createEmitter();\n  const notify = changed.emit;\n\n  const next = (id: string | null): string => id ?? '';\n  const getEditingId = (): string => {\n    const host = source.host?.();\n    const id = host ? host.editingId() ?? '' : ownId;\n    if (!id) return '';\n    if (source.isAllowed && !source.isAllowed()) return '';\n    if (source.isSelectedNode && !source.isSelectedNode(id)) return '';\n    return id;\n  };\n\n  return {\n    getEditingId,\n    getEditingIds() {\n      const id = getEditingId();\n      if (!id) return NO_IDS;\n      if (!idSet.has(id)) idSet = new Set([id]);\n      return idSet;\n    },\n    setEditingId(id) {\n      const host = source.host?.();\n      if (next(id) !== getEditingId()) ownTool = null;\n      if (host) { host.setEditingId(id); return; }\n      if (next(id) === ownId) return;\n      ownId = next(id);\n      notify();\n    },\n    getSelectedAnchors: () => {\n      const host = source.host?.();\n      return host?.selectedAnchors && host.setSelectedAnchors ? host.selectedAnchors() : selectedAnchors;\n    },\n    setSelectedAnchors(next) {\n      const host = source.host?.();\n      if (host?.selectedAnchors && host.setSelectedAnchors) { host.setSelectedAnchors(next); return; }\n      selectedAnchors = next;\n      notify();\n    },\n    getMarquee: () => marquee,\n    setMarquee(rect) {\n      marquee = rect;\n      notify();\n    },\n    getSelectedMark: () => selectedMark,\n    setSelectedMark(mark) {\n      if (mark?.owner === selectedMark?.owner && mark?.index === selectedMark?.index) return;\n      selectedMark = mark;\n      notify();\n    },\n    getExtensions: () => extensions,\n    setExtensions(next) {\n      if (next === extensions) return;\n      extensions = next;\n      notify();\n    },\n    getHandleLocks: () => handleLocks,\n    setHandleLocks(next) {\n      handleLocks = { angle: next.angle, length: next.length };\n      notify();\n    },\n    getTool() {\n      const on = getEditingId();\n      const host = source.host?.();\n      if (host?.tool) return on ? host.tool() : null;\n      // Dropped on the read that finds its path gone: a host can close the\n      // path without telling this state.\n      if (ownTool && ownTool.on !== on) ownTool = null;\n      return ownTool?.id ?? null;\n    },\n    setTool(id) {\n      const host = source.host?.();\n      if (host?.tool && host.setTool) { host.setTool(id); return; }\n      const on = getEditingId();\n      const tool = id && on ? { id, on } : null;\n      if (tool?.id === ownTool?.id && tool?.on === ownTool?.on) return;\n      ownTool = tool;\n      notify();\n    },\n    subscribe: changed.subscribe,\n  };\n}\n"],"mappings":"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"}

package/dist/features/paths/pathSnap/sceneIndex.js

@@ -29,7 +29,7 @@ function createSceneSnapIndexer(scene) {
 		const paths = [];
 		const extra = [];
 		for (const node of scene.nodes.values()) {
-			if (node.kind !== "leaf" || notes.has(node.layer) || gates.hidden(node.id)) continue;
+			if (node.kind !== "mark" || notes.has(node.layer) || gates.hidden(node.id)) continue;
 			const g = nodeSnapGeometry(node);
 			if (!g) continue;
 			for (const p of g.points) extra.push({

package/dist/features/paths/pathSnap/sceneIndex.js.map

@@ -1 +1 @@
-{"version":3,"file":"sceneIndex.js","names":[],"sources":["../../../../src/features/paths/pathSnap/sceneIndex.ts"],"sourcesContent":["import {\n  createPathSnapIndex, type Path, type PathSnapIndex, type PathSnapTarget,\n} from '@weasel-js/geom';\nimport type { Scene } from 'core/scene/types';\nimport { isAnnotationLayer } from 'core/scene/annotation';\nimport { nodeGates } from 'core/scene/nodeGates';\nimport type { SnapGeometry } from 'interactions/actions/snapDep';\nimport { nodeSnapGeometry } from './snapGeometry';\n\ntype SnapScene = Pick<Scene<unknown, string, unknown>, 'nodes' | 'layers' | 'getVersion'>;\n\n/** A scene's paths indexed for snapping; `ids[i]` is the node path `i` came\n *  from, or null for a path of the query's own (`also`). */\nexport interface SceneSnapIndex {\n  ids: (string | null)[];\n  index: PathSnapIndex;\n}\n\n/** Indexes every leaf of `scene` with geometry (`nodeSnapGeometry`), but\n *  hidden ones (`nodeGates`) and those on an annotation layer, once per scene\n *  version, and again when a query brings geometry of its own. The scene\n *  alone and the scene with the last `also` are cached apart, so a query\n *  without geometry does not evict a gesture's. */\nexport function createSceneSnapIndexer(scene: SnapScene): (also?: SnapGeometry) => SceneSnapIndex {\n  type Slot = { version: number; layers: unknown; also: SnapGeometry | undefined; built: SceneSnapIndex };\n  const slots: { bare: Slot | null; also: Slot | null } = { bare: null, also: null };\n  return (also) => {\n    const version = scene.getVersion();\n    const layers = scene.layers;\n    const key = also ? 'also' : 'bare';\n    const cached = slots[key];\n    if (cached?.version === version && cached.layers === layers && cached.also === also) return cached.built;\n    const notes = new Set(layers.filter(isAnnotationLayer).map((l) => l.id));\n    const gates = nodeGates({ layers, get: (id) => scene.nodes.get(id) });\n    const ids: (string | null)[] = [];\n    const paths: Path[] = [];\n    const extra: PathSnapTarget[] = [];\n    for (const node of scene.nodes.values()) {\n      if (node.kind !== 'leaf' || notes.has(node.layer) || gates.hidden(node.id)) continue;\n      const g = nodeSnapGeometry(node);\n      if (!g) continue;\n      for (const p of g.points) extra.push({ ...p, paths: [paths.length] });\n      ids.push(node.id);\n      paths.push(g.path);\n    }\n    for (const path of also?.paths ?? []) { ids.push(null); paths.push(path); }\n    if (also?.anchors) {\n      ids.push(null);\n      for (const p of also.anchors) extra.push({ kind: 'anchor', x: p.x, y: p.y, paths: [paths.length] });\n      paths.push({ kind: 'polygon', commands: new Uint8Array(), coords: new Float32Array(), fillRule: 'nonzero' });\n    }\n    const built = { ids, index: createPathSnapIndex(paths, extra) };\n    slots[key] = { version, layers, also, built };\n    return built;\n  };\n}\n\nconst indexers = new WeakMap<object, ReturnType<typeof createSceneSnapIndexer>>();\n\n/** {@link createSceneSnapIndexer}, one per scene, so every source over a\n *  scene shares its index. */\nexport function sceneSnapIndex(scene: SnapScene, also?: SnapGeometry): SceneSnapIndex {\n  let indexer = indexers.get(scene);\n  if (!indexer) indexers.set(scene, (indexer = createSceneSnapIndexer(scene)));\n  return indexer(also);\n}\n"],"mappings":";;;;;;;;;;;AAuBA,SAAgB,uBAAuB,OAA2D;CAEhG,MAAM,QAAkD;EAAE,MAAM;EAAM,MAAM;CAAK;CACjF,QAAQ,SAAS;EACf,MAAM,UAAU,MAAM,WAAW;EACjC,MAAM,SAAS,MAAM;EACrB,MAAM,MAAM,OAAO,SAAS;EAC5B,MAAM,SAAS,MAAM;EACrB,IAAI,QAAQ,YAAY,WAAW,OAAO,WAAW,UAAU,OAAO,SAAS,MAAM,OAAO,OAAO;EACnG,MAAM,QAAQ,IAAI,IAAI,OAAO,OAAO,iBAAiB,CAAC,CAAC,KAAK,MAAM,EAAE,EAAE,CAAC;EACvE,MAAM,QAAQ,UAAU;GAAE;GAAQ,MAAM,OAAO,MAAM,MAAM,IAAI,EAAE;EAAE,CAAC;EACpE,MAAM,MAAyB,CAAC;EAChC,MAAM,QAAgB,CAAC;EACvB,MAAM,QAA0B,CAAC;EACjC,KAAK,MAAM,QAAQ,MAAM,MAAM,OAAO,GAAG;GACvC,IAAI,KAAK,SAAS,UAAU,MAAM,IAAI,KAAK,KAAK,KAAK,MAAM,OAAO,KAAK,EAAE,GAAG;GAC5E,MAAM,IAAI,iBAAiB,IAAI;GAC/B,IAAI,CAAC,GAAG;GACR,KAAK,MAAM,KAAK,EAAE,QAAQ,MAAM,KAAK;IAAE,GAAG;IAAG,OAAO,CAAC,MAAM,MAAM;GAAE,CAAC;GACpE,IAAI,KAAK,KAAK,EAAE;GAChB,MAAM,KAAK,EAAE,IAAI;EACnB;EACA,KAAK,MAAM,QAAQ,MAAM,SAAS,CAAC,GAAG;GAAE,IAAI,KAAK,IAAI;GAAG,MAAM,KAAK,IAAI;EAAG;EAC1E,IAAI,MAAM,SAAS;GACjB,IAAI,KAAK,IAAI;GACb,KAAK,MAAM,KAAK,KAAK,SAAS,MAAM,KAAK;IAAE,MAAM;IAAU,GAAG,EAAE;IAAG,GAAG,EAAE;IAAG,OAAO,CAAC,MAAM,MAAM;GAAE,CAAC;GAClG,MAAM,KAAK;IAAE,MAAM;IAAW,0BAAU,IAAI,WAAW;IAAG,wBAAQ,IAAI,aAAa;IAAG,UAAU;GAAU,CAAC;EAC7G;EACA,MAAM,QAAQ;GAAE;GAAK,OAAO,oBAAoB,OAAO,KAAK;EAAE;EAC9D,MAAM,OAAO;GAAE;GAAS;GAAQ;GAAM;EAAM;EAC5C,OAAO;CACT;AACF;AAEA,IAAM,2BAAW,IAAI,QAA2D;;;AAIhF,SAAgB,eAAe,OAAkB,MAAqC;CACpF,IAAI,UAAU,SAAS,IAAI,KAAK;CAChC,IAAI,CAAC,SAAS,SAAS,IAAI,OAAQ,UAAU,uBAAuB,KAAK,CAAE;CAC3E,OAAO,QAAQ,IAAI;AACrB"}
+{"version":3,"file":"sceneIndex.js","names":[],"sources":["../../../../src/features/paths/pathSnap/sceneIndex.ts"],"sourcesContent":["import {\n  createPathSnapIndex, type Path, type PathSnapIndex, type PathSnapTarget,\n} from '@weasel-js/geom';\nimport type { Scene } from 'core/scene/types';\nimport { isAnnotationLayer } from 'core/scene/annotation';\nimport { nodeGates } from 'core/scene/nodeGates';\nimport type { SnapGeometry } from 'interactions/actions/snapDep';\nimport { nodeSnapGeometry } from './snapGeometry';\n\ntype SnapScene = Pick<Scene<unknown, string, unknown>, 'nodes' | 'layers' | 'getVersion'>;\n\n/** A scene's paths indexed for snapping; `ids[i]` is the node path `i` came\n *  from, or null for a path of the query's own (`also`). */\nexport interface SceneSnapIndex {\n  ids: (string | null)[];\n  index: PathSnapIndex;\n}\n\n/** Indexes every leaf of `scene` with geometry (`nodeSnapGeometry`), but\n *  hidden ones (`nodeGates`) and those on an annotation layer, once per scene\n *  version, and again when a query brings geometry of its own. The scene\n *  alone and the scene with the last `also` are cached apart, so a query\n *  without geometry does not evict a gesture's. */\nexport function createSceneSnapIndexer(scene: SnapScene): (also?: SnapGeometry) => SceneSnapIndex {\n  type Slot = { version: number; layers: unknown; also: SnapGeometry | undefined; built: SceneSnapIndex };\n  const slots: { bare: Slot | null; also: Slot | null } = { bare: null, also: null };\n  return (also) => {\n    const version = scene.getVersion();\n    const layers = scene.layers;\n    const key = also ? 'also' : 'bare';\n    const cached = slots[key];\n    if (cached?.version === version && cached.layers === layers && cached.also === also) return cached.built;\n    const notes = new Set(layers.filter(isAnnotationLayer).map((l) => l.id));\n    const gates = nodeGates({ layers, get: (id) => scene.nodes.get(id) });\n    const ids: (string | null)[] = [];\n    const paths: Path[] = [];\n    const extra: PathSnapTarget[] = [];\n    for (const node of scene.nodes.values()) {\n      if (node.kind !== 'mark' || notes.has(node.layer) || gates.hidden(node.id)) continue;\n      const g = nodeSnapGeometry(node);\n      if (!g) continue;\n      for (const p of g.points) extra.push({ ...p, paths: [paths.length] });\n      ids.push(node.id);\n      paths.push(g.path);\n    }\n    for (const path of also?.paths ?? []) { ids.push(null); paths.push(path); }\n    if (also?.anchors) {\n      ids.push(null);\n      for (const p of also.anchors) extra.push({ kind: 'anchor', x: p.x, y: p.y, paths: [paths.length] });\n      paths.push({ kind: 'polygon', commands: new Uint8Array(), coords: new Float32Array(), fillRule: 'nonzero' });\n    }\n    const built = { ids, index: createPathSnapIndex(paths, extra) };\n    slots[key] = { version, layers, also, built };\n    return built;\n  };\n}\n\nconst indexers = new WeakMap<object, ReturnType<typeof createSceneSnapIndexer>>();\n\n/** {@link createSceneSnapIndexer}, one per scene, so every source over a\n *  scene shares its index. */\nexport function sceneSnapIndex(scene: SnapScene, also?: SnapGeometry): SceneSnapIndex {\n  let indexer = indexers.get(scene);\n  if (!indexer) indexers.set(scene, (indexer = createSceneSnapIndexer(scene)));\n  return indexer(also);\n}\n"],"mappings":";;;;;;;;;;;AAuBA,SAAgB,uBAAuB,OAA2D;CAEhG,MAAM,QAAkD;EAAE,MAAM;EAAM,MAAM;CAAK;CACjF,QAAQ,SAAS;EACf,MAAM,UAAU,MAAM,WAAW;EACjC,MAAM,SAAS,MAAM;EACrB,MAAM,MAAM,OAAO,SAAS;EAC5B,MAAM,SAAS,MAAM;EACrB,IAAI,QAAQ,YAAY,WAAW,OAAO,WAAW,UAAU,OAAO,SAAS,MAAM,OAAO,OAAO;EACnG,MAAM,QAAQ,IAAI,IAAI,OAAO,OAAO,iBAAiB,CAAC,CAAC,KAAK,MAAM,EAAE,EAAE,CAAC;EACvE,MAAM,QAAQ,UAAU;GAAE;GAAQ,MAAM,OAAO,MAAM,MAAM,IAAI,EAAE;EAAE,CAAC;EACpE,MAAM,MAAyB,CAAC;EAChC,MAAM,QAAgB,CAAC;EACvB,MAAM,QAA0B,CAAC;EACjC,KAAK,MAAM,QAAQ,MAAM,MAAM,OAAO,GAAG;GACvC,IAAI,KAAK,SAAS,UAAU,MAAM,IAAI,KAAK,KAAK,KAAK,MAAM,OAAO,KAAK,EAAE,GAAG;GAC5E,MAAM,IAAI,iBAAiB,IAAI;GAC/B,IAAI,CAAC,GAAG;GACR,KAAK,MAAM,KAAK,EAAE,QAAQ,MAAM,KAAK;IAAE,GAAG;IAAG,OAAO,CAAC,MAAM,MAAM;GAAE,CAAC;GACpE,IAAI,KAAK,KAAK,EAAE;GAChB,MAAM,KAAK,EAAE,IAAI;EACnB;EACA,KAAK,MAAM,QAAQ,MAAM,SAAS,CAAC,GAAG;GAAE,IAAI,KAAK,IAAI;GAAG,MAAM,KAAK,IAAI;EAAG;EAC1E,IAAI,MAAM,SAAS;GACjB,IAAI,KAAK,IAAI;GACb,KAAK,MAAM,KAAK,KAAK,SAAS,MAAM,KAAK;IAAE,MAAM;IAAU,GAAG,EAAE;IAAG,GAAG,EAAE;IAAG,OAAO,CAAC,MAAM,MAAM;GAAE,CAAC;GAClG,MAAM,KAAK;IAAE,MAAM;IAAW,0BAAU,IAAI,WAAW;IAAG,wBAAQ,IAAI,aAAa;IAAG,UAAU;GAAU,CAAC;EAC7G;EACA,MAAM,QAAQ;GAAE;GAAK,OAAO,oBAAoB,OAAO,KAAK;EAAE;EAC9D,MAAM,OAAO;GAAE;GAAS;GAAQ;GAAM;EAAM;EAC5C,OAAO;CACT;AACF;AAEA,IAAM,2BAAW,IAAI,QAA2D;;;AAIhF,SAAgB,eAAe,OAAkB,MAAqC;CACpF,IAAI,UAAU,SAAS,IAAI,KAAK;CAChC,IAAI,CAAC,SAAS,SAAS,IAAI,OAAQ,UAAU,uBAAuB,KAAK,CAAE;CAC3E,OAAO,QAAQ,IAAI;AACrB"}

package/dist/features/selection/enteredGroupFrame.js

@@ -0,0 +1,65 @@
+import { viewToTransform } from "../../core/viewport/view.js";
+import { worldToScreen } from "../../core/viewport/viewTransform.js";
+import { rectPathFor } from "./handleCommands.js";
+import { useMemo } from "react";
+
+//#region src/features/selection/enteredGroupFrame.ts
+/** The theme token the frame reads its color from, set on the canvas or any element above it. */
+var ENTERED_FRAME_TOKEN = "--wzl-entered-group";
+/** The frame's color where nothing sets {@link ENTERED_FRAME_TOKEN}. */
+var ENTERED_FRAME_COLOR = "#a48bd4";
+var FRAME_WIDTH = 1;
+var FRAME_DASH = [6, 4];
+/**
+* The frame around the group a canvas is working inside: one dashed outline on the group's
+* box, in the selection chrome's own screen space, repainting when the entered group changes.
+*/
+function createEnteredGroupFrameLayer(opts) {
+	return {
+		id: "entered-group-frame",
+		label: "Entered group",
+		space: "screen",
+		subscribe: (repaint) => {
+			const offGroup = opts.entered.subscribe(repaint);
+			const offColor = opts.colorChanged?.(repaint);
+			return () => {
+				offGroup();
+				offColor?.();
+			};
+		},
+		draw: (_data, view) => {
+			const id = opts.entered.get();
+			const b = id === null ? null : opts.boundsOf(id);
+			if (b === null) return [];
+			const [x, y] = worldToScreen(b.x, b.y, viewToTransform(view));
+			return [{
+				kind: "path",
+				path: rectPathFor(x, y, b.width * view.scale.x, b.height * view.scale.y),
+				stroke: {
+					paint: {
+						kind: "solid",
+						color: opts.color?.() ?? ENTERED_FRAME_COLOR
+					},
+					width: FRAME_WIDTH,
+					dash: FRAME_DASH
+				}
+			}];
+		}
+	};
+}
+function useEnteredGroupFrameLayer(entered, boundsOf, color) {
+	return useMemo(() => createEnteredGroupFrameLayer({
+		entered,
+		boundsOf,
+		color: color.read,
+		colorChanged: color.changed
+	}), [
+		entered,
+		boundsOf,
+		color
+	]);
+}
+
+//#endregion
+export { ENTERED_FRAME_COLOR, ENTERED_FRAME_TOKEN, createEnteredGroupFrameLayer, useEnteredGroupFrameLayer };
+//# sourceMappingURL=enteredGroupFrame.js.map

package/dist/features/selection/enteredGroupFrame.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"enteredGroupFrame.js","names":[],"sources":["../../../src/features/selection/enteredGroupFrame.ts"],"sourcesContent":["import { useMemo } from 'react';\nimport type { RenderLayer } from 'core/layers/render';\nimport type { Bounds } from 'core/viewport/fitViewToBounds';\nimport { viewToTransform } from 'core/viewport/view';\nimport { worldToScreen } from 'core/viewport/viewTransform';\nimport type { EnteredGroupApi } from 'canvas/deps/enteredGroup';\nimport { rectPathFor } from './handleCommands';\n\n/** The theme token the frame reads its color from, set on the canvas or any element above it. */\nexport const ENTERED_FRAME_TOKEN = '--wzl-entered-group';\n/** The frame's color where nothing sets {@link ENTERED_FRAME_TOKEN}. */\nexport const ENTERED_FRAME_COLOR = '#a48bd4';\nconst FRAME_WIDTH = 1;\nconst FRAME_DASH = [6, 4];\n\n/**\n * The frame around the group a canvas is working inside: one dashed outline on the group's\n * box, in the selection chrome's own screen space, repainting when the entered group changes.\n */\nexport function createEnteredGroupFrameLayer(opts: {\n  entered: EnteredGroupApi;\n  /** The box to frame, in world units. */\n  boundsOf: (id: string) => Bounds | null;\n  /** The frame's color, read at each paint. Default {@link ENTERED_FRAME_COLOR}. */\n  color?: () => string;\n  /** Hears that `color` may answer differently: a theme or mode switch. */\n  colorChanged?: (fn: () => void) => () => void;\n}): RenderLayer<unknown> {\n  return {\n    id: 'entered-group-frame',\n    label: 'Entered group',\n    space: 'screen',\n    subscribe: (repaint) => {\n      const offGroup = opts.entered.subscribe(repaint);\n      const offColor = opts.colorChanged?.(repaint);\n      return () => { offGroup(); offColor?.(); };\n    },\n    draw: (_data, view) => {\n      const id = opts.entered.get();\n      const b = id === null ? null : opts.boundsOf(id);\n      if (b === null) return [];\n      const [x, y] = worldToScreen(b.x, b.y, viewToTransform(view));\n      return [{\n        kind: 'path',\n        path: rectPathFor(x, y, b.width * view.scale.x, b.height * view.scale.y),\n        stroke: {\n          paint: { kind: 'solid', color: opts.color?.() ?? ENTERED_FRAME_COLOR },\n          width: FRAME_WIDTH,\n          dash: FRAME_DASH,\n        },\n      }];\n    },\n  };\n}\n\nexport function useEnteredGroupFrameLayer(\n  entered: EnteredGroupApi,\n  boundsOf: (id: string) => Bounds | null,\n  color: { read: () => string; changed: (fn: () => void) => () => void },\n): RenderLayer<unknown> {\n  return useMemo(\n    () => createEnteredGroupFrameLayer({ entered, boundsOf, color: color.read, colorChanged: color.changed }),\n    [entered, boundsOf, color],\n  );\n}\n"],"mappings":";;;;;;;AASA,IAAa,sBAAsB;;AAEnC,IAAa,sBAAsB;AACnC,IAAM,cAAc;AACpB,IAAM,aAAa,CAAC,GAAG,CAAC;;;;;AAMxB,SAAgB,6BAA6B,MAQpB;CACvB,OAAO;EACL,IAAI;EACJ,OAAO;EACP,OAAO;EACP,YAAY,YAAY;GACtB,MAAM,WAAW,KAAK,QAAQ,UAAU,OAAO;GAC/C,MAAM,WAAW,KAAK,eAAe,OAAO;GAC5C,aAAa;IAAE,SAAS;IAAG,WAAW;GAAG;EAC3C;EACA,OAAO,OAAO,SAAS;GACrB,MAAM,KAAK,KAAK,QAAQ,IAAI;GAC5B,MAAM,IAAI,OAAO,OAAO,OAAO,KAAK,SAAS,EAAE;GAC/C,IAAI,MAAM,MAAM,OAAO,CAAC;GACxB,MAAM,CAAC,GAAG,KAAK,cAAc,EAAE,GAAG,EAAE,GAAG,gBAAgB,IAAI,CAAC;GAC5D,OAAO,CAAC;IACN,MAAM;IACN,MAAM,YAAY,GAAG,GAAG,EAAE,QAAQ,KAAK,MAAM,GAAG,EAAE,SAAS,KAAK,MAAM,CAAC;IACvE,QAAQ;KACN,OAAO;MAAE,MAAM;MAAS,OAAO,KAAK,QAAQ,KAAK;KAAoB;KACrE,OAAO;KACP,MAAM;IACR;GACF,CAAC;EACH;CACF;AACF;AAEA,SAAgB,0BACd,SACA,UACA,OACsB;CACtB,OAAO,cACC,6BAA6B;EAAE;EAAS;EAAU,OAAO,MAAM;EAAM,cAAc,MAAM;CAAQ,CAAC,GACxG;EAAC;EAAS;EAAU;CAAK,CAC3B;AACF"}

package/dist/features/selection/enteredGroupScope.js

@@ -0,0 +1,44 @@
+import { reachableInGroup } from "../../canvas/deps/enteredGroup.js";
+import { createEmitter } from "@weasel-js/registry";
+import { OUT_OF_SCOPE_ALPHA } from "@weasel-js/modes";
+
+//#region src/features/selection/enteredGroupScope.ts
+/**
+* The entered group as a scope: everything outside its subtree dims and stops taking hits, and
+* so does the group itself, whose empty box is empty canvas while it is entered. With nothing
+* entered every node is lit and live. Compose `alphaFor` into `<SceneCanvas alphaFor>` and the
+* scope into `redrawOn` to show it.
+*/
+function createEnteredGroupScope(opts) {
+	const { entered, scene } = opts;
+	const dim = opts.dimAlpha ?? OUT_OF_SCOPE_ALPHA;
+	const listeners = createEmitter();
+	let version = 0;
+	let stop = null;
+	return {
+		alphaFor: (id) => {
+			const group = entered.get();
+			return id === group || reachableInGroup(scene, group, id) ? 1 : dim;
+		},
+		isPointerInteractive: (id) => reachableInGroup(scene, entered.get(), id),
+		getVersion: () => version,
+		subscribe(fn) {
+			if (stop === null) stop = entered.subscribe(() => {
+				version++;
+				listeners.emit();
+			});
+			const off = listeners.subscribe(fn);
+			return () => {
+				off();
+				if (listeners.size === 0) {
+					stop?.();
+					stop = null;
+				}
+			};
+		}
+	};
+}
+
+//#endregion
+export { createEnteredGroupScope };
+//# sourceMappingURL=enteredGroupScope.js.map

package/dist/features/selection/enteredGroupScope.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"enteredGroupScope.js","names":[],"sources":["../../../src/features/selection/enteredGroupScope.ts"],"sourcesContent":["import { OUT_OF_SCOPE_ALPHA, type NodeScope } from '@weasel-js/modes';\nimport { createEmitter } from '@weasel-js/registry';\nimport { reachableInGroup, type EnteredGroupApi } from 'canvas/deps/enteredGroup';\nimport type { Scene } from 'core/scene/types';\n\n/**\n * The entered group as a scope: everything outside its subtree dims and stops taking hits, and\n * so does the group itself, whose empty box is empty canvas while it is entered. With nothing\n * entered every node is lit and live. Compose `alphaFor` into `<SceneCanvas alphaFor>` and the\n * scope into `redrawOn` to show it.\n */\nexport function createEnteredGroupScope(opts: {\n  entered: EnteredGroupApi;\n  scene: Pick<Scene<unknown, string, unknown>, 'ancestorsOf'>;\n  /** Alpha for a node outside the entered group. Default `OUT_OF_SCOPE_ALPHA`. */\n  dimAlpha?: number;\n}): NodeScope {\n  const { entered, scene } = opts;\n  const dim = opts.dimAlpha ?? OUT_OF_SCOPE_ALPHA;\n  const listeners = createEmitter();\n  let version = 0;\n  let stop: (() => void) | null = null;\n\n  return {\n    alphaFor: (id) => {\n      const group = entered.get();\n      return id === group || reachableInGroup(scene, group, id) ? 1 : dim;\n    },\n    isPointerInteractive: (id) => reachableInGroup(scene, entered.get(), id),\n    getVersion: () => version,\n    subscribe(fn) {\n      if (stop === null) stop = entered.subscribe(() => { version++; listeners.emit(); });\n      const off = listeners.subscribe(fn);\n      return () => {\n        off();\n        if (listeners.size === 0) { stop?.(); stop = null; }\n      };\n    },\n  };\n}\n"],"mappings":";;;;;;;;;;;AAWA,SAAgB,wBAAwB,MAK1B;CACZ,MAAM,EAAE,SAAS,UAAU;CAC3B,MAAM,MAAM,KAAK,YAAY;CAC7B,MAAM,YAAY,cAAc;CAChC,IAAI,UAAU;CACd,IAAI,OAA4B;CAEhC,OAAO;EACL,WAAW,OAAO;GAChB,MAAM,QAAQ,QAAQ,IAAI;GAC1B,OAAO,OAAO,SAAS,iBAAiB,OAAO,OAAO,EAAE,IAAI,IAAI;EAClE;EACA,uBAAuB,OAAO,iBAAiB,OAAO,QAAQ,IAAI,GAAG,EAAE;EACvE,kBAAkB;EAClB,UAAU,IAAI;GACZ,IAAI,SAAS,MAAM,OAAO,QAAQ,gBAAgB;IAAE;IAAW,UAAU,KAAK;GAAG,CAAC;GAClF,MAAM,MAAM,UAAU,UAAU,EAAE;GAClC,aAAa;IACX,IAAI;IACJ,IAAI,UAAU,SAAS,GAAG;KAAE,OAAO;KAAG,OAAO;IAAM;GACrD;EACF;CACF;AACF"}

package/dist/features/text/sceneTextDrafts.js

@@ -0,0 +1,64 @@
+import { asNodeId } from "../../core/scene/types.js";
+
+//#region src/features/text/sceneTextDrafts.ts
+/**
+* A text edit shown to the scene keystroke by keystroke, for the readers that
+* see a node somewhere besides the overlay: text something derives from, such
+* as the hidden text a path effect lays along a path, or a second view.
+*/
+/** `data` with an edit's text, runs and style folded in through the options' setters, for one `scene.update`. */
+function editedData(data, edit, { setText, setRuns, setStyle }) {
+	let next = setText ? setText(data, edit.text) : {
+		...data,
+		text: edit.text
+	};
+	if (edit.runs) next = setRuns ? setRuns(next, [...edit.runs]) : {
+		...next,
+		runs: edit.runs
+	};
+	if (edit.style) next = setStyle ? setStyle(next, edit.style) : {
+		...next,
+		style: edit.style
+	};
+	return next;
+}
+/** Where an edit's writes go. Each `draft` is shown as a data override folding the draft into whatever the node stores,
+*  so a recorded write made meanwhile shows through it and the document holds no draft; the `commit` records the
+*  result as one undo entry and then lets the override go; `end` lets it go, so a canceled edit leaves no entry and
+*  the redo stack as it was. */
+function sceneTextDrafts(sceneRef, optsRef) {
+	/** The open edit's claim on the scene's overrides, with the scene it was made on. */
+	let held = null;
+	const release = (id) => {
+		if (held?.id !== id) return;
+		held.hold.drop();
+		held = null;
+	};
+	return {
+		draft: (id, draft) => {
+			const scene = sceneRef.current;
+			if (scene.get(asNodeId(id)) === void 0) return;
+			if (held !== null && (held.id !== id || held.scene !== scene)) release(held.id);
+			held ??= {
+				id,
+				scene,
+				hold: scene.overrides.hold()
+			};
+			const opts = optsRef.current;
+			held.hold.show([[asNodeId(id), { data: (stored) => editedData(stored, draft, opts) }]]);
+		},
+		commit: (id, data) => {
+			const scene = sceneRef.current;
+			scene.batch("Edit text", () => scene.update(asNodeId(id), { data }));
+			release(id);
+		},
+		end: release,
+		close: () => {
+			if (held !== null) release(held.id);
+		}
+	};
+}
+
+//#endregion
+export { editedData, sceneTextDrafts };
+//# sourceMappingURL=sceneTextDrafts.js.map

package/dist/features/text/sceneTextDrafts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sceneTextDrafts.js","names":[],"sources":["../../../src/features/text/sceneTextDrafts.ts"],"sourcesContent":["/**\n * A text edit shown to the scene keystroke by keystroke, for the readers that\n * see a node somewhere besides the overlay: text something derives from, such\n * as the hidden text a path effect lays along a path, or a second view.\n */\nimport { asNodeId, type PoseHold, type Scene } from '../../core/scene/types';\nimport type { StyledRun, TextStyle } from '@weasel-js/text';\nimport type { TextEditDraft } from '@weasel-js/text-dom';\nimport type { DefaultTextData, UseSceneTextEditOptions } from './useSceneTextEdit';\n\n/** `data` with an edit's text, runs and style folded in through the options' setters, for one `scene.update`. */\nexport function editedData<TData extends DefaultTextData>(\n  data: TData,\n  edit: { text: string; runs?: readonly StyledRun[]; style?: TextStyle },\n  { setText, setRuns, setStyle }: UseSceneTextEditOptions<TData>,\n): TData {\n  let next = setText ? setText(data, edit.text) : { ...data, text: edit.text };\n  if (edit.runs) next = setRuns ? setRuns(next, [...edit.runs]) : { ...next, runs: edit.runs };\n  if (edit.style) next = setStyle ? setStyle(next, edit.style) : { ...next, style: edit.style };\n  return next;\n}\n\n/** Where an edit's writes go. Each `draft` is shown as a data override folding the draft into whatever the node stores,\n *  so a recorded write made meanwhile shows through it and the document holds no draft; the `commit` records the\n *  result as one undo entry and then lets the override go; `end` lets it go, so a canceled edit leaves no entry and\n *  the redo stack as it was. */\nexport function sceneTextDrafts<TData extends DefaultTextData, TLayer extends string, TPose>(\n  sceneRef: { readonly current: Scene<TData, TLayer, TPose> },\n  optsRef: { readonly current: UseSceneTextEditOptions<TData> },\n): {\n  draft: (id: string, draft: TextEditDraft) => void;\n  commit: (id: string, data: TData) => void;\n  end: (id: string) => void;\n  /** Let any open edit's draft go, as an unmount must: the overlay goes without an `end`. */\n  close: () => void;\n} {\n  /** The open edit's claim on the scene's overrides, with the scene it was made on. */\n  let held: { id: string; scene: Scene<TData, TLayer, TPose>; hold: PoseHold<TPose, TData> } | null = null;\n  const release = (id: string): void => {\n    if (held?.id !== id) return;\n    held.hold.drop();\n    held = null;\n  };\n  return {\n    draft: (id, draft) => {\n      const scene = sceneRef.current;\n      if (scene.get(asNodeId(id)) === undefined) return;\n      if (held !== null && (held.id !== id || held.scene !== scene)) release(held.id);\n      held ??= { id, scene, hold: scene.overrides.hold() };\n      const opts = optsRef.current;\n      held.hold.show([[asNodeId(id), { data: (stored) => editedData(stored, draft, opts) }]]);\n    },\n    commit: (id, data) => {\n      const scene = sceneRef.current;\n      scene.batch('Edit text', () => scene.update(asNodeId(id), { data }));\n      // After the write, so no frame shows the text from before the edit in between.\n      release(id);\n    },\n    end: release,\n    close: () => {\n      if (held !== null) release(held.id);\n    },\n  };\n}\n"],"mappings":";;;;;;;;;AAWA,SAAgB,WACd,MACA,MACA,EAAE,SAAS,SAAS,YACb;CACP,IAAI,OAAO,UAAU,QAAQ,MAAM,KAAK,IAAI,IAAI;EAAE,GAAG;EAAM,MAAM,KAAK;CAAK;CAC3E,IAAI,KAAK,MAAM,OAAO,UAAU,QAAQ,MAAM,CAAC,GAAG,KAAK,IAAI,CAAC,IAAI;EAAE,GAAG;EAAM,MAAM,KAAK;CAAK;CAC3F,IAAI,KAAK,OAAO,OAAO,WAAW,SAAS,MAAM,KAAK,KAAK,IAAI;EAAE,GAAG;EAAM,OAAO,KAAK;CAAM;CAC5F,OAAO;AACT;;;;;AAMA,SAAgB,gBACd,UACA,SAOA;;CAEA,IAAI,OAAgG;CACpG,MAAM,WAAW,OAAqB;EACpC,IAAI,MAAM,OAAO,IAAI;EACrB,KAAK,KAAK,KAAK;EACf,OAAO;CACT;CACA,OAAO;EACL,QAAQ,IAAI,UAAU;GACpB,MAAM,QAAQ,SAAS;GACvB,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC,MAAM,QAAW;GAC3C,IAAI,SAAS,SAAS,KAAK,OAAO,MAAM,KAAK,UAAU,QAAQ,QAAQ,KAAK,EAAE;GAC9E,SAAS;IAAE;IAAI;IAAO,MAAM,MAAM,UAAU,KAAK;GAAE;GACnD,MAAM,OAAO,QAAQ;GACrB,KAAK,KAAK,KAAK,CAAC,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,WAAW,WAAW,QAAQ,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC;EACxF;EACA,SAAS,IAAI,SAAS;GACpB,MAAM,QAAQ,SAAS;GACvB,MAAM,MAAM,mBAAmB,MAAM,OAAO,SAAS,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;GAEnE,QAAQ,EAAE;EACZ;EACA,KAAK;EACL,aAAa;GACX,IAAI,SAAS,MAAM,QAAQ,KAAK,EAAE;EACpC;CACF;AACF"}

package/dist/features/text/textHitAt.js

@@ -1,6 +1,10 @@
+import { derivedPartsOf } from "../../core/scene/derivedParts.js";
+import { nodesAsShown, shownLookup } from "../../core/scene/nodeAsShown.js";
 import { targetTransformOf, worldToLocal } from "../../core/geometry/targetFrame.js";
 import { textBoxOf } from "../../canvas/nodeShapes/textPainter.js";
-import { scenePaintedPoseOf } from "../../canvas/derivedPath.js";
+import { sceneDerivedPathOf, scenePaintedPoseOf } from "../../canvas/derivedPath.js";
+import { effectSourceFor } from "../pathEffects/effectSources.js";
+import { boundsOfPath, pathContainsPoint } from "@weasel-js/geom";
 import { caretIndexAt, pointInTextPose } from "@weasel-js/text";
 
 //#region src/features/text/textHitAt.ts
@@ -10,14 +14,31 @@ import { caretIndexAt, pointInTextPose } from "@weasel-js/text";
 * `pointInTextPose` and `caretIndexAt` work in the node's own box, so the
 * point is taken back through the frame the node is drawn in. The whole box
 * takes the point, padding included; the caret is placed in the inset one.
+*
+* A path effect hiding a text source answers for it within the bounds of any
+* glyph it lays, counters included, with the caret at the end of the text.
+* A curved glyph takes a double-click anywhere in its axis-aligned box, wider
+* than the ink selection picks.
 */
 function textHitAt(scene, read, cx, cy) {
-	const order = scene.renderOrderNodes();
+	const order = nodesAsShown(scene.overrides, scene.renderOrderNodes());
+	const shown = shownLookup(scene);
 	const paintedPoseOf = scenePaintedPoseOf(scene);
+	const derivedPathOf = sceneDerivedPathOf(scene);
 	for (let i = order.length - 1; i >= 0; i--) {
 		const node = order[i];
 		if (scene.isLocked(node.id) || scene.isHidden(node.id)) continue;
-		if (!read.isText(node.data)) continue;
+		if (!read.isText(node.data)) {
+			const source = effectSourceFor(scene, node.id, "text");
+			const text = source === null || scene.isLocked(source) ? void 0 : shown.get(source);
+			if (text === void 0 || !read.isText(text.data)) continue;
+			const path = derivedPathOf(node);
+			if (path !== null && onAGlyph(path, cx, cy)) return {
+				id: String(source),
+				caret: read.text(text.data).length
+			};
+			continue;
+		}
 		const at = paintedPoseOf(node);
 		const p = worldToLocal(targetTransformOf(at), cx, cy);
 		if (!p) continue;
@@ -45,6 +66,16 @@ function textHitAt(scene, read, cx, cy) {
 	}
 	return null;
 }
+/** Whether `(x, y)` is within the bounds of one of `path`'s parts: a glyph's box, so a stem too thin to land on and the
+*  hole in an o still take the click. */
+function onAGlyph(path, x, y) {
+	const parts = derivedPartsOf(path);
+	if (parts === void 0) return pathContainsPoint(path, x, y);
+	return parts.some(({ path: part }) => {
+		const b = boundsOfPath(part);
+		return x >= b.x && x <= b.x + b.width && y >= b.y && y <= b.y + b.height;
+	});
+}
 
 //#endregion
 export { textHitAt };

package/dist/features/text/textHitAt.js.map

@@ -1 +1 @@
-{"version":3,"file":"textHitAt.js","names":[],"sources":["../../../src/features/text/textHitAt.ts"],"sourcesContent":["import type { Scene } from '../../core/scene/types';\nimport type { RectPose } from 'core/geometry/unionBounds';\nimport { scenePaintedPoseOf } from '../../canvas/derivedPath';\nimport { targetTransformOf, worldToLocal } from 'core/geometry/targetFrame';\nimport { caretIndexAt, pointInTextPose, type StyledRun, type TextStyle, type TextVerticalAlign } from '@weasel-js/text';\nimport { textBoxOf } from '../../canvas/nodeShapes/textPainter';\n\n/** How a node's text fields are read from its `data`. */\nexport interface TextReads<TData> {\n  isText(data: TData): boolean;\n  text(data: TData): string;\n  style(data: TData): TextStyle | undefined;\n  runs(data: TData): readonly StyledRun[] | undefined;\n  verticalAlign(data: TData): TextVerticalAlign | undefined;\n  padding(data: TData): number | undefined;\n}\n\n/**\n * The top-most unlocked text node at world `(cx, cy)`, and the caret there.\n *\n * `pointInTextPose` and `caretIndexAt` work in the node's own box, so the\n * point is taken back through the frame the node is drawn in. The whole box\n * takes the point, padding included; the caret is placed in the inset one.\n */\nexport function textHitAt<TData, TPose extends RectPose>(\n  scene: Scene<TData, string, TPose>,\n  read: TextReads<TData>,\n  cx: number,\n  cy: number,\n): { id: string; caret: number } | null {\n  // renderOrder() is back-to-front, so iterate in reverse and stop on the first hit.\n  const order = scene.renderOrderNodes();\n  const paintedPoseOf = scenePaintedPoseOf(scene);\n  for (let i = order.length - 1; i >= 0; i--) {\n    const node = order[i];\n    if (scene.isLocked(node.id) || scene.isHidden(node.id)) continue;\n    if (!read.isText(node.data)) continue;\n    const at = paintedPoseOf(node);\n    const p = worldToLocal(targetTransformOf(at), cx, cy);\n    if (!p) continue;\n    const pose = {\n      ...textBoxOf({ padding: read.padding(node.data) }, at),\n      text: read.text(node.data),\n      runs: read.runs(node.data) as StyledRun[] | undefined,\n      style: read.style(node.data),\n      verticalAlign: read.verticalAlign(node.data),\n    };\n    const box = { x: at.x, y: at.y, width: at.width, height: at.height };\n    if (!pointInTextPose(p.x, p.y, { ...pose, ...box })) continue;\n    return { id: String(node.id), caret: caretIndexAt(p.x, p.y, pose) };\n  }\n  return null;\n}\n"],"mappings":";;;;;;;;;;;;;AAwBA,SAAgB,UACd,OACA,MACA,IACA,IACsC;CAEtC,MAAM,QAAQ,MAAM,iBAAiB;CACrC,MAAM,gBAAgB,mBAAmB,KAAK;CAC9C,KAAK,IAAI,IAAI,MAAM,SAAS,GAAG,KAAK,GAAG,KAAK;EAC1C,MAAM,OAAO,MAAM;EACnB,IAAI,MAAM,SAAS,KAAK,EAAE,KAAK,MAAM,SAAS,KAAK,EAAE,GAAG;EACxD,IAAI,CAAC,KAAK,OAAO,KAAK,IAAI,GAAG;EAC7B,MAAM,KAAK,cAAc,IAAI;EAC7B,MAAM,IAAI,aAAa,kBAAkB,EAAE,GAAG,IAAI,EAAE;EACpD,IAAI,CAAC,GAAG;EACR,MAAM,OAAO;GACX,GAAG,UAAU,EAAE,SAAS,KAAK,QAAQ,KAAK,IAAI,EAAE,GAAG,EAAE;GACrD,MAAM,KAAK,KAAK,KAAK,IAAI;GACzB,MAAM,KAAK,KAAK,KAAK,IAAI;GACzB,OAAO,KAAK,MAAM,KAAK,IAAI;GAC3B,eAAe,KAAK,cAAc,KAAK,IAAI;EAC7C;EACA,MAAM,MAAM;GAAE,GAAG,GAAG;GAAG,GAAG,GAAG;GAAG,OAAO,GAAG;GAAO,QAAQ,GAAG;EAAO;EACnE,IAAI,CAAC,gBAAgB,EAAE,GAAG,EAAE,GAAG;GAAE,GAAG;GAAM,GAAG;EAAI,CAAC,GAAG;EACrD,OAAO;GAAE,IAAI,OAAO,KAAK,EAAE;GAAG,OAAO,aAAa,EAAE,GAAG,EAAE,GAAG,IAAI;EAAE;CACpE;CACA,OAAO;AACT"}
+{"version":3,"file":"textHitAt.js","names":[],"sources":["../../../src/features/text/textHitAt.ts"],"sourcesContent":["import type { Scene } from '../../core/scene/types';\nimport type { RectPose } from 'core/geometry/unionBounds';\nimport { boundsOfPath, pathContainsPoint, type Path } from '@weasel-js/geom';\nimport { sceneDerivedPathOf, scenePaintedPoseOf } from '../../canvas/derivedPath';\nimport { derivedPartsOf } from '../../core/scene/derivedParts';\nimport { nodesAsShown, shownLookup } from '../../core/scene/nodeAsShown';\nimport { effectSourceFor } from '../pathEffects/effectSources';\nimport { targetTransformOf, worldToLocal } from 'core/geometry/targetFrame';\nimport { caretIndexAt, pointInTextPose, type StyledRun, type TextStyle, type TextVerticalAlign } from '@weasel-js/text';\nimport { textBoxOf } from '../../canvas/nodeShapes/textPainter';\n\n/** How a node's text fields are read from its `data`. */\nexport interface TextReads<TData> {\n  isText(data: TData): boolean;\n  text(data: TData): string;\n  style(data: TData): TextStyle | undefined;\n  runs(data: TData): readonly StyledRun[] | undefined;\n  verticalAlign(data: TData): TextVerticalAlign | undefined;\n  padding(data: TData): number | undefined;\n}\n\n/**\n * The top-most unlocked text node at world `(cx, cy)`, and the caret there.\n *\n * `pointInTextPose` and `caretIndexAt` work in the node's own box, so the\n * point is taken back through the frame the node is drawn in. The whole box\n * takes the point, padding included; the caret is placed in the inset one.\n *\n * A path effect hiding a text source answers for it within the bounds of any\n * glyph it lays, counters included, with the caret at the end of the text.\n * A curved glyph takes a double-click anywhere in its axis-aligned box, wider\n * than the ink selection picks.\n */\nexport function textHitAt<TData, TPose extends RectPose>(\n  scene: Scene<TData, string, TPose>,\n  read: TextReads<TData>,\n  cx: number,\n  cy: number,\n): { id: string; caret: number } | null {\n  // renderOrder() is back-to-front, so iterate in reverse and stop on the first hit.\n  // Hit as painted: an open edit's draft is what the glyphs and the caret are laid out from.\n  const order = nodesAsShown(scene.overrides, scene.renderOrderNodes());\n  const shown = shownLookup(scene);\n  const paintedPoseOf = scenePaintedPoseOf(scene);\n  const derivedPathOf = sceneDerivedPathOf(scene);\n  for (let i = order.length - 1; i >= 0; i--) {\n    const node = order[i];\n    if (scene.isLocked(node.id) || scene.isHidden(node.id)) continue;\n    if (!read.isText(node.data)) {\n      const source = effectSourceFor(scene, node.id, 'text');\n      const text = source === null || scene.isLocked(source) ? undefined : shown.get(source);\n      if (text === undefined || !read.isText(text.data)) continue;\n      const path = derivedPathOf(node);\n      if (path !== null && onAGlyph(path, cx, cy)) return { id: String(source), caret: read.text(text.data).length };\n      continue;\n    }\n    const at = paintedPoseOf(node);\n    const p = worldToLocal(targetTransformOf(at), cx, cy);\n    if (!p) continue;\n    const pose = {\n      ...textBoxOf({ padding: read.padding(node.data) }, at),\n      text: read.text(node.data),\n      runs: read.runs(node.data) as StyledRun[] | undefined,\n      style: read.style(node.data),\n      verticalAlign: read.verticalAlign(node.data),\n    };\n    const box = { x: at.x, y: at.y, width: at.width, height: at.height };\n    if (!pointInTextPose(p.x, p.y, { ...pose, ...box })) continue;\n    return { id: String(node.id), caret: caretIndexAt(p.x, p.y, pose) };\n  }\n  return null;\n}\n\n/** Whether `(x, y)` is within the bounds of one of `path`'s parts: a glyph's box, so a stem too thin to land on and the\n *  hole in an o still take the click. */\nfunction onAGlyph(path: Path, x: number, y: number): boolean {\n  const parts = derivedPartsOf(path);\n  if (parts === undefined) return pathContainsPoint(path, x, y);\n  return parts.some(({ path: part }) => {\n    const b = boundsOfPath(part);\n    return x >= b.x && x <= b.x + b.width && y >= b.y && y <= b.y + b.height;\n  });\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAiCA,SAAgB,UACd,OACA,MACA,IACA,IACsC;CAGtC,MAAM,QAAQ,aAAa,MAAM,WAAW,MAAM,iBAAiB,CAAC;CACpE,MAAM,QAAQ,YAAY,KAAK;CAC/B,MAAM,gBAAgB,mBAAmB,KAAK;CAC9C,MAAM,gBAAgB,mBAAmB,KAAK;CAC9C,KAAK,IAAI,IAAI,MAAM,SAAS,GAAG,KAAK,GAAG,KAAK;EAC1C,MAAM,OAAO,MAAM;EACnB,IAAI,MAAM,SAAS,KAAK,EAAE,KAAK,MAAM,SAAS,KAAK,EAAE,GAAG;EACxD,IAAI,CAAC,KAAK,OAAO,KAAK,IAAI,GAAG;GAC3B,MAAM,SAAS,gBAAgB,OAAO,KAAK,IAAI,MAAM;GACrD,MAAM,OAAO,WAAW,QAAQ,MAAM,SAAS,MAAM,IAAI,SAAY,MAAM,IAAI,MAAM;GACrF,IAAI,SAAS,UAAa,CAAC,KAAK,OAAO,KAAK,IAAI,GAAG;GACnD,MAAM,OAAO,cAAc,IAAI;GAC/B,IAAI,SAAS,QAAQ,SAAS,MAAM,IAAI,EAAE,GAAG,OAAO;IAAE,IAAI,OAAO,MAAM;IAAG,OAAO,KAAK,KAAK,KAAK,IAAI,CAAC,CAAC;GAAO;GAC7G;EACF;EACA,MAAM,KAAK,cAAc,IAAI;EAC7B,MAAM,IAAI,aAAa,kBAAkB,EAAE,GAAG,IAAI,EAAE;EACpD,IAAI,CAAC,GAAG;EACR,MAAM,OAAO;GACX,GAAG,UAAU,EAAE,SAAS,KAAK,QAAQ,KAAK,IAAI,EAAE,GAAG,EAAE;GACrD,MAAM,KAAK,KAAK,KAAK,IAAI;GACzB,MAAM,KAAK,KAAK,KAAK,IAAI;GACzB,OAAO,KAAK,MAAM,KAAK,IAAI;GAC3B,eAAe,KAAK,cAAc,KAAK,IAAI;EAC7C;EACA,MAAM,MAAM;GAAE,GAAG,GAAG;GAAG,GAAG,GAAG;GAAG,OAAO,GAAG;GAAO,QAAQ,GAAG;EAAO;EACnE,IAAI,CAAC,gBAAgB,EAAE,GAAG,EAAE,GAAG;GAAE,GAAG;GAAM,GAAG;EAAI,CAAC,GAAG;EACrD,OAAO;GAAE,IAAI,OAAO,KAAK,EAAE;GAAG,OAAO,aAAa,EAAE,GAAG,EAAE,GAAG,IAAI;EAAE;CACpE;CACA,OAAO;AACT;;;AAIA,SAAS,SAAS,MAAY,GAAW,GAAoB;CAC3D,MAAM,QAAQ,eAAe,IAAI;CACjC,IAAI,UAAU,QAAW,OAAO,kBAAkB,MAAM,GAAG,CAAC;CAC5D,OAAO,MAAM,MAAM,EAAE,MAAM,WAAW;EACpC,MAAM,IAAI,aAAa,IAAI;EAC3B,OAAO,KAAK,EAAE,KAAK,KAAK,EAAE,IAAI,EAAE,SAAS,KAAK,EAAE,KAAK,KAAK,EAAE,IAAI,EAAE;CACpE,CAAC;AACH"}

package/dist/features/text/useSceneTextEdit.js

@@ -1,11 +1,13 @@
+import { inheritedPaintIn, withInheritedPaint } from "../../core/scene/inheritedPaint.js";
 import { textBoxOf } from "../../canvas/nodeShapes/textPainter.js";
 import { asNodeId } from "../../core/scene/types.js";
 import { scenePaintedPoseOf } from "../../canvas/derivedPath.js";
 import { findMountedCanvas } from "../../canvas/mountedCanvases.js";
 import { drawOneEditing } from "./editingDrawOne.js";
 import { textHitAt } from "./textHitAt.js";
+import { editedData, sceneTextDrafts } from "./sceneTextDrafts.js";
 import { poseFrameOf } from "@weasel-js/geom";
-import { useCallback, useMemo, useRef } from "react";
+import { useCallback, useEffect, useMemo, useRef } from "react";
 import { useLatest } from "@weasel-js/react";
 import { clientToCanvas } from "@weasel-js/routing";
 import { resolveScreenLength } from "@weasel-js/paint";
@@ -47,6 +49,8 @@ function useSceneTextEdit(scene, container, options = {}) {
 	const optsRef = useLatest(options);
 	const containerRef = useLatest(container);
 	const openedOnRef = useRef(null);
+	const drafts = useMemo(() => sceneTextDrafts(sceneRef, optsRef), [sceneRef, optsRef]);
+	useEffect(() => () => drafts.close(), [drafts]);
 	const surface = () => {
 		const root = containerRef.current;
 		const canvas = root ? findMountedCanvas(root, openedOnRef.current) : null;
@@ -70,7 +74,11 @@ function useSceneTextEdit(scene, container, options = {}) {
 		escape: options.escape,
 		fontHold: options.fontHold,
 		onStart: (id) => optsRef.current.onStart?.(id),
-		onEnd: (id) => optsRef.current.onEnd?.(id),
+		onEnd: (id) => {
+			drafts.end(id);
+			optsRef.current.onEnd?.(id);
+		},
+		onDraft: drafts.draft,
 		getText: (id) => {
 			const node = sceneRef.current.get(asNodeId(id));
 			return node ? read.text(node.data) : "";
@@ -83,10 +91,7 @@ function useSceneTextEdit(scene, container, options = {}) {
 			const node = sceneRef.current.get(asNodeId(id));
 			if (!node) return void 0;
 			const get = optsRef.current.getPaint;
-			return get ? get(node.data) : {
-				fill: node.data.fill,
-				stroke: node.data.stroke
-			};
+			return get ? get(node.data) : shownTextPaint(sceneRef.current, node);
 		},
 		getScreenPose: (id) => {
 			const scene = sceneRef.current;
@@ -105,20 +110,11 @@ function useSceneTextEdit(scene, container, options = {}) {
 			const nid = asNodeId(id);
 			const node = sceneRef.current.get(nid);
 			if (!node) return;
-			const { setText, setRuns, setStyle } = optsRef.current;
-			let data = setText ? setText(node.data, text) : {
-				...node.data,
-				text
-			};
-			if (runs) data = setRuns ? setRuns(data, runs) : {
-				...data,
-				runs
-			};
-			if (style) data = setStyle ? setStyle(data, style) : {
-				...data,
+			drafts.commit(id, editedData(node.data, {
+				text,
+				runs,
 				style
-			};
-			sceneRef.current.update(nid, { data });
+			}, optsRef.current));
 		}
 	});
 	const onDoubleClick = useCallback((e) => {
@@ -219,6 +215,14 @@ function frameLinearOf(pose, stretch) {
 		d * stretch
 	];
 }
+/** A text node's paint as the canvas paints it: an inherited one is its container's. */
+function shownTextPaint(scene, node) {
+	const { fill, stroke } = withInheritedPaint(node.data, inheritedPaintIn(scene, node));
+	return {
+		fill,
+		stroke
+	};
+}
 
 //#endregion
 export { useSceneTextEdit };