@weasel-js/core 1.11.0 → 1.12.0

package/dist/canvas/SceneCanvas/useCanvasSelection.js

@@ -17,7 +17,12 @@ import { useMemo } from "react";
 * caller's own api is not wrapped and still writes.
 */
 function useCanvasSelection(args) {
-	const { scene, supplied, options, selectable, describeKind } = args;
+	const { scene, selectable, kindOf } = args;
+	const { selection: supplied, selectionOptions: options, describeKind } = args.props;
+	const describe = useMemo(() => describeKind ?? (kindOf && ((node) => {
+		const kind = kindOf(node);
+		return kind === "unknown" ? void 0 : kind;
+	})), [describeKind, kindOf]);
 	const derivedOptions = useMemo(() => ({
 		scene,
 		...options ?? {}
@@ -25,7 +30,7 @@ function useCanvasSelection(args) {
 	const internal = useSelection(derivedOptions);
 	const base = supplied ?? internal;
 	const selection = selectable ? base : readOnlySelection(base);
-	usePublishSceneSelection(scene, selection.current, describeKind);
+	usePublishSceneSelection(scene, selection.current, describe);
 	return selection;
 }
 

package/dist/canvas/SceneCanvas/useCanvasSelection.js.map

@@ -1 +1 @@
-{"version":3,"file":"useCanvasSelection.js","names":[],"sources":["../../../src/canvas/SceneCanvas/useCanvasSelection.ts"],"sourcesContent":["import { useMemo } from 'react';\nimport type { Node, NodeId, Scene } from 'core/scene/types';\nimport { readOnlySelection } from 'core/selection/readOnlySelection';\nimport { usePublishSceneSelection } from 'core/selection/usePublishSceneSelection';\nimport { useSelection, type SelectionApi, type UseSelectionOptions } from 'core/selection/useSelection';\n\n/**\n * The canvas's selection, published to any surrounding selection context.\n *\n * A caller-supplied api wins, and the one built here is then unused. The\n * built one is bound to the scene, so the selection an edit was made under\n * rides on the scene's history entries and undo can put it back.\n *\n * Everything the kit writes selection through (the `selection` dep, the\n * adapter's `setSelection`, ops committed through either) reads the returned\n * api, so on an unselectable canvas every write path here is closed. The\n * caller's own api is not wrapped and still writes.\n */\nexport function useCanvasSelection<TData, TLayer extends string, TPose>(args: {\n  scene: Scene<TData, TLayer, TPose>;\n  /** `<SceneCanvas selection>`. */\n  supplied: SelectionApi | undefined;\n  options: UseSelectionOptions | undefined;\n  selectable: boolean;\n  describeKind: ((node: Node<TData, TLayer, TPose>) => string | undefined) | undefined;\n}): SelectionApi {\n  const { scene, supplied, options, selectable, describeKind } = args;\n  const derivedOptions = useMemo<UseSelectionOptions>(\n    () => ({ scene, ...(options ?? {}) }),\n    [scene, options],\n  );\n  const internal = useSelection(derivedOptions);\n  const base = supplied ?? internal;\n  const selection = selectable ? base : readOnlySelection(base);\n  usePublishSceneSelection(scene, selection.current as readonly NodeId[], describeKind);\n  return selection;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAkBA,SAAgB,mBAAwD,MAOvD;CACf,MAAM,EAAE,OAAO,UAAU,SAAS,YAAY,iBAAiB;CAC/D,MAAM,iBAAiB,eACd;EAAE;EAAO,GAAI,WAAW,CAAC;CAAG,IACnC,CAAC,OAAO,OAAO,CACjB;CACA,MAAM,WAAW,aAAa,cAAc;CAC5C,MAAM,OAAO,YAAY;CACzB,MAAM,YAAY,aAAa,OAAO,kBAAkB,IAAI;CAC5D,yBAAyB,OAAO,UAAU,SAA8B,YAAY;CACpF,OAAO;AACT"}
+{"version":3,"file":"useCanvasSelection.js","names":[],"sources":["../../../src/canvas/SceneCanvas/useCanvasSelection.ts"],"sourcesContent":["import { useMemo } from 'react';\nimport type { Node, NodeId, Scene } from 'core/scene/types';\nimport { readOnlySelection } from 'core/selection/readOnlySelection';\nimport { usePublishSceneSelection } from 'core/selection/usePublishSceneSelection';\nimport { useSelection, type SelectionApi, type UseSelectionOptions } from 'core/selection/useSelection';\nimport type { SceneCanvasProps } from './props';\n\n/**\n * The canvas's selection, published to any surrounding selection context.\n *\n * A caller-supplied api wins, and the one built here is then unused. The\n * built one is bound to the scene, so the selection an edit was made under\n * rides on the scene's history entries and undo can put it back.\n *\n * Everything the kit writes selection through (the `selection` dep, the\n * adapter's `setSelection`, ops committed through either) reads the returned\n * api, so on an unselectable canvas every write path here is closed. The\n * caller's own api is not wrapped and still writes.\n */\nexport function useCanvasSelection<TData, TLayer extends string, TPose>(args: {\n  scene: Scene<TData, TLayer, TPose>;\n  props: Pick<SceneCanvasProps<TData, TLayer, TPose>, 'selection' | 'selectionOptions' | 'describeKind'>;\n  selectable: boolean;\n  /** The canvas's routing kind, published for each node unless `describeKind` is given. */\n  kindOf: ((node: { kind: string; data: TData }) => string) | undefined;\n}): SelectionApi {\n  const { scene, selectable, kindOf } = args;\n  const { selection: supplied, selectionOptions: options, describeKind } = args.props;\n  const describe = useMemo(() => describeKind ?? (kindOf && ((node: Node<TData, TLayer, TPose>) => {\n    const kind = kindOf(node);\n    return kind === 'unknown' ? undefined : kind;\n  })), [describeKind, kindOf]);\n  const derivedOptions = useMemo<UseSelectionOptions>(\n    () => ({ scene, ...(options ?? {}) }),\n    [scene, options],\n  );\n  const internal = useSelection(derivedOptions);\n  const base = supplied ?? internal;\n  const selection = selectable ? base : readOnlySelection(base);\n  usePublishSceneSelection(scene, selection.current as readonly NodeId[], describe);\n  return selection;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAmBA,SAAgB,mBAAwD,MAMvD;CACf,MAAM,EAAE,OAAO,YAAY,WAAW;CACtC,MAAM,EAAE,WAAW,UAAU,kBAAkB,SAAS,iBAAiB,KAAK;CAC9E,MAAM,WAAW,cAAc,iBAAiB,YAAY,SAAqC;EAC/F,MAAM,OAAO,OAAO,IAAI;EACxB,OAAO,SAAS,YAAY,SAAY;CAC1C,KAAK,CAAC,cAAc,MAAM,CAAC;CAC3B,MAAM,iBAAiB,eACd;EAAE;EAAO,GAAI,WAAW,CAAC;CAAG,IACnC,CAAC,OAAO,OAAO,CACjB;CACA,MAAM,WAAW,aAAa,cAAc;CAC5C,MAAM,OAAO,YAAY;CACzB,MAAM,YAAY,aAAa,OAAO,kBAAkB,IAAI;CAC5D,yBAAyB,OAAO,UAAU,SAA8B,QAAQ;CAChF,OAAO;AACT"}

package/dist/canvas/SceneCanvas/useCanvasTools.js

@@ -1,8 +1,9 @@
+import { createViewMarkerContribution } from "../../features/viewports/viewMarkerDrag.js";
 import { createLongPressFeedbackContribution } from "../../features/longPress/longPressFeedback.js";
 import { useTools } from "../../tools/overlayBinding.js";
 import { presetActions, presetAmbient, presetContributions, resolveFeatures } from "./features.js";
 import { useBuiltinTools } from "./useBuiltinTools.js";
-import { useCallback, useEffect, useMemo } from "react";
+import { useEffect, useMemo } from "react";
 import { useLatest } from "@weasel-js/react";
 
 //#region src/canvas/SceneCanvas/useCanvasTools.ts
@@ -21,12 +22,16 @@ var entryKey = (e) => {
 };
 /** The presets a canvas runs with. Keyed on the entries, not the array, so
 *  an inline `features={['draw', pathTools]}` does not re-derive every render. */
-function useEnabledFeatures(features, named, hasViewport) {
+function useEnabledFeatures(features, named, hasViewport, selectRotates) {
 	const featuresKey = (features ?? []).map(entryKey).join("|");
-	return useMemo(() => resolveFeatures(features, named, { viewport: hasViewport }), [
+	return useMemo(() => resolveFeatures(features, named, {
+		viewport: hasViewport,
+		selectRotates
+	}), [
 		featuresKey,
 		named,
-		hasViewport
+		hasViewport,
+		selectRotates
 	]);
 }
 /**
@@ -37,12 +42,8 @@ function useEnabledFeatures(features, named, hasViewport) {
 function useCanvasTools(args) {
 	const { select, enabled, tools: toolsProp, defaultTools, toolOptions, inertia, ambient, initialActiveTool, modes, onToolsCreated } = args;
 	const takeover = toolsProp && isToolsApi(toolsProp) ? toolsProp : null;
-	const selectionRef = useLatest(args.selection);
-	const selected = useCallback(() => selectionRef.current.get(), [selectionRef]);
 	const registry = useBuiltinTools({
 		select,
-		scene: args.scene,
-		selection: selected,
 		enabled,
 		defaultTools,
 		patch: toolsProp && !isToolsApi(toolsProp) ? toolsProp : null,
@@ -52,14 +53,18 @@ function useCanvasTools(args) {
 	const defaultPressFeedback = useMemo(() => createLongPressFeedbackContribution(), []);
 	const feedbackOpt = args.pressFeedback ?? true;
 	const pressFeedback = feedbackOpt === true ? defaultPressFeedback : feedbackOpt || null;
+	const defaultMarkerDrag = useMemo(() => createViewMarkerContribution(), []);
+	const markerDrag = args.actions === null ? null : defaultMarkerDrag;
 	const mergedAmbient = useMemo(() => [
 		...presetContributions(enabled),
 		...ambient ?? [],
-		...pressFeedback ? [pressFeedback] : []
+		...pressFeedback ? [pressFeedback] : [],
+		...markerDrag ? [markerDrag] : []
 	], [
 		enabled,
 		ambient,
-		pressFeedback
+		pressFeedback,
+		markerDrag
 	]);
 	const internal = useTools({
 		active: initialActiveTool ?? ("select" in registry ? "select" : null),

package/dist/canvas/SceneCanvas/useCanvasTools.js.map

@@ -1 +1 @@
-{"version":3,"file":"useCanvasTools.js","names":[],"sources":["../../../src/canvas/SceneCanvas/useCanvasTools.ts"],"sourcesContent":["import { useCallback, useEffect, useMemo } from 'react';\nimport { useLatest } from '@weasel-js/react';\nimport type { Action, SelectionApi } from '@weasel-js/routing';\nimport type { Scene } from 'core/scene/types';\nimport { createLongPressFeedbackContribution } from '../../features/longPress/longPressFeedback';\nimport { useTools, type Contribution, type Tool, type ToolsApi } from '../../tools/overlayBinding';\nimport {\n  presetActions,\n  presetAmbient,\n  presetContributions,\n  resolveFeatures,\n  type EnabledPresets,\n  type FeatureBindingOptions,\n  type FeatureEntry,\n  type NamedPresets,\n} from './features';\nimport type { SceneCanvasProps } from './props';\nimport type { ToolsPatch } from './toolRegistry';\nimport { useBuiltinTools } from './useBuiltinTools';\n\ntype Props = SceneCanvasProps<unknown, string, unknown>;\n\n/** Discriminate the polymorphic `tools` prop: `ToolsApi` has `setActive`\n *  / `active` / `registry`; the patch record shape has none of those. */\nfunction isToolsApi(tools: ToolsApi | ToolsPatch): tools is ToolsApi {\n  return typeof (tools as ToolsApi).setActive === 'function';\n}\n\nconst presetSerials = new WeakMap<object, number>();\nlet nextSerial = 0;\nconst entryKey = (e: FeatureEntry): string => {\n  if (typeof e === 'string') return e;\n  let n = presetSerials.get(e);\n  if (n === undefined) presetSerials.set(e, (n = nextSerial++));\n  return `#${n}`;\n};\n\n/** The presets a canvas runs with. Keyed on the entries, not the array, so\n *  an inline `features={['draw', pathTools]}` does not re-derive every render. */\nexport function useEnabledFeatures(\n  features: readonly FeatureEntry[] | undefined,\n  named: NamedPresets | null,\n  hasViewport: boolean,\n): EnabledPresets {\n  const featuresKey = (features ?? []).map(entryKey).join('|');\n  return useMemo(\n    () => resolveFeatures(features, named, { viewport: hasViewport }),\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n    [featuresKey, named, hasViewport],\n  );\n}\n\n/**\n * The canvas's tools: a caller's own `ToolsApi` when the `tools` prop is one\n * (the takeover form), and otherwise the built-ins the presets and\n * `defaultTools` name, patched by a `tools` record.\n */\nexport function useCanvasTools(args: {\n  /** The canvas's select tool, which is built from its scene and pickers. */\n  select: Tool;\n  /** The canvas's scene and selection, which the rig tools edit and read. */\n  scene: Scene<unknown, string, unknown>;\n  selection: SelectionApi;\n  enabled: EnabledPresets;\n  tools: Props['tools'];\n  defaultTools: Props['defaultTools'];\n  toolOptions: Props['toolOptions'];\n  /** `viewport.inertia`, which is the hand tool's. */\n  inertia: NonNullable<Props['viewport']>['inertia'];\n  ambient: Props['ambient'];\n  /** `longPress.feedback`. Default true, which installs the kit's own. */\n  pressFeedback: NonNullable<Props['longPress']>['feedback'];\n  initialActiveTool: Props['initialActiveTool'];\n  modes: Props['modes'];\n  onToolsCreated: Props['onToolsCreated'];\n}): {\n  /** What the canvas routes input through: the takeover, or `internal`. */\n  tools: ToolsApi;\n  /** The canvas's own api, built whether or not a takeover replaces it. */\n  internal: ToolsApi;\n  takeover: ToolsApi | null;\n} {\n  const { select, enabled, tools: toolsProp, defaultTools, toolOptions, inertia, ambient, initialActiveTool, modes, onToolsCreated } = args;\n\n  const takeover = toolsProp && isToolsApi(toolsProp) ? toolsProp : null;\n  const selectionRef = useLatest(args.selection);\n  const selected = useCallback(() => selectionRef.current.get(), [selectionRef]);\n  const registry = useBuiltinTools({\n    select,\n    scene: args.scene,\n    selection: selected,\n    enabled,\n    defaultTools,\n    patch: toolsProp && !isToolsApi(toolsProp) ? toolsProp : null,\n    toolOptions,\n    inertia,\n  });\n\n  const defaultPressFeedback = useMemo(() => createLongPressFeedbackContribution(), []);\n  const feedbackOpt = args.pressFeedback ?? true;\n  const pressFeedback = feedbackOpt === true ? defaultPressFeedback : feedbackOpt || null;\n  const mergedAmbient = useMemo(\n    () => [...presetContributions(enabled), ...(ambient ?? []), ...(pressFeedback ? [pressFeedback] : [])],\n    [enabled, ambient, pressFeedback],\n  );\n\n  const internal = useTools({\n    active: initialActiveTool ?? ('select' in registry ? 'select' : null),\n    registry,\n    ...(mergedAmbient.length ? { ambient: mergedAmbient } : {}),\n    ...(modes ? { modes } : {}),\n  });\n  const tools = takeover ?? internal;\n\n  const onToolsCreatedRef = useLatest(onToolsCreated);\n  useEffect(() => { onToolsCreatedRef.current?.(tools); }, [tools, onToolsCreatedRef]);\n\n  return { tools, internal, takeover };\n}\n\n/**\n * The presets' ambient bindings, and the standard actions the canvas\n * registers. The bindings are not tools and sit outside `tools`, so they apply\n * under a takeover too. An action is registered when an enabled preset brings\n * it, or when it is in `pool` and a tool or contribution on this canvas binds\n * it: a tool brings the actions it routes to, so `defaultTools={['rect']}`\n * works under any preset.\n */\nexport function useFeatureBindings(args: {\n  enabled: EnabledPresets;\n  /** Actions registered only when something binds them. */\n  pool: readonly Action[];\n  tools: Pick<ToolsApi, 'registry' | 'ambient'>;\n  move: FeatureBindingOptions['move'];\n  rotate: FeatureBindingOptions['rotate'];\n}): { contributions: Contribution[]; standardActions: Action[] } {\n  const { enabled, pool, tools, move, rotate } = args;\n  const contributions = useMemo<Contribution[]>(\n    () => presetAmbient(enabled, { move, rotate }),\n    [enabled, move, rotate],\n  );\n  const standardActions = useMemo(() => {\n    const out = presetActions(enabled);\n    const have = new Set(out.map((a) => a.id));\n    const bound = new Set<string>();\n    for (const entry of [...Object.values(tools.registry), ...tools.ambient, ...contributions]) {\n      for (const b of entry.bindings ?? []) bound.add(b.actionId);\n    }\n    for (const a of pool) {\n      if (bound.has(a.id) && !have.has(a.id)) {\n        have.add(a.id);\n        out.push(a);\n      }\n    }\n    return out;\n  }, [enabled, pool, tools, contributions]);\n  return { contributions, standardActions };\n}\n\n"],"mappings":"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"}
+{"version":3,"file":"useCanvasTools.js","names":[],"sources":["../../../src/canvas/SceneCanvas/useCanvasTools.ts"],"sourcesContent":["import { useEffect, useMemo } from 'react';\nimport { useLatest } from '@weasel-js/react';\nimport type { Action } from '@weasel-js/routing';\nimport { createLongPressFeedbackContribution } from '../../features/longPress/longPressFeedback';\nimport { createViewMarkerContribution } from '../../features/viewports/viewMarkerDrag';\nimport { useTools, type Contribution, type Tool, type ToolsApi } from '../../tools/overlayBinding';\nimport {\n  presetActions,\n  presetAmbient,\n  presetContributions,\n  resolveFeatures,\n  type EnabledPresets,\n  type FeatureBindingOptions,\n  type FeatureEntry,\n  type NamedPresets,\n} from './features';\nimport type { SceneCanvasProps } from './props';\nimport type { ToolsPatch } from './toolRegistry';\nimport { useBuiltinTools } from './useBuiltinTools';\n\ntype Props = SceneCanvasProps<unknown, string, unknown>;\n\n/** Discriminate the polymorphic `tools` prop: `ToolsApi` has `setActive`\n *  / `active` / `registry`; the patch record shape has none of those. */\nfunction isToolsApi(tools: ToolsApi | ToolsPatch): tools is ToolsApi {\n  return typeof (tools as ToolsApi).setActive === 'function';\n}\n\nconst presetSerials = new WeakMap<object, number>();\nlet nextSerial = 0;\nconst entryKey = (e: FeatureEntry): string => {\n  if (typeof e === 'string') return e;\n  let n = presetSerials.get(e);\n  if (n === undefined) presetSerials.set(e, (n = nextSerial++));\n  return `#${n}`;\n};\n\n/** The presets a canvas runs with. Keyed on the entries, not the array, so\n *  an inline `features={['draw', pathTools]}` does not re-derive every render. */\nexport function useEnabledFeatures(\n  features: readonly FeatureEntry[] | undefined,\n  named: NamedPresets | null,\n  hasViewport: boolean,\n  selectRotates: boolean,\n): EnabledPresets {\n  const featuresKey = (features ?? []).map(entryKey).join('|');\n  return useMemo(\n    () => resolveFeatures(features, named, { viewport: hasViewport, selectRotates }),\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n    [featuresKey, named, hasViewport, selectRotates],\n  );\n}\n\n/**\n * The canvas's tools: a caller's own `ToolsApi` when the `tools` prop is one\n * (the takeover form), and otherwise the built-ins the presets and\n * `defaultTools` name, patched by a `tools` record.\n */\nexport function useCanvasTools(args: {\n  /** The canvas's select tool, which is built from its scene and pickers. */\n  select: Tool;\n  enabled: EnabledPresets;\n  tools: Props['tools'];\n  defaultTools: Props['defaultTools'];\n  toolOptions: Props['toolOptions'];\n  /** `viewport.inertia`, which is the hand tool's. */\n  inertia: NonNullable<Props['viewport']>['inertia'];\n  ambient: Props['ambient'];\n  /** `null` leaves out the kit's default actions, the marker drag among them. */\n  actions: Props['actions'];\n  /** `longPress.feedback`. Default true, which installs the kit's own. */\n  pressFeedback: NonNullable<Props['longPress']>['feedback'];\n  initialActiveTool: Props['initialActiveTool'];\n  modes: Props['modes'];\n  onToolsCreated: Props['onToolsCreated'];\n}): {\n  /** What the canvas routes input through: the takeover, or `internal`. */\n  tools: ToolsApi;\n  /** The canvas's own api, built whether or not a takeover replaces it. */\n  internal: ToolsApi;\n  takeover: ToolsApi | null;\n} {\n  const { select, enabled, tools: toolsProp, defaultTools, toolOptions, inertia, ambient, initialActiveTool, modes, onToolsCreated } = args;\n\n  const takeover = toolsProp && isToolsApi(toolsProp) ? toolsProp : null;\n  const registry = useBuiltinTools({\n    select,\n    enabled,\n    defaultTools,\n    patch: toolsProp && !isToolsApi(toolsProp) ? toolsProp : null,\n    toolOptions,\n    inertia,\n  });\n\n  const defaultPressFeedback = useMemo(() => createLongPressFeedbackContribution(), []);\n  const feedbackOpt = args.pressFeedback ?? true;\n  const pressFeedback = feedbackOpt === true ? defaultPressFeedback : feedbackOpt || null;\n  const defaultMarkerDrag = useMemo(() => createViewMarkerContribution(), []);\n  const markerDrag = args.actions === null ? null : defaultMarkerDrag;\n  const mergedAmbient = useMemo(\n    () => [\n      ...presetContributions(enabled), ...(ambient ?? []),\n      ...(pressFeedback ? [pressFeedback] : []), ...(markerDrag ? [markerDrag] : []),\n    ],\n    [enabled, ambient, pressFeedback, markerDrag],\n  );\n\n  const internal = useTools({\n    active: initialActiveTool ?? ('select' in registry ? 'select' : null),\n    registry,\n    ...(mergedAmbient.length ? { ambient: mergedAmbient } : {}),\n    ...(modes ? { modes } : {}),\n  });\n  const tools = takeover ?? internal;\n\n  const onToolsCreatedRef = useLatest(onToolsCreated);\n  useEffect(() => { onToolsCreatedRef.current?.(tools); }, [tools, onToolsCreatedRef]);\n\n  return { tools, internal, takeover };\n}\n\n/**\n * The presets' ambient bindings, and the standard actions the canvas\n * registers. The bindings are not tools and sit outside `tools`, so they apply\n * under a takeover too. An action is registered when an enabled preset brings\n * it, or when it is in `pool` and a tool or contribution on this canvas binds\n * it: a tool brings the actions it routes to, so `defaultTools={['rect']}`\n * works under any preset.\n */\nexport function useFeatureBindings(args: {\n  enabled: EnabledPresets;\n  /** Actions registered only when something binds them. */\n  pool: readonly Action[];\n  tools: Pick<ToolsApi, 'registry' | 'ambient'>;\n  move: FeatureBindingOptions['move'];\n  rotate: FeatureBindingOptions['rotate'];\n}): { contributions: Contribution[]; standardActions: Action[] } {\n  const { enabled, pool, tools, move, rotate } = args;\n  const contributions = useMemo<Contribution[]>(\n    () => presetAmbient(enabled, { move, rotate }),\n    [enabled, move, rotate],\n  );\n  const standardActions = useMemo(() => {\n    const out = presetActions(enabled);\n    const have = new Set(out.map((a) => a.id));\n    const bound = new Set<string>();\n    for (const entry of [...Object.values(tools.registry), ...tools.ambient, ...contributions]) {\n      for (const b of entry.bindings ?? []) bound.add(b.actionId);\n    }\n    for (const a of pool) {\n      if (bound.has(a.id) && !have.has(a.id)) {\n        have.add(a.id);\n        out.push(a);\n      }\n    }\n    return out;\n  }, [enabled, pool, tools, contributions]);\n  return { contributions, standardActions };\n}\n\n"],"mappings":"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"}

package/dist/canvas/SceneCanvas/useNodeKinds.js

@@ -1,5 +1,5 @@
-import { createNodeRouting } from "../../core/scene/NodeRouting.js";
 import { inferredNodeRouting } from "./defaultNodeRouting.js";
+import { createNodeRouting } from "../../core/scene/NodeRouting.js";
 import { useMemo } from "react";
 
 //#region src/canvas/SceneCanvas/useNodeKinds.ts

package/dist/canvas/SceneCanvas/useNodeKinds.js.map

@@ -1 +1 @@
-{"version":3,"file":"useNodeKinds.js","names":[],"sources":["../../../src/canvas/SceneCanvas/useNodeKinds.ts"],"sourcesContent":["import { useMemo } from 'react';\nimport { createNodeRouting, type NodeRoutingEntry } from 'core/scene/NodeRouting';\nimport type { NodeId, Scene } from 'core/scene/types';\nimport { inferredNodeRouting } from './defaultNodeRouting';\n\n/**\n * The canvas's routing-trait classifier, by node data and by node id, so\n * `target: 'kind:text'` on a binding speaks the vocabulary of `Hit.kind`.\n * Unset `routing` falls back to `inferredNodeRouting`. An explicit empty list\n * opts out: both are undefined, every hit is `kind: 'unknown'`, and no\n * `kind:` target form can match.\n */\nexport function useNodeKinds<TData, TLayer extends string, TPose>(\n  scene: Scene<TData, TLayer, TPose>,\n  routing: readonly NodeRoutingEntry[] | undefined,\n): {\n  kindOf: ((node: { kind: string; data: TData }) => string) | undefined;\n  kindOfNode: ((id: string) => string | undefined) | undefined;\n} {\n  const kindOf = useMemo(() => {\n    const effective = routing === undefined ? inferredNodeRouting : routing;\n    if (effective.length === 0) return undefined;\n    const registry = createNodeRouting();\n    for (const k of effective) registry.register(k);\n    return (node: { kind: string; data: TData }) => registry.classify(node.data, node);\n  }, [routing]);\n\n  const kindOfNode = useMemo(() => {\n    if (!kindOf) return undefined;\n    return (id: string): string | undefined => {\n      const node = scene.get(id as NodeId);\n      return node ? kindOf(node) : undefined;\n    };\n  }, [kindOf, scene]);\n\n  return { kindOf, kindOfNode };\n}\n"],"mappings":";;;;;;;;;;;;AAYA,SAAgB,aACd,OACA,SAIA;CACA,MAAM,SAAS,cAAc;EAC3B,MAAM,YAAY,YAAY,SAAY,sBAAsB;EAChE,IAAI,UAAU,WAAW,GAAG,OAAO;EACnC,MAAM,WAAW,kBAAkB;EACnC,KAAK,MAAM,KAAK,WAAW,SAAS,SAAS,CAAC;EAC9C,QAAQ,SAAwC,SAAS,SAAS,KAAK,MAAM,IAAI;CACnF,GAAG,CAAC,OAAO,CAAC;CAUZ,OAAO;EAAE;EAAQ,YARE,cAAc;GAC/B,IAAI,CAAC,QAAQ,OAAO;GACpB,QAAQ,OAAmC;IACzC,MAAM,OAAO,MAAM,IAAI,EAAY;IACnC,OAAO,OAAO,OAAO,IAAI,IAAI;GAC/B;EACF,GAAG,CAAC,QAAQ,KAAK,CAEA;CAAW;AAC9B"}
+{"version":3,"file":"useNodeKinds.js","names":[],"sources":["../../../src/canvas/SceneCanvas/useNodeKinds.ts"],"sourcesContent":["import { useMemo } from 'react';\nimport { createNodeRouting, type NodeRoutingEntry } from 'core/scene/NodeRouting';\nimport type { NodeId, Scene } from 'core/scene/types';\nimport { inferredNodeRouting } from './defaultNodeRouting';\n\nexport interface NodeKinds<TData> {\n  kindOf: ((node: { kind: string; data: TData }) => string) | undefined;\n  kindOfNode: ((id: string) => string | undefined) | undefined;\n}\n\n/**\n * The canvas's routing-trait classifier, by node data and by node id, so\n * `target: 'kind:text'` on a binding speaks the vocabulary of `Hit.kind`.\n * Unset `routing` falls back to `inferredNodeRouting`. An explicit empty list\n * opts out: both are undefined, every hit is `kind: 'unknown'`, and no\n * `kind:` target form can match.\n */\nexport function useNodeKinds<TData, TLayer extends string, TPose>(\n  scene: Scene<TData, TLayer, TPose>,\n  routing: readonly NodeRoutingEntry[] | undefined,\n): NodeKinds<TData> {\n  const kindOf = useMemo(() => {\n    const effective = routing === undefined ? inferredNodeRouting : routing;\n    if (effective.length === 0) return undefined;\n    const registry = createNodeRouting();\n    for (const k of effective) registry.register(k);\n    return (node: { kind: string; data: TData }) => registry.classify(node.data, node);\n  }, [routing]);\n\n  const kindOfNode = useMemo(() => {\n    if (!kindOf) return undefined;\n    return (id: string): string | undefined => {\n      const node = scene.get(id as NodeId);\n      return node ? kindOf(node) : undefined;\n    };\n  }, [kindOf, scene]);\n\n  return { kindOf, kindOfNode };\n}\n"],"mappings":";;;;;;;;;;;;AAiBA,SAAgB,aACd,OACA,SACkB;CAClB,MAAM,SAAS,cAAc;EAC3B,MAAM,YAAY,YAAY,SAAY,sBAAsB;EAChE,IAAI,UAAU,WAAW,GAAG,OAAO;EACnC,MAAM,WAAW,kBAAkB;EACnC,KAAK,MAAM,KAAK,WAAW,SAAS,SAAS,CAAC;EAC9C,QAAQ,SAAwC,SAAS,SAAS,KAAK,MAAM,IAAI;CACnF,GAAG,CAAC,OAAO,CAAC;CAUZ,OAAO;EAAE;EAAQ,YARE,cAAc;GAC/B,IAAI,CAAC,QAAQ,OAAO;GACpB,QAAQ,OAAmC;IACzC,MAAM,OAAO,MAAM,IAAI,EAAY;IACnC,OAAO,OAAO,OAAO,IAAI,IAAI;GAC/B;EACF,GAAG,CAAC,QAAQ,KAAK,CAEA;CAAW;AAC9B"}

package/dist/canvas/SceneCanvas/useSceneCanvasHandle.js

@@ -26,7 +26,9 @@ function useAddedViews() {
 				w: 0,
 				h: 0
 			}
-		}, [surfaceViewRegistry])
+		}, [surfaceViewRegistry]),
+		aimOf: useCallback((id) => surfaceViewRegistry?.aimOf(id) ?? null, [surfaceViewRegistry]),
+		setAim: useCallback((id, aim) => surfaceViewRegistry?.setAim(id, aim) ?? false, [surfaceViewRegistry])
 	};
 }
 /**
@@ -35,7 +37,7 @@ function useAddedViews() {
 * and keeps the canvas's own copies of the element and the handle current.
 */
 function useSceneCanvasHandle(args) {
-	const { ref, elementRef, apiRef, onElement, ingest, viewAnimation, camera, addView, viewAt } = args;
+	const { ref, elementRef, apiRef, onElement, ingest, viewAnimation, camera, addView, viewAt, aimOf, setAim } = args;
 	const [ready, setReady] = useState(false);
 	return {
 		handleRef: useCallback((node) => {
@@ -49,7 +51,9 @@ function useSceneCanvasHandle(args) {
 				isViewAnimating: viewAnimation.isAnimating,
 				camera,
 				addView,
-				viewAt
+				viewAt,
+				aimOf,
+				setAim
 			} : null;
 			apiRef.current = extended;
 			setReady(extended !== null);
@@ -63,6 +67,8 @@ function useSceneCanvasHandle(args) {
 			camera,
 			addView,
 			viewAt,
+			aimOf,
+			setAim,
 			onElement
 		]),
 		ready

package/dist/canvas/SceneCanvas/useSceneCanvasHandle.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSceneCanvasHandle.js","names":[],"sources":["../../../src/canvas/SceneCanvas/useSceneCanvasHandle.ts"],"sourcesContent":["import { useCallback, useState, type ForwardedRef, type MutableRefObject } from 'react';\nimport { assignRef } from '@weasel-js/react';\nimport type { ViewAnimationApi } from 'core/viewport/useViewAnimation';\nimport type { CanvasViewProps } from '../CanvasView';\nimport type { CanvasExtensionApi, CanvasViewHandle, SceneCanvasApi } from '../canvasExtension';\nimport { IDENTITY_VIEW, useOptionalViewRegistry } from '../viewRegistry';\n\n/** Views added through the handle rather than declared as props or children. */\nexport function useAddedViews(): {\n  views: readonly CanvasViewProps[];\n  addView: SceneCanvasApi['addView'];\n  viewAt: SceneCanvasApi['viewAt'];\n} {\n  const surfaceViewRegistry = useOptionalViewRegistry();\n  const [views, setViews] = useState<readonly CanvasViewProps[]>([]);\n  const addView = useCallback((props: CanvasViewProps): CanvasViewHandle => {\n    setViews((list) => [...list.filter((v) => v.id !== props.id), props]);\n    return {\n      id: props.id,\n      draw: (data, outer, dims) =>\n        surfaceViewRegistry?.list().find((r) => r.id === props.id)?.layer.draw(data, outer, dims) ?? [],\n      remove: () => setViews((list) => list.filter((v) => v !== props)),\n    };\n  }, [surfaceViewRegistry]);\n  const viewAt = useCallback<SceneCanvasApi['viewAt']>((at, opts) => (\n    surfaceViewRegistry?.viewAt(at, opts) ?? { id: null, view: IDENTITY_VIEW, rect: { x: 0, y: 0, w: 0, h: 0 } }\n  ), [surfaceViewRegistry]);\n  return { views, addView, viewAt };\n}\n\n/**\n * The ref callback `<SceneCanvas>` hands `<Canvas>`. It extends the\n * primitive's handle into the `SceneCanvasApi` the consumer's ref receives,\n * and keeps the canvas's own copies of the element and the handle current.\n */\nexport function useSceneCanvasHandle(args: {\n  ref: ForwardedRef<SceneCanvasApi>;\n  /** Written with the canvas element, for the input listeners. */\n  elementRef: MutableRefObject<HTMLElement | null>;\n  /** Written with the extended handle, for `requestRedraw` and point conversion. */\n  apiRef: MutableRefObject<CanvasExtensionApi | null>;\n  /** Told the element whenever it attaches or detaches. */\n  onElement: (element: HTMLElement | null) => void;\n  ingest: SceneCanvasApi['ingest'];\n  viewAnimation: Pick<ViewAnimationApi, 'animate' | 'stop' | 'isAnimating'>;\n  camera: SceneCanvasApi['camera'];\n  addView: SceneCanvasApi['addView'];\n  viewAt: SceneCanvasApi['viewAt'];\n}): {\n  handleRef: (node: CanvasExtensionApi | null) => void;\n  /** Whether the handle is attached, as state: an effect needing the handle\n   *  keys off this instead of assuming when React attaches it. */\n  ready: boolean;\n} {\n  const { ref, elementRef, apiRef, onElement, ingest, viewAnimation, camera, addView, viewAt } = args;\n  const [ready, setReady] = useState(false);\n  const handleRef = useCallback(\n    (node: CanvasExtensionApi | null) => {\n      elementRef.current = node?.element ?? null;\n      onElement(elementRef.current);\n      const extended: SceneCanvasApi | null = node\n        ? {\n            ...node,\n            ingest,\n            animateView: viewAnimation.animate,\n            stopViewAnimation: viewAnimation.stop,\n            isViewAnimating: viewAnimation.isAnimating,\n            camera,\n            addView,\n            viewAt,\n          }\n        : null;\n      apiRef.current = extended;\n      setReady(extended !== null);\n      assignRef(ref, extended);\n    },\n    [ref, elementRef, apiRef, ingest, viewAnimation, camera, addView, viewAt, onElement],\n  );\n  return { handleRef, ready };\n}\n"],"mappings":";;;;;;AAQA,SAAgB,gBAId;CACA,MAAM,sBAAsB,wBAAwB;CACpD,MAAM,CAAC,OAAO,YAAY,SAAqC,CAAC,CAAC;CAajE,OAAO;EAAE;EAAO,SAZA,aAAa,UAA6C;GACxE,UAAU,SAAS,CAAC,GAAG,KAAK,QAAQ,MAAM,EAAE,OAAO,MAAM,EAAE,GAAG,KAAK,CAAC;GACpE,OAAO;IACL,IAAI,MAAM;IACV,OAAO,MAAM,OAAO,SAClB,qBAAqB,KAAK,CAAC,CAAC,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC;IAChG,cAAc,UAAU,SAAS,KAAK,QAAQ,MAAM,MAAM,KAAK,CAAC;GAClE;EACF,GAAG,CAAC,mBAAmB,CAIP;EAAS,QAHV,aAAuC,IAAI,SACxD,qBAAqB,OAAO,IAAI,IAAI,KAAK;GAAE,IAAI;GAAM,MAAM;GAAe,MAAM;IAAE,GAAG;IAAG,GAAG;IAAG,GAAG;IAAG,GAAG;GAAE;EAAE,GAC1G,CAAC,mBAAmB,CACE;CAAO;AAClC;;;;;;AAOA,SAAgB,qBAAqB,MAkBnC;CACA,MAAM,EAAE,KAAK,YAAY,QAAQ,WAAW,QAAQ,eAAe,QAAQ,SAAS,WAAW;CAC/F,MAAM,CAAC,OAAO,YAAY,SAAS,KAAK;CAuBxC,OAAO;EAAE,WAtBS,aACf,SAAoC;GACnC,WAAW,UAAU,MAAM,WAAW;GACtC,UAAU,WAAW,OAAO;GAC5B,MAAM,WAAkC,OACpC;IACE,GAAG;IACH;IACA,aAAa,cAAc;IAC3B,mBAAmB,cAAc;IACjC,iBAAiB,cAAc;IAC/B;IACA;IACA;GACF,IACA;GACJ,OAAO,UAAU;GACjB,SAAS,aAAa,IAAI;GAC1B,UAAU,KAAK,QAAQ;EACzB,GACA;GAAC;GAAK;GAAY;GAAQ;GAAQ;GAAe;GAAQ;GAAS;GAAQ;EAAS,CAE5E;EAAW;CAAM;AAC5B"}
+{"version":3,"file":"useSceneCanvasHandle.js","names":[],"sources":["../../../src/canvas/SceneCanvas/useSceneCanvasHandle.ts"],"sourcesContent":["import { useCallback, useState, type ForwardedRef, type MutableRefObject } from 'react';\nimport { assignRef } from '@weasel-js/react';\nimport type { ViewAnimationApi } from 'core/viewport/useViewAnimation';\nimport type { CanvasViewProps } from '../CanvasView';\nimport type { CanvasExtensionApi, CanvasViewHandle, SceneCanvasApi } from '../canvasExtension';\nimport { IDENTITY_VIEW, useOptionalViewRegistry } from '../viewRegistry';\n\n/** Views added through the handle rather than declared as props or children. */\nexport function useAddedViews(): {\n  views: readonly CanvasViewProps[];\n  addView: SceneCanvasApi['addView'];\n  viewAt: SceneCanvasApi['viewAt'];\n  aimOf: SceneCanvasApi['aimOf'];\n  setAim: SceneCanvasApi['setAim'];\n} {\n  const surfaceViewRegistry = useOptionalViewRegistry();\n  const [views, setViews] = useState<readonly CanvasViewProps[]>([]);\n  const addView = useCallback((props: CanvasViewProps): CanvasViewHandle => {\n    setViews((list) => [...list.filter((v) => v.id !== props.id), props]);\n    return {\n      id: props.id,\n      draw: (data, outer, dims) =>\n        surfaceViewRegistry?.list().find((r) => r.id === props.id)?.layer.draw(data, outer, dims) ?? [],\n      remove: () => setViews((list) => list.filter((v) => v !== props)),\n    };\n  }, [surfaceViewRegistry]);\n  const viewAt = useCallback<SceneCanvasApi['viewAt']>((at, opts) => (\n    surfaceViewRegistry?.viewAt(at, opts) ?? { id: null, view: IDENTITY_VIEW, rect: { x: 0, y: 0, w: 0, h: 0 } }\n  ), [surfaceViewRegistry]);\n  const aimOf = useCallback<SceneCanvasApi['aimOf']>(\n    (id) => surfaceViewRegistry?.aimOf(id) ?? null, [surfaceViewRegistry]);\n  const setAim = useCallback<SceneCanvasApi['setAim']>(\n    (id, aim) => surfaceViewRegistry?.setAim(id, aim) ?? false, [surfaceViewRegistry]);\n  return { views, addView, viewAt, aimOf, setAim };\n}\n\n/**\n * The ref callback `<SceneCanvas>` hands `<Canvas>`. It extends the\n * primitive's handle into the `SceneCanvasApi` the consumer's ref receives,\n * and keeps the canvas's own copies of the element and the handle current.\n */\nexport function useSceneCanvasHandle(args: {\n  ref: ForwardedRef<SceneCanvasApi>;\n  /** Written with the canvas element, for the input listeners. */\n  elementRef: MutableRefObject<HTMLElement | null>;\n  /** Written with the extended handle, for `requestRedraw` and point conversion. */\n  apiRef: MutableRefObject<CanvasExtensionApi | null>;\n  /** Told the element whenever it attaches or detaches. */\n  onElement: (element: HTMLElement | null) => void;\n  ingest: SceneCanvasApi['ingest'];\n  viewAnimation: Pick<ViewAnimationApi, 'animate' | 'stop' | 'isAnimating'>;\n  camera: SceneCanvasApi['camera'];\n  addView: SceneCanvasApi['addView'];\n  viewAt: SceneCanvasApi['viewAt'];\n  aimOf: SceneCanvasApi['aimOf'];\n  setAim: SceneCanvasApi['setAim'];\n}): {\n  handleRef: (node: CanvasExtensionApi | null) => void;\n  /** Whether the handle is attached, as state: an effect needing the handle\n   *  keys off this instead of assuming when React attaches it. */\n  ready: boolean;\n} {\n  const { ref, elementRef, apiRef, onElement, ingest, viewAnimation, camera, addView, viewAt, aimOf, setAim } = args;\n  const [ready, setReady] = useState(false);\n  const handleRef = useCallback(\n    (node: CanvasExtensionApi | null) => {\n      elementRef.current = node?.element ?? null;\n      onElement(elementRef.current);\n      const extended: SceneCanvasApi | null = node\n        ? {\n            ...node,\n            ingest,\n            animateView: viewAnimation.animate,\n            stopViewAnimation: viewAnimation.stop,\n            isViewAnimating: viewAnimation.isAnimating,\n            camera,\n            addView,\n            viewAt,\n            aimOf,\n            setAim,\n          }\n        : null;\n      apiRef.current = extended;\n      setReady(extended !== null);\n      assignRef(ref, extended);\n    },\n    [ref, elementRef, apiRef, ingest, viewAnimation, camera, addView, viewAt, aimOf, setAim, onElement],\n  );\n  return { handleRef, ready };\n}\n"],"mappings":";;;;;;AAQA,SAAgB,gBAMd;CACA,MAAM,sBAAsB,wBAAwB;CACpD,MAAM,CAAC,OAAO,YAAY,SAAqC,CAAC,CAAC;CAiBjE,OAAO;EAAE;EAAO,SAhBA,aAAa,UAA6C;GACxE,UAAU,SAAS,CAAC,GAAG,KAAK,QAAQ,MAAM,EAAE,OAAO,MAAM,EAAE,GAAG,KAAK,CAAC;GACpE,OAAO;IACL,IAAI,MAAM;IACV,OAAO,MAAM,OAAO,SAClB,qBAAqB,KAAK,CAAC,CAAC,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC;IAChG,cAAc,UAAU,SAAS,KAAK,QAAQ,MAAM,MAAM,KAAK,CAAC;GAClE;EACF,GAAG,CAAC,mBAAmB,CAQP;EAAS,QAPV,aAAuC,IAAI,SACxD,qBAAqB,OAAO,IAAI,IAAI,KAAK;GAAE,IAAI;GAAM,MAAM;GAAe,MAAM;IAAE,GAAG;IAAG,GAAG;IAAG,GAAG;IAAG,GAAG;GAAE;EAAE,GAC1G,CAAC,mBAAmB,CAKE;EAAQ,OAJnB,aACX,OAAO,qBAAqB,MAAM,EAAE,KAAK,MAAM,CAAC,mBAAmB,CAGrC;EAAO,QAFzB,aACZ,IAAI,QAAQ,qBAAqB,OAAO,IAAI,GAAG,KAAK,OAAO,CAAC,mBAAmB,CAC1C;CAAO;AACjD;;;;;;AAOA,SAAgB,qBAAqB,MAoBnC;CACA,MAAM,EAAE,KAAK,YAAY,QAAQ,WAAW,QAAQ,eAAe,QAAQ,SAAS,QAAQ,OAAO,WAAW;CAC9G,MAAM,CAAC,OAAO,YAAY,SAAS,KAAK;CAyBxC,OAAO;EAAE,WAxBS,aACf,SAAoC;GACnC,WAAW,UAAU,MAAM,WAAW;GACtC,UAAU,WAAW,OAAO;GAC5B,MAAM,WAAkC,OACpC;IACE,GAAG;IACH;IACA,aAAa,cAAc;IAC3B,mBAAmB,cAAc;IACjC,iBAAiB,cAAc;IAC/B;IACA;IACA;IACA;IACA;GACF,IACA;GACJ,OAAO,UAAU;GACjB,SAAS,aAAa,IAAI;GAC1B,UAAU,KAAK,QAAQ;EACzB,GACA;GAAC;GAAK;GAAY;GAAQ;GAAQ;GAAe;GAAQ;GAAS;GAAQ;GAAO;GAAQ;EAAS,CAE3F;EAAW;CAAM;AAC5B"}

package/dist/canvas/SceneCanvas/useSceneCanvasLayers.js

@@ -1,4 +1,5 @@
 import { targetSizesPx } from "../../core/device/targets.js";
+import { drawnBoundsScene } from "../derivedPath.js";
 import { createSnapOutcomeStore } from "../../features/snap/outcomeStore.js";
 import { builtLayersOf, isCustomEntry } from "../layerSlots.js";
 import { useTargetBasePx } from "../../core/device/useTargetBasePx.js";
@@ -8,6 +9,7 @@ import { mergeLayersWithDefaults } from "./mergeLayers.js";
 import { useDispatcherOverlayLayer } from "./useDispatcherOverlayLayer.js";
 import { usePreviewGhostLayer } from "./usePreviewGhostLayer.js";
 import { useDepartureGhostLayer } from "./useDepartureGhostLayer.js";
+import { useEffectSourcesLayer } from "../../features/pathEffects/useEffectSourcesLayer.js";
 import { usePoseTransition } from "../../animation/poseTransition.js";
 import { useSceneSlotLayers } from "./useSceneSlotLayers.js";
 import { useSelectionOverlayLayer } from "./useSelectionOverlayLayer.js";
@@ -19,7 +21,8 @@ import { useMemo, useRef, useState } from "react";
 * The layer map `<SceneCanvas>` hands `<Canvas>`: the caller's `layers` over
 * the kit defaults, with the scene and selection-overlay slots built, and the
 * canvas's own layers anchored around them. Removed nodes leave just above
-* the scene, the preview ghost above them, the dispatcher's overlay (marquee, lasso) above the ghost, and the
+* the scene, the preview ghost above them, a selected path effect's hidden sources above that, the dispatcher's
+* overlay (marquee, lasso) above those, and the
 * anchor overlay above the selection chrome.
 */
 function useSceneCanvasLayers(args) {
@@ -50,6 +53,7 @@ function useSceneCanvasLayers(args) {
 		sceneSlot,
 		departures
 	});
+	const effectSourcesLayer = useEffectSourcesLayer(scene);
 	const dispatcherOverlay = useDispatcherOverlayLayer({ dispatcher });
 	const hitRadiusPx = args.selectTool?.handleHitRadius ?? targetSizesPx(targetScale, baseSizes).handle;
 	const edges = args.selectTool?.resize?.edgeHandles ?? true;
@@ -60,7 +64,17 @@ function useSceneCanvasLayers(args) {
 	const chromeAffordancesRef = useRef([]);
 	const slopsLayer = useMemo(() => createSlopsDebugLayer({ getAffordances: () => chromeAffordancesRef.current }), []);
 	const [snapStore] = useState(() => createSnapOutcomeStore());
-	const snapReadoutLayer = useMemo(() => createSnapReadoutLayer(snapStore, args.snapReadoutStyle), [snapStore, args.snapReadoutStyle]);
+	const { color, gapColor, lineWidth } = args.snapReadoutStyle ?? {};
+	const snapReadoutLayer = useMemo(() => createSnapReadoutLayer(snapStore, {
+		...color !== void 0 ? { color } : {},
+		...gapColor !== void 0 ? { gapColor } : {},
+		...lineWidth !== void 0 ? { lineWidth } : {}
+	}), [
+		snapStore,
+		color,
+		gapColor,
+		lineWidth
+	]);
 	const overlaySlot = merged.pathEditingOverlay;
 	const overlayConfig = overlaySlot && !isCustomEntry(overlaySlot) ? overlaySlot : void 0;
 	const overlayAnchor = overlaySlot === null ? "dispatcherOverlay" : "pathEditingOverlay";
@@ -68,7 +82,7 @@ function useSceneCanvasLayers(args) {
 		nodeOf: (id) => scene.get(id),
 		planeOfNode: args.planeOfNode
 	}, overlayConfig);
-	const { layer: selectionOverlayLayer, rotationBadge } = useSelectionOverlayLayer(merged.selectionOverlay, pathEditState.getEditingIds, poseDescriptor, args.boundsIncludeStroke ? scene : void 0, resizeHandles);
+	const { layer: selectionOverlayLayer, rotationBadge } = useSelectionOverlayLayer(merged.selectionOverlay, pathEditState.getEditingIds, poseDescriptor, args.boundsIncludeStroke ? drawnBoundsScene(scene) : void 0, resizeHandles);
 	return {
 		layers: useMemo(() => ({
 			...builtLayersOf(merged),
@@ -82,9 +96,13 @@ function useSceneCanvasLayers(args) {
 				layer: previewLayer,
 				after: "departureGhost"
 			},
+			effectSources: {
+				layer: effectSourcesLayer,
+				after: "previewGhost"
+			},
 			dispatcherOverlay: {
 				layer: dispatcherOverlay,
-				after: "previewGhost"
+				after: "effectSources"
 			},
 			pathEditingOverlay: overlaySlot === null || isCustomEntry(overlaySlot) ? overlaySlot : {
 				layer: pathEditingOverlayLayer,
@@ -104,6 +122,7 @@ function useSceneCanvasLayers(args) {
 			selectionOverlayLayer,
 			departureLayer,
 			previewLayer,
+			effectSourcesLayer,
 			dispatcherOverlay,
 			pathEditingOverlayLayer,
 			overlaySlot,

package/dist/canvas/SceneCanvas/useSceneCanvasLayers.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSceneCanvasLayers.js","names":[],"sources":["../../../src/canvas/SceneCanvas/useSceneCanvasLayers.ts"],"sourcesContent":["import { useMemo, useRef, useState, type MutableRefObject } from 'react';\nimport type { ColorOverrideRegistry } from '@weasel-js/animator';\nimport type { Dispatcher } from '@weasel-js/routing';\nimport type { Affordance } from 'affordances/types';\nimport type { Node, NodeId, Scene } from 'core/scene/types';\nimport type { Bounds } from 'core/viewport/fitViewToBounds';\nimport type { PlaneMap } from 'core/viewport/parallax';\nimport type { View } from 'core/viewport/view';\nimport type { PathEditState } from 'features/paths/pathEditState';\nimport { usePathEditOverlayLayer } from 'features/paths/usePathEdit';\nimport type { rotationBadgeOf } from 'features/selection/overlay';\nimport type { PoseDescriptor } from 'interactions/actions/resize/geometry';\nimport type { HierarchicalAdapter } from '../buildSceneTree';\nimport { builtLayersOf, isCustomEntry, type CanvasLayers } from '../layerSlots';\nimport { createSlopsDebugLayer } from '../slopsDebugLayer';\nimport { useTargetBasePx } from 'core/device/useTargetBasePx';\nimport { targetSizesPx } from 'core/device/targets';\nimport type { ResizeHandleLayout } from 'interactions/actions/resize/cornerHandles';\nimport { mergeLayersWithDefaults } from './mergeLayers';\nimport type { SceneCanvasLayers } from './props';\nimport { useDispatcherOverlayLayer } from './useDispatcherOverlayLayer';\nimport { usePreviewGhostLayer } from './usePreviewGhostLayer';\nimport { useDepartureGhostLayer } from './useDepartureGhostLayer';\nimport type { Departures } from '../../animation/departures';\nimport { usePoseTransition, type PoseTransitionSeat } from '../../animation/poseTransition';\nimport { useSceneSlotLayers } from './useSceneSlotLayers';\nimport { useSelectionOverlayLayer } from './useSelectionOverlayLayer';\nimport type { DrawnBoundsScene } from '../drawnBounds';\nimport { createSnapOutcomeStore, type SnapOutcomeStore } from 'features/snap/outcomeStore';\nimport { createSnapReadoutLayer, type SnapReadoutStyle } from 'features/snap/readoutLayer';\n\n/**\n * The layer map `<SceneCanvas>` hands `<Canvas>`: the caller's `layers` over\n * the kit defaults, with the scene and selection-overlay slots built, and the\n * canvas's own layers anchored around them. Removed nodes leave just above\n * the scene, the preview ghost above them, the dispatcher's overlay (marquee, lasso) above the ghost, and the\n * anchor overlay above the selection chrome.\n */\nexport function useSceneCanvasLayers<TData, TLayer extends string, TPose>(args: {\n  /** `<SceneCanvas layers>`. Omitted, the result is the full default set. */\n  layers: SceneCanvasLayers<Node<TData, TLayer, TPose>, TPose> | undefined;\n  /** The device profile's, which sizes the default handles. */\n  targetScale: number;\n  scene: Scene<TData, TLayer, TPose>;\n  adapter: HierarchicalAdapter<Node<TData, TLayer, TPose>, TPose>;\n  poseDescriptor: PoseDescriptor<TPose>;\n  alphaFor: ((id: string) => number) | undefined;\n  colorOverrides: ColorOverrideRegistry | undefined;\n  boundsOf: (id: string) => Bounds | null;\n  planeOfNode: (id: string, view: View) => PlaneMap | null;\n  /** `<SceneCanvas poseTransition>`, whose ghosts of removed nodes this draws. */\n  poseTransition: PoseTransitionSeat<TPose> | null | undefined;\n  /** Ids an in-flight gesture is ghosting. */\n  previewIds: () => Iterable<string> | null;\n  dispatcher: Dispatcher;\n  /** Whether to mount the snap readout layer. */\n  snapReadout: boolean;\n  snapReadoutStyle?: SnapReadoutStyle;\n  pathEditState: PathEditState;\n  /** `debug.slops`: paint the hit regions of the chrome affordances. */\n  slops: boolean;\n  /** `geometry.boundsIncludeStroke`: whether chrome sits on the stroke. */\n  boundsIncludeStroke: boolean;\n  /** `selectTool`'s `handleHitRadius` and `resize.edgeHandles`, resolved here into\n   *  the one {@link ResizeHandleLayout} the overlay paints and the hit-test reads. */\n  selectTool?: { handleHitRadius?: number; resize?: { edgeHandles?: boolean } };\n}): {\n  layers: CanvasLayers;\n  /** Where the selection overlay paints its rotate badge, or null. */\n  rotationBadge: ReturnType<typeof rotationBadgeOf>;\n  /** Which resize handles exist and their hit radius, for every hit-test of this canvas. */\n  resizeHandles: ResizeHandleLayout;\n  /** The affordances the gesture mounter hit-tests, which it publishes here\n   *  so the slops halos are the hit regions rather than a copy of them. */\n  chromeAffordancesRef: MutableRefObject<readonly Affordance[]>;\n  /** The marks the readout layer draws; the canvas's snap dep writes them. */\n  snapStore: SnapOutcomeStore;\n  /** The removed nodes the seat is seeing off. */\n  departures: Departures<TPose, Node<TData, TLayer, TPose>>;\n} {\n  const { scene, adapter, poseDescriptor, alphaFor, dispatcher, pathEditState, slops, targetScale } = args;\n\n  const baseSizes = useTargetBasePx();\n  const merged = useMemo(\n    () => mergeLayersWithDefaults(args.layers, targetScale, baseSizes),\n    [args.layers, targetScale, baseSizes],\n  );\n\n  const { config: sceneSlot, layers: sceneLayers } = useSceneSlotLayers({\n    slot: merged.scene,\n    scene,\n    adapter,\n    alphaFor,\n    colorOverrides: args.colorOverrides,\n    boundsOf: args.boundsOf,\n    previewIds: args.previewIds,\n  });\n  // Takes the scene-wired slot, so a ghosted derived node still resolves its path.\n  const previewLayer = usePreviewGhostLayer<TData, TLayer, TPose>({ scene, sceneSlot, dispatcher });\n  const departures = usePoseTransition(scene, args.poseTransition);\n  const departureLayer = useDepartureGhostLayer({ scene, sceneSlot, departures });\n  const dispatcherOverlay = useDispatcherOverlayLayer({ dispatcher });\n\n  const hitRadiusPx = args.selectTool?.handleHitRadius ?? targetSizesPx(targetScale, baseSizes).handle;\n  const edges = args.selectTool?.resize?.edgeHandles ?? true;\n  const resizeHandles = useMemo<ResizeHandleLayout>(() => ({ edges, hitRadiusPx }), [edges, hitRadiusPx]);\n\n  const chromeAffordancesRef = useRef<readonly Affordance[]>([]);\n  const slopsLayer = useMemo(\n    () => createSlopsDebugLayer({ getAffordances: () => chromeAffordancesRef.current }),\n    [],\n  );\n\n  const [snapStore] = useState(() => createSnapOutcomeStore());\n  const snapReadoutLayer = useMemo(() => createSnapReadoutLayer(snapStore, args.snapReadoutStyle), [snapStore, args.snapReadoutStyle]);\n  const overlaySlot = merged.pathEditingOverlay;\n  const overlayConfig = overlaySlot && !isCustomEntry(overlaySlot) ? overlaySlot : undefined;\n  const overlayAnchor = overlaySlot === null ? 'dispatcherOverlay' : 'pathEditingOverlay';\n  const pathEditingOverlayLayer = usePathEditOverlayLayer(pathEditState, {\n    nodeOf: (id) => scene.get(id as NodeId),\n    planeOfNode: args.planeOfNode,\n  }, overlayConfig);\n\n  const { layer: selectionOverlayLayer, rotationBadge } = useSelectionOverlayLayer<TPose>(\n    merged.selectionOverlay,\n    pathEditState.getEditingIds,\n    poseDescriptor,\n    args.boundsIncludeStroke ? (scene as unknown as DrawnBoundsScene) : undefined,\n    resizeHandles,\n  );\n\n  const layers = useMemo<CanvasLayers>(() => ({\n    ...builtLayersOf(merged),\n    scene: sceneLayers,\n    selectionOverlay: selectionOverlayLayer ? { layer: selectionOverlayLayer } : null,\n    departureGhost: { layer: departureLayer, after: 'scene' },\n    previewGhost: { layer: previewLayer, after: 'departureGhost' },\n    dispatcherOverlay: { layer: dispatcherOverlay, after: 'previewGhost' },\n    pathEditingOverlay: overlaySlot === null || isCustomEntry(overlaySlot)\n      ? overlaySlot\n      : { layer: pathEditingOverlayLayer, after: 'selectionOverlay' },\n    ...(args.snapReadout ? { snapReadout: { layer: snapReadoutLayer, after: overlayAnchor } } : {}),\n    ...(slops ? { slopsDebug: { layer: slopsLayer, after: args.snapReadout ? 'snapReadout' : overlayAnchor } } : {}),\n  }), [\n    merged, sceneLayers, selectionOverlayLayer, departureLayer, previewLayer, dispatcherOverlay, pathEditingOverlayLayer, overlaySlot, overlayAnchor,\n    snapReadoutLayer, args.snapReadout, slops, slopsLayer,\n  ]);\n\n  return { layers, rotationBadge, resizeHandles, chromeAffordancesRef, snapStore, departures };\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAsCA,SAAgB,qBAA0D,MAyCxE;CACA,MAAM,EAAE,OAAO,SAAS,gBAAgB,UAAU,YAAY,eAAe,OAAO,gBAAgB;CAEpG,MAAM,YAAY,gBAAgB;CAClC,MAAM,SAAS,cACP,wBAAwB,KAAK,QAAQ,aAAa,SAAS,GACjE;EAAC,KAAK;EAAQ;EAAa;CAAS,CACtC;CAEA,MAAM,EAAE,QAAQ,WAAW,QAAQ,gBAAgB,mBAAmB;EACpE,MAAM,OAAO;EACb;EACA;EACA;EACA,gBAAgB,KAAK;EACrB,UAAU,KAAK;EACf,YAAY,KAAK;CACnB,CAAC;CAED,MAAM,eAAe,qBAA2C;EAAE;EAAO;EAAW;CAAW,CAAC;CAChG,MAAM,aAAa,kBAAkB,OAAO,KAAK,cAAc;CAC/D,MAAM,iBAAiB,uBAAuB;EAAE;EAAO;EAAW;CAAW,CAAC;CAC9E,MAAM,oBAAoB,0BAA0B,EAAE,WAAW,CAAC;CAElE,MAAM,cAAc,KAAK,YAAY,mBAAmB,cAAc,aAAa,SAAS,CAAC,CAAC;CAC9F,MAAM,QAAQ,KAAK,YAAY,QAAQ,eAAe;CACtD,MAAM,gBAAgB,eAAmC;EAAE;EAAO;CAAY,IAAI,CAAC,OAAO,WAAW,CAAC;CAEtG,MAAM,uBAAuB,OAA8B,CAAC,CAAC;CAC7D,MAAM,aAAa,cACX,sBAAsB,EAAE,sBAAsB,qBAAqB,QAAQ,CAAC,GAClF,CAAC,CACH;CAEA,MAAM,CAAC,aAAa,eAAe,uBAAuB,CAAC;CAC3D,MAAM,mBAAmB,cAAc,uBAAuB,WAAW,KAAK,gBAAgB,GAAG,CAAC,WAAW,KAAK,gBAAgB,CAAC;CACnI,MAAM,cAAc,OAAO;CAC3B,MAAM,gBAAgB,eAAe,CAAC,cAAc,WAAW,IAAI,cAAc;CACjF,MAAM,gBAAgB,gBAAgB,OAAO,sBAAsB;CACnE,MAAM,0BAA0B,wBAAwB,eAAe;EACrE,SAAS,OAAO,MAAM,IAAI,EAAY;EACtC,aAAa,KAAK;CACpB,GAAG,aAAa;CAEhB,MAAM,EAAE,OAAO,uBAAuB,kBAAkB,yBACtD,OAAO,kBACP,cAAc,eACd,gBACA,KAAK,sBAAuB,QAAwC,QACpE,aACF;CAmBA,OAAO;EAAE,QAjBM,eAA6B;GAC1C,GAAG,cAAc,MAAM;GACvB,OAAO;GACP,kBAAkB,wBAAwB,EAAE,OAAO,sBAAsB,IAAI;GAC7E,gBAAgB;IAAE,OAAO;IAAgB,OAAO;GAAQ;GACxD,cAAc;IAAE,OAAO;IAAc,OAAO;GAAiB;GAC7D,mBAAmB;IAAE,OAAO;IAAmB,OAAO;GAAe;GACrE,oBAAoB,gBAAgB,QAAQ,cAAc,WAAW,IACjE,cACA;IAAE,OAAO;IAAyB,OAAO;GAAmB;GAChE,GAAI,KAAK,cAAc,EAAE,aAAa;IAAE,OAAO;IAAkB,OAAO;GAAc,EAAE,IAAI,CAAC;GAC7F,GAAI,QAAQ,EAAE,YAAY;IAAE,OAAO;IAAY,OAAO,KAAK,cAAc,gBAAgB;GAAc,EAAE,IAAI,CAAC;EAChH,IAAI;GACF;GAAQ;GAAa;GAAuB;GAAgB;GAAc;GAAmB;GAAyB;GAAa;GACnI;GAAkB,KAAK;GAAa;GAAO;EAC7C,CAES;EAAQ;EAAe;EAAe;EAAsB;EAAW;CAAW;AAC7F"}
+{"version":3,"file":"useSceneCanvasLayers.js","names":[],"sources":["../../../src/canvas/SceneCanvas/useSceneCanvasLayers.ts"],"sourcesContent":["import { useMemo, useRef, useState, type MutableRefObject } from 'react';\nimport type { ColorOverrideRegistry } from '@weasel-js/animator';\nimport type { Dispatcher } from '@weasel-js/routing';\nimport type { Affordance } from 'affordances/types';\nimport type { Node, NodeId, Scene } from 'core/scene/types';\nimport type { Bounds } from 'core/viewport/fitViewToBounds';\nimport type { PlaneMap } from 'core/viewport/parallax';\nimport type { View } from 'core/viewport/view';\nimport type { PathEditState } from 'features/paths/pathEditState';\nimport { usePathEditOverlayLayer } from 'features/paths/usePathEdit';\nimport type { rotationBadgeOf } from 'features/selection/overlay';\nimport type { PoseDescriptor } from 'interactions/actions/resize/geometry';\nimport type { HierarchicalAdapter } from '../buildSceneTree';\nimport { builtLayersOf, isCustomEntry, type CanvasLayers } from '../layerSlots';\nimport { createSlopsDebugLayer } from '../slopsDebugLayer';\nimport { useTargetBasePx } from 'core/device/useTargetBasePx';\nimport { targetSizesPx } from 'core/device/targets';\nimport type { ResizeHandleLayout } from 'interactions/actions/resize/cornerHandles';\nimport { mergeLayersWithDefaults } from './mergeLayers';\nimport type { SceneCanvasLayers } from './props';\nimport { useDispatcherOverlayLayer } from './useDispatcherOverlayLayer';\nimport { usePreviewGhostLayer } from './usePreviewGhostLayer';\nimport { useDepartureGhostLayer } from './useDepartureGhostLayer';\nimport { useEffectSourcesLayer } from 'features/pathEffects/useEffectSourcesLayer';\nimport type { Departures } from '../../animation/departures';\nimport { usePoseTransition, type PoseTransitionSeat } from '../../animation/poseTransition';\nimport { useSceneSlotLayers } from './useSceneSlotLayers';\nimport { useSelectionOverlayLayer } from './useSelectionOverlayLayer';\nimport { drawnBoundsScene } from '../derivedPath';\nimport { createSnapOutcomeStore, type SnapOutcomeStore } from 'features/snap/outcomeStore';\nimport { createSnapReadoutLayer } from 'features/snap/readoutLayer';\nimport type { SnapReadoutStyle } from 'features/snap/types';\n\n/**\n * The layer map `<SceneCanvas>` hands `<Canvas>`: the caller's `layers` over\n * the kit defaults, with the scene and selection-overlay slots built, and the\n * canvas's own layers anchored around them. Removed nodes leave just above\n * the scene, the preview ghost above them, a selected path effect's hidden sources above that, the dispatcher's\n * overlay (marquee, lasso) above those, and the\n * anchor overlay above the selection chrome.\n */\nexport function useSceneCanvasLayers<TData, TLayer extends string, TPose>(args: {\n  /** `<SceneCanvas layers>`. Omitted, the result is the full default set. */\n  layers: SceneCanvasLayers<Node<TData, TLayer, TPose>, TPose> | undefined;\n  /** The device profile's, which sizes the default handles. */\n  targetScale: number;\n  scene: Scene<TData, TLayer, TPose>;\n  adapter: HierarchicalAdapter<Node<TData, TLayer, TPose>, TPose>;\n  poseDescriptor: PoseDescriptor<TPose>;\n  alphaFor: ((id: string) => number) | undefined;\n  colorOverrides: ColorOverrideRegistry | undefined;\n  boundsOf: (id: string) => Bounds | null;\n  planeOfNode: (id: string, view: View) => PlaneMap | null;\n  /** `<SceneCanvas poseTransition>`, whose ghosts of removed nodes this draws. */\n  poseTransition: PoseTransitionSeat<TPose> | null | undefined;\n  /** Ids an in-flight gesture is ghosting. */\n  previewIds: () => Iterable<string> | null;\n  dispatcher: Dispatcher;\n  /** Whether to mount the snap readout layer. */\n  snapReadout: boolean;\n  snapReadoutStyle?: SnapReadoutStyle;\n  pathEditState: PathEditState;\n  /** `debug.slops`: paint the hit regions of the chrome affordances. */\n  slops: boolean;\n  /** `geometry.boundsIncludeStroke`: whether chrome sits on the stroke. */\n  boundsIncludeStroke: boolean;\n  /** `selectTool`'s `handleHitRadius` and `resize.edgeHandles`, resolved here into\n   *  the one {@link ResizeHandleLayout} the overlay paints and the hit-test reads. */\n  selectTool?: { handleHitRadius?: number; resize?: { edgeHandles?: boolean } };\n}): {\n  layers: CanvasLayers;\n  /** Where the selection overlay paints its rotate badge, or null. */\n  rotationBadge: ReturnType<typeof rotationBadgeOf>;\n  /** Which resize handles exist and their hit radius, for every hit-test of this canvas. */\n  resizeHandles: ResizeHandleLayout;\n  /** The affordances the gesture mounter hit-tests, which it publishes here\n   *  so the slops halos are the hit regions rather than a copy of them. */\n  chromeAffordancesRef: MutableRefObject<readonly Affordance[]>;\n  /** The marks the readout layer draws; the canvas's snap dep writes them. */\n  snapStore: SnapOutcomeStore;\n  /** The removed nodes the seat is seeing off. */\n  departures: Departures<TPose, Node<TData, TLayer, TPose>>;\n} {\n  const { scene, adapter, poseDescriptor, alphaFor, dispatcher, pathEditState, slops, targetScale } = args;\n\n  const baseSizes = useTargetBasePx();\n  const merged = useMemo(\n    () => mergeLayersWithDefaults(args.layers, targetScale, baseSizes),\n    [args.layers, targetScale, baseSizes],\n  );\n\n  const { config: sceneSlot, layers: sceneLayers } = useSceneSlotLayers({\n    slot: merged.scene,\n    scene,\n    adapter,\n    alphaFor,\n    colorOverrides: args.colorOverrides,\n    boundsOf: args.boundsOf,\n    previewIds: args.previewIds,\n  });\n  // Takes the scene-wired slot, so a ghosted derived node still resolves its path.\n  const previewLayer = usePreviewGhostLayer<TData, TLayer, TPose>({ scene, sceneSlot, dispatcher });\n  const departures = usePoseTransition(scene, args.poseTransition);\n  const departureLayer = useDepartureGhostLayer({ scene, sceneSlot, departures });\n  const effectSourcesLayer = useEffectSourcesLayer(scene);\n  const dispatcherOverlay = useDispatcherOverlayLayer({ dispatcher });\n\n  const hitRadiusPx = args.selectTool?.handleHitRadius ?? targetSizesPx(targetScale, baseSizes).handle;\n  const edges = args.selectTool?.resize?.edgeHandles ?? true;\n  const resizeHandles = useMemo<ResizeHandleLayout>(() => ({ edges, hitRadiusPx }), [edges, hitRadiusPx]);\n\n  const chromeAffordancesRef = useRef<readonly Affordance[]>([]);\n  const slopsLayer = useMemo(\n    () => createSlopsDebugLayer({ getAffordances: () => chromeAffordancesRef.current }),\n    [],\n  );\n\n  const [snapStore] = useState(() => createSnapOutcomeStore());\n  // Keyed on the style's values, so an inline `readoutStyle` literal keeps the layer.\n  const { color, gapColor, lineWidth } = args.snapReadoutStyle ?? {};\n  const snapReadoutLayer = useMemo(() => createSnapReadoutLayer(snapStore, {\n    ...(color !== undefined ? { color } : {}),\n    ...(gapColor !== undefined ? { gapColor } : {}),\n    ...(lineWidth !== undefined ? { lineWidth } : {}),\n  }), [snapStore, color, gapColor, lineWidth]);\n  const overlaySlot = merged.pathEditingOverlay;\n  const overlayConfig = overlaySlot && !isCustomEntry(overlaySlot) ? overlaySlot : undefined;\n  const overlayAnchor = overlaySlot === null ? 'dispatcherOverlay' : 'pathEditingOverlay';\n  const pathEditingOverlayLayer = usePathEditOverlayLayer(pathEditState, {\n    nodeOf: (id) => scene.get(id as NodeId),\n    planeOfNode: args.planeOfNode,\n  }, overlayConfig);\n\n  const { layer: selectionOverlayLayer, rotationBadge } = useSelectionOverlayLayer<TPose>(\n    merged.selectionOverlay,\n    pathEditState.getEditingIds,\n    poseDescriptor,\n    args.boundsIncludeStroke ? drawnBoundsScene(scene) : undefined,\n    resizeHandles,\n  );\n\n  const layers = useMemo<CanvasLayers>(() => ({\n    ...builtLayersOf(merged),\n    scene: sceneLayers,\n    selectionOverlay: selectionOverlayLayer ? { layer: selectionOverlayLayer } : null,\n    departureGhost: { layer: departureLayer, after: 'scene' },\n    previewGhost: { layer: previewLayer, after: 'departureGhost' },\n    effectSources: { layer: effectSourcesLayer, after: 'previewGhost' },\n    dispatcherOverlay: { layer: dispatcherOverlay, after: 'effectSources' },\n    pathEditingOverlay: overlaySlot === null || isCustomEntry(overlaySlot)\n      ? overlaySlot\n      : { layer: pathEditingOverlayLayer, after: 'selectionOverlay' },\n    ...(args.snapReadout ? { snapReadout: { layer: snapReadoutLayer, after: overlayAnchor } } : {}),\n    ...(slops ? { slopsDebug: { layer: slopsLayer, after: args.snapReadout ? 'snapReadout' : overlayAnchor } } : {}),\n  }), [\n    merged, sceneLayers, selectionOverlayLayer, departureLayer, previewLayer, effectSourcesLayer, dispatcherOverlay, pathEditingOverlayLayer, overlaySlot, overlayAnchor,\n    snapReadoutLayer, args.snapReadout, slops, slopsLayer,\n  ]);\n\n  return { layers, rotationBadge, resizeHandles, chromeAffordancesRef, snapStore, departures };\n}\n"],"mappings":"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"}

package/dist/canvas/SceneCanvas/useSceneCanvasTools.js

@@ -3,17 +3,16 @@ import { useCanvasTools, useFeatureBindings } from "./useCanvasTools.js";
 //#region src/canvas/SceneCanvas/useSceneCanvasTools.ts
 /** The canvas's tools, and the contributions and standard actions its presets bring. */
 function useSceneCanvasTools(args) {
-	const { props, select, scene, selection, enabled } = args;
+	const { props, select, enabled } = args;
 	const { tools, internal, takeover } = useCanvasTools({
 		select,
-		scene,
-		selection,
 		enabled,
 		tools: props.tools,
 		defaultTools: props.defaultTools,
 		toolOptions: props.toolOptions,
 		inertia: props.viewport?.inertia,
 		ambient: props.ambient,
+		actions: props.actions,
 		pressFeedback: props.longPress?.feedback,
 		initialActiveTool: props.initialActiveTool,
 		modes: props.modes,

package/dist/canvas/SceneCanvas/useSceneCanvasTools.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSceneCanvasTools.js","names":[],"sources":["../../../src/canvas/SceneCanvas/useSceneCanvasTools.ts"],"sourcesContent":["import type { Scene } from 'core/scene/types';\nimport type { SelectionApi } from 'core/selection/useSelection';\nimport type { Tool } from '../../tools/overlayBinding';\nimport type { EnabledPresets, FeatureBindingOptions, PresetSource } from './features';\nimport type { SceneCanvasProps } from './props';\nimport { useCanvasTools, useFeatureBindings } from './useCanvasTools';\n\ntype Props = SceneCanvasProps<unknown, string, unknown>;\n\n/** The `<SceneCanvas>` props its tools and preset bindings read. */\nexport type SceneCanvasToolProps = Pick<\n  Props,\n  | 'tools' | 'defaultTools' | 'toolOptions' | 'viewport' | 'ambient' | 'longPress'\n  | 'initialActiveTool' | 'modes' | 'onToolsCreated' | 'selectTool'\n>;\n\n/** The canvas's tools, and the contributions and standard actions its presets bring. */\nexport function useSceneCanvasTools(args: {\n  props: SceneCanvasToolProps;\n  select: Tool;\n  /** The select tool's move options, which the selection's `move` binding takes. */\n  move: unknown;\n  scene: Scene<unknown, string, unknown>;\n  selection: SelectionApi;\n  enabled: EnabledPresets;\n  presetSource: PresetSource;\n}) {\n  const { props, select, scene, selection, enabled } = args;\n  const { tools, internal, takeover } = useCanvasTools({\n    select, scene, selection,\n    enabled,\n    tools: props.tools,\n    defaultTools: props.defaultTools,\n    toolOptions: props.toolOptions,\n    inertia: props.viewport?.inertia,\n    ambient: props.ambient,\n    pressFeedback: props.longPress?.feedback,\n    initialActiveTool: props.initialActiveTool,\n    modes: props.modes,\n    onToolsCreated: props.onToolsCreated,\n  });\n  const { contributions, standardActions } = useFeatureBindings({\n    enabled, pool: args.presetSource.pool,\n    tools,\n    move: args.move as FeatureBindingOptions['move'],\n    rotate: (props.selectTool?.rotate || undefined) as FeatureBindingOptions['rotate'],\n  });\n  return { tools, internal, takeover, contributions, standardActions };\n}\n"],"mappings":";;;;AAiBA,SAAgB,oBAAoB,MASjC;CACD,MAAM,EAAE,OAAO,QAAQ,OAAO,WAAW,YAAY;CACrD,MAAM,EAAE,OAAO,UAAU,aAAa,eAAe;EACnD;EAAQ;EAAO;EACf;EACA,OAAO,MAAM;EACb,cAAc,MAAM;EACpB,aAAa,MAAM;EACnB,SAAS,MAAM,UAAU;EACzB,SAAS,MAAM;EACf,eAAe,MAAM,WAAW;EAChC,mBAAmB,MAAM;EACzB,OAAO,MAAM;EACb,gBAAgB,MAAM;CACxB,CAAC;CACD,MAAM,EAAE,eAAe,oBAAoB,mBAAmB;EAC5D;EAAS,MAAM,KAAK,aAAa;EACjC;EACA,MAAM,KAAK;EACX,QAAS,MAAM,YAAY,UAAU;CACvC,CAAC;CACD,OAAO;EAAE;EAAO;EAAU;EAAU;EAAe;CAAgB;AACrE"}
+{"version":3,"file":"useSceneCanvasTools.js","names":[],"sources":["../../../src/canvas/SceneCanvas/useSceneCanvasTools.ts"],"sourcesContent":["import type { Tool } from '../../tools/overlayBinding';\nimport type { EnabledPresets, FeatureBindingOptions, PresetSource } from './features';\nimport type { SceneCanvasProps } from './props';\nimport { useCanvasTools, useFeatureBindings } from './useCanvasTools';\n\ntype Props = SceneCanvasProps<unknown, string, unknown>;\n\n/** The `<SceneCanvas>` props its tools and preset bindings read. */\nexport type SceneCanvasToolProps = Pick<\n  Props,\n  | 'tools' | 'defaultTools' | 'toolOptions' | 'viewport' | 'ambient' | 'longPress'\n  | 'initialActiveTool' | 'modes' | 'onToolsCreated' | 'selectTool' | 'actions'\n>;\n\n/** The canvas's tools, and the contributions and standard actions its presets bring. */\nexport function useSceneCanvasTools(args: {\n  props: SceneCanvasToolProps;\n  select: Tool;\n  /** The select tool's move options, which the selection's `move` binding takes. */\n  move: unknown;\n  enabled: EnabledPresets;\n  presetSource: PresetSource;\n}) {\n  const { props, select, enabled } = args;\n  const { tools, internal, takeover } = useCanvasTools({\n    select,\n    enabled,\n    tools: props.tools,\n    defaultTools: props.defaultTools,\n    toolOptions: props.toolOptions,\n    inertia: props.viewport?.inertia,\n    ambient: props.ambient,\n    actions: props.actions,\n    pressFeedback: props.longPress?.feedback,\n    initialActiveTool: props.initialActiveTool,\n    modes: props.modes,\n    onToolsCreated: props.onToolsCreated,\n  });\n  const { contributions, standardActions } = useFeatureBindings({\n    enabled, pool: args.presetSource.pool,\n    tools,\n    move: args.move as FeatureBindingOptions['move'],\n    rotate: (props.selectTool?.rotate || undefined) as FeatureBindingOptions['rotate'],\n  });\n  return { tools, internal, takeover, contributions, standardActions };\n}\n"],"mappings":";;;;AAeA,SAAgB,oBAAoB,MAOjC;CACD,MAAM,EAAE,OAAO,QAAQ,YAAY;CACnC,MAAM,EAAE,OAAO,UAAU,aAAa,eAAe;EACnD;EACA;EACA,OAAO,MAAM;EACb,cAAc,MAAM;EACpB,aAAa,MAAM;EACnB,SAAS,MAAM,UAAU;EACzB,SAAS,MAAM;EACf,SAAS,MAAM;EACf,eAAe,MAAM,WAAW;EAChC,mBAAmB,MAAM;EACzB,OAAO,MAAM;EACb,gBAAgB,MAAM;CACxB,CAAC;CACD,MAAM,EAAE,eAAe,oBAAoB,mBAAmB;EAC5D;EAAS,MAAM,KAAK,aAAa;EACjC;EACA,MAAM,KAAK;EACX,QAAS,MAAM,YAAY,UAAU;CACvC,CAAC;CACD,OAAO;EAAE;EAAO;EAAU;EAAU;EAAe;CAAgB;AACrE"}

package/dist/canvas/SceneCanvas/useSceneChrome.js

@@ -16,7 +16,7 @@ import { useLatest } from "@weasel-js/react";
 * pointer to capture, so whichever view is under the cursor owns the point.
 */
 function useSceneHover(args) {
-	const { canvasApiRef, viewRef, nodeAtPointRef, enabled } = args;
+	const { canvasApiRef, viewRef, nodeAtPointRef, enabled, onChange } = args;
 	const surfaceViewRegistry = useOptionalViewRegistry();
 	return useHoverTracking({
 		nodeAtClientPoint: (clientX, clientY) => {
@@ -32,7 +32,8 @@ function useSceneHover(args) {
 			} : view);
 			return hit ? { id: hit.id } : null;
 		},
-		enabled
+		enabled,
+		...onChange ? { onChange } : {}
 	});
 }
 /**
@@ -42,17 +43,16 @@ function useSceneHover(args) {
 * An unselectable canvas hides the marquee and lasso by default: every
 * selection write no-ops there, so the select tool's empty-drag binding still
 * claims the gesture, keeping it from falling through to an ambient drag such
-* as insert, but paints nothing. `rotateOff` hides the rotation handle.
+* as insert, but paints nothing.
 */
 function useChromeRules(args) {
-	const { enabled, selectable, rotateOff, chromeVisibility } = args;
+	const { enabled, selectable, chromeVisibility } = args;
 	return useMemo(() => {
 		const defaults = presetChromeRules(enabled, PRESET_OWNED_CHROME);
 		if (!selectable) {
 			defaults["action.marquee"] = never;
 			defaults["action.lasso"] = never;
 		}
-		if (rotateOff) defaults["selection.rotation-handle"] = never;
 		return {
 			...defaults,
 			...chromeVisibility
@@ -60,7 +60,6 @@ function useChromeRules(args) {
 	}, [
 		chromeVisibility,
 		selectable,
-		rotateOff,
 		enabled
 	]);
 }
@@ -93,7 +92,7 @@ function useSceneCanvasChrome(args) {
 	const { getHover, canvasRef: trackHoverOn } = useSceneHover({
 		...args.hover,
 		viewRef,
-		enabled: rules.chromeVisibility !== void 0
+		enabled: rules.chromeVisibility !== void 0 || args.hover.onChange !== void 0
 	});
 	return {
 		...useSurfaceChromeCaps({

package/dist/canvas/SceneCanvas/useSceneChrome.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSceneChrome.js","names":[],"sources":["../../../src/canvas/SceneCanvas/useSceneChrome.ts"],"sourcesContent":["import { useCallback, useMemo, type RefObject } from 'react';\nimport { useLatest } from '@weasel-js/react';\nimport type { Dispatcher, RuleCtx } from '@weasel-js/routing';\nimport type { NodeId } from 'core/scene/types';\nimport type { View } from 'core/viewport/view';\nimport { never, useHoverTracking, type HoverTracking, type VisibilityRules } from 'features/chrome-caps';\nimport {\n  useChromeCaps,\n  type ChromeCaps,\n  type ChromeCapsSource,\n  type ViewRuleInputs,\n} from 'features/chrome-caps/useChromeCaps';\nimport type { CanvasExtensionApi } from '../canvasExtension';\nimport { useOptionalViewRegistry } from '../viewRegistry';\nimport { presetChromeRules, type EnabledPresets } from './features';\nimport { PRESET_OWNED_CHROME } from './presets/chrome';\nimport type { NodeAtPoint } from './useNodeAtPoint';\nimport { worldPointAt } from './worldPointAt';\n\n/**\n * The node under the pointer, for `RuleCtx.hover`. One lookup, not a\n * client-to-world thunk beside a picker: the point and the camera its\n * tolerance converts against have to come from the same view. Hover has no\n * pointer to capture, so whichever view is under the cursor owns the point.\n */\nexport function useSceneHover(args: {\n  canvasApiRef: RefObject<Pick<CanvasExtensionApi, 'clientToWorld'> | null>;\n  /** The surface's own camera, for a point no declared view claims. */\n  viewRef: { readonly current: View };\n  nodeAtPointRef: { readonly current: NodeAtPoint | undefined };\n  enabled: boolean;\n}): HoverTracking {\n  const { canvasApiRef, viewRef, nodeAtPointRef, enabled } = args;\n  const surfaceViewRegistry = useOptionalViewRegistry();\n  return useHoverTracking({\n    nodeAtClientPoint: (clientX, clientY) => {\n      const api = canvasApiRef.current;\n      if (!api) return null;\n      const target = surfaceViewRegistry?.resolver.at(null, clientX, clientY);\n      const view = target?.view ?? viewRef.current;\n      const [x, y] = worldPointAt(api, target, clientX, clientY);\n      // A view judges its own layers; the surface's gate is the picker's default.\n      const reg = target?.id != null\n        ? surfaceViewRegistry?.list().find((r) => r.id === target.id)\n        : undefined;\n      const hit = nodeAtPointRef.current?.(\n        x, y, reg ? { scale: view.scale, layerIsPainted: reg.layerIsPainted } : view,\n      );\n      return hit ? { id: hit.id as NodeId } : null;\n    },\n    enabled,\n  });\n}\n\n/**\n * The surface's chrome-visibility rules: the presets' defaults under the\n * consumer's `chromeVisibility`, which wins.\n *\n * An unselectable canvas hides the marquee and lasso by default: every\n * selection write no-ops there, so the select tool's empty-drag binding still\n * claims the gesture, keeping it from falling through to an ambient drag such\n * as insert, but paints nothing. `rotateOff` hides the rotation handle.\n */\nexport function useChromeRules(args: {\n  enabled: EnabledPresets;\n  selectable: boolean;\n  /** `selectTool.rotate === false`. */\n  rotateOff: boolean;\n  chromeVisibility: VisibilityRules | undefined;\n}): VisibilityRules {\n  const { enabled, selectable, rotateOff, chromeVisibility } = args;\n  return useMemo(() => {\n    const defaults = presetChromeRules(enabled, PRESET_OWNED_CHROME);\n    if (!selectable) {\n      defaults['action.marquee'] = never;\n      defaults['action.lasso'] = never;\n    }\n    if (rotateOff) defaults['selection.rotation-handle'] = never;\n    return { ...defaults, ...chromeVisibility };\n  }, [chromeVisibility, selectable, rotateOff, enabled]);\n}\n\n/** The chrome-caps answers for the surface's own view. */\nexport function useSurfaceChromeCaps(args: {\n  source: ChromeCapsSource;\n  /** The selection as rendered. `SelectionApi.current` can be a live getter\n   *  that runs ahead of the commit the painted chrome was built from. */\n  selection: readonly NodeId[];\n  viewRef: { readonly current: View };\n  dispatcher: Pick<Dispatcher, 'getActiveAction'>;\n}): {\n  chromeCaps: ChromeCaps;\n  getIsVisible: () => (id: string) => boolean;\n  getRuleCtx: () => RuleCtx | undefined;\n} {\n  const { viewRef, dispatcher } = args;\n  const chromeCaps = useChromeCaps(args.source);\n  const committedSelectionRef = useLatest(args.selection);\n  const currentRuleInputs = useCallback((): ViewRuleInputs => ({\n    selection: committedSelectionRef.current,\n    view: viewRef.current,\n    action: dispatcher.getActiveAction(),\n  }), [dispatcher, committedSelectionRef, viewRef]);\n  const getIsVisible = useCallback(\n    (): ((id: string) => boolean) => chromeCaps.isVisible(currentRuleInputs()),\n    [chromeCaps, currentRuleInputs],\n  );\n  const getRuleCtx = useCallback(\n    () => chromeCaps.ruleCtx(currentRuleInputs()),\n    [chromeCaps, currentRuleInputs],\n  );\n  return { chromeCaps, getIsVisible, getRuleCtx };\n}\n\n/**\n * The surface's chrome: hover tracking, the visibility rules, and the chrome-caps answers they\n * feed. `source` is the chrome-caps source minus the parts built here.\n */\nexport function useSceneCanvasChrome(args: {\n  source: Omit<ChromeCapsSource, 'rules' | 'getHover'>;\n  rules: Parameters<typeof useChromeRules>[0];\n  hover: Omit<Parameters<typeof useSceneHover>[0], 'enabled' | 'viewRef'>;\n  selection: readonly NodeId[];\n  viewRef: { readonly current: View };\n  dispatcher: Pick<Dispatcher, 'getActiveAction'>;\n}) {\n  const { rules, viewRef } = args;\n  const { getHover, canvasRef: trackHoverOn } = useSceneHover({\n    ...args.hover, viewRef, enabled: rules.chromeVisibility !== undefined,\n  });\n  const chromeRules = useChromeRules(rules);\n  const caps = useSurfaceChromeCaps({\n    source: { rules: chromeRules, getHover, ...args.source },\n    selection: args.selection,\n    viewRef,\n    dispatcher: args.dispatcher,\n  });\n  return { ...caps, trackHoverOn };\n}\n"],"mappings":";;;;;;;;;;;;;;;;;AAyBA,SAAgB,cAAc,MAMZ;CAChB,MAAM,EAAE,cAAc,SAAS,gBAAgB,YAAY;CAC3D,MAAM,sBAAsB,wBAAwB;CACpD,OAAO,iBAAiB;EACtB,oBAAoB,SAAS,YAAY;GACvC,MAAM,MAAM,aAAa;GACzB,IAAI,CAAC,KAAK,OAAO;GACjB,MAAM,SAAS,qBAAqB,SAAS,GAAG,MAAM,SAAS,OAAO;GACtE,MAAM,OAAO,QAAQ,QAAQ,QAAQ;GACrC,MAAM,CAAC,GAAG,KAAK,aAAa,KAAK,QAAQ,SAAS,OAAO;GAEzD,MAAM,MAAM,QAAQ,MAAM,OACtB,qBAAqB,KAAK,CAAC,CAAC,MAAM,MAAM,EAAE,OAAO,OAAO,EAAE,IAC1D;GACJ,MAAM,MAAM,eAAe,UACzB,GAAG,GAAG,MAAM;IAAE,OAAO,KAAK;IAAO,gBAAgB,IAAI;GAAe,IAAI,IAC1E;GACA,OAAO,MAAM,EAAE,IAAI,IAAI,GAAa,IAAI;EAC1C;EACA;CACF,CAAC;AACH;;;;;;;;;;AAWA,SAAgB,eAAe,MAMX;CAClB,MAAM,EAAE,SAAS,YAAY,WAAW,qBAAqB;CAC7D,OAAO,cAAc;EACnB,MAAM,WAAW,kBAAkB,SAAS,mBAAmB;EAC/D,IAAI,CAAC,YAAY;GACf,SAAS,oBAAoB;GAC7B,SAAS,kBAAkB;EAC7B;EACA,IAAI,WAAW,SAAS,+BAA+B;EACvD,OAAO;GAAE,GAAG;GAAU,GAAG;EAAiB;CAC5C,GAAG;EAAC;EAAkB;EAAY;EAAW;CAAO,CAAC;AACvD;;AAGA,SAAgB,qBAAqB,MAWnC;CACA,MAAM,EAAE,SAAS,eAAe;CAChC,MAAM,aAAa,cAAc,KAAK,MAAM;CAC5C,MAAM,wBAAwB,UAAU,KAAK,SAAS;CACtD,MAAM,oBAAoB,mBAAmC;EAC3D,WAAW,sBAAsB;EACjC,MAAM,QAAQ;EACd,QAAQ,WAAW,gBAAgB;CACrC,IAAI;EAAC;EAAY;EAAuB;CAAO,CAAC;CAShD,OAAO;EAAE;EAAY,cARA,kBACc,WAAW,UAAU,kBAAkB,CAAC,GACzE,CAAC,YAAY,iBAAiB,CAMX;EAAc,YAJhB,kBACX,WAAW,QAAQ,kBAAkB,CAAC,GAC5C,CAAC,YAAY,iBAAiB,CAEG;CAAW;AAChD;;;;;AAMA,SAAgB,qBAAqB,MAOlC;CACD,MAAM,EAAE,OAAO,YAAY;CAC3B,MAAM,EAAE,UAAU,WAAW,iBAAiB,cAAc;EAC1D,GAAG,KAAK;EAAO;EAAS,SAAS,MAAM,qBAAqB;CAC9D,CAAC;CAQD,OAAO;EAAE,GANI,qBAAqB;GAChC,QAAQ;IAAE,OAFQ,eAAe,KAEhB;IAAa;IAAU,GAAG,KAAK;GAAO;GACvD,WAAW,KAAK;GAChB;GACA,YAAY,KAAK;EACnB,CACY;EAAM;CAAa;AACjC"}
+{"version":3,"file":"useSceneChrome.js","names":[],"sources":["../../../src/canvas/SceneCanvas/useSceneChrome.ts"],"sourcesContent":["import { useCallback, useMemo, type RefObject } from 'react';\nimport { useLatest } from '@weasel-js/react';\nimport type { Dispatcher, RuleCtx } from '@weasel-js/routing';\nimport type { NodeId } from 'core/scene/types';\nimport type { View } from 'core/viewport/view';\nimport { never, useHoverTracking, type HoverTracking, type VisibilityRules } from 'features/chrome-caps';\nimport {\n  useChromeCaps,\n  type ChromeCaps,\n  type ChromeCapsSource,\n  type ViewRuleInputs,\n} from 'features/chrome-caps/useChromeCaps';\nimport type { CanvasExtensionApi } from '../canvasExtension';\nimport { useOptionalViewRegistry } from '../viewRegistry';\nimport { presetChromeRules, type EnabledPresets } from './features';\nimport { PRESET_OWNED_CHROME } from './presets/chrome';\nimport type { NodeAtPoint } from './useNodeAtPoint';\nimport { worldPointAt } from './worldPointAt';\n\n/**\n * The node under the pointer, for `RuleCtx.hover`. One lookup, not a\n * client-to-world thunk beside a picker: the point and the camera its\n * tolerance converts against have to come from the same view. Hover has no\n * pointer to capture, so whichever view is under the cursor owns the point.\n */\nexport function useSceneHover(args: {\n  canvasApiRef: RefObject<Pick<CanvasExtensionApi, 'clientToWorld'> | null>;\n  /** The surface's own camera, for a point no declared view claims. */\n  viewRef: { readonly current: View };\n  nodeAtPointRef: { readonly current: NodeAtPoint | undefined };\n  enabled: boolean;\n  onChange?: (id: NodeId | null) => void;\n}): HoverTracking {\n  const { canvasApiRef, viewRef, nodeAtPointRef, enabled, onChange } = args;\n  const surfaceViewRegistry = useOptionalViewRegistry();\n  return useHoverTracking({\n    nodeAtClientPoint: (clientX, clientY) => {\n      const api = canvasApiRef.current;\n      if (!api) return null;\n      const target = surfaceViewRegistry?.resolver.at(null, clientX, clientY);\n      const view = target?.view ?? viewRef.current;\n      const [x, y] = worldPointAt(api, target, clientX, clientY);\n      // A view judges its own layers; the surface's gate is the picker's default.\n      const reg = target?.id != null\n        ? surfaceViewRegistry?.list().find((r) => r.id === target.id)\n        : undefined;\n      const hit = nodeAtPointRef.current?.(\n        x, y, reg ? { scale: view.scale, layerIsPainted: reg.layerIsPainted } : view,\n      );\n      return hit ? { id: hit.id as NodeId } : null;\n    },\n    enabled,\n    ...(onChange ? { onChange } : {}),\n  });\n}\n\n/**\n * The surface's chrome-visibility rules: the presets' defaults under the\n * consumer's `chromeVisibility`, which wins.\n *\n * An unselectable canvas hides the marquee and lasso by default: every\n * selection write no-ops there, so the select tool's empty-drag binding still\n * claims the gesture, keeping it from falling through to an ambient drag such\n * as insert, but paints nothing.\n */\nexport function useChromeRules(args: {\n  enabled: EnabledPresets;\n  selectable: boolean;\n  chromeVisibility: VisibilityRules | undefined;\n}): VisibilityRules {\n  const { enabled, selectable, chromeVisibility } = args;\n  return useMemo(() => {\n    const defaults = presetChromeRules(enabled, PRESET_OWNED_CHROME);\n    if (!selectable) {\n      defaults['action.marquee'] = never;\n      defaults['action.lasso'] = never;\n    }\n    return { ...defaults, ...chromeVisibility };\n  }, [chromeVisibility, selectable, enabled]);\n}\n\n/** The chrome-caps answers for the surface's own view. */\nexport function useSurfaceChromeCaps(args: {\n  source: ChromeCapsSource;\n  /** The selection as rendered. `SelectionApi.current` can be a live getter\n   *  that runs ahead of the commit the painted chrome was built from. */\n  selection: readonly NodeId[];\n  viewRef: { readonly current: View };\n  dispatcher: Pick<Dispatcher, 'getActiveAction'>;\n}): {\n  chromeCaps: ChromeCaps;\n  getIsVisible: () => (id: string) => boolean;\n  getRuleCtx: () => RuleCtx | undefined;\n} {\n  const { viewRef, dispatcher } = args;\n  const chromeCaps = useChromeCaps(args.source);\n  const committedSelectionRef = useLatest(args.selection);\n  const currentRuleInputs = useCallback((): ViewRuleInputs => ({\n    selection: committedSelectionRef.current,\n    view: viewRef.current,\n    action: dispatcher.getActiveAction(),\n  }), [dispatcher, committedSelectionRef, viewRef]);\n  const getIsVisible = useCallback(\n    (): ((id: string) => boolean) => chromeCaps.isVisible(currentRuleInputs()),\n    [chromeCaps, currentRuleInputs],\n  );\n  const getRuleCtx = useCallback(\n    () => chromeCaps.ruleCtx(currentRuleInputs()),\n    [chromeCaps, currentRuleInputs],\n  );\n  return { chromeCaps, getIsVisible, getRuleCtx };\n}\n\n/**\n * The surface's chrome: hover tracking, the visibility rules, and the chrome-caps answers they\n * feed. `source` is the chrome-caps source minus the parts built here.\n */\nexport function useSceneCanvasChrome(args: {\n  source: Omit<ChromeCapsSource, 'rules' | 'getHover'>;\n  rules: Parameters<typeof useChromeRules>[0];\n  hover: Omit<Parameters<typeof useSceneHover>[0], 'enabled' | 'viewRef'>;\n  selection: readonly NodeId[];\n  viewRef: { readonly current: View };\n  dispatcher: Pick<Dispatcher, 'getActiveAction'>;\n}) {\n  const { rules, viewRef } = args;\n  const { getHover, canvasRef: trackHoverOn } = useSceneHover({\n    ...args.hover, viewRef, enabled: rules.chromeVisibility !== undefined || args.hover.onChange !== undefined,\n  });\n  const chromeRules = useChromeRules(rules);\n  const caps = useSurfaceChromeCaps({\n    source: { rules: chromeRules, getHover, ...args.source },\n    selection: args.selection,\n    viewRef,\n    dispatcher: args.dispatcher,\n  });\n  return { ...caps, trackHoverOn };\n}\n"],"mappings":";;;;;;;;;;;;;;;;;AAyBA,SAAgB,cAAc,MAOZ;CAChB,MAAM,EAAE,cAAc,SAAS,gBAAgB,SAAS,aAAa;CACrE,MAAM,sBAAsB,wBAAwB;CACpD,OAAO,iBAAiB;EACtB,oBAAoB,SAAS,YAAY;GACvC,MAAM,MAAM,aAAa;GACzB,IAAI,CAAC,KAAK,OAAO;GACjB,MAAM,SAAS,qBAAqB,SAAS,GAAG,MAAM,SAAS,OAAO;GACtE,MAAM,OAAO,QAAQ,QAAQ,QAAQ;GACrC,MAAM,CAAC,GAAG,KAAK,aAAa,KAAK,QAAQ,SAAS,OAAO;GAEzD,MAAM,MAAM,QAAQ,MAAM,OACtB,qBAAqB,KAAK,CAAC,CAAC,MAAM,MAAM,EAAE,OAAO,OAAO,EAAE,IAC1D;GACJ,MAAM,MAAM,eAAe,UACzB,GAAG,GAAG,MAAM;IAAE,OAAO,KAAK;IAAO,gBAAgB,IAAI;GAAe,IAAI,IAC1E;GACA,OAAO,MAAM,EAAE,IAAI,IAAI,GAAa,IAAI;EAC1C;EACA;EACA,GAAI,WAAW,EAAE,SAAS,IAAI,CAAC;CACjC,CAAC;AACH;;;;;;;;;;AAWA,SAAgB,eAAe,MAIX;CAClB,MAAM,EAAE,SAAS,YAAY,qBAAqB;CAClD,OAAO,cAAc;EACnB,MAAM,WAAW,kBAAkB,SAAS,mBAAmB;EAC/D,IAAI,CAAC,YAAY;GACf,SAAS,oBAAoB;GAC7B,SAAS,kBAAkB;EAC7B;EACA,OAAO;GAAE,GAAG;GAAU,GAAG;EAAiB;CAC5C,GAAG;EAAC;EAAkB;EAAY;CAAO,CAAC;AAC5C;;AAGA,SAAgB,qBAAqB,MAWnC;CACA,MAAM,EAAE,SAAS,eAAe;CAChC,MAAM,aAAa,cAAc,KAAK,MAAM;CAC5C,MAAM,wBAAwB,UAAU,KAAK,SAAS;CACtD,MAAM,oBAAoB,mBAAmC;EAC3D,WAAW,sBAAsB;EACjC,MAAM,QAAQ;EACd,QAAQ,WAAW,gBAAgB;CACrC,IAAI;EAAC;EAAY;EAAuB;CAAO,CAAC;CAShD,OAAO;EAAE;EAAY,cARA,kBACc,WAAW,UAAU,kBAAkB,CAAC,GACzE,CAAC,YAAY,iBAAiB,CAMX;EAAc,YAJhB,kBACX,WAAW,QAAQ,kBAAkB,CAAC,GAC5C,CAAC,YAAY,iBAAiB,CAEG;CAAW;AAChD;;;;;AAMA,SAAgB,qBAAqB,MAOlC;CACD,MAAM,EAAE,OAAO,YAAY;CAC3B,MAAM,EAAE,UAAU,WAAW,iBAAiB,cAAc;EAC1D,GAAG,KAAK;EAAO;EAAS,SAAS,MAAM,qBAAqB,UAAa,KAAK,MAAM,aAAa;CACnG,CAAC;CAQD,OAAO;EAAE,GANI,qBAAqB;GAChC,QAAQ;IAAE,OAFQ,eAAe,KAEhB;IAAa;IAAU,GAAG,KAAK;GAAO;GACvD,WAAW,KAAK;GAChB;GACA,YAAY,KAAK;EACnB,CACY;EAAM;CAAa;AACjC"}

package/dist/canvas/SceneCanvas/useSceneGestureDispatcher.js

@@ -1,13 +1,14 @@
 import { EMPTY_CHROME_STATE } from "../../core/selection/chromeState.js";
-import { useDispatchDepSources } from "../deps/dispatchSources.js";
 import { anchorStateFrom, buildAffordanceAt, buildClassifyTarget, layerAffordance } from "../affordanceAt.js";
-import { pathFromPlane } from "../planeClips.js";
 import { useOptionalViewRegistry } from "../viewRegistry.js";
+import { useDispatchDepSources } from "../deps/dispatchSources.js";
+import { pathFromPlane } from "../planeClips.js";
+import { VIEW_MARKER_ENTRY_ID } from "../../features/viewports/viewMarkerDrag.js";
 import { useKitSettingsDepSource } from "../deps/kitSettings.js";
 import { useChromeAffordances } from "./useChromeAffordances.js";
 import { useSurfaceRouting } from "./useSurfaceRouting.js";
 import { traceConversion } from "./coordTrace.js";
-import { useCallback, useInsertionEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useInsertionEffect, useMemo, useState } from "react";
 import { useLatest } from "@weasel-js/react";
 import { createLongPressStore } from "@weasel-js/routing";
 import { useActionsRegistry, useDepRegistry, useGestureDispatcher } from "@weasel-js/routing/react";
@@ -57,9 +58,22 @@ function useAffordanceAt(inputs, depRegistry, viewRegistry) {
 		return (worldPoint) => {
 			const extra = canvasApiRef.current?.hitTestExtras?.(worldPoint.x, worldPoint.y);
 			if (extra) return layerAffordance(extra.layerId, extra.hit);
+			const marker = viewRegistry?.markerAt(null, worldPoint);
+			if (marker) return marker;
 			return affordanceAt ? affordanceAt(worldPoint) : null;
 		};
-	}, [affordanceAt, canvasApiRef]);
+	}, [
+		affordanceAt,
+		canvasApiRef,
+		viewRegistry
+	]);
+}
+/** Markers take presses only while the routed tools carry the marker drag:
+*  `actions={null}` and a tools takeover both leave it out. */
+function useMarkerGate(viewRegistry, ambient) {
+	const installed = ambient.some((entry) => entry.id === VIEW_MARKER_ENTRY_ID);
+	const installedRef = useLatest(installed);
+	useEffect(() => viewRegistry?.gateMarkers(() => installedRef.current), [viewRegistry, installedRef]);
 }
 /** Which body a world point lands on, its selection state, and its routing kind. */
 function useClassifyTarget(inputs, kindOfNodeRef) {
@@ -86,7 +100,7 @@ function useClassifyTarget(inputs, kindOfNodeRef) {
 }
 /** Runs this canvas's gesture dispatcher over its tools, contributions, and chrome. */
 function useSceneGestureDispatcher(inputs) {
-	const { canvasRef, canvasApiRef, tools, contributions, enabled, keyboard, claimKeys, viewRef, kindOfNode, dispatcher, getRuleCtx, onDoubleClick, onClick, longPress: { duration: longPressDuration, haptics: longPressHaptics } = {} } = inputs;
+	const { canvasRef, canvasApiRef, tools, contributions, enabled, keyboard, claimKeys, viewRef, kindOfNode, dispatcher, traces, getRuleCtx, onDoubleClick, onClick, longPress: { duration: longPressDuration, haptics: longPressHaptics } = {} } = inputs;
 	const registry = useActionsRegistry();
 	const depRegistry = useDepRegistry();
 	const viewRegistry = useOptionalViewRegistry();
@@ -102,6 +116,7 @@ function useSceneGestureDispatcher(inputs) {
 		contributions
 	]);
 	const kindOfNodeRef = useLatest(kindOfNode);
+	useMarkerGate(viewRegistry, tools.ambient);
 	const affordanceWithLayers = useAffordanceAt(inputs, depRegistry, viewRegistry);
 	const classifyTarget = useClassifyTarget(inputs, kindOfNodeRef);
 	const clientToWorld = useCallback((clientX, clientY) => {
@@ -111,12 +126,13 @@ function useSceneGestureDispatcher(inputs) {
 			x,
 			y
 		};
-		traceConversion(clientX, clientY, api ? canvasRef.current : null, viewRef?.current, world);
+		traceConversion(traces.coords, clientX, clientY, api ? canvasRef.current : null, viewRef?.current, world);
 		return world;
 	}, [
 		canvasRef,
 		canvasApiRef,
-		viewRef
+		viewRef,
+		traces.coords
 	]);
 	const requestRedraw = useCallback(() => {
 		canvasApiRef.current?.requestRedraw?.();
@@ -144,6 +160,7 @@ function useSceneGestureDispatcher(inputs) {
 		affordanceAt: affordanceWithLayers,
 		classifyTarget,
 		dispatcher,
+		trace: traces.dispatch,
 		clientToWorld,
 		requestRedraw,
 		paintedCursor,