@weasel-js/core 1.10.0 → 1.11.0

package/dist/core/selection/usePublishSceneSelection.js

@@ -1,26 +1,33 @@
-import { useMemo as e } from "react";
-import { usePublishSelection as t } from "@weasel-js/routing/react";
+import { useMemo } from "react";
+import { usePublishSelection } from "@weasel-js/routing/react";
+
 //#region src/core/selection/usePublishSceneSelection.ts
-function n(e) {
-	if (e.kind === "container") return "group";
-	let t = e.pose;
-	if (t && typeof t == "object" && "kind" in t && typeof t.kind == "string") return "path";
+function defaultKindLabel(node) {
+	if (node.kind === "container") return "group";
+	const pose = node.pose;
+	if (pose && typeof pose === "object" && "kind" in pose && typeof pose.kind === "string") return "path";
 }
-function r(e, t, r) {
-	if (t.length !== 0) return t.map((t) => {
-		let i = e.get(t);
-		if (i) return r ? r(i) : n(i);
+/** The label published beside each selected id, parallel to `ids`; `undefined` when
+*  nothing is selected. `describeKind` replaces the default for every node. */
+function selectionKindLabels(scene, ids, describeKind) {
+	if (ids.length === 0) return void 0;
+	return ids.map((id) => {
+		const node = scene.get(id);
+		if (!node) return void 0;
+		return describeKind ? describeKind(node) : defaultKindLabel(node);
 	});
 }
-function i(n, i, a) {
-	let o = e(() => r(n, i, a), [
-		n,
-		i,
-		a
+/** Publishes a scene's selection, with a kind label per id, into any surrounding
+*  `<SelectionContextProvider>`. A no-op without one. */
+function usePublishSceneSelection(scene, ids, describeKind) {
+	const kinds = useMemo(() => selectionKindLabels(scene, ids, describeKind), [
+		scene,
+		ids,
+		describeKind
 	]);
-	t(i, o);
+	usePublishSelection(ids, kinds);
 }
-//#endregion
-export { r as selectionKindLabels, i as usePublishSceneSelection };
 
+//#endregion
+export { selectionKindLabels, usePublishSceneSelection };
 //# sourceMappingURL=usePublishSceneSelection.js.map

package/dist/core/selection/usePublishSceneSelection.js.map

@@ -1 +1 @@
-{"version":3,"file":"usePublishSceneSelection.js","names":["defaultKindLabel","node","pose","selectionKindLabels","ids","scene","id","describeKind","usePublishSceneSelection","kinds","useMemo"],"sources":["../../../src/core/selection/usePublishSceneSelection.ts"],"sourcesContent":["import { usePublishSelection } from '@weasel-js/routing/react';\nimport type { Node, NodeId, Scene } from 'core/scene/types';\nimport { useMemo } from 'react';\n\ntype KindLabel = string | undefined;\n\n// Not the routing kind: this reads the node and its pose where `NodeRouting.classify` reads\n// `data`, and the two disagree on most nodes (`SceneCanvas.selectionKinds.test.tsx`).\nfunction defaultKindLabel(node: Node<unknown, string, unknown>): KindLabel {\n  if (node.kind === 'container') return 'group';\n  const pose = node.pose as { kind?: unknown } | null;\n  if (pose && typeof pose === 'object' && 'kind' in pose && typeof pose.kind === 'string') return 'path';\n  return undefined;\n}\n\n/** The label published beside each selected id, parallel to `ids`; `undefined` when\n *  nothing is selected. `describeKind` replaces the default for every node. */\nexport function selectionKindLabels<TData, TLayer extends string, TPose>(\n  scene: Pick<Scene<TData, TLayer, TPose>, 'get'>,\n  ids: readonly NodeId[],\n  describeKind?: (node: Node<TData, TLayer, TPose>) => KindLabel,\n): readonly KindLabel[] | undefined {\n  if (ids.length === 0) return undefined;\n  return ids.map((id) => {\n    const node = scene.get(id);\n    if (!node) return undefined;\n    return describeKind ? describeKind(node) : defaultKindLabel(node as Node<unknown, string, unknown>);\n  });\n}\n\n/** Publishes a scene's selection, with a kind label per id, into any surrounding\n *  `<SelectionContextProvider>`. A no-op without one. */\nexport function usePublishSceneSelection<TData, TLayer extends string, TPose>(\n  scene: Pick<Scene<TData, TLayer, TPose>, 'get'>,\n  ids: readonly NodeId[],\n  describeKind?: (node: Node<TData, TLayer, TPose>) => KindLabel,\n): void {\n  const kinds = useMemo(() => selectionKindLabels(scene, ids, describeKind), [scene, ids, describeKind]);\n  usePublishSelection(ids, kinds);\n}\n"],"mappings":";;;AAQA,SAASA,EAAiB,GAAiD;CACzE,IAAIC,EAAK,SAAS,aAAa,OAAO;CACtC,IAAMC,IAAOD,EAAK;CAClB,IAAIC,KAAQ,OAAOA,KAAS,YAAY,UAAUA,KAAQ,OAAOA,EAAK,QAAS,UAAU,OAAO;AAElG;AAIA,SAAgBC,EACd,GACA,GACA,GACkC;CAClC,IAAIC,EAAI,WAAW,GACnB,OAAOA,EAAI,KAAK,MAAO;EACrB,IAAMH,IAAOI,EAAM,IAAIC,CAAE;EACzB,IAAKL,GACL,OAAOM,IAAeA,EAAaN,CAAI,IAAID,EAAiBC,CAAsC;CACpG,CAAC;AACH;AAIA,SAAgBO,EACd,GACA,GACA,GACM;CACN,IAAMC,IAAQC,QAAcP,EAAoBE,GAAOD,GAAKG,CAAY,GAAG;EAACF;EAAOD;EAAKG;CAAY,CAAC;CACrG,EAAoBH,GAAKK,CAAK;AAChC"}
+{"version":3,"file":"usePublishSceneSelection.js","names":[],"sources":["../../../src/core/selection/usePublishSceneSelection.ts"],"sourcesContent":["import { usePublishSelection } from '@weasel-js/routing/react';\nimport type { Node, NodeId, Scene } from 'core/scene/types';\nimport { useMemo } from 'react';\n\ntype KindLabel = string | undefined;\n\n// Not the routing kind: this reads the node and its pose where `NodeRouting.classify` reads\n// `data`, and the two disagree on most nodes (`SceneCanvas.selectionKinds.test.tsx`).\nfunction defaultKindLabel(node: Node<unknown, string, unknown>): KindLabel {\n  if (node.kind === 'container') return 'group';\n  const pose = node.pose as { kind?: unknown } | null;\n  if (pose && typeof pose === 'object' && 'kind' in pose && typeof pose.kind === 'string') return 'path';\n  return undefined;\n}\n\n/** The label published beside each selected id, parallel to `ids`; `undefined` when\n *  nothing is selected. `describeKind` replaces the default for every node. */\nexport function selectionKindLabels<TData, TLayer extends string, TPose>(\n  scene: Pick<Scene<TData, TLayer, TPose>, 'get'>,\n  ids: readonly NodeId[],\n  describeKind?: (node: Node<TData, TLayer, TPose>) => KindLabel,\n): readonly KindLabel[] | undefined {\n  if (ids.length === 0) return undefined;\n  return ids.map((id) => {\n    const node = scene.get(id);\n    if (!node) return undefined;\n    return describeKind ? describeKind(node) : defaultKindLabel(node as Node<unknown, string, unknown>);\n  });\n}\n\n/** Publishes a scene's selection, with a kind label per id, into any surrounding\n *  `<SelectionContextProvider>`. A no-op without one. */\nexport function usePublishSceneSelection<TData, TLayer extends string, TPose>(\n  scene: Pick<Scene<TData, TLayer, TPose>, 'get'>,\n  ids: readonly NodeId[],\n  describeKind?: (node: Node<TData, TLayer, TPose>) => KindLabel,\n): void {\n  const kinds = useMemo(() => selectionKindLabels(scene, ids, describeKind), [scene, ids, describeKind]);\n  usePublishSelection(ids, kinds);\n}\n"],"mappings":";;;;AAQA,SAAS,iBAAiB,MAAiD;CACzE,IAAI,KAAK,SAAS,aAAa,OAAO;CACtC,MAAM,OAAO,KAAK;CAClB,IAAI,QAAQ,OAAO,SAAS,YAAY,UAAU,QAAQ,OAAO,KAAK,SAAS,UAAU,OAAO;AAElG;;;AAIA,SAAgB,oBACd,OACA,KACA,cACkC;CAClC,IAAI,IAAI,WAAW,GAAG,OAAO;CAC7B,OAAO,IAAI,KAAK,OAAO;EACrB,MAAM,OAAO,MAAM,IAAI,EAAE;EACzB,IAAI,CAAC,MAAM,OAAO;EAClB,OAAO,eAAe,aAAa,IAAI,IAAI,iBAAiB,IAAsC;CACpG,CAAC;AACH;;;AAIA,SAAgB,yBACd,OACA,KACA,cACM;CACN,MAAM,QAAQ,cAAc,oBAAoB,OAAO,KAAK,YAAY,GAAG;EAAC;EAAO;EAAK;CAAY,CAAC;CACrG,oBAAoB,KAAK,KAAK;AAChC"}

package/dist/core/selection/useSelection.js

@@ -1,74 +1,107 @@
-import { dlog as e } from "../../debug/flag.js";
-import { useLayoutEffect as t, useMemo as n, useRef as r, useState as i, useSyncExternalStore as a } from "react";
-import { useLatest as o } from "@weasel-js/react";
-import { createSelectionStore as s, intentOf as c, select as l } from "@weasel-js/select";
+import { dlog } from "../../debug/flag.js";
+import { useLayoutEffect, useMemo, useRef, useState, useSyncExternalStore } from "react";
+import { useLatest } from "@weasel-js/react";
+import { createSelectionStore, intentOf, select } from "@weasel-js/select";
+
 //#region src/core/selection/useSelection.ts
-function u(e) {
-	let { renderOrder: t } = e;
-	return typeof t == "function" ? () => t.call(e) : void 0;
+/** The order a store paints its nodes in, when it is a scene and has one. */
+function paintOrderOf(store) {
+	const { renderOrder } = store;
+	return typeof renderOrder === "function" ? () => renderOrder.call(store) : void 0;
 }
-function d(d = {}) {
-	let { mode: f = "single", extend: p = "shift", initial: m = [], lock: h = !1, scene: g, range: _, order: v } = d, [y] = i(() => s([...m])), b = g ?? y, x = r(m);
-	a(b.subscribe, () => b.getSelection());
-	let S = r(!1);
-	t(() => {
-		g && !S.current && (S.current = !0, x.current.length > 0 && g.getSelection().length === 0 && g.setSelection([...x.current]));
-	}, [g]);
-	let C = o({
-		mode: f,
-		extend: p,
-		lock: h,
-		range: _,
-		order: v
-	}), w = r(null);
-	return n(() => {
-		let t = () => b.getSelection(), n = (n) => {
-			C.current.lock || (e("selection", "set", {
-				from: t().length,
-				to: n.length,
-				ids: n
-			}), b.setSelection(n));
-		}, r = (e) => t().filter((t) => t !== e);
+/**
+* Owns selection state, exposes a click-policy helper (single vs multi with
+* an extend key), and pre-builds the `getSelection` / `setSelection` adapter
+* methods:
+*
+* ```tsx
+* const selection = useSelection({ mode: 'multi' });
+* const adapter = useSceneAdapter(scene, { selection: selection.adapterMethods });
+* ```
+*
+* Returns the same object for as long as `scene` is the same store, so it is
+* safe as a memo or effect dependency. The calling component re-renders when
+* the selection changes; key anything derived from the ids on
+* `selection.current`.
+*/
+function useSelection(opts = {}) {
+	const { mode = "single", extend = "shift", initial = [], lock = false, scene, range, order } = opts;
+	const [local] = useState(() => createSelectionStore([...initial]));
+	const store = scene ?? local;
+	const initialRef = useRef(initial);
+	useSyncExternalStore(store.subscribe, () => store.getSelection());
+	const seeded = useRef(false);
+	useLayoutEffect(() => {
+		if (!scene || seeded.current) return;
+		seeded.current = true;
+		if (initialRef.current.length > 0 && scene.getSelection().length === 0) scene.setSelection([...initialRef.current]);
+	}, [scene]);
+	const optsRef = useLatest({
+		mode,
+		extend,
+		lock,
+		range,
+		order
+	});
+	const anchorRef = useRef(null);
+	return useMemo(() => {
+		const get = () => store.getSelection();
+		const set = (ids) => {
+			if (optsRef.current.lock) return;
+			dlog("selection", "set", {
+				from: get().length,
+				to: ids.length,
+				ids
+			});
+			store.setSelection(ids);
+		};
+		const without = (id) => get().filter((x) => x !== id);
 		return {
 			get current() {
-				return t();
+				return get();
 			},
-			get: t,
-			set: n,
-			add(e) {
-				C.current.mode === "single" ? n([e]) : t().includes(e) || n([...t(), e]);
+			get,
+			set,
+			add(id) {
+				if (optsRef.current.mode === "single") set([id]);
+				else if (!get().includes(id)) set([...get(), id]);
 			},
-			remove(e) {
-				t().includes(e) && n(r(e));
+			remove(id) {
+				if (get().includes(id)) set(without(id));
 			},
-			toggle(e) {
-				t().includes(e) ? n(r(e)) : n(C.current.mode === "single" ? [e] : [...t(), e]);
+			toggle(id) {
+				if (get().includes(id)) set(without(id));
+				else set(optsRef.current.mode === "single" ? [id] : [...get(), id]);
 			},
 			clear() {
-				n([]);
+				set([]);
 			},
-			contains: (e) => t().includes(e),
-			applyClick(e, r) {
-				let { mode: i, extend: a, range: o, order: s = u(b), lock: d } = C.current;
-				if (d) return;
-				let f = t(), p = w.current !== null && f.includes(w.current) ? w.current : f.at(-1) ?? null, m = c(r, {
-					mode: i,
-					toggle: a,
-					range: o
-				}), h = l({
-					ids: f,
-					anchor: p
-				}, e, m, m === "range" && s ? { order: [...s()] } : {});
-				w.current = h.anchor, n([...h.ids]);
+			contains: (id) => get().includes(id),
+			applyClick(id, modifiers) {
+				const { mode: m, extend: key, range: rangeKey, order: walk = paintOrderOf(store), lock: locked } = optsRef.current;
+				if (locked) return;
+				const ids = get();
+				const anchor = anchorRef.current !== null && ids.includes(anchorRef.current) ? anchorRef.current : ids.at(-1) ?? null;
+				const intent = intentOf(modifiers, {
+					mode: m,
+					toggle: key,
+					range: rangeKey
+				});
+				const next = select({
+					ids,
+					anchor
+				}, id, intent, intent === "range" && walk ? { order: [...walk()] } : {});
+				anchorRef.current = next.anchor;
+				set([...next.ids]);
 			},
 			adapterMethods: {
-				getSelection: () => t(),
-				setSelection: (e) => n(e)
+				getSelection: () => get(),
+				setSelection: (ids) => set(ids)
 			}
 		};
-	}, [b, C]);
+	}, [store, optsRef]);
 }
-//#endregion
-export { d as useSelection };
 
+//#endregion
+export { useSelection };
 //# sourceMappingURL=useSelection.js.map

package/dist/core/selection/useSelection.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSelection.js","names":["paintOrderOf","store","renderOrder","useSelection","opts","local","useState","createSelectionStore","initial","scene","initialRef","useRef","seeded","optsRef","useLatest","anchorRef","useMemo","get","set","dlog","ids","without","x","id","m","key","rangeKey","walk","locked","anchor","intent","intentOf","modifiers","next","select"],"sources":["../../../src/core/selection/useSelection.ts"],"sourcesContent":["import { useLayoutEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react';\nimport { useLatest } from '@weasel-js/react';\nimport { createSelectionStore, intentOf, select, type SelectionStore as Store } from '@weasel-js/select';\nimport type { NodeId } from 'core/scene/types';\nimport { dlog } from 'debug/flag';\n\n/** Declared in `@weasel-js/routing`; re-exported here, beside the hook that returns one. */\nimport type { SelectionApi, SelectionMode, SelectionExtendKey } from '@weasel-js/routing';\nexport type { SelectionApi, SelectionMode, SelectionExtendKey };\n\n/** Somewhere selection can live outside this hook. `Scene` satisfies it;\n *  so does any store with the same three methods. */\nexport type SelectionStore = Store<NodeId>;\n\n/** Options for {@link useSelection}. */\nexport interface UseSelectionOptions {\n  /** Default `'single'`. */\n  mode?: SelectionMode;\n  /** Default `'shift'`. Ignored in single-mode. */\n  extend?: SelectionExtendKey;\n  /** The key that selects everything from the last pressed id to this one,\n   *  along `order`. Absent, nothing ranges. It beats `extend` when both name\n   *  one key, so give them different keys. Ignored in single-mode. */\n  range?: SelectionExtendKey;\n  /** The sequence a range walks: a layer panel's rows, a timeline's tracks.\n   *  Default is the order the `scene` paints in, back to front; with neither,\n   *  the range key replaces. */\n  order?: () => Iterable<NodeId>;\n  /** Default `[]`. */\n  initial?: readonly NodeId[];\n  /** Keep the selection on this store rather than in the hook, so every\n   *  consumer of the same scene shares one selection and undo / redo can\n   *  restore it. `initial` then only seeds a store that has none yet.\n   *  Omit it and the hook owns a selection nobody else sees. */\n  scene?: SelectionStore;\n  /** When `true`, every mutator (`set`/`add`/`remove`/`toggle`/`clear`/\n   *  `applyClick`) is a no-op — selection stays at whatever `initial`\n   *  pinned it to. */\n  lock?: boolean;\n}\n\n/** The order a store paints its nodes in, when it is a scene and has one. */\nfunction paintOrderOf(store: SelectionStore): (() => Iterable<NodeId>) | undefined {\n  const { renderOrder } = store as { renderOrder?: () => Iterable<NodeId> };\n  return typeof renderOrder === 'function' ? () => renderOrder.call(store) : undefined;\n}\n\n/**\n * Owns selection state, exposes a click-policy helper (single vs multi with\n * an extend key), and pre-builds the `getSelection` / `setSelection` adapter\n * methods:\n *\n * ```tsx\n * const selection = useSelection({ mode: 'multi' });\n * const adapter = useSceneAdapter(scene, { selection: selection.adapterMethods });\n * ```\n *\n * Returns the same object for as long as `scene` is the same store, so it is\n * safe as a memo or effect dependency. The calling component re-renders when\n * the selection changes; key anything derived from the ids on\n * `selection.current`.\n */\nexport function useSelection(opts: UseSelectionOptions = {}): SelectionApi {\n  const { mode = 'single', extend = 'shift', initial = [], lock = false, scene, range, order } = opts;\n  // Without a `scene` the hook still keeps its ids in a store, so `get()` reads one store either\n  // way and a write is visible before the re-render it causes.\n  const [local] = useState(() => createSelectionStore<NodeId>([...initial]));\n  const store = scene ?? local;\n  const initialRef = useRef(initial);\n\n  useSyncExternalStore(store.subscribe, () => store.getSelection());\n\n  // A store that already holds a selection wins: the hook is joining it, not\n  // resetting it. In an effect, not during render — the store has other\n  // subscribers.\n  const seeded = useRef(false);\n  useLayoutEffect(() => {\n    if (!scene || seeded.current) return;\n    seeded.current = true;\n    if (initialRef.current.length > 0 && scene.getSelection().length === 0) {\n      scene.setSelection([...initialRef.current]);\n    }\n  }, [scene]);\n\n  const optsRef = useLatest({ mode, extend, lock, range, order });\n  const anchorRef = useRef<NodeId | null>(null);\n\n  return useMemo<SelectionApi>(() => {\n    const get = (): NodeId[] => store.getSelection() as NodeId[];\n    const set = (ids: NodeId[]): void => {\n      if (optsRef.current.lock) return;\n      dlog('selection', 'set', { from: get().length, to: ids.length, ids });\n      store.setSelection(ids);\n    };\n    const without = (id: NodeId) => get().filter((x) => x !== id);\n    return {\n      get current() { return get(); },\n      get,\n      set,\n      add(id) {\n        if (optsRef.current.mode === 'single') set([id]);\n        else if (!get().includes(id)) set([...get(), id]);\n      },\n      remove(id) {\n        if (get().includes(id)) set(without(id));\n      },\n      toggle(id) {\n        if (get().includes(id)) set(without(id));\n        else set(optsRef.current.mode === 'single' ? [id] : [...get(), id]);\n      },\n      clear() { set([]); },\n      contains: (id) => get().includes(id),\n      applyClick(id, modifiers) {\n        const { mode: m, extend: key, range: rangeKey, order: walk = paintOrderOf(store), lock: locked } = optsRef.current;\n        if (locked) return;\n        const ids = get();\n        // A selection something else set — a marquee, an undo — ranges from its last id.\n        const anchor = anchorRef.current !== null && ids.includes(anchorRef.current)\n          ? anchorRef.current\n          : (ids.at(-1) ?? null);\n        const intent = intentOf(modifiers, { mode: m, toggle: key, range: rangeKey });\n        const next = select({ ids, anchor }, id, intent, intent === 'range' && walk ? { order: [...walk()] } : {});\n        anchorRef.current = next.anchor;\n        set([...next.ids]);\n      },\n      adapterMethods: {\n        getSelection: () => get(),\n        setSelection: (ids: NodeId[]) => set(ids),\n      },\n    };\n  }, [store, optsRef]);\n}\n"],"mappings":"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"}
+{"version":3,"file":"useSelection.js","names":[],"sources":["../../../src/core/selection/useSelection.ts"],"sourcesContent":["import { useLayoutEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react';\nimport { useLatest } from '@weasel-js/react';\nimport { createSelectionStore, intentOf, select, type SelectionStore as Store } from '@weasel-js/select';\nimport type { NodeId } from 'core/scene/types';\nimport { dlog } from 'debug/flag';\n\n/** Declared in `@weasel-js/routing`; re-exported here, beside the hook that returns one. */\nimport type { SelectionApi, SelectionMode, SelectionExtendKey } from '@weasel-js/routing';\nexport type { SelectionApi, SelectionMode, SelectionExtendKey };\n\n/** Somewhere selection can live outside this hook. `Scene` satisfies it;\n *  so does any store with the same three methods. */\nexport type SelectionStore = Store<NodeId>;\n\n/** Options for {@link useSelection}. */\nexport interface UseSelectionOptions {\n  /** Default `'single'`. */\n  mode?: SelectionMode;\n  /** Default `'shift'`. Ignored in single-mode. */\n  extend?: SelectionExtendKey;\n  /** The key that selects everything from the last pressed id to this one,\n   *  along `order`. Absent, nothing ranges. It beats `extend` when both name\n   *  one key, so give them different keys. Ignored in single-mode. */\n  range?: SelectionExtendKey;\n  /** The sequence a range walks: a layer panel's rows, a timeline's tracks.\n   *  Default is the order the `scene` paints in, back to front; with neither,\n   *  the range key replaces. */\n  order?: () => Iterable<NodeId>;\n  /** Default `[]`. */\n  initial?: readonly NodeId[];\n  /** Keep the selection on this store rather than in the hook, so every\n   *  consumer of the same scene shares one selection and undo / redo can\n   *  restore it. `initial` then only seeds a store that has none yet.\n   *  Omit it and the hook owns a selection nobody else sees. */\n  scene?: SelectionStore;\n  /** When `true`, every mutator (`set`/`add`/`remove`/`toggle`/`clear`/\n   *  `applyClick`) is a no-op — selection stays at whatever `initial`\n   *  pinned it to. */\n  lock?: boolean;\n}\n\n/** The order a store paints its nodes in, when it is a scene and has one. */\nfunction paintOrderOf(store: SelectionStore): (() => Iterable<NodeId>) | undefined {\n  const { renderOrder } = store as { renderOrder?: () => Iterable<NodeId> };\n  return typeof renderOrder === 'function' ? () => renderOrder.call(store) : undefined;\n}\n\n/**\n * Owns selection state, exposes a click-policy helper (single vs multi with\n * an extend key), and pre-builds the `getSelection` / `setSelection` adapter\n * methods:\n *\n * ```tsx\n * const selection = useSelection({ mode: 'multi' });\n * const adapter = useSceneAdapter(scene, { selection: selection.adapterMethods });\n * ```\n *\n * Returns the same object for as long as `scene` is the same store, so it is\n * safe as a memo or effect dependency. The calling component re-renders when\n * the selection changes; key anything derived from the ids on\n * `selection.current`.\n */\nexport function useSelection(opts: UseSelectionOptions = {}): SelectionApi {\n  const { mode = 'single', extend = 'shift', initial = [], lock = false, scene, range, order } = opts;\n  // Without a `scene` the hook still keeps its ids in a store, so `get()` reads one store either\n  // way and a write is visible before the re-render it causes.\n  const [local] = useState(() => createSelectionStore<NodeId>([...initial]));\n  const store = scene ?? local;\n  const initialRef = useRef(initial);\n\n  useSyncExternalStore(store.subscribe, () => store.getSelection());\n\n  // A store that already holds a selection wins: the hook is joining it, not\n  // resetting it. In an effect, not during render — the store has other\n  // subscribers.\n  const seeded = useRef(false);\n  useLayoutEffect(() => {\n    if (!scene || seeded.current) return;\n    seeded.current = true;\n    if (initialRef.current.length > 0 && scene.getSelection().length === 0) {\n      scene.setSelection([...initialRef.current]);\n    }\n  }, [scene]);\n\n  const optsRef = useLatest({ mode, extend, lock, range, order });\n  const anchorRef = useRef<NodeId | null>(null);\n\n  return useMemo<SelectionApi>(() => {\n    const get = (): NodeId[] => store.getSelection() as NodeId[];\n    const set = (ids: NodeId[]): void => {\n      if (optsRef.current.lock) return;\n      dlog('selection', 'set', { from: get().length, to: ids.length, ids });\n      store.setSelection(ids);\n    };\n    const without = (id: NodeId) => get().filter((x) => x !== id);\n    return {\n      get current() { return get(); },\n      get,\n      set,\n      add(id) {\n        if (optsRef.current.mode === 'single') set([id]);\n        else if (!get().includes(id)) set([...get(), id]);\n      },\n      remove(id) {\n        if (get().includes(id)) set(without(id));\n      },\n      toggle(id) {\n        if (get().includes(id)) set(without(id));\n        else set(optsRef.current.mode === 'single' ? [id] : [...get(), id]);\n      },\n      clear() { set([]); },\n      contains: (id) => get().includes(id),\n      applyClick(id, modifiers) {\n        const { mode: m, extend: key, range: rangeKey, order: walk = paintOrderOf(store), lock: locked } = optsRef.current;\n        if (locked) return;\n        const ids = get();\n        // A selection something else set — a marquee, an undo — ranges from its last id.\n        const anchor = anchorRef.current !== null && ids.includes(anchorRef.current)\n          ? anchorRef.current\n          : (ids.at(-1) ?? null);\n        const intent = intentOf(modifiers, { mode: m, toggle: key, range: rangeKey });\n        const next = select({ ids, anchor }, id, intent, intent === 'range' && walk ? { order: [...walk()] } : {});\n        anchorRef.current = next.anchor;\n        set([...next.ids]);\n      },\n      adapterMethods: {\n        getSelection: () => get(),\n        setSelection: (ids: NodeId[]) => set(ids),\n      },\n    };\n  }, [store, optsRef]);\n}\n"],"mappings":"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"}

package/dist/core/shapeKinds.js

@@ -1,54 +1,69 @@
 //#region src/core/shapeKinds.ts
-var e = {
+/**
+* Declaration order is the enumeration order of every derived list —
+* `KIT_SHAPE_KINDS`, and through it `defaultNodeRouting` /
+* `defaultNodeProperties` / `BUILTIN_TOOL_IDS`.
+*/
+var SHAPE_KINDS = {
 	rect: {
-		tool: !0,
-		insertPreview: !0
+		tool: true,
+		insertPreview: true
 	},
 	ellipse: {
-		tool: !0,
-		insertPreview: !0
+		tool: true,
+		insertPreview: true
 	},
 	line: {
-		tool: !0,
-		insertPreview: !0
+		tool: true,
+		insertPreview: true
 	},
 	polygon: {
-		tool: !0,
-		insertPreview: !0
+		tool: true,
+		insertPreview: true
 	},
 	star: {
-		tool: !0,
-		insertPreview: !0
+		tool: true,
+		insertPreview: true
 	},
 	pen: {
-		tool: !0,
-		insertPreview: !1
+		tool: true,
+		insertPreview: false
 	},
 	pencil: {
-		tool: !0,
-		insertPreview: !0
+		tool: true,
+		insertPreview: true
 	},
 	lasso: {
-		tool: !0,
-		insertPreview: !1
+		tool: true,
+		insertPreview: false
 	},
 	text: {
-		tool: !0,
-		insertPreview: !0
+		tool: true,
+		insertPreview: true,
+		text: true
+	},
+	sticky: {
+		tool: true,
+		insertPreview: true,
+		text: true
 	},
 	image: {
-		tool: !1,
-		insertPreview: !0
+		tool: false,
+		insertPreview: true
 	}
 };
-function t(e, t) {
-	return Object.keys(e).filter((n) => e[n][t]);
+/** Kinds in `table` whose descriptor sets `field`, in declaration order. */
+function shapeKindsWhere(table, field) {
+	return Object.keys(table).filter((k) => table[k][field]);
 }
-function n(t) {
-	return e[t];
+/** The descriptor for `kind`, or `undefined` for a kind the kit doesn't ship.
+*  The one accessor: ask it rather than testing membership of a derived list. */
+function shapeKindInfo(kind) {
+	return SHAPE_KINDS[kind];
 }
-var r = t(e, "tool");
-//#endregion
-export { r as KIT_SHAPE_KINDS, e as SHAPE_KINDS, n as shapeKindInfo, t as shapeKindsWhere };
+/** Runtime, iterable list of the shape-tool ids in `BuiltinShapeToolId`. */
+var KIT_SHAPE_KINDS = shapeKindsWhere(SHAPE_KINDS, "tool");
 
+//#endregion
+export { KIT_SHAPE_KINDS, SHAPE_KINDS, shapeKindInfo, shapeKindsWhere };
 //# sourceMappingURL=shapeKinds.js.map

package/dist/core/shapeKinds.js.map

@@ -1 +1 @@
-{"version":3,"file":"shapeKinds.js","names":["SHAPE_KINDS","shapeKindsWhere","table","k","field","shapeKindInfo","kind","KIT_SHAPE_KINDS"],"sources":["../../src/core/shapeKinds.ts"],"sourcesContent":["/**\n * The kit's built-in shape kinds — one table, every other spelling derived.\n *\n * This module imports nothing on purpose: `useBuiltinShapeTools` imports the\n * package barrel, so anything barrel-reachable that needs these lists at\n * module-evaluation time must not route through it.\n */\n\n/** What the kit knows about one built-in shape kind. */\nexport interface ShapeKindDescriptor {\n  /** Mounted as a built-in shape tool by `useBuiltinShapeTools`, and so a\n   *  member of `BuiltinShapeToolId` / `KIT_SHAPE_KINDS`. `image` is false:\n   *  `useImageTool` needs a `src` and can't be auto-mounted. */\n  readonly tool: boolean;\n  /** `insertAction` emits an `insertPreview` overlay for this kind, and the\n   *  dispatcher overlay layer knows how to draw it. Kinds without one still\n   *  commit; they just have no live drag preview. */\n  readonly insertPreview: boolean;\n}\n\n/**\n * Declaration order is the enumeration order of every derived list —\n * `KIT_SHAPE_KINDS`, and through it `defaultNodeRouting` /\n * `defaultNodeProperties` / `BUILTIN_TOOL_IDS`.\n */\nexport const SHAPE_KINDS = {\n  rect: { tool: true, insertPreview: true },\n  ellipse: { tool: true, insertPreview: true },\n  line: { tool: true, insertPreview: true },\n  polygon: { tool: true, insertPreview: true },\n  star: { tool: true, insertPreview: true },\n  pen: { tool: true, insertPreview: false },\n  pencil: { tool: true, insertPreview: true },\n  lasso: { tool: true, insertPreview: false },\n  text: { tool: true, insertPreview: true },\n  image: { tool: false, insertPreview: true },\n} as const satisfies Record<string, ShapeKindDescriptor>;\n\n/** Every kind in the table, tool or not. */\nexport type ShapeKind = keyof typeof SHAPE_KINDS;\n\n/** The keys of a shape-kind table whose descriptor sets `F` to `true`. */\nexport type ShapeKindsWhere<T, F extends keyof ShapeKindDescriptor> = {\n  [K in keyof T]: T[K] extends Record<F, true> ? K : never;\n}[keyof T];\n\n/** Built-in shape tool ids handled by `useBuiltinShapeTools`. */\nexport type BuiltinShapeToolId = ShapeKindsWhere<typeof SHAPE_KINDS, 'tool'>;\n\n/** The insert kinds the kit's dispatcher overlay layer knows how to render.\n *  Consumer-defined kinds fall outside it: no live preview, commit unaffected. */\nexport type KitInsertShape = ShapeKindsWhere<typeof SHAPE_KINDS, 'insertPreview'>;\n\n/** Kinds in `table` whose descriptor sets `field`, in declaration order. */\nexport function shapeKindsWhere<T extends Record<string, ShapeKindDescriptor>>(\n  table: T,\n  field: keyof ShapeKindDescriptor,\n): (keyof T & string)[] {\n  return (Object.keys(table) as (keyof T & string)[]).filter((k) => table[k][field]);\n}\n\n/** The descriptor for `kind`, or `undefined` for a kind the kit doesn't ship.\n *  The one accessor: ask it rather than testing membership of a derived list. */\nexport function shapeKindInfo(kind: string): ShapeKindDescriptor | undefined {\n  return (SHAPE_KINDS as Record<string, ShapeKindDescriptor>)[kind];\n}\n\n/** Runtime, iterable list of the shape-tool ids in `BuiltinShapeToolId`. */\nexport const KIT_SHAPE_KINDS: readonly BuiltinShapeToolId[] =\n  shapeKindsWhere(SHAPE_KINDS, 'tool') as BuiltinShapeToolId[];\n"],"mappings":";AAyBA,IAAaA,IAAc;CACzB,MAAM;EAAE,MAAM;EAAM,eAAe;CAAK;CACxC,SAAS;EAAE,MAAM;EAAM,eAAe;CAAK;CAC3C,MAAM;EAAE,MAAM;EAAM,eAAe;CAAK;CACxC,SAAS;EAAE,MAAM;EAAM,eAAe;CAAK;CAC3C,MAAM;EAAE,MAAM;EAAM,eAAe;CAAK;CACxC,KAAK;EAAE,MAAM;EAAM,eAAe;CAAM;CACxC,QAAQ;EAAE,MAAM;EAAM,eAAe;CAAK;CAC1C,OAAO;EAAE,MAAM;EAAM,eAAe;CAAM;CAC1C,MAAM;EAAE,MAAM;EAAM,eAAe;CAAK;CACxC,OAAO;EAAE,MAAM;EAAO,eAAe;CAAK;AAC5C;AAkBA,SAAgBC,EACd,GACA,GACsB;CACtB,OAAQ,OAAO,KAAKC,CAAK,CAAC,CAA0B,QAAQ,MAAMA,EAAMC,EAAE,CAACC,EAAM;AACnF;AAIA,SAAgBC,EAAc,GAA+C;CAC3E,OAAQL,EAAoDM;AAC9D;AAGA,IAAaC,IACXN,EAAgBD,GAAa,MAAM"}
+{"version":3,"file":"shapeKinds.js","names":[],"sources":["../../src/core/shapeKinds.ts"],"sourcesContent":["/**\n * The kit's built-in shape kinds — one table, every other spelling derived.\n *\n * This module imports nothing on purpose: `useBuiltinShapeTools` imports the\n * package barrel, so anything barrel-reachable that needs these lists at\n * module-evaluation time must not route through it.\n */\n\n/** What the kit knows about one built-in shape kind. */\nexport interface ShapeKindDescriptor {\n  /** Mounted as a built-in shape tool by `useBuiltinShapeTools`, and so a\n   *  member of `BuiltinShapeToolId` / `KIT_SHAPE_KINDS`. `image` is false:\n   *  `useImageTool` needs a `src` and can't be auto-mounted. */\n  readonly tool: boolean;\n  /** `insertAction` emits an `insertPreview` overlay for this kind, and the\n   *  dispatcher overlay layer knows how to draw it. Kinds without one still\n   *  commit; they just have no live drag preview. */\n  readonly insertPreview: boolean;\n  /** A node of this kind is a text node: an insert drops into its caret, and\n   *  its properties carry the text groups. Absent, it is not. */\n  readonly text?: boolean;\n}\n\n/**\n * Declaration order is the enumeration order of every derived list —\n * `KIT_SHAPE_KINDS`, and through it `defaultNodeRouting` /\n * `defaultNodeProperties` / `BUILTIN_TOOL_IDS`.\n */\nexport const SHAPE_KINDS = {\n  rect: { tool: true, insertPreview: true },\n  ellipse: { tool: true, insertPreview: true },\n  line: { tool: true, insertPreview: true },\n  polygon: { tool: true, insertPreview: true },\n  star: { tool: true, insertPreview: true },\n  pen: { tool: true, insertPreview: false },\n  pencil: { tool: true, insertPreview: true },\n  lasso: { tool: true, insertPreview: false },\n  text: { tool: true, insertPreview: true, text: true },\n  sticky: { tool: true, insertPreview: true, text: true },\n  image: { tool: false, insertPreview: true },\n} as const satisfies Record<string, ShapeKindDescriptor>;\n\n/** Every kind in the table, tool or not. */\nexport type ShapeKind = keyof typeof SHAPE_KINDS;\n\n/** The keys of a shape-kind table whose descriptor sets `F` to `true`. */\nexport type ShapeKindsWhere<T, F extends keyof ShapeKindDescriptor> = {\n  [K in keyof T]: T[K] extends Record<F, true> ? K : never;\n}[keyof T];\n\n/** Built-in shape tool ids handled by `useBuiltinShapeTools`. */\nexport type BuiltinShapeToolId = ShapeKindsWhere<typeof SHAPE_KINDS, 'tool'>;\n\n/** The insert kinds the kit's dispatcher overlay layer knows how to render.\n *  Consumer-defined kinds fall outside it: no live preview, commit unaffected. */\nexport type KitInsertShape = ShapeKindsWhere<typeof SHAPE_KINDS, 'insertPreview'>;\n\n/** Kinds in `table` whose descriptor sets `field`, in declaration order. */\nexport function shapeKindsWhere<T extends Record<string, ShapeKindDescriptor>>(\n  table: T,\n  field: keyof ShapeKindDescriptor,\n): (keyof T & string)[] {\n  return (Object.keys(table) as (keyof T & string)[]).filter((k) => table[k][field]);\n}\n\n/** The descriptor for `kind`, or `undefined` for a kind the kit doesn't ship.\n *  The one accessor: ask it rather than testing membership of a derived list. */\nexport function shapeKindInfo(kind: string): ShapeKindDescriptor | undefined {\n  return (SHAPE_KINDS as Record<string, ShapeKindDescriptor>)[kind];\n}\n\n/** Runtime, iterable list of the shape-tool ids in `BuiltinShapeToolId`. */\nexport const KIT_SHAPE_KINDS: readonly BuiltinShapeToolId[] =\n  shapeKindsWhere(SHAPE_KINDS, 'tool') as BuiltinShapeToolId[];\n"],"mappings":";;;;;;AA4BA,IAAa,cAAc;CACzB,MAAM;EAAE,MAAM;EAAM,eAAe;CAAK;CACxC,SAAS;EAAE,MAAM;EAAM,eAAe;CAAK;CAC3C,MAAM;EAAE,MAAM;EAAM,eAAe;CAAK;CACxC,SAAS;EAAE,MAAM;EAAM,eAAe;CAAK;CAC3C,MAAM;EAAE,MAAM;EAAM,eAAe;CAAK;CACxC,KAAK;EAAE,MAAM;EAAM,eAAe;CAAM;CACxC,QAAQ;EAAE,MAAM;EAAM,eAAe;CAAK;CAC1C,OAAO;EAAE,MAAM;EAAM,eAAe;CAAM;CAC1C,MAAM;EAAE,MAAM;EAAM,eAAe;EAAM,MAAM;CAAK;CACpD,QAAQ;EAAE,MAAM;EAAM,eAAe;EAAM,MAAM;CAAK;CACtD,OAAO;EAAE,MAAM;EAAO,eAAe;CAAK;AAC5C;;AAkBA,SAAgB,gBACd,OACA,OACsB;CACtB,OAAQ,OAAO,KAAK,KAAK,CAAC,CAA0B,QAAQ,MAAM,MAAM,EAAE,CAAC,MAAM;AACnF;;;AAIA,SAAgB,cAAc,MAA+C;CAC3E,OAAQ,YAAoD;AAC9D;;AAGA,IAAa,kBACX,gBAAgB,aAAa,MAAM"}

package/dist/core/stableStringify.js

@@ -1,8 +1,9 @@
 //#region src/core/stableStringify.ts
-function e(e) {
-	return JSON.stringify(e, (e, t) => t && typeof t == "object" && !Array.isArray(t) ? Object.fromEntries(Object.entries(t).sort(([e], [t]) => e < t ? -1 : 1)) : t);
+/** JSON with object keys sorted, so two equal values produce one string. */
+function stableStringify(value) {
+	return JSON.stringify(value, (_key, v) => v && typeof v === "object" && !Array.isArray(v) ? Object.fromEntries(Object.entries(v).sort(([a], [b]) => a < b ? -1 : 1)) : v);
 }
-//#endregion
-export { e as stableStringify };
 
+//#endregion
+export { stableStringify };
 //# sourceMappingURL=stableStringify.js.map

package/dist/core/stableStringify.js.map

@@ -1 +1 @@
-{"version":3,"file":"stableStringify.js","names":["stableStringify","value","v","a","b"],"sources":["../../src/core/stableStringify.ts"],"sourcesContent":["/** JSON with object keys sorted, so two equal values produce one string. */\nexport function stableStringify(value: unknown): string {\n  return JSON.stringify(value, (_key, v) =>\n    v && typeof v === 'object' && !Array.isArray(v)\n      ? Object.fromEntries(Object.entries(v).sort(([a], [b]) => (a < b ? -1 : 1)))\n      : v,\n  );\n}\n"],"mappings":";AACA,SAAgBA,EAAgB,GAAwB;CACtD,OAAO,KAAK,UAAUC,IAAQ,GAAM,MAClCC,KAAK,OAAOA,KAAM,YAAY,CAAC,MAAM,QAAQA,CAAC,IAC1C,OAAO,YAAY,OAAO,QAAQA,CAAC,CAAC,CAAC,MAAM,CAACC,IAAI,CAACC,OAAQD,IAAIC,IAAI,KAAK,CAAE,CAAC,IACzEF,CACN;AACF"}
+{"version":3,"file":"stableStringify.js","names":[],"sources":["../../src/core/stableStringify.ts"],"sourcesContent":["/** JSON with object keys sorted, so two equal values produce one string. */\nexport function stableStringify(value: unknown): string {\n  return JSON.stringify(value, (_key, v) =>\n    v && typeof v === 'object' && !Array.isArray(v)\n      ? Object.fromEntries(Object.entries(v).sort(([a], [b]) => (a < b ? -1 : 1)))\n      : v,\n  );\n}\n"],"mappings":";;AACA,SAAgB,gBAAgB,OAAwB;CACtD,OAAO,KAAK,UAAU,QAAQ,MAAM,MAClC,KAAK,OAAO,MAAM,YAAY,CAAC,MAAM,QAAQ,CAAC,IAC1C,OAAO,YAAY,OAAO,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAQ,IAAI,IAAI,KAAK,CAAE,CAAC,IACzE,CACN;AACF"}

package/dist/core/stylus/stylus.js

@@ -1,39 +1,63 @@
-import { clientToWorld as e } from "../viewport/clientToWorld.js";
+import { clientToWorld } from "../viewport/clientToWorld.js";
+
 //#region src/core/stylus/stylus.ts
-function t(e, t = {}) {
-	let n = t.minWidth ?? .5, r = t.maxWidth ?? 6, i = t.gamma ?? 1.6, a = Math.max(0, Math.min(1, e)) ** i;
-	return n + (r - n) * a;
+/**
+* Map a 0..1 pressure value to a stroke width.
+*
+* `width(p) = minWidth + (maxWidth - minWidth) × p^gamma`
+*
+* Mouse / non-stylus inputs report `pressure === 0` (no button) or `0.5`
+* (button held); gate on `pointerType === 'pen'` upstream to give them a
+* constant width instead.
+*/
+function pressureToWidth(pressure, options = {}) {
+	const minWidth = options.minWidth ?? .5;
+	const maxWidth = options.maxWidth ?? 6;
+	const gamma = options.gamma ?? 1.6;
+	const shaped = Math.max(0, Math.min(1, pressure)) ** gamma;
+	return minWidth + (maxWidth - minWidth) * shaped;
 }
-function n(e) {
-	let t = e, n = e.pointerType ?? "";
+/** Extract a normalized stylus snapshot from any PointerEvent. Pure. */
+function getStylusData(e) {
+	const ext = e;
+	const pointerType = e.pointerType ?? "";
 	return {
 		pressure: e.pressure,
 		tiltX: e.tiltX ?? 0,
 		tiltY: e.tiltY ?? 0,
-		altitudeAngle: typeof t.altitudeAngle == "number" ? t.altitudeAngle : void 0,
-		azimuthAngle: typeof t.azimuthAngle == "number" ? t.azimuthAngle : void 0,
+		altitudeAngle: typeof ext.altitudeAngle === "number" ? ext.altitudeAngle : void 0,
+		azimuthAngle: typeof ext.azimuthAngle === "number" ? ext.azimuthAngle : void 0,
 		twist: e.twist ?? 0,
-		pointerType: n,
-		isStylus: n === "pen"
+		pointerType,
+		isStylus: pointerType === "pen"
 	};
 }
-function r(t, r, i) {
-	let a = t.getCoalescedEvents, o = typeof a == "function" ? a.call(t) : [], s = o.length > 0 ? o : [t];
-	for (let t of s) {
-		let [a, o] = [t.clientX - r.canvasRect.left, t.clientY - r.canvasRect.top], [s, c] = e(t.clientX, t.clientY, r.canvasRect, r.view);
-		i({
-			clientX: t.clientX,
-			clientY: t.clientY,
-			screenX: a,
-			screenY: o,
-			worldX: s,
-			worldY: c,
-			stylus: n(t),
-			event: t
+/**
+* Iterate coalesced sub-events of a `pointermove`, yielding a
+* `PointerSample` per sub-event with world coords already derived. When
+* `getCoalescedEvents` is unavailable or returns an empty list, the parent
+* event itself is yielded once.
+*/
+function forEachCoalesced(event, ctx, cb) {
+	const get = event.getCoalescedEvents;
+	const sub = typeof get === "function" ? get.call(event) : [];
+	const list = sub.length > 0 ? sub : [event];
+	for (const e of list) {
+		const [screenX, screenY] = [e.clientX - ctx.canvasRect.left, e.clientY - ctx.canvasRect.top];
+		const [worldX, worldY] = clientToWorld(e.clientX, e.clientY, ctx.canvasRect, ctx.view);
+		cb({
+			clientX: e.clientX,
+			clientY: e.clientY,
+			screenX,
+			screenY,
+			worldX,
+			worldY,
+			stylus: getStylusData(e),
+			event: e
 		});
 	}
 }
-//#endregion
-export { r as forEachCoalesced, n as getStylusData, t as pressureToWidth };
 
+//#endregion
+export { forEachCoalesced, getStylusData, pressureToWidth };
 //# sourceMappingURL=stylus.js.map

package/dist/core/stylus/stylus.js.map

@@ -1 +1 @@
-{"version":3,"file":"stylus.js","names":["pressureToWidth","minWidth","options","maxWidth","gamma","shaped","pressure","getStylusData","ext","pointerType","forEachCoalesced","get","event","sub","list","e","screenX","screenY","ctx","worldX","worldY","clientToWorld"],"sources":["../../../src/core/stylus/stylus.ts"],"sourcesContent":["import { clientToWorld } from 'core/viewport/clientToWorld';\n/**\n * Stylus / Pencil pointer-event helpers.\n *\n * These normalize the standard `PointerEvent` stylus fields across browsers,\n * fill in defaults for non-stylus inputs, and provide a coalesced-event\n * iterator for high-frequency samples.\n *\n * `pointerType: 'pen'` covers Apple Pencil on iPad Safari. The\n * barrel-double-tap (Pencil 2) and barrel-squeeze (Pencil Pro) gestures are\n * NOT exposed to web pages.\n */\n\n/** Normalized snapshot of stylus state at a single pointer sample. */\nexport interface StylusData {\n  /** 0..1. Mouse and ordinary touch report 0 when no button is held and 0.5\n   *  while a button is held (per the Pointer Events spec). Stylus inputs\n   *  report a true pressure curve. */\n  pressure: number;\n  /** Tilt of the pen in degrees from the surface normal, projected onto the\n   *  X axis. Range ±90. Zero for mouse/touch. */\n  tiltX: number;\n  /** Tilt projected onto the Y axis. Range ±90. Zero for mouse/touch. */\n  tiltY: number;\n  /** Newer (Pointer Events level 3) angle in radians between the surface\n   *  and the pen barrel. π/2 = perpendicular to the surface. Undefined on\n   *  browsers that haven't shipped the field yet. */\n  altitudeAngle: number | undefined;\n  /** Newer angle in radians around the Z axis. Undefined on browsers\n   *  without level-3 support. */\n  azimuthAngle: number | undefined;\n  /** Rotation of the pen barrel in degrees. Apple Pencil Pro reports this\n   *  natively but Safari does NOT yet surface it via PointerEvent.twist —\n   *  expect 0 there. Some Wacom stylus drivers do report it. */\n  twist: number;\n  /** Raw pointerType from the event ('mouse' | 'pen' | 'touch' | ''). */\n  pointerType: string;\n  /** Convenience: `pointerType === 'pen'`. */\n  isStylus: boolean;\n}\n\n/** Options for `pressureToWidth`. */\nexport interface PressureToWidthOptions {\n  /** Width returned at pressure 0. Default 0.5. */\n  minWidth?: number;\n  /** Width returned at pressure 1. Default 6. */\n  maxWidth?: number;\n  /** Response curve exponent applied to pressure before lerping\n   *  (`p ** gamma`). 1 = linear. Default 1.6. */\n  gamma?: number;\n}\n\n/**\n * Map a 0..1 pressure value to a stroke width.\n *\n * `width(p) = minWidth + (maxWidth - minWidth) × p^gamma`\n *\n * Mouse / non-stylus inputs report `pressure === 0` (no button) or `0.5`\n * (button held); gate on `pointerType === 'pen'` upstream to give them a\n * constant width instead.\n */\nexport function pressureToWidth(\n  pressure: number,\n  options: PressureToWidthOptions = {},\n): number {\n  const minWidth = options.minWidth ?? 0.5;\n  const maxWidth = options.maxWidth ?? 6;\n  const gamma = options.gamma ?? 1.6;\n  const p = Math.max(0, Math.min(1, pressure));\n  const shaped = p ** gamma;\n  return minWidth + (maxWidth - minWidth) * shaped;\n}\n\n/** Extract a normalized stylus snapshot from any PointerEvent. Pure. */\nexport function getStylusData(e: PointerEvent): StylusData {\n  const ext = e as PointerEvent & {\n    altitudeAngle?: number;\n    azimuthAngle?: number;\n  };\n  const pointerType = e.pointerType ?? '';\n  return {\n    pressure: e.pressure,\n    tiltX: e.tiltX ?? 0,\n    tiltY: e.tiltY ?? 0,\n    altitudeAngle: typeof ext.altitudeAngle === 'number' ? ext.altitudeAngle : undefined,\n    azimuthAngle: typeof ext.azimuthAngle === 'number' ? ext.azimuthAngle : undefined,\n    twist: e.twist ?? 0,\n    pointerType,\n    isStylus: pointerType === 'pen',\n  };\n}\n\n/** One enriched sample, ready for tools that want world coords + stylus\n *  data at every coalesced sub-frame. */\nexport interface PointerSample {\n  /** Client coords (relative to viewport). */\n  clientX: number;\n  clientY: number;\n  /** Canvas-relative CSS pixels. */\n  screenX: number;\n  screenY: number;\n  /** World coords, derived from `screenX/Y` via the supplied view. */\n  worldX: number;\n  worldY: number;\n  /** Stylus snapshot for this sample. */\n  stylus: StylusData;\n  /** Original event (may be the parent move or a coalesced sub-event). */\n  event: PointerEvent;\n}\n\n/** Context for `forEachCoalesced`: the canvas's client rect and its view. */\nexport interface CoalescedCtx {\n  canvasRect: { left: number; top: number };\n  view: { x: number; y: number; scale: { x: number; y: number } };\n}\n\n/**\n * Iterate coalesced sub-events of a `pointermove`, yielding a\n * `PointerSample` per sub-event with world coords already derived. When\n * `getCoalescedEvents` is unavailable or returns an empty list, the parent\n * event itself is yielded once.\n */\nexport function forEachCoalesced(\n  event: PointerEvent,\n  ctx: CoalescedCtx,\n  cb: (sample: PointerSample) => void,\n): void {\n  // Cast through unknown — older lib.dom.d.ts in some toolchains omits the\n  // method even though every modern engine ships it.\n  const get = (event as unknown as { getCoalescedEvents?: () => PointerEvent[] })\n    .getCoalescedEvents;\n  const sub = typeof get === 'function' ? get.call(event) : [];\n  const list = sub.length > 0 ? sub : [event];\n  for (const e of list) {\n    const [screenX, screenY] = [e.clientX - ctx.canvasRect.left, e.clientY - ctx.canvasRect.top];\n    const [worldX, worldY] = clientToWorld(e.clientX, e.clientY, ctx.canvasRect, ctx.view);\n    cb({\n      clientX: e.clientX,\n      clientY: e.clientY,\n      screenX,\n      screenY,\n      worldX,\n      worldY,\n      stylus: getStylusData(e),\n      event: e,\n    });\n  }\n}\n"],"mappings":";;AA6DA,SAAgBA,EACd,GACA,IAAkC,CAAC,GAC3B;CACR,IAAMC,IAAWC,EAAQ,YAAY,IAC/BC,IAAWD,EAAQ,YAAY,GAC/BE,IAAQF,EAAQ,SAAS,KAEzBG,IADI,KAAK,IAAI,GAAG,KAAK,IAAI,GAAGC,CAAQ,CAC3B,KAAKF;CACpB,OAAOH,KAAYE,IAAWF,KAAYI;AAC5C;AAGA,SAAgBE,EAAc,GAA6B;CACzD,IAAMC,IAAM,GAINC,IAAc,EAAE,eAAe;CACrC,OAAO;EACL,UAAU,EAAE;EACZ,OAAO,EAAE,SAAS;EAClB,OAAO,EAAE,SAAS;EAClB,eAAe,OAAOD,EAAI,iBAAkB,WAAWA,EAAI,gBAAgB,KAAA;EAC3E,cAAc,OAAOA,EAAI,gBAAiB,WAAWA,EAAI,eAAe,KAAA;EACxE,OAAO,EAAE,SAAS;EAClB;EACA,UAAUC,MAAgB;CAC5B;AACF;AAgCA,SAAgBC,EACd,GACA,GACA,GACM;CAGN,IAAMC,IAAOC,EACV,oBACGC,IAAM,OAAOF,KAAQ,aAAaA,EAAI,KAAKC,CAAK,IAAI,CAAC,GACrDE,IAAOD,EAAI,SAAS,IAAIA,IAAM,CAACD,CAAK;CAC1C,KAAK,IAAMG,KAAKD,GAAM;EACpB,IAAM,CAACE,GAASC,KAAW,CAACF,EAAE,UAAUG,EAAI,WAAW,MAAMH,EAAE,UAAUG,EAAI,WAAW,GAAG,GACrF,CAACC,GAAQC,KAAUC,EAAcN,EAAE,SAASA,EAAE,SAASG,EAAI,YAAYA,EAAI,IAAI;EACrF,EAAG;GACD,SAASH,EAAE;GACX,SAASA,EAAE;GACX;GACA;GACA;GACA;GACA,QAAQR,EAAcQ,CAAC;GACvB,OAAOA;EACT,CAAC;CACH;AACF"}
+{"version":3,"file":"stylus.js","names":[],"sources":["../../../src/core/stylus/stylus.ts"],"sourcesContent":["import { clientToWorld } from 'core/viewport/clientToWorld';\n/**\n * Stylus / Pencil pointer-event helpers.\n *\n * These normalize the standard `PointerEvent` stylus fields across browsers,\n * fill in defaults for non-stylus inputs, and provide a coalesced-event\n * iterator for high-frequency samples.\n *\n * `pointerType: 'pen'` covers Apple Pencil on iPad Safari. The\n * barrel-double-tap (Pencil 2) and barrel-squeeze (Pencil Pro) gestures are\n * NOT exposed to web pages.\n */\n\n/** Normalized snapshot of stylus state at a single pointer sample. */\nexport interface StylusData {\n  /** 0..1. Mouse and ordinary touch report 0 when no button is held and 0.5\n   *  while a button is held (per the Pointer Events spec). Stylus inputs\n   *  report a true pressure curve. */\n  pressure: number;\n  /** Tilt of the pen in degrees from the surface normal, projected onto the\n   *  X axis. Range ±90. Zero for mouse/touch. */\n  tiltX: number;\n  /** Tilt projected onto the Y axis. Range ±90. Zero for mouse/touch. */\n  tiltY: number;\n  /** Newer (Pointer Events level 3) angle in radians between the surface\n   *  and the pen barrel. π/2 = perpendicular to the surface. Undefined on\n   *  browsers that haven't shipped the field yet. */\n  altitudeAngle: number | undefined;\n  /** Newer angle in radians around the Z axis. Undefined on browsers\n   *  without level-3 support. */\n  azimuthAngle: number | undefined;\n  /** Rotation of the pen barrel in degrees. Apple Pencil Pro reports this\n   *  natively but Safari does NOT yet surface it via PointerEvent.twist —\n   *  expect 0 there. Some Wacom stylus drivers do report it. */\n  twist: number;\n  /** Raw pointerType from the event ('mouse' | 'pen' | 'touch' | ''). */\n  pointerType: string;\n  /** Convenience: `pointerType === 'pen'`. */\n  isStylus: boolean;\n}\n\n/** Options for `pressureToWidth`. */\nexport interface PressureToWidthOptions {\n  /** Width returned at pressure 0. Default 0.5. */\n  minWidth?: number;\n  /** Width returned at pressure 1. Default 6. */\n  maxWidth?: number;\n  /** Response curve exponent applied to pressure before lerping\n   *  (`p ** gamma`). 1 = linear. Default 1.6. */\n  gamma?: number;\n}\n\n/**\n * Map a 0..1 pressure value to a stroke width.\n *\n * `width(p) = minWidth + (maxWidth - minWidth) × p^gamma`\n *\n * Mouse / non-stylus inputs report `pressure === 0` (no button) or `0.5`\n * (button held); gate on `pointerType === 'pen'` upstream to give them a\n * constant width instead.\n */\nexport function pressureToWidth(\n  pressure: number,\n  options: PressureToWidthOptions = {},\n): number {\n  const minWidth = options.minWidth ?? 0.5;\n  const maxWidth = options.maxWidth ?? 6;\n  const gamma = options.gamma ?? 1.6;\n  const p = Math.max(0, Math.min(1, pressure));\n  const shaped = p ** gamma;\n  return minWidth + (maxWidth - minWidth) * shaped;\n}\n\n/** Extract a normalized stylus snapshot from any PointerEvent. Pure. */\nexport function getStylusData(e: PointerEvent): StylusData {\n  const ext = e as PointerEvent & {\n    altitudeAngle?: number;\n    azimuthAngle?: number;\n  };\n  const pointerType = e.pointerType ?? '';\n  return {\n    pressure: e.pressure,\n    tiltX: e.tiltX ?? 0,\n    tiltY: e.tiltY ?? 0,\n    altitudeAngle: typeof ext.altitudeAngle === 'number' ? ext.altitudeAngle : undefined,\n    azimuthAngle: typeof ext.azimuthAngle === 'number' ? ext.azimuthAngle : undefined,\n    twist: e.twist ?? 0,\n    pointerType,\n    isStylus: pointerType === 'pen',\n  };\n}\n\n/** One enriched sample, ready for tools that want world coords + stylus\n *  data at every coalesced sub-frame. */\nexport interface PointerSample {\n  /** Client coords (relative to viewport). */\n  clientX: number;\n  clientY: number;\n  /** Canvas-relative CSS pixels. */\n  screenX: number;\n  screenY: number;\n  /** World coords, derived from `screenX/Y` via the supplied view. */\n  worldX: number;\n  worldY: number;\n  /** Stylus snapshot for this sample. */\n  stylus: StylusData;\n  /** Original event (may be the parent move or a coalesced sub-event). */\n  event: PointerEvent;\n}\n\n/** Context for `forEachCoalesced`: the canvas's client rect and its view. */\nexport interface CoalescedCtx {\n  canvasRect: { left: number; top: number };\n  view: { x: number; y: number; scale: { x: number; y: number } };\n}\n\n/**\n * Iterate coalesced sub-events of a `pointermove`, yielding a\n * `PointerSample` per sub-event with world coords already derived. When\n * `getCoalescedEvents` is unavailable or returns an empty list, the parent\n * event itself is yielded once.\n */\nexport function forEachCoalesced(\n  event: PointerEvent,\n  ctx: CoalescedCtx,\n  cb: (sample: PointerSample) => void,\n): void {\n  // Cast through unknown — older lib.dom.d.ts in some toolchains omits the\n  // method even though every modern engine ships it.\n  const get = (event as unknown as { getCoalescedEvents?: () => PointerEvent[] })\n    .getCoalescedEvents;\n  const sub = typeof get === 'function' ? get.call(event) : [];\n  const list = sub.length > 0 ? sub : [event];\n  for (const e of list) {\n    const [screenX, screenY] = [e.clientX - ctx.canvasRect.left, e.clientY - ctx.canvasRect.top];\n    const [worldX, worldY] = clientToWorld(e.clientX, e.clientY, ctx.canvasRect, ctx.view);\n    cb({\n      clientX: e.clientX,\n      clientY: e.clientY,\n      screenX,\n      screenY,\n      worldX,\n      worldY,\n      stylus: getStylusData(e),\n      event: e,\n    });\n  }\n}\n"],"mappings":";;;;;;;;;;;;AA6DA,SAAgB,gBACd,UACA,UAAkC,CAAC,GAC3B;CACR,MAAM,WAAW,QAAQ,YAAY;CACrC,MAAM,WAAW,QAAQ,YAAY;CACrC,MAAM,QAAQ,QAAQ,SAAS;CAE/B,MAAM,SADI,KAAK,IAAI,GAAG,KAAK,IAAI,GAAG,QAAQ,CAC3B,KAAK;CACpB,OAAO,YAAY,WAAW,YAAY;AAC5C;;AAGA,SAAgB,cAAc,GAA6B;CACzD,MAAM,MAAM;CAIZ,MAAM,cAAc,EAAE,eAAe;CACrC,OAAO;EACL,UAAU,EAAE;EACZ,OAAO,EAAE,SAAS;EAClB,OAAO,EAAE,SAAS;EAClB,eAAe,OAAO,IAAI,kBAAkB,WAAW,IAAI,gBAAgB;EAC3E,cAAc,OAAO,IAAI,iBAAiB,WAAW,IAAI,eAAe;EACxE,OAAO,EAAE,SAAS;EAClB;EACA,UAAU,gBAAgB;CAC5B;AACF;;;;;;;AAgCA,SAAgB,iBACd,OACA,KACA,IACM;CAGN,MAAM,MAAO,MACV;CACH,MAAM,MAAM,OAAO,QAAQ,aAAa,IAAI,KAAK,KAAK,IAAI,CAAC;CAC3D,MAAM,OAAO,IAAI,SAAS,IAAI,MAAM,CAAC,KAAK;CAC1C,KAAK,MAAM,KAAK,MAAM;EACpB,MAAM,CAAC,SAAS,WAAW,CAAC,EAAE,UAAU,IAAI,WAAW,MAAM,EAAE,UAAU,IAAI,WAAW,GAAG;EAC3F,MAAM,CAAC,QAAQ,UAAU,cAAc,EAAE,SAAS,EAAE,SAAS,IAAI,YAAY,IAAI,IAAI;EACrF,GAAG;GACD,SAAS,EAAE;GACX,SAAS,EAAE;GACX;GACA;GACA;GACA;GACA,QAAQ,cAAc,CAAC;GACvB,OAAO;EACT,CAAC;CACH;AACF"}