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

package/dist/interactions/actions/insert/repositionAction.js

@@ -38,7 +38,8 @@ var INSERT_REPOSITION_BINDING = {
 		...heldKeySpec(" "),
 		phase: "engaged"
 	},
-	actionId: "insert.reposition"
+	actionId: "insert.reposition",
+	opts: { id: "insert.reposition.held" }
 };
 
 //#endregion

package/dist/interactions/actions/insert/repositionAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"repositionAction.js","names":[],"sources":["../../../../src/interactions/actions/insert/repositionAction.ts"],"sourcesContent":["import { heldKeySpec, type Action, type GestureBinding } from '@weasel-js/routing';\nimport type { InsertLiveGesture } from './live';\n\n/**\n * Companion to `insertAction`: while its key is held, dragging moves the\n * shape being drawn instead of resizing it; letting go resumes resizing from\n * where the shape now sits. No-op when no insert is in flight.\n */\nexport const insertRepositionAction: Action = {\n  id: 'insert.reposition',\n  label: 'Insert — reposition',\n  group: 'insert',\n  eligible: { capability: 'creates-shapes' },\n  invoker: {\n    timing: 'ongoing',\n    start: (ctx) => {\n      const gesture = ctx.deps.insertLive?.gesture as InsertLiveGesture | null | undefined;\n      if (!gesture || !gesture.open) return {};\n      gesture.repositioning = true;\n      return {\n        kind: 'insert.reposition',\n        onEnd: () => { gesture.repositioning = false; },\n      };\n    },\n  },\n  requires: ['insertLive'],\n};\n\n/**\n * The binding a shape-drawing tool adds so holding Space mid-draw repositions\n * the shape. Gated to the tool's own engaged phase, so Space between drags is\n * left to the offhand hand tool. Shift and Alt may be down with it, so a\n * constrained or from-center draw can be moved without letting go of them.\n */\nexport const INSERT_REPOSITION_BINDING: GestureBinding = {\n  spec: { ...heldKeySpec(' '), phase: 'engaged' },\n  actionId: 'insert.reposition',\n};\n"],"mappings":";;;;;;;;AAQA,IAAa,yBAAiC;CAC5C,IAAI;CACJ,OAAO;CACP,OAAO;CACP,UAAU,EAAE,YAAY,iBAAiB;CACzC,SAAS;EACP,QAAQ;EACR,QAAQ,QAAQ;GACd,MAAM,UAAU,IAAI,KAAK,YAAY;GACrC,IAAI,CAAC,WAAW,CAAC,QAAQ,MAAM,OAAO,CAAC;GACvC,QAAQ,gBAAgB;GACxB,OAAO;IACL,MAAM;IACN,aAAa;KAAE,QAAQ,gBAAgB;IAAO;GAChD;EACF;CACF;CACA,UAAU,CAAC,YAAY;AACzB;;;;;;;AAQA,IAAa,4BAA4C;CACvD,MAAM;EAAE,GAAG,YAAY,GAAG;EAAG,OAAO;CAAU;CAC9C,UAAU;AACZ"}
+{"version":3,"file":"repositionAction.js","names":[],"sources":["../../../../src/interactions/actions/insert/repositionAction.ts"],"sourcesContent":["import { heldKeySpec, type Action, type GestureBinding } from '@weasel-js/routing';\nimport type { InsertLiveGesture } from './live';\n\n/**\n * Companion to `insertAction`: while its key is held, dragging moves the\n * shape being drawn instead of resizing it; letting go resumes resizing from\n * where the shape now sits. No-op when no insert is in flight.\n */\nexport const insertRepositionAction: Action = {\n  id: 'insert.reposition',\n  label: 'Insert — reposition',\n  group: 'insert',\n  eligible: { capability: 'creates-shapes' },\n  invoker: {\n    timing: 'ongoing',\n    start: (ctx) => {\n      const gesture = ctx.deps.insertLive?.gesture as InsertLiveGesture | null | undefined;\n      if (!gesture || !gesture.open) return {};\n      gesture.repositioning = true;\n      return {\n        kind: 'insert.reposition',\n        onEnd: () => { gesture.repositioning = false; },\n      };\n    },\n  },\n  requires: ['insertLive'],\n};\n\n/**\n * The binding a shape-drawing tool adds so holding Space mid-draw repositions\n * the shape. Gated to the tool's own engaged phase, so Space between drags is\n * left to the offhand hand tool. Shift and Alt may be down with it, so a\n * constrained or from-center draw can be moved without letting go of them.\n */\nexport const INSERT_REPOSITION_BINDING: GestureBinding = {\n  spec: { ...heldKeySpec(' '), phase: 'engaged' },\n  actionId: 'insert.reposition',\n  opts: { id: 'insert.reposition.held' },\n};\n"],"mappings":";;;;;;;;AAQA,IAAa,yBAAiC;CAC5C,IAAI;CACJ,OAAO;CACP,OAAO;CACP,UAAU,EAAE,YAAY,iBAAiB;CACzC,SAAS;EACP,QAAQ;EACR,QAAQ,QAAQ;GACd,MAAM,UAAU,IAAI,KAAK,YAAY;GACrC,IAAI,CAAC,WAAW,CAAC,QAAQ,MAAM,OAAO,CAAC;GACvC,QAAQ,gBAAgB;GACxB,OAAO;IACL,MAAM;IACN,aAAa;KAAE,QAAQ,gBAAgB;IAAO;GAChD;EACF;CACF;CACA,UAAU,CAAC,YAAY;AACzB;;;;;;;AAQA,IAAa,4BAA4C;CACvD,MAAM;EAAE,GAAG,YAAY,GAAG;EAAG,OAAO;CAAU;CAC9C,UAAU;CACV,MAAM,EAAE,IAAI,yBAAyB;AACvC"}

package/dist/interactions/actions/insert/session.js

@@ -1,9 +1,9 @@
+import { insertParent } from "./parent.js";
 import { gestureReaders } from "../../gestures/shared/screenTolerance.js";
 import { pointerStateOf } from "../pointerState.js";
 import { SNAP_ANGLE_STEP, snapMods } from "../../../features/snap/roles.js";
 import { insertKind } from "./shape.js";
 import { spanSnap } from "../../../features/snap/spanSnap.js";
-import { insertParent } from "./parent.js";
 import { resolveParams } from "@weasel-js/routing";
 
 //#region src/interactions/actions/insert/session.ts
@@ -18,7 +18,7 @@ function beginInsert(ctx, opts) {
 	const selection = ctx.deps.selection;
 	const priorSelection = selection ? [...selection.get()] : [];
 	if (selection && priorSelection.length > 0) selection.clear();
-	const parent = insertParent(ctx.deps.scene, ctx.deps.insertInto?.get());
+	const parent = insertParent(ctx.deps.scene, ctx.deps.insertInto?.get(), ctx.deps.canDropInto);
 	const constrain = () => insertKind(resolveParams(opts?.params)) === "line" ? { step: SNAP_ANGLE_STEP } : void 0;
 	const snap = spanSnap(ctx.deps.snap, constrain, parent === null ? {} : { parent });
 	const behaviors = opts?.behaviors ?? [];

package/dist/interactions/actions/insert/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","names":[],"sources":["../../../../src/interactions/actions/insert/session.ts"],"sourcesContent":["import type { BindingOpts, DragSample, InvocationCtx } from '@weasel-js/routing';\nimport { resolveParams } from '@weasel-js/routing';\nimport { SNAP_ANGLE_STEP, snapMods } from 'features/snap/roles';\nimport { spanSnap, type SpanSnap } from 'features/snap/spanSnap';\nimport { pointerStateOf } from '../pointerState';\nimport type { Op } from 'core/ops/types';\nimport type { NodeId, Scene } from 'core/scene/types';\nimport type { SelectionApi } from 'core/selection/useSelection';\nimport { gestureReaders, type GestureReaders } from '../../gestures/shared/screenTolerance';\nimport type { GestureContext, InsertBehavior, InsertPoint } from '../../gestures/types';\nimport type { InsertDep, TextEditDep } from '../depSchema';\nimport { insertParent } from './parent';\nimport { insertKind } from './shape';\n\n/** The key an insert's single gesture point rides under in the behaviors'\n *  `draggedIds` / `origin` / `current` — insert has no node id yet. */\nexport const GESTURE_KEY = 'gesture';\n\n/** What an insert captured at press. Nothing here changes during the drag.\n *  The deps are captured because the dispatcher builds the deps bag once, on\n *  `start`: every later pump event carries `deps: {}`. */\nexport interface InsertSession {\n  readonly dep: InsertDep;\n  /** For the text kind's drop-into-the-caret step. */\n  readonly textEdit: TextEditDep | undefined;\n  /** Snaps the drag's start and current point, so the live preview and the\n   *  committed geometry agree. Freehand pencil samples are deliberately NOT\n   *  snapped — a grid-quantized freehand trail is a staircase, not a stroke. */\n  readonly snap: SpanSnap;\n  /** The active binding's opts — re-resolved on every read so thunked\n   *  params see the latest tool state (e.g. polygon `sides` after ArrowUp). */\n  readonly opts: BindingOpts | undefined;\n  /** What was selected before the draw cleared it, to put back on cancel. */\n  readonly priorSelection: readonly NodeId[];\n  /** Behaviors from `opts.behaviors`; empty when none were bound. */\n  readonly behaviors: readonly InsertBehavior<unknown>[];\n  /** Reused gesture context handed to behaviors. Its `origin` holds the\n   *  start point under {@link GESTURE_KEY}, after `onStart` shaped it. */\n  readonly gestureCtx: GestureContext<unknown>;\n  /** For committing a behavior's `Op[]`. */\n  readonly scene: Scene<unknown, string, unknown> | undefined;\n  /** The container the node lands in; null for the top of the tree. */\n  readonly parent: NodeId | null;\n  readonly applyOps: ((ops: Op[], label: string) => void) | undefined;\n  readonly selection: SelectionApi | undefined;\n}\n\n/** What the latest pump event left. Replaced, not mutated, by the next. */\nexport interface InsertFrame {\n  /** The raw (unsnapped) pointer in world space. */\n  readonly pointer: InsertPoint;\n  /** Pointer trail accumulated by the dispatcher in world space; pencil-kind\n   *  commits read it. */\n  readonly points: ReadonlyArray<DragSample> | null;\n  /** Alt inverts the binding's nominal `originMode` (corner ⇄ center), so\n   *  pressing or releasing it mid-drag flips the preview and the commit\n   *  without the dispatcher re-routing to another binding. */\n  readonly altHeld: boolean;\n  /** The endpoints after the snap session and the behaviors. */\n  readonly shaped: { start: InsertPoint; current: InsertPoint };\n}\n\n/** Capture an insert at press. Null with no `insert` dep. Clears the\n *  selection and runs each behavior's `onStart`. */\nexport function beginInsert(\n  ctx: InvocationCtx,\n  opts: BindingOpts | undefined,\n): { session: InsertSession; readers: GestureReaders; frame: InsertFrame } | null {\n  const dep = ctx.deps.insert;\n  if (!dep) return null;\n\n  // Starting a draw retires any prior selection — the lingering halo\n  // around an unrelated node while the user is drawing a new shape is\n  // just visual noise, and it primes the UX bug where a drag that\n  // continues over the selected node would otherwise drive the move\n  // action via fall-through. The clear is unconditional: the user has\n  // committed to \"I'm making a new thing\" by engaging a creation tool.\n  const selection = ctx.deps.selection;\n  const priorSelection = selection ? [...selection.get()] : [];\n  if (selection && priorSelection.length > 0) {\n    selection.clear();\n  }\n\n  const parent = insertParent(ctx.deps.scene, ctx.deps.insertInto?.get());\n  const constrain = () => (insertKind(resolveParams(opts?.params)) === 'line' ? { step: SNAP_ANGLE_STEP } : undefined);\n  const snap = spanSnap(ctx.deps.snap, constrain, parent === null ? {} : { parent });\n  const behaviors = (opts?.behaviors ?? []) as InsertBehavior<unknown>[];\n  const readers = gestureReaders(ctx.deps);\n  const origin = snap.start({ x: ctx.world.x, y: ctx.world.y }, snapMods(ctx)).point;\n  const gestureCtx: GestureContext<unknown> = {\n    draggedIds: [GESTURE_KEY],\n    origin: new Map<string, unknown>([[GESTURE_KEY, origin]]),\n    current: new Map<string, unknown>([[GESTURE_KEY, origin]]),\n    snap: null,\n    modifiers: { ...ctx.modifiers },\n    pointer: pointerStateOf(ctx.world, ctx),\n    view: readers.view(),\n    plane: readers.plane(),\n    kitSettings: readers.kitSettings,\n    // No node exists to adapt until commit; insert behaviors read points.\n    adapter: undefined as unknown as GestureContext<unknown>['adapter'],\n    scratch: {},\n  };\n  for (const b of behaviors) b.onStart?.(gestureCtx);\n  // A snap target in range outranks a behavior's own snapping.\n  if (snap.startHeld()) gestureCtx.origin.set(GESTURE_KEY, origin);\n  const startPoint = gestureCtx.origin.get(GESTURE_KEY) as InsertPoint;\n  snap.anchor(startPoint);\n\n  const session: InsertSession = {\n    dep,\n    textEdit: ctx.deps.textEdit,\n    snap,\n    opts,\n    priorSelection,\n    behaviors,\n    gestureCtx,\n    scene: ctx.deps.scene,\n    parent,\n    applyOps: ctx.deps.applyOps,\n    selection,\n  };\n  const frame: InsertFrame = {\n    pointer: { x: ctx.world.x, y: ctx.world.y },\n    points: ctx.drag?.points ?? null,\n    altHeld: ctx.modifiers.alt,\n    shaped: { start: startPoint, current: startPoint },\n  };\n  return { session, readers, frame };\n}\n"],"mappings":";;;;;;;;;;;AAgBA,IAAa,cAAc;;;AAgD3B,SAAgB,YACd,KACA,MACgF;CAChF,MAAM,MAAM,IAAI,KAAK;CACrB,IAAI,CAAC,KAAK,OAAO;CAQjB,MAAM,YAAY,IAAI,KAAK;CAC3B,MAAM,iBAAiB,YAAY,CAAC,GAAG,UAAU,IAAI,CAAC,IAAI,CAAC;CAC3D,IAAI,aAAa,eAAe,SAAS,GACvC,UAAU,MAAM;CAGlB,MAAM,SAAS,aAAa,IAAI,KAAK,OAAO,IAAI,KAAK,YAAY,IAAI,CAAC;CACtE,MAAM,kBAAmB,WAAW,cAAc,MAAM,MAAM,CAAC,MAAM,SAAS,EAAE,MAAM,gBAAgB,IAAI;CAC1G,MAAM,OAAO,SAAS,IAAI,KAAK,MAAM,WAAW,WAAW,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;CACjF,MAAM,YAAa,MAAM,aAAa,CAAC;CACvC,MAAM,UAAU,eAAe,IAAI,IAAI;CACvC,MAAM,SAAS,KAAK,MAAM;EAAE,GAAG,IAAI,MAAM;EAAG,GAAG,IAAI,MAAM;CAAE,GAAG,SAAS,GAAG,CAAC,CAAC,CAAC;CAC7E,MAAM,aAAsC;EAC1C,YAAY,CAAC,WAAW;EACxB,wBAAQ,IAAI,IAAqB,CAAC,CAAC,aAAa,MAAM,CAAC,CAAC;EACxD,yBAAS,IAAI,IAAqB,CAAC,CAAC,aAAa,MAAM,CAAC,CAAC;EACzD,MAAM;EACN,WAAW,EAAE,GAAG,IAAI,UAAU;EAC9B,SAAS,eAAe,IAAI,OAAO,GAAG;EACtC,MAAM,QAAQ,KAAK;EACnB,OAAO,QAAQ,MAAM;EACrB,aAAa,QAAQ;EAErB,SAAS;EACT,SAAS,CAAC;CACZ;CACA,KAAK,MAAM,KAAK,WAAW,EAAE,UAAU,UAAU;CAEjD,IAAI,KAAK,UAAU,GAAG,WAAW,OAAO,IAAI,aAAa,MAAM;CAC/D,MAAM,aAAa,WAAW,OAAO,IAAI,WAAW;CACpD,KAAK,OAAO,UAAU;CAqBtB,OAAO;EAAE;GAlBP;GACA,UAAU,IAAI,KAAK;GACnB;GACA;GACA;GACA;GACA;GACA,OAAO,IAAI,KAAK;GAChB;GACA,UAAU,IAAI,KAAK;GACnB;EAQO;EAAS;EAAS;GALzB,SAAS;IAAE,GAAG,IAAI,MAAM;IAAG,GAAG,IAAI,MAAM;GAAE;GAC1C,QAAQ,IAAI,MAAM,UAAU;GAC5B,SAAS,IAAI,UAAU;GACvB,QAAQ;IAAE,OAAO;IAAY,SAAS;GAAW;EAExB;CAAM;AACnC"}
+{"version":3,"file":"session.js","names":[],"sources":["../../../../src/interactions/actions/insert/session.ts"],"sourcesContent":["import type { BindingOpts, DragSample, InvocationCtx } from '@weasel-js/routing';\nimport { resolveParams } from '@weasel-js/routing';\nimport { SNAP_ANGLE_STEP, snapMods } from 'features/snap/roles';\nimport { spanSnap, type SpanSnap } from 'features/snap/spanSnap';\nimport { pointerStateOf } from '../pointerState';\nimport type { Op } from 'core/ops/types';\nimport type { NodeId, Scene } from 'core/scene/types';\nimport type { SelectionApi } from 'core/selection/useSelection';\nimport { gestureReaders, type GestureReaders } from '../../gestures/shared/screenTolerance';\nimport type { GestureContext, InsertBehavior, InsertPoint } from '../../gestures/types';\nimport type { InsertDep, TextEditDep } from '../depSchema';\nimport { insertParent } from './parent';\nimport { insertKind } from './shape';\n\n/** The key an insert's single gesture point rides under in the behaviors'\n *  `draggedIds` / `origin` / `current` — insert has no node id yet. */\nexport const GESTURE_KEY = 'gesture';\n\n/** What an insert captured at press. Nothing here changes during the drag.\n *  The deps are captured because the dispatcher builds the deps bag once, on\n *  `start`: every later pump event carries `deps: {}`. */\nexport interface InsertSession {\n  readonly dep: InsertDep;\n  /** For the text kind's drop-into-the-caret step. */\n  readonly textEdit: TextEditDep | undefined;\n  /** Snaps the drag's start and current point, so the live preview and the\n   *  committed geometry agree. Freehand pencil samples are deliberately NOT\n   *  snapped — a grid-quantized freehand trail is a staircase, not a stroke. */\n  readonly snap: SpanSnap;\n  /** The active binding's opts — re-resolved on every read so thunked\n   *  params see the latest tool state (e.g. polygon `sides` after ArrowUp). */\n  readonly opts: BindingOpts | undefined;\n  /** What was selected before the draw cleared it, to put back on cancel. */\n  readonly priorSelection: readonly NodeId[];\n  /** Behaviors from `opts.behaviors`; empty when none were bound. */\n  readonly behaviors: readonly InsertBehavior<unknown>[];\n  /** Reused gesture context handed to behaviors. Its `origin` holds the\n   *  start point under {@link GESTURE_KEY}, after `onStart` shaped it. */\n  readonly gestureCtx: GestureContext<unknown>;\n  /** For committing a behavior's `Op[]`. */\n  readonly scene: Scene<unknown, string, unknown> | undefined;\n  /** The container the node lands in; null for the top of the tree. */\n  readonly parent: NodeId | null;\n  readonly applyOps: ((ops: Op[], label: string) => void) | undefined;\n  readonly selection: SelectionApi | undefined;\n}\n\n/** What the latest pump event left. Replaced, not mutated, by the next. */\nexport interface InsertFrame {\n  /** The raw (unsnapped) pointer in world space. */\n  readonly pointer: InsertPoint;\n  /** Pointer trail accumulated by the dispatcher in world space; pencil-kind\n   *  commits read it. */\n  readonly points: ReadonlyArray<DragSample> | null;\n  /** Alt inverts the binding's nominal `originMode` (corner ⇄ center), so\n   *  pressing or releasing it mid-drag flips the preview and the commit\n   *  without the dispatcher re-routing to another binding. */\n  readonly altHeld: boolean;\n  /** The endpoints after the snap session and the behaviors. */\n  readonly shaped: { start: InsertPoint; current: InsertPoint };\n}\n\n/** Capture an insert at press. Null with no `insert` dep. Clears the\n *  selection and runs each behavior's `onStart`. */\nexport function beginInsert(\n  ctx: InvocationCtx,\n  opts: BindingOpts | undefined,\n): { session: InsertSession; readers: GestureReaders; frame: InsertFrame } | null {\n  const dep = ctx.deps.insert;\n  if (!dep) return null;\n\n  // Starting a draw retires any prior selection — the lingering halo\n  // around an unrelated node while the user is drawing a new shape is\n  // just visual noise, and it primes the UX bug where a drag that\n  // continues over the selected node would otherwise drive the move\n  // action via fall-through. The clear is unconditional: the user has\n  // committed to \"I'm making a new thing\" by engaging a creation tool.\n  const selection = ctx.deps.selection;\n  const priorSelection = selection ? [...selection.get()] : [];\n  if (selection && priorSelection.length > 0) {\n    selection.clear();\n  }\n\n  const parent = insertParent(ctx.deps.scene, ctx.deps.insertInto?.get(), ctx.deps.canDropInto);\n  const constrain = () => (insertKind(resolveParams(opts?.params)) === 'line' ? { step: SNAP_ANGLE_STEP } : undefined);\n  const snap = spanSnap(ctx.deps.snap, constrain, parent === null ? {} : { parent });\n  const behaviors = (opts?.behaviors ?? []) as InsertBehavior<unknown>[];\n  const readers = gestureReaders(ctx.deps);\n  const origin = snap.start({ x: ctx.world.x, y: ctx.world.y }, snapMods(ctx)).point;\n  const gestureCtx: GestureContext<unknown> = {\n    draggedIds: [GESTURE_KEY],\n    origin: new Map<string, unknown>([[GESTURE_KEY, origin]]),\n    current: new Map<string, unknown>([[GESTURE_KEY, origin]]),\n    snap: null,\n    modifiers: { ...ctx.modifiers },\n    pointer: pointerStateOf(ctx.world, ctx),\n    view: readers.view(),\n    plane: readers.plane(),\n    kitSettings: readers.kitSettings,\n    // No node exists to adapt until commit; insert behaviors read points.\n    adapter: undefined as unknown as GestureContext<unknown>['adapter'],\n    scratch: {},\n  };\n  for (const b of behaviors) b.onStart?.(gestureCtx);\n  // A snap target in range outranks a behavior's own snapping.\n  if (snap.startHeld()) gestureCtx.origin.set(GESTURE_KEY, origin);\n  const startPoint = gestureCtx.origin.get(GESTURE_KEY) as InsertPoint;\n  snap.anchor(startPoint);\n\n  const session: InsertSession = {\n    dep,\n    textEdit: ctx.deps.textEdit,\n    snap,\n    opts,\n    priorSelection,\n    behaviors,\n    gestureCtx,\n    scene: ctx.deps.scene,\n    parent,\n    applyOps: ctx.deps.applyOps,\n    selection,\n  };\n  const frame: InsertFrame = {\n    pointer: { x: ctx.world.x, y: ctx.world.y },\n    points: ctx.drag?.points ?? null,\n    altHeld: ctx.modifiers.alt,\n    shaped: { start: startPoint, current: startPoint },\n  };\n  return { session, readers, frame };\n}\n"],"mappings":";;;;;;;;;;;AAgBA,IAAa,cAAc;;;AAgD3B,SAAgB,YACd,KACA,MACgF;CAChF,MAAM,MAAM,IAAI,KAAK;CACrB,IAAI,CAAC,KAAK,OAAO;CAQjB,MAAM,YAAY,IAAI,KAAK;CAC3B,MAAM,iBAAiB,YAAY,CAAC,GAAG,UAAU,IAAI,CAAC,IAAI,CAAC;CAC3D,IAAI,aAAa,eAAe,SAAS,GACvC,UAAU,MAAM;CAGlB,MAAM,SAAS,aAAa,IAAI,KAAK,OAAO,IAAI,KAAK,YAAY,IAAI,GAAG,IAAI,KAAK,WAAW;CAC5F,MAAM,kBAAmB,WAAW,cAAc,MAAM,MAAM,CAAC,MAAM,SAAS,EAAE,MAAM,gBAAgB,IAAI;CAC1G,MAAM,OAAO,SAAS,IAAI,KAAK,MAAM,WAAW,WAAW,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;CACjF,MAAM,YAAa,MAAM,aAAa,CAAC;CACvC,MAAM,UAAU,eAAe,IAAI,IAAI;CACvC,MAAM,SAAS,KAAK,MAAM;EAAE,GAAG,IAAI,MAAM;EAAG,GAAG,IAAI,MAAM;CAAE,GAAG,SAAS,GAAG,CAAC,CAAC,CAAC;CAC7E,MAAM,aAAsC;EAC1C,YAAY,CAAC,WAAW;EACxB,wBAAQ,IAAI,IAAqB,CAAC,CAAC,aAAa,MAAM,CAAC,CAAC;EACxD,yBAAS,IAAI,IAAqB,CAAC,CAAC,aAAa,MAAM,CAAC,CAAC;EACzD,MAAM;EACN,WAAW,EAAE,GAAG,IAAI,UAAU;EAC9B,SAAS,eAAe,IAAI,OAAO,GAAG;EACtC,MAAM,QAAQ,KAAK;EACnB,OAAO,QAAQ,MAAM;EACrB,aAAa,QAAQ;EAErB,SAAS;EACT,SAAS,CAAC;CACZ;CACA,KAAK,MAAM,KAAK,WAAW,EAAE,UAAU,UAAU;CAEjD,IAAI,KAAK,UAAU,GAAG,WAAW,OAAO,IAAI,aAAa,MAAM;CAC/D,MAAM,aAAa,WAAW,OAAO,IAAI,WAAW;CACpD,KAAK,OAAO,UAAU;CAqBtB,OAAO;EAAE;GAlBP;GACA,UAAU,IAAI,KAAK;GACnB;GACA;GACA;GACA;GACA;GACA,OAAO,IAAI,KAAK;GAChB;GACA,UAAU,IAAI,KAAK;GACnB;EAQO;EAAS;EAAS;GALzB,SAAS;IAAE,GAAG,IAAI,MAAM;IAAG,GAAG,IAAI,MAAM;GAAE;GAC1C,QAAQ,IAAI,MAAM,UAAU;GAC5B,SAAS,IAAI,UAAU;GACvB,QAAQ;IAAE,OAAO;IAAY,SAAS;GAAW;EAExB;CAAM;AACnC"}

package/dist/interactions/actions/move/action.js

@@ -27,10 +27,13 @@ var moveAction = inPlane({
 	id: "move",
 	label: "Move",
 	activeCursor: "move",
-	defaultBinding: {
-		kind: "drag",
-		target: "selected-body"
-	},
+	defaultBinding: [{
+		spec: {
+			kind: "drag",
+			target: "selected-body"
+		},
+		opts: { id: "move.drag" }
+	}],
 	eligible: { capability: "transforms-selection" },
 	modifierRoles: SNAP_ROLES,
 	requires: [

package/dist/interactions/actions/move/action.js.map

@@ -1 +1 @@
-{"version":3,"file":"action.js","names":[],"sources":["../../../../src/interactions/actions/move/action.ts"],"sourcesContent":["import type { Action } from '@weasel-js/routing';\nimport type { InvocationCtx, OngoingHandle, BindingOpts } from '@weasel-js/routing';\nimport { transformPreview } from '../transformFinish';\nimport { pastDragThreshold } from '@weasel-js/routing';\nimport { closeGesture, runBehaviorCancel } from '../gestureLifecycle';\nimport { inPlane, selectionLayer } from '../planeInput';\nimport { beginMove, type MoveFrame, type ReparentOnDrop } from './session';\nimport { nextFrame } from './frame';\nimport { commitMove } from './commit';\nimport { recordTransform } from '../transform-again/memory';\nimport { SNAP_ROLES } from 'features/snap/roles';\nexport type { ReparentOnDrop };\n\n/**\n * Drag-translates the selection.\n *\n * Each frame's poses go to the scene's ephemeral override table, not the\n * document: `Scene.setPose` records an undo entry per call, and the overrides\n * are what let a node deriving its geometry from a dragged one follow the\n * drag. Release commits one batch — at most one undo entry, none when the\n * binding's params make it transient — and cancel drops the overrides.\n *\n * Behaviors from the binding's `opts.behaviors` fold into each frame; on\n * release the first non-`undefined` answer wins (`Op[]` commits, `null`\n * aborts). `beginMove` appends the action's own two: a layout drop and\n * reparent-on-drop.\n */\nexport const moveAction: Action & { requires: string[] } = inPlane({\n  id: 'move',\n  label: 'Move',\n  // No hover `cursor`: pointing at a node shouldn't preemptively promise a move.\n  activeCursor: 'move',\n  // Ambient default targets `selected-body`, not a bare `{ kind: 'drag' }`,\n  // which catches every drag in ambient scope and bleeds the move into\n  // drawing-tool gestures wherever the higher-priority active match falls\n  // through.\n  defaultBinding: { kind: 'drag', target: 'selected-body' },\n  eligible: { capability: 'transforms-selection' },\n  modifierRoles: SNAP_ROLES,\n  requires: ['selection', 'scene', 'poseDescriptor', 'layout', 'applyOps', 'geometryProjection', 'nodeAtPoint', 'canDropInto', 'view', 'boundsIncludeStroke', 'kitSettings', 'snap', 'transformFollowers'],\n  invoker: {\n    timing: 'ongoing',\n    start(ctx: InvocationCtx, opts?: BindingOpts): OngoingHandle {\n      let frame: MoveFrame = { delta: { dx: 0, dy: 0 }, previews: new Map(), opaque: new Set() };\n      const begun = beginMove(ctx, opts, () => frame);\n      if (!begun) return {};\n      const { session, readers } = begun;\n      const subject = [...(ctx.deps.selection?.get() ?? [])] as string[];\n      const hold = session.scene.overrides.hold();\n      const preview = transformPreview(ctx.deps, session.scene, () => frame.previews);\n      // Where the last move put the pointer, once the drag has passed its\n      // threshold; null until then.\n      let engaged: { x: number; y: number } | null = null;\n      return {\n        kind: 'move',\n        onMove(moveCtx: InvocationCtx): void {\n          if (!moveCtx.drag) return;\n          if (!engaged) {\n            const s = moveCtx.drag.screenDelta;\n            if (s && !pastDragThreshold({ clientX: 0, clientY: 0 }, { clientX: s.x, clientY: s.y }, session.dragThresholdPx)) return;\n            session.lifecycle.start(session.ids as unknown as string[]);\n          }\n          engaged = moveCtx.world;\n          frame = nextFrame(session, readers, moveCtx);\n          hold.set(preview.poses());\n        },\n        onEnd(endCtx: InvocationCtx, reason: 'commit' | 'cancel'): void {\n          let committed = false;\n          try {\n            // A press that never traveled `dragThresholdPx` was never a move:\n            // its behaviors started, so they are canceled, not asked to commit.\n            if (reason === 'commit' && engaged) {\n              committed = commitMove({\n                session,\n                delta: frame.delta,\n                at: endCtx.drag ? endCtx.world : engaged,\n              });\n              if (committed) recordTransform(session.scene, { kind: 'translate', ...frame.delta }, subject);\n            } else runBehaviorCancel(session.behaviors, session.gestureCtx);\n          } finally {\n            session.snap?.end();\n            // After the commit, so no frame can paint the pre-drag pose between\n            // the override going away and the document catching up.\n            closeGesture({ hold, previews: frame.previews, behaviors: session.behaviors, ctx: session.gestureCtx, lifecycle: session.lifecycle }, committed);\n          }\n        },\n        previewIds: preview.previewIds,\n        previewData: preview.previewData,\n        previewOpaqueIds: () => (frame.opaque.size === 0 ? null : frame.opaque),\n      };\n    },\n  },\n  /**\n   * Always enabled: the dispatcher treats anything `!== true` as \"fall\n   * through to the next-best match\", so a disabled reason here loses every\n   * drag-on-selected-body to a lower-specificity binding (a shape tool's\n   * insert drag).\n   */\n  enabled: () => true,\n}, selectionLayer);\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AA2BA,IAAa,aAA8C,QAAQ;CACjE,IAAI;CACJ,OAAO;CAEP,cAAc;CAKd,gBAAgB;EAAE,MAAM;EAAQ,QAAQ;CAAgB;CACxD,UAAU,EAAE,YAAY,uBAAuB;CAC/C,eAAe;CACf,UAAU;EAAC;EAAa;EAAS;EAAkB;EAAU;EAAY;EAAsB;EAAe;EAAe;EAAQ;EAAuB;EAAe;EAAQ;CAAoB;CACvM,SAAS;EACP,QAAQ;EACR,MAAM,KAAoB,MAAmC;GAC3D,IAAI,QAAmB;IAAE,OAAO;KAAE,IAAI;KAAG,IAAI;IAAE;IAAG,0BAAU,IAAI,IAAI;IAAG,wBAAQ,IAAI,IAAI;GAAE;GACzF,MAAM,QAAQ,UAAU,KAAK,YAAY,KAAK;GAC9C,IAAI,CAAC,OAAO,OAAO,CAAC;GACpB,MAAM,EAAE,SAAS,YAAY;GAC7B,MAAM,UAAU,CAAC,GAAI,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,CAAE;GACrD,MAAM,OAAO,QAAQ,MAAM,UAAU,KAAK;GAC1C,MAAM,UAAU,iBAAiB,IAAI,MAAM,QAAQ,aAAa,MAAM,QAAQ;GAG9E,IAAI,UAA2C;GAC/C,OAAO;IACL,MAAM;IACN,OAAO,SAA8B;KACnC,IAAI,CAAC,QAAQ,MAAM;KACnB,IAAI,CAAC,SAAS;MACZ,MAAM,IAAI,QAAQ,KAAK;MACvB,IAAI,KAAK,CAAC,kBAAkB;OAAE,SAAS;OAAG,SAAS;MAAE,GAAG;OAAE,SAAS,EAAE;OAAG,SAAS,EAAE;MAAE,GAAG,QAAQ,eAAe,GAAG;MAClH,QAAQ,UAAU,MAAM,QAAQ,GAA0B;KAC5D;KACA,UAAU,QAAQ;KAClB,QAAQ,UAAU,SAAS,SAAS,OAAO;KAC3C,KAAK,IAAI,QAAQ,MAAM,CAAC;IAC1B;IACA,MAAM,QAAuB,QAAmC;KAC9D,IAAI,YAAY;KAChB,IAAI;MAGF,IAAI,WAAW,YAAY,SAAS;OAClC,YAAY,WAAW;QACrB;QACA,OAAO,MAAM;QACb,IAAI,OAAO,OAAO,OAAO,QAAQ;OACnC,CAAC;OACD,IAAI,WAAW,gBAAgB,QAAQ,OAAO;QAAE,MAAM;QAAa,GAAG,MAAM;OAAM,GAAG,OAAO;MAC9F,OAAO,kBAAkB,QAAQ,WAAW,QAAQ,UAAU;KAChE,UAAU;MACR,QAAQ,MAAM,IAAI;MAGlB,aAAa;OAAE;OAAM,UAAU,MAAM;OAAU,WAAW,QAAQ;OAAW,KAAK,QAAQ;OAAY,WAAW,QAAQ;MAAU,GAAG,SAAS;KACjJ;IACF;IACA,YAAY,QAAQ;IACpB,aAAa,QAAQ;IACrB,wBAAyB,MAAM,OAAO,SAAS,IAAI,OAAO,MAAM;GAClE;EACF;CACF;;;;;;;CAOA,eAAe;AACjB,GAAG,cAAc"}
+{"version":3,"file":"action.js","names":[],"sources":["../../../../src/interactions/actions/move/action.ts"],"sourcesContent":["import type { Action } from '@weasel-js/routing';\nimport type { InvocationCtx, OngoingHandle, BindingOpts } from '@weasel-js/routing';\nimport { transformPreview } from '../transformFinish';\nimport { pastDragThreshold } from '@weasel-js/routing';\nimport { closeGesture, runBehaviorCancel } from '../gestureLifecycle';\nimport { inPlane, selectionLayer } from '../planeInput';\nimport { beginMove, type MoveFrame, type ReparentOnDrop } from './session';\nimport { nextFrame } from './frame';\nimport { commitMove } from './commit';\nimport { recordTransform } from '../transform-again/memory';\nimport { SNAP_ROLES } from 'features/snap/roles';\nexport type { ReparentOnDrop };\n\n/**\n * Drag-translates the selection.\n *\n * Each frame's poses go to the scene's ephemeral override table, not the\n * document: `Scene.setPose` records an undo entry per call, and the overrides\n * are what let a node deriving its geometry from a dragged one follow the\n * drag. Release commits one batch — at most one undo entry, none when the\n * binding's params make it transient — and cancel drops the overrides.\n *\n * Behaviors from the binding's `opts.behaviors` fold into each frame; on\n * release the first non-`undefined` answer wins (`Op[]` commits, `null`\n * aborts). `beginMove` appends the action's own two: a layout drop and\n * reparent-on-drop.\n */\nexport const moveAction: Action & { requires: string[] } = inPlane({\n  id: 'move',\n  label: 'Move',\n  // No hover `cursor`: pointing at a node shouldn't preemptively promise a move.\n  activeCursor: 'move',\n  // Ambient default targets `selected-body`, not a bare `{ kind: 'drag' }`,\n  // which catches every drag in ambient scope and bleeds the move into\n  // drawing-tool gestures wherever the higher-priority active match falls\n  // through.\n  defaultBinding: [{ spec: { kind: 'drag', target: 'selected-body' }, opts: { id: 'move.drag' } }],\n  eligible: { capability: 'transforms-selection' },\n  modifierRoles: SNAP_ROLES,\n  requires: ['selection', 'scene', 'poseDescriptor', 'layout', 'applyOps', 'geometryProjection', 'nodeAtPoint', 'canDropInto', 'view', 'boundsIncludeStroke', 'kitSettings', 'snap', 'transformFollowers'],\n  invoker: {\n    timing: 'ongoing',\n    start(ctx: InvocationCtx, opts?: BindingOpts): OngoingHandle {\n      let frame: MoveFrame = { delta: { dx: 0, dy: 0 }, previews: new Map(), opaque: new Set() };\n      const begun = beginMove(ctx, opts, () => frame);\n      if (!begun) return {};\n      const { session, readers } = begun;\n      const subject = [...(ctx.deps.selection?.get() ?? [])] as string[];\n      const hold = session.scene.overrides.hold();\n      const preview = transformPreview(ctx.deps, session.scene, () => frame.previews);\n      // Where the last move put the pointer, once the drag has passed its\n      // threshold; null until then.\n      let engaged: { x: number; y: number } | null = null;\n      return {\n        kind: 'move',\n        onMove(moveCtx: InvocationCtx): void {\n          if (!moveCtx.drag) return;\n          if (!engaged) {\n            const s = moveCtx.drag.screenDelta;\n            if (s && !pastDragThreshold({ clientX: 0, clientY: 0 }, { clientX: s.x, clientY: s.y }, session.dragThresholdPx)) return;\n            session.lifecycle.start(session.ids as unknown as string[]);\n          }\n          engaged = moveCtx.world;\n          frame = nextFrame(session, readers, moveCtx);\n          hold.set(preview.poses());\n        },\n        onEnd(endCtx: InvocationCtx, reason: 'commit' | 'cancel'): void {\n          let committed = false;\n          try {\n            // A press that never traveled `dragThresholdPx` was never a move:\n            // its behaviors started, so they are canceled, not asked to commit.\n            if (reason === 'commit' && engaged) {\n              committed = commitMove({\n                session,\n                delta: frame.delta,\n                at: endCtx.drag ? endCtx.world : engaged,\n              });\n              if (committed) recordTransform(session.scene, { kind: 'translate', ...frame.delta }, subject);\n            } else runBehaviorCancel(session.behaviors, session.gestureCtx);\n          } finally {\n            session.snap?.end();\n            // After the commit, so no frame can paint the pre-drag pose between\n            // the override going away and the document catching up.\n            closeGesture({ hold, previews: frame.previews, behaviors: session.behaviors, ctx: session.gestureCtx, lifecycle: session.lifecycle }, committed);\n          }\n        },\n        previewIds: preview.previewIds,\n        previewData: preview.previewData,\n        previewOpaqueIds: () => (frame.opaque.size === 0 ? null : frame.opaque),\n      };\n    },\n  },\n  /**\n   * Always enabled: the dispatcher treats anything `!== true` as \"fall\n   * through to the next-best match\", so a disabled reason here loses every\n   * drag-on-selected-body to a lower-specificity binding (a shape tool's\n   * insert drag).\n   */\n  enabled: () => true,\n}, selectionLayer);\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AA2BA,IAAa,aAA8C,QAAQ;CACjE,IAAI;CACJ,OAAO;CAEP,cAAc;CAKd,gBAAgB,CAAC;EAAE,MAAM;GAAE,MAAM;GAAQ,QAAQ;EAAgB;EAAG,MAAM,EAAE,IAAI,YAAY;CAAE,CAAC;CAC/F,UAAU,EAAE,YAAY,uBAAuB;CAC/C,eAAe;CACf,UAAU;EAAC;EAAa;EAAS;EAAkB;EAAU;EAAY;EAAsB;EAAe;EAAe;EAAQ;EAAuB;EAAe;EAAQ;CAAoB;CACvM,SAAS;EACP,QAAQ;EACR,MAAM,KAAoB,MAAmC;GAC3D,IAAI,QAAmB;IAAE,OAAO;KAAE,IAAI;KAAG,IAAI;IAAE;IAAG,0BAAU,IAAI,IAAI;IAAG,wBAAQ,IAAI,IAAI;GAAE;GACzF,MAAM,QAAQ,UAAU,KAAK,YAAY,KAAK;GAC9C,IAAI,CAAC,OAAO,OAAO,CAAC;GACpB,MAAM,EAAE,SAAS,YAAY;GAC7B,MAAM,UAAU,CAAC,GAAI,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,CAAE;GACrD,MAAM,OAAO,QAAQ,MAAM,UAAU,KAAK;GAC1C,MAAM,UAAU,iBAAiB,IAAI,MAAM,QAAQ,aAAa,MAAM,QAAQ;GAG9E,IAAI,UAA2C;GAC/C,OAAO;IACL,MAAM;IACN,OAAO,SAA8B;KACnC,IAAI,CAAC,QAAQ,MAAM;KACnB,IAAI,CAAC,SAAS;MACZ,MAAM,IAAI,QAAQ,KAAK;MACvB,IAAI,KAAK,CAAC,kBAAkB;OAAE,SAAS;OAAG,SAAS;MAAE,GAAG;OAAE,SAAS,EAAE;OAAG,SAAS,EAAE;MAAE,GAAG,QAAQ,eAAe,GAAG;MAClH,QAAQ,UAAU,MAAM,QAAQ,GAA0B;KAC5D;KACA,UAAU,QAAQ;KAClB,QAAQ,UAAU,SAAS,SAAS,OAAO;KAC3C,KAAK,IAAI,QAAQ,MAAM,CAAC;IAC1B;IACA,MAAM,QAAuB,QAAmC;KAC9D,IAAI,YAAY;KAChB,IAAI;MAGF,IAAI,WAAW,YAAY,SAAS;OAClC,YAAY,WAAW;QACrB;QACA,OAAO,MAAM;QACb,IAAI,OAAO,OAAO,OAAO,QAAQ;OACnC,CAAC;OACD,IAAI,WAAW,gBAAgB,QAAQ,OAAO;QAAE,MAAM;QAAa,GAAG,MAAM;OAAM,GAAG,OAAO;MAC9F,OAAO,kBAAkB,QAAQ,WAAW,QAAQ,UAAU;KAChE,UAAU;MACR,QAAQ,MAAM,IAAI;MAGlB,aAAa;OAAE;OAAM,UAAU,MAAM;OAAU,WAAW,QAAQ;OAAW,KAAK,QAAQ;OAAY,WAAW,QAAQ;MAAU,GAAG,SAAS;KACjJ;IACF;IACA,YAAY,QAAQ;IACpB,aAAa,QAAQ;IACrB,wBAAyB,MAAM,OAAO,SAAS,IAAI,OAAO,MAAM;GAClE;EACF;CACF;;;;;;;CAOA,eAAe;AACjB,GAAG,cAAc"}

package/dist/interactions/actions/move/commit/reparent.js

@@ -19,7 +19,7 @@ function resolveDropTarget(session, at) {
 	if (!hit) return null;
 	const hitNode = session.scene.get(hit);
 	if (!hitNode) return null;
-	if (hitNode.kind === "container" && session.admits(hit)) return {
+	if (session.admits(hit)) return {
 		newParent: hit,
 		newLayer: hitNode.layer,
 		hitSibling: null

package/dist/interactions/actions/move/commit/reparent.js.map

@@ -1 +1 @@
-{"version":3,"file":"reparent.js","names":[],"sources":["../../../../../src/interactions/actions/move/commit/reparent.ts"],"sourcesContent":["import { createReparentOp } from 'core/ops/reparent';\nimport { createSetLayerOp } from 'core/ops/setLayer';\nimport { createTransformOp } from 'core/ops/transform';\nimport type { Op } from 'core/ops/types';\nimport type { NodeId } from 'core/scene/types';\nimport { planeToPlane } from 'core/viewport/parallax';\nimport { rebaseLocalPose } from 'core/scene/composePose';\nimport { scenePoseAdapter } from 'core/scene/scenePoseAdapter';\nimport { carryPose, planeOf } from '../../planeInput';\nimport { draggedWorldPose, grabbedPoseAdapter } from '../delta';\nimport type { MoveSession, ReparentOnDrop } from '../session';\nimport { translateOps } from '../translate';\n\n/** Resolved drop target — the new parent + layer + (for `'above'` mode)\n *  the hit sibling whose z-order position the moved node should land\n *  immediately above. `newParent === null` means \"land at the layer\n *  root\" (top-level node of `newLayer`). */\nexport interface DropTarget {\n  newParent: NodeId | null;\n  newLayer: string;\n  hitSibling: NodeId | null;\n}\n\n/** Walk the hit chain to find the appropriate drop target. Returns\n *  `null` when no reparent should happen (drop on empty canvas, or the\n *  only hits are the moved subtree itself). */\nexport function resolveDropTarget(\n  session: MoveSession,\n  at: { x: number; y: number },\n): DropTarget | null {\n  const dep = session.nodeAtPoint;\n  if (!dep) return null;\n\n  // Exclude moved roots + their descendants. Otherwise we'd happily\n  // reparent a node into itself (or under one of its own children).\n  const exclude = new Set<NodeId>([...session.ids, ...session.cascadeIds]);\n  const hit = dep(at, exclude);\n  if (!hit) return null;\n\n  const hitNode = session.scene.get(hit);\n  if (!hitNode) return null;\n\n  // Containers act as drop-INTO targets; leaves act as drop-NEXT-TO\n  // targets (parent = leaf's parent). When the leaf has no parent\n  // (top-level under a layer), `newParent === null` and the moved\n  // subtree lands at the layer root.\n  if (hitNode.kind === 'container' && session.admits(hit)) {\n    return { newParent: hit, newLayer: hitNode.layer, hitSibling: null };\n  }\n  // A container `canDropInto` refuses is a sibling to land beside, inside\n  // the nearest container around it that admits the drop.\n  let newParent = hitNode.parent;\n  let hitSibling: NodeId = hit;\n  while (newParent !== null && !session.admits(newParent)) {\n    hitSibling = newParent;\n    newParent = session.scene.get(newParent)?.parent ?? null;\n  }\n  return { newParent, newLayer: hitNode.layer, hitSibling };\n}\n\n/** Reparent and reposition each moved root as ops, keeping the world pose the\n *  drag showed, then the ops that bring uncarried descendants along. */\nexport function reparentOps(\n  session: MoveSession,\n  target: DropTarget,\n  mode: ReparentOnDrop,\n  delta: { dx: number; dy: number },\n): Op[] {\n  const { scene, pc, view } = session;\n  const adapter = scenePoseAdapter(scene);\n  const label = session.lifecycle.label;\n  const ops: Op[] = [];\n  // The destination's children as each op will find them: an earlier root's\n  // landing shifts where a later one goes.\n  const siblings = [...(target.newParent === null ? scene.roots : scene.childrenOf(target.newParent))];\n  for (const id of session.ids) {\n    if (!session.startPoses.has(id)) continue;\n    const node = scene.get(id)!;\n    const crossing = node.layer !== target.newLayer;\n    const world = carryPose(\n      session.descriptorOf(id),\n      draggedWorldPose(session, grabbedPoseAdapter(session, adapter), id, delta),\n      crossing ? planeToPlane(planeOf(view, node.layer), planeOf(view, target.newLayer)) : null,\n    );\n    const to = rebaseLocalPose(adapter, world, target.newParent as string | null, pc.compose, pc.decompose);\n\n    let from = node.parent as string | null;\n    if (crossing) {\n      // The scene refuses a layer change on a node whose parent is on another layer.\n      if (from !== null) {\n        ops.push(createReparentOp({\n          id: id as string, fromParentId: from, toParentId: null, label, coalesceKey: `reparent:${id}:orphan`,\n        }));\n        from = null;\n      }\n      ops.push(createSetLayerOp({ id: id as string, from: node.layer, to: target.newLayer, label }));\n    }\n\n    const was = siblings.indexOf(id);\n    if (was >= 0) siblings.splice(was, 1);\n    const hit = mode === 'above' && target.hitSibling\n      ? siblings.indexOf(target.hitSibling)\n      : -1;\n    const toIndex = hit >= 0 ? hit + 1 : undefined;\n    if (toIndex === undefined) siblings.push(id);\n    else siblings.splice(toIndex, 0, id);\n\n    ops.push(createReparentOp({\n      id: id as string, fromParentId: from, toParentId: target.newParent as string | null, toIndex, label,\n    }));\n    ops.push(createTransformOp<unknown>({ id: id as string, from: node.pose, to, label }));\n  }\n  return [...ops, ...translateOps(session, session.cascadeIds, delta)];\n}\n"],"mappings":";;;;;;;;;;;;;;AA0BA,SAAgB,kBACd,SACA,IACmB;CACnB,MAAM,MAAM,QAAQ;CACpB,IAAI,CAAC,KAAK,OAAO;CAKjB,MAAM,MAAM,IAAI,oBAAI,IADA,IAAY,CAAC,GAAG,QAAQ,KAAK,GAAG,QAAQ,UAAU,CAClD,CAAO;CAC3B,IAAI,CAAC,KAAK,OAAO;CAEjB,MAAM,UAAU,QAAQ,MAAM,IAAI,GAAG;CACrC,IAAI,CAAC,SAAS,OAAO;CAMrB,IAAI,QAAQ,SAAS,eAAe,QAAQ,OAAO,GAAG,GACpD,OAAO;EAAE,WAAW;EAAK,UAAU,QAAQ;EAAO,YAAY;CAAK;CAIrE,IAAI,YAAY,QAAQ;CACxB,IAAI,aAAqB;CACzB,OAAO,cAAc,QAAQ,CAAC,QAAQ,OAAO,SAAS,GAAG;EACvD,aAAa;EACb,YAAY,QAAQ,MAAM,IAAI,SAAS,CAAC,EAAE,UAAU;CACtD;CACA,OAAO;EAAE;EAAW,UAAU,QAAQ;EAAO;CAAW;AAC1D;;;AAIA,SAAgB,YACd,SACA,QACA,MACA,OACM;CACN,MAAM,EAAE,OAAO,IAAI,SAAS;CAC5B,MAAM,UAAU,iBAAiB,KAAK;CACtC,MAAM,QAAQ,QAAQ,UAAU;CAChC,MAAM,MAAY,CAAC;CAGnB,MAAM,WAAW,CAAC,GAAI,OAAO,cAAc,OAAO,MAAM,QAAQ,MAAM,WAAW,OAAO,SAAS,CAAE;CACnG,KAAK,MAAM,MAAM,QAAQ,KAAK;EAC5B,IAAI,CAAC,QAAQ,WAAW,IAAI,EAAE,GAAG;EACjC,MAAM,OAAO,MAAM,IAAI,EAAE;EACzB,MAAM,WAAW,KAAK,UAAU,OAAO;EACvC,MAAM,QAAQ,UACZ,QAAQ,aAAa,EAAE,GACvB,iBAAiB,SAAS,mBAAmB,SAAS,OAAO,GAAG,IAAI,KAAK,GACzE,WAAW,aAAa,QAAQ,MAAM,KAAK,KAAK,GAAG,QAAQ,MAAM,OAAO,QAAQ,CAAC,IAAI,IACvF;EACA,MAAM,KAAK,gBAAgB,SAAS,OAAO,OAAO,WAA4B,GAAG,SAAS,GAAG,SAAS;EAEtG,IAAI,OAAO,KAAK;EAChB,IAAI,UAAU;GAEZ,IAAI,SAAS,MAAM;IACjB,IAAI,KAAK,iBAAiB;KACpB;KAAc,cAAc;KAAM,YAAY;KAAM;KAAO,aAAa,YAAY,GAAG;IAC7F,CAAC,CAAC;IACF,OAAO;GACT;GACA,IAAI,KAAK,iBAAiB;IAAM;IAAc,MAAM,KAAK;IAAO,IAAI,OAAO;IAAU;GAAM,CAAC,CAAC;EAC/F;EAEA,MAAM,MAAM,SAAS,QAAQ,EAAE;EAC/B,IAAI,OAAO,GAAG,SAAS,OAAO,KAAK,CAAC;EACpC,MAAM,MAAM,SAAS,WAAW,OAAO,aACnC,SAAS,QAAQ,OAAO,UAAU,IAClC;EACJ,MAAM,UAAU,OAAO,IAAI,MAAM,IAAI;EACrC,IAAI,YAAY,QAAW,SAAS,KAAK,EAAE;OACtC,SAAS,OAAO,SAAS,GAAG,EAAE;EAEnC,IAAI,KAAK,iBAAiB;GACpB;GAAc,cAAc;GAAM,YAAY,OAAO;GAA4B;GAAS;EAChG,CAAC,CAAC;EACF,IAAI,KAAK,kBAA2B;GAAM;GAAc,MAAM,KAAK;GAAM;GAAI;EAAM,CAAC,CAAC;CACvF;CACA,OAAO,CAAC,GAAG,KAAK,GAAG,aAAa,SAAS,QAAQ,YAAY,KAAK,CAAC;AACrE"}
+{"version":3,"file":"reparent.js","names":[],"sources":["../../../../../src/interactions/actions/move/commit/reparent.ts"],"sourcesContent":["import { createReparentOp } from 'core/ops/reparent';\nimport { createSetLayerOp } from 'core/ops/setLayer';\nimport { createTransformOp } from 'core/ops/transform';\nimport type { Op } from 'core/ops/types';\nimport type { NodeId } from 'core/scene/types';\nimport { planeToPlane } from 'core/viewport/parallax';\nimport { rebaseLocalPose } from 'core/scene/composePose';\nimport { scenePoseAdapter } from 'core/scene/scenePoseAdapter';\nimport { carryPose, planeOf } from '../../planeInput';\nimport { draggedWorldPose, grabbedPoseAdapter } from '../delta';\nimport type { MoveSession, ReparentOnDrop } from '../session';\nimport { translateOps } from '../translate';\n\n/** Resolved drop target — the new parent + layer + (for `'above'` mode)\n *  the hit sibling whose z-order position the moved node should land\n *  immediately above. `newParent === null` means \"land at the layer\n *  root\" (top-level node of `newLayer`). */\nexport interface DropTarget {\n  newParent: NodeId | null;\n  newLayer: string;\n  hitSibling: NodeId | null;\n}\n\n/** Walk the hit chain to find the appropriate drop target. Returns\n *  `null` when no reparent should happen (drop on empty canvas, or the\n *  only hits are the moved subtree itself). */\nexport function resolveDropTarget(\n  session: MoveSession,\n  at: { x: number; y: number },\n): DropTarget | null {\n  const dep = session.nodeAtPoint;\n  if (!dep) return null;\n\n  // Exclude moved roots + their descendants. Otherwise we'd happily\n  // reparent a node into itself (or under one of its own children).\n  const exclude = new Set<NodeId>([...session.ids, ...session.cascadeIds]);\n  const hit = dep(at, exclude);\n  if (!hit) return null;\n\n  const hitNode = session.scene.get(hit);\n  if (!hitNode) return null;\n\n  // A node that admits the drop is a drop-INTO target; any other is a\n  // drop-NEXT-TO target (parent = its parent). When it has no parent\n  // (top-level under a layer), `newParent === null` and the moved\n  // subtree lands at the layer root.\n  if (session.admits(hit)) {\n    return { newParent: hit, newLayer: hitNode.layer, hitSibling: null };\n  }\n  // A node that refuses the drop is a sibling to land beside, inside\n  // the nearest ancestor that admits it.\n  let newParent = hitNode.parent;\n  let hitSibling: NodeId = hit;\n  while (newParent !== null && !session.admits(newParent)) {\n    hitSibling = newParent;\n    newParent = session.scene.get(newParent)?.parent ?? null;\n  }\n  return { newParent, newLayer: hitNode.layer, hitSibling };\n}\n\n/** Reparent and reposition each moved root as ops, keeping the world pose the\n *  drag showed, then the ops that bring uncarried descendants along. */\nexport function reparentOps(\n  session: MoveSession,\n  target: DropTarget,\n  mode: ReparentOnDrop,\n  delta: { dx: number; dy: number },\n): Op[] {\n  const { scene, pc, view } = session;\n  const adapter = scenePoseAdapter(scene);\n  const label = session.lifecycle.label;\n  const ops: Op[] = [];\n  // The destination's children as each op will find them: an earlier root's\n  // landing shifts where a later one goes.\n  const siblings = [...(target.newParent === null ? scene.roots : scene.childrenOf(target.newParent))];\n  for (const id of session.ids) {\n    if (!session.startPoses.has(id)) continue;\n    const node = scene.get(id)!;\n    const crossing = node.layer !== target.newLayer;\n    const world = carryPose(\n      session.descriptorOf(id),\n      draggedWorldPose(session, grabbedPoseAdapter(session, adapter), id, delta),\n      crossing ? planeToPlane(planeOf(view, node.layer), planeOf(view, target.newLayer)) : null,\n    );\n    const to = rebaseLocalPose(adapter, world, target.newParent as string | null, pc.compose, pc.decompose);\n\n    let from = node.parent as string | null;\n    if (crossing) {\n      // The scene refuses a layer change on a node whose parent is on another layer.\n      if (from !== null) {\n        ops.push(createReparentOp({\n          id: id as string, fromParentId: from, toParentId: null, label, coalesceKey: `reparent:${id}:orphan`,\n        }));\n        from = null;\n      }\n      ops.push(createSetLayerOp({ id: id as string, from: node.layer, to: target.newLayer, label }));\n    }\n\n    const was = siblings.indexOf(id);\n    if (was >= 0) siblings.splice(was, 1);\n    const hit = mode === 'above' && target.hitSibling\n      ? siblings.indexOf(target.hitSibling)\n      : -1;\n    const toIndex = hit >= 0 ? hit + 1 : undefined;\n    if (toIndex === undefined) siblings.push(id);\n    else siblings.splice(toIndex, 0, id);\n\n    ops.push(createReparentOp({\n      id: id as string, fromParentId: from, toParentId: target.newParent as string | null, toIndex, label,\n    }));\n    ops.push(createTransformOp<unknown>({ id: id as string, from: node.pose, to, label }));\n  }\n  return [...ops, ...translateOps(session, session.cascadeIds, delta)];\n}\n"],"mappings":";;;;;;;;;;;;;;AA0BA,SAAgB,kBACd,SACA,IACmB;CACnB,MAAM,MAAM,QAAQ;CACpB,IAAI,CAAC,KAAK,OAAO;CAKjB,MAAM,MAAM,IAAI,oBAAI,IADA,IAAY,CAAC,GAAG,QAAQ,KAAK,GAAG,QAAQ,UAAU,CAClD,CAAO;CAC3B,IAAI,CAAC,KAAK,OAAO;CAEjB,MAAM,UAAU,QAAQ,MAAM,IAAI,GAAG;CACrC,IAAI,CAAC,SAAS,OAAO;CAMrB,IAAI,QAAQ,OAAO,GAAG,GACpB,OAAO;EAAE,WAAW;EAAK,UAAU,QAAQ;EAAO,YAAY;CAAK;CAIrE,IAAI,YAAY,QAAQ;CACxB,IAAI,aAAqB;CACzB,OAAO,cAAc,QAAQ,CAAC,QAAQ,OAAO,SAAS,GAAG;EACvD,aAAa;EACb,YAAY,QAAQ,MAAM,IAAI,SAAS,CAAC,EAAE,UAAU;CACtD;CACA,OAAO;EAAE;EAAW,UAAU,QAAQ;EAAO;CAAW;AAC1D;;;AAIA,SAAgB,YACd,SACA,QACA,MACA,OACM;CACN,MAAM,EAAE,OAAO,IAAI,SAAS;CAC5B,MAAM,UAAU,iBAAiB,KAAK;CACtC,MAAM,QAAQ,QAAQ,UAAU;CAChC,MAAM,MAAY,CAAC;CAGnB,MAAM,WAAW,CAAC,GAAI,OAAO,cAAc,OAAO,MAAM,QAAQ,MAAM,WAAW,OAAO,SAAS,CAAE;CACnG,KAAK,MAAM,MAAM,QAAQ,KAAK;EAC5B,IAAI,CAAC,QAAQ,WAAW,IAAI,EAAE,GAAG;EACjC,MAAM,OAAO,MAAM,IAAI,EAAE;EACzB,MAAM,WAAW,KAAK,UAAU,OAAO;EACvC,MAAM,QAAQ,UACZ,QAAQ,aAAa,EAAE,GACvB,iBAAiB,SAAS,mBAAmB,SAAS,OAAO,GAAG,IAAI,KAAK,GACzE,WAAW,aAAa,QAAQ,MAAM,KAAK,KAAK,GAAG,QAAQ,MAAM,OAAO,QAAQ,CAAC,IAAI,IACvF;EACA,MAAM,KAAK,gBAAgB,SAAS,OAAO,OAAO,WAA4B,GAAG,SAAS,GAAG,SAAS;EAEtG,IAAI,OAAO,KAAK;EAChB,IAAI,UAAU;GAEZ,IAAI,SAAS,MAAM;IACjB,IAAI,KAAK,iBAAiB;KACpB;KAAc,cAAc;KAAM,YAAY;KAAM;KAAO,aAAa,YAAY,GAAG;IAC7F,CAAC,CAAC;IACF,OAAO;GACT;GACA,IAAI,KAAK,iBAAiB;IAAM;IAAc,MAAM,KAAK;IAAO,IAAI,OAAO;IAAU;GAAM,CAAC,CAAC;EAC/F;EAEA,MAAM,MAAM,SAAS,QAAQ,EAAE;EAC/B,IAAI,OAAO,GAAG,SAAS,OAAO,KAAK,CAAC;EACpC,MAAM,MAAM,SAAS,WAAW,OAAO,aACnC,SAAS,QAAQ,OAAO,UAAU,IAClC;EACJ,MAAM,UAAU,OAAO,IAAI,MAAM,IAAI;EACrC,IAAI,YAAY,QAAW,SAAS,KAAK,EAAE;OACtC,SAAS,OAAO,SAAS,GAAG,EAAE;EAEnC,IAAI,KAAK,iBAAiB;GACpB;GAAc,cAAc;GAAM,YAAY,OAAO;GAA4B;GAAS;EAChG,CAAC,CAAC;EACF,IAAI,KAAK,kBAA2B;GAAM;GAAc,MAAM,KAAK;GAAM;GAAI;EAAM,CAAC,CAAC;CACvF;CACA,OAAO,CAAC,GAAG,KAAK,GAAG,aAAa,SAAS,QAAQ,YAAY,KAAK,CAAC;AACrE"}

package/dist/interactions/actions/move/gestureAdapter.js

@@ -16,16 +16,15 @@ function moveGestureAdapter(scene, commit, selection) {
 			for (const [id, pose] of poses) {
 				const nodeId = asNodeId(id);
 				const mine = previews.get(id);
-				const installed = mine !== void 0 && overrides.get(nodeId) === mine;
 				if (pose === null) {
 					previews.delete(id);
-					if (installed) overrides.clear(nodeId);
-				} else if (installed) mine.pose = pose;
-				else {
-					const entry = { pose };
-					previews.set(id, entry);
-					overrides.set(nodeId, entry);
+					if (mine !== void 0) overrides.clear(nodeId, mine);
+					continue;
 				}
+				const entry = mine ?? { pose };
+				entry.pose = pose;
+				previews.set(id, entry);
+				if (!overrides.has(nodeId, entry)) overrides.set(nodeId, entry);
 			}
 			overrides.commit();
 		},

package/dist/interactions/actions/move/gestureAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"gestureAdapter.js","names":[],"sources":["../../../../src/interactions/actions/move/gestureAdapter.ts"],"sourcesContent":["/**\n * The scene-backed adapter the move behavior pipeline reads and commits\n * through: the default actions' commit adapter, plus what a behavior needs\n * while the gesture runs and after it ends (`previewPoses`, `poseTarget`, and\n * an `applyOps` of its own).\n */\nimport type { Op } from 'core/ops/types';\nimport type { Node, PoseOverride, Scene } from 'core/scene/types';\nimport { asNodeId } from 'core/scene/types';\nimport type { MoveAdapter } from 'core/adapters/types';\nimport type { SelectionApi } from 'core/selection/useSelection';\nimport { scenePoseTarget } from '../../../animation/poseTarget';\nimport { defaultCommitAdapter } from '../defaultCommitAdapter';\n\nexport type MoveGestureAdapter<TPose> = MoveAdapter<Node<unknown, string, TPose>, TPose>\n  & ReturnType<typeof defaultCommitAdapter<TPose>>\n  & { previewPoses(poses: ReadonlyMap<string, TPose | null>): void };\n\n/** `commit` is how a behavior's own `applyOps` batch lands; the returned\n *  adapter is passed back so the ops apply through it. Left out, the adapter\n *  has no `applyOps`. `selection` is as `defaultCommitAdapter` takes it. */\nexport function moveGestureAdapter<TPose>(\n  scene: Scene<unknown, string, TPose>,\n  commit?: (ops: Op[], label: string, adapter: MoveGestureAdapter<TPose>) => void,\n  selection?: SelectionApi['adapterMethods'],\n): MoveGestureAdapter<TPose> {\n  const previews = new Map<string, PoseOverride<TPose>>();\n  const adapter: MoveGestureAdapter<TPose> = {\n    ...defaultCommitAdapter(scene, selection),\n    ...(commit ? { applyOps: (ops: Op[], label: string) => commit(ops, label, adapter) } : {}),\n    previewPoses: (poses) => {\n      const { overrides } = scene;\n      for (const [id, pose] of poses) {\n        const nodeId = asNodeId(id);\n        const mine = previews.get(id);\n        const installed = mine !== undefined && overrides.get(nodeId) === mine;\n        if (pose === null) {\n          previews.delete(id);\n          if (installed) overrides.clear(nodeId);\n        } else if (installed) {\n          mine.pose = pose;\n        } else {\n          const entry = { pose };\n          previews.set(id, entry);\n          overrides.set(nodeId, entry);\n        }\n      }\n      overrides.commit();\n    },\n    poseTarget: (id, descriptor) => scenePoseTarget(scene, id, descriptor),\n  };\n  return adapter;\n}\n"],"mappings":";;;;;;;;AAqBA,SAAgB,mBACd,OACA,QACA,WAC2B;CAC3B,MAAM,2BAAW,IAAI,IAAiC;CACtD,MAAM,UAAqC;EACzC,GAAG,qBAAqB,OAAO,SAAS;EACxC,GAAI,SAAS,EAAE,WAAW,KAAW,UAAkB,OAAO,KAAK,OAAO,OAAO,EAAE,IAAI,CAAC;EACxF,eAAe,UAAU;GACvB,MAAM,EAAE,cAAc;GACtB,KAAK,MAAM,CAAC,IAAI,SAAS,OAAO;IAC9B,MAAM,SAAS,SAAS,EAAE;IAC1B,MAAM,OAAO,SAAS,IAAI,EAAE;IAC5B,MAAM,YAAY,SAAS,UAAa,UAAU,IAAI,MAAM,MAAM;IAClE,IAAI,SAAS,MAAM;KACjB,SAAS,OAAO,EAAE;KAClB,IAAI,WAAW,UAAU,MAAM,MAAM;IACvC,OAAO,IAAI,WACT,KAAK,OAAO;SACP;KACL,MAAM,QAAQ,EAAE,KAAK;KACrB,SAAS,IAAI,IAAI,KAAK;KACtB,UAAU,IAAI,QAAQ,KAAK;IAC7B;GACF;GACA,UAAU,OAAO;EACnB;EACA,aAAa,IAAI,eAAe,gBAAgB,OAAO,IAAI,UAAU;CACvE;CACA,OAAO;AACT"}
+{"version":3,"file":"gestureAdapter.js","names":[],"sources":["../../../../src/interactions/actions/move/gestureAdapter.ts"],"sourcesContent":["/**\n * The scene-backed adapter the move behavior pipeline reads and commits\n * through: the default actions' commit adapter, plus what a behavior needs\n * while the gesture runs and after it ends (`previewPoses`, `poseTarget`, and\n * an `applyOps` of its own).\n */\nimport type { Op } from 'core/ops/types';\nimport type { Node, PoseOverride, Scene } from 'core/scene/types';\nimport { asNodeId } from 'core/scene/types';\nimport type { MoveAdapter } from 'core/adapters/types';\nimport type { SelectionApi } from 'core/selection/useSelection';\nimport { scenePoseTarget } from '../../../animation/poseTarget';\nimport { defaultCommitAdapter } from '../defaultCommitAdapter';\n\nexport type MoveGestureAdapter<TPose> = MoveAdapter<Node<unknown, string, TPose>, TPose>\n  & ReturnType<typeof defaultCommitAdapter<TPose>>\n  & { previewPoses(poses: ReadonlyMap<string, TPose | null>): void };\n\n/** `commit` is how a behavior's own `applyOps` batch lands; the returned\n *  adapter is passed back so the ops apply through it. Left out, the adapter\n *  has no `applyOps`. `selection` is as `defaultCommitAdapter` takes it. */\nexport function moveGestureAdapter<TPose>(\n  scene: Scene<unknown, string, TPose>,\n  commit?: (ops: Op[], label: string, adapter: MoveGestureAdapter<TPose>) => void,\n  selection?: SelectionApi['adapterMethods'],\n): MoveGestureAdapter<TPose> {\n  const previews = new Map<string, PoseOverride<TPose>>();\n  const adapter: MoveGestureAdapter<TPose> = {\n    ...defaultCommitAdapter(scene, selection),\n    ...(commit ? { applyOps: (ops: Op[], label: string) => commit(ops, label, adapter) } : {}),\n    previewPoses: (poses) => {\n      const { overrides } = scene;\n      for (const [id, pose] of poses) {\n        const nodeId = asNodeId(id);\n        const mine = previews.get(id);\n        if (pose === null) {\n          previews.delete(id);\n          if (mine !== undefined) overrides.clear(nodeId, mine);\n          continue;\n        }\n        const entry = mine ?? { pose };\n        entry.pose = pose;\n        previews.set(id, entry);\n        // Back where it stood if the table dropped it: the node went and came back.\n        if (!overrides.has(nodeId, entry)) overrides.set(nodeId, entry);\n      }\n      overrides.commit();\n    },\n    poseTarget: (id, descriptor) => scenePoseTarget(scene, id, descriptor),\n  };\n  return adapter;\n}\n"],"mappings":";;;;;;;;AAqBA,SAAgB,mBACd,OACA,QACA,WAC2B;CAC3B,MAAM,2BAAW,IAAI,IAAiC;CACtD,MAAM,UAAqC;EACzC,GAAG,qBAAqB,OAAO,SAAS;EACxC,GAAI,SAAS,EAAE,WAAW,KAAW,UAAkB,OAAO,KAAK,OAAO,OAAO,EAAE,IAAI,CAAC;EACxF,eAAe,UAAU;GACvB,MAAM,EAAE,cAAc;GACtB,KAAK,MAAM,CAAC,IAAI,SAAS,OAAO;IAC9B,MAAM,SAAS,SAAS,EAAE;IAC1B,MAAM,OAAO,SAAS,IAAI,EAAE;IAC5B,IAAI,SAAS,MAAM;KACjB,SAAS,OAAO,EAAE;KAClB,IAAI,SAAS,QAAW,UAAU,MAAM,QAAQ,IAAI;KACpD;IACF;IACA,MAAM,QAAQ,QAAQ,EAAE,KAAK;IAC7B,MAAM,OAAO;IACb,SAAS,IAAI,IAAI,KAAK;IAEtB,IAAI,CAAC,UAAU,IAAI,QAAQ,KAAK,GAAG,UAAU,IAAI,QAAQ,KAAK;GAChE;GACA,UAAU,OAAO;EACnB;EACA,aAAa,IAAI,eAAe,gBAAgB,OAAO,IAAI,UAAU;CACvE;CACA,OAAO;AACT"}

package/dist/interactions/actions/move/layout/exits.js

@@ -38,7 +38,7 @@ function resolveLayoutExits(session, dropCenter, ids) {
 			for (const id of parentId === null ? scene.roots : scene.childrenOf(parentId)) {
 				if (excluded.has(id)) continue;
 				const node = scene.get(id);
-				if (!node || node.kind !== "container") continue;
+				if (!node) continue;
 				if (node.layer === layer && depth >= bestDepth && layoutDep.getLayout(id) === null && holds(id, null) && session.admits(id)) {
 					best = id;
 					bestDepth = depth;

package/dist/interactions/actions/move/layout/exits.js.map

@@ -1 +1 @@
-{"version":3,"file":"exits.js","names":[],"sources":["../../../../../src/interactions/actions/move/layout/exits.ts"],"sourcesContent":["import type { NodeId } from 'core/scene/types';\nimport { poseDescriptorForNode } from 'core/geometry/poseDescriptor';\nimport { toPlane } from 'core/viewport/parallax';\nimport { composeWorldPose } from 'core/scene/composePose';\nimport { scenePoseAdapter } from 'core/scene/scenePoseAdapter';\nimport type { LayoutStrategy } from '../../../../layout/types';\nimport { planeOf } from '../../planeInput';\nimport type { MoveSession } from '../session';\nimport { pointInBounds } from './container';\n\n/** Where each dragged root that leaves its layout container on release lands.\n *  A root leaves when the drop center falls outside the body of the layout\n *  container holding it, and lands under the innermost plain container beneath\n *  the drop that admits it (`canDropInto`) — a layout container there has\n *  already declined it — or at the top level of its layer. A root whose parent\n *  has no layout is not this pass's to move; `reparentOnDrop` decides for those. */\nexport function resolveLayoutExits(\n  session: MoveSession, dropCenter: { x: number; y: number } | null, ids: Iterable<NodeId>,\n): Map<NodeId, NodeId | null> {\n  const out = new Map<NodeId, NodeId | null>();\n  const layoutDep = session.layout;\n  const center = dropCenter;\n  if (!layoutDep || !center) return out;\n  const { scene, pc, projection: d } = session;\n  const poseAdapter = scenePoseAdapter(scene);\n  const excluded = new Set<NodeId>([...session.ids, ...session.cascadeIds]);\n  const holds = (id: NodeId, layout: LayoutStrategy<unknown> | null): boolean => {\n    const node = scene.get(id)!;\n    const plane = planeOf(session.view, node.layer);\n    const at = plane ? toPlane(plane, center) : center;\n    const pose = composeWorldPose(poseAdapter, id as string, pc.compose);\n    if (layout?.contains) return layout.contains(pose, at);\n    const b = poseDescriptorForNode(d, node).getBounds(pose);\n    return pointInBounds(b, at);\n  };\n  const landings = new Map<string, NodeId | null>();\n  const landingOn = (layer: string): NodeId | null => {\n    if (landings.has(layer)) return landings.get(layer)!;\n    // Deepest wins; among equals, the later sibling (painted over the other).\n    let best: NodeId | null = null;\n    let bestDepth = -1;\n    const walk = (parentId: NodeId | null, depth: number): void => {\n      for (const id of parentId === null ? scene.roots : scene.childrenOf(parentId)) {\n        if (excluded.has(id)) continue;\n        const node = scene.get(id);\n        if (!node || node.kind !== 'container') continue;\n        if (node.layer === layer && depth >= bestDepth\n          && layoutDep.getLayout(id as string) === null && holds(id, null) && session.admits(id)) {\n          best = id;\n          bestDepth = depth;\n        }\n        walk(id, depth + 1);\n      }\n    };\n    walk(null, 0);\n    landings.set(layer, best);\n    return best;\n  };\n  for (const id of ids) {\n    const node = scene.get(id);\n    const parent = node?.parent ?? null;\n    if (!node || parent === null) continue;\n    const layout = layoutDep.getLayout(parent as string);\n    if (!layout || holds(parent, layout)) continue;\n    out.set(id, landingOn(node.layer));\n  }\n  return out;\n}\n"],"mappings":";;;;;;;;;;;;;;AAgBA,SAAgB,mBACd,SAAsB,YAA6C,KACvC;CAC5B,MAAM,sBAAM,IAAI,IAA2B;CAC3C,MAAM,YAAY,QAAQ;CAC1B,MAAM,SAAS;CACf,IAAI,CAAC,aAAa,CAAC,QAAQ,OAAO;CAClC,MAAM,EAAE,OAAO,IAAI,YAAY,MAAM;CACrC,MAAM,cAAc,iBAAiB,KAAK;CAC1C,MAAM,2BAAW,IAAI,IAAY,CAAC,GAAG,QAAQ,KAAK,GAAG,QAAQ,UAAU,CAAC;CACxE,MAAM,SAAS,IAAY,WAAoD;EAC7E,MAAM,OAAO,MAAM,IAAI,EAAE;EACzB,MAAM,QAAQ,QAAQ,QAAQ,MAAM,KAAK,KAAK;EAC9C,MAAM,KAAK,QAAQ,QAAQ,OAAO,MAAM,IAAI;EAC5C,MAAM,OAAO,iBAAiB,aAAa,IAAc,GAAG,OAAO;EACnE,IAAI,QAAQ,UAAU,OAAO,OAAO,SAAS,MAAM,EAAE;EACrD,MAAM,IAAI,sBAAsB,GAAG,IAAI,CAAC,CAAC,UAAU,IAAI;EACvD,OAAO,cAAc,GAAG,EAAE;CAC5B;CACA,MAAM,2BAAW,IAAI,IAA2B;CAChD,MAAM,aAAa,UAAiC;EAClD,IAAI,SAAS,IAAI,KAAK,GAAG,OAAO,SAAS,IAAI,KAAK;EAElD,IAAI,OAAsB;EAC1B,IAAI,YAAY;EAChB,MAAM,QAAQ,UAAyB,UAAwB;GAC7D,KAAK,MAAM,MAAM,aAAa,OAAO,MAAM,QAAQ,MAAM,WAAW,QAAQ,GAAG;IAC7E,IAAI,SAAS,IAAI,EAAE,GAAG;IACtB,MAAM,OAAO,MAAM,IAAI,EAAE;IACzB,IAAI,CAAC,QAAQ,KAAK,SAAS,aAAa;IACxC,IAAI,KAAK,UAAU,SAAS,SAAS,aAChC,UAAU,UAAU,EAAY,MAAM,QAAQ,MAAM,IAAI,IAAI,KAAK,QAAQ,OAAO,EAAE,GAAG;KACxF,OAAO;KACP,YAAY;IACd;IACA,KAAK,IAAI,QAAQ,CAAC;GACpB;EACF;EACA,KAAK,MAAM,CAAC;EACZ,SAAS,IAAI,OAAO,IAAI;EACxB,OAAO;CACT;CACA,KAAK,MAAM,MAAM,KAAK;EACpB,MAAM,OAAO,MAAM,IAAI,EAAE;EACzB,MAAM,SAAS,MAAM,UAAU;EAC/B,IAAI,CAAC,QAAQ,WAAW,MAAM;EAC9B,MAAM,SAAS,UAAU,UAAU,MAAgB;EACnD,IAAI,CAAC,UAAU,MAAM,QAAQ,MAAM,GAAG;EACtC,IAAI,IAAI,IAAI,UAAU,KAAK,KAAK,CAAC;CACnC;CACA,OAAO;AACT"}
+{"version":3,"file":"exits.js","names":[],"sources":["../../../../../src/interactions/actions/move/layout/exits.ts"],"sourcesContent":["import type { NodeId } from 'core/scene/types';\nimport { poseDescriptorForNode } from 'core/geometry/poseDescriptor';\nimport { toPlane } from 'core/viewport/parallax';\nimport { composeWorldPose } from 'core/scene/composePose';\nimport { scenePoseAdapter } from 'core/scene/scenePoseAdapter';\nimport type { LayoutStrategy } from '../../../../layout/types';\nimport { planeOf } from '../../planeInput';\nimport type { MoveSession } from '../session';\nimport { pointInBounds } from './container';\n\n/** Where each dragged root that leaves its layout container on release lands.\n *  A root leaves when the drop center falls outside the body of the layout\n *  container holding it, and lands under the innermost plain container beneath\n *  the drop that admits it (`canDropInto`) — a layout container there has\n *  already declined it — or at the top level of its layer. A root whose parent\n *  has no layout is not this pass's to move; `reparentOnDrop` decides for those. */\nexport function resolveLayoutExits(\n  session: MoveSession, dropCenter: { x: number; y: number } | null, ids: Iterable<NodeId>,\n): Map<NodeId, NodeId | null> {\n  const out = new Map<NodeId, NodeId | null>();\n  const layoutDep = session.layout;\n  const center = dropCenter;\n  if (!layoutDep || !center) return out;\n  const { scene, pc, projection: d } = session;\n  const poseAdapter = scenePoseAdapter(scene);\n  const excluded = new Set<NodeId>([...session.ids, ...session.cascadeIds]);\n  const holds = (id: NodeId, layout: LayoutStrategy<unknown> | null): boolean => {\n    const node = scene.get(id)!;\n    const plane = planeOf(session.view, node.layer);\n    const at = plane ? toPlane(plane, center) : center;\n    const pose = composeWorldPose(poseAdapter, id as string, pc.compose);\n    if (layout?.contains) return layout.contains(pose, at);\n    const b = poseDescriptorForNode(d, node).getBounds(pose);\n    return pointInBounds(b, at);\n  };\n  const landings = new Map<string, NodeId | null>();\n  const landingOn = (layer: string): NodeId | null => {\n    if (landings.has(layer)) return landings.get(layer)!;\n    // Deepest wins; among equals, the later sibling (painted over the other).\n    let best: NodeId | null = null;\n    let bestDepth = -1;\n    const walk = (parentId: NodeId | null, depth: number): void => {\n      for (const id of parentId === null ? scene.roots : scene.childrenOf(parentId)) {\n        if (excluded.has(id)) continue;\n        const node = scene.get(id);\n        if (!node) continue;\n        if (node.layer === layer && depth >= bestDepth\n          && layoutDep.getLayout(id as string) === null && holds(id, null) && session.admits(id)) {\n          best = id;\n          bestDepth = depth;\n        }\n        walk(id, depth + 1);\n      }\n    };\n    walk(null, 0);\n    landings.set(layer, best);\n    return best;\n  };\n  for (const id of ids) {\n    const node = scene.get(id);\n    const parent = node?.parent ?? null;\n    if (!node || parent === null) continue;\n    const layout = layoutDep.getLayout(parent as string);\n    if (!layout || holds(parent, layout)) continue;\n    out.set(id, landingOn(node.layer));\n  }\n  return out;\n}\n"],"mappings":";;;;;;;;;;;;;;AAgBA,SAAgB,mBACd,SAAsB,YAA6C,KACvC;CAC5B,MAAM,sBAAM,IAAI,IAA2B;CAC3C,MAAM,YAAY,QAAQ;CAC1B,MAAM,SAAS;CACf,IAAI,CAAC,aAAa,CAAC,QAAQ,OAAO;CAClC,MAAM,EAAE,OAAO,IAAI,YAAY,MAAM;CACrC,MAAM,cAAc,iBAAiB,KAAK;CAC1C,MAAM,2BAAW,IAAI,IAAY,CAAC,GAAG,QAAQ,KAAK,GAAG,QAAQ,UAAU,CAAC;CACxE,MAAM,SAAS,IAAY,WAAoD;EAC7E,MAAM,OAAO,MAAM,IAAI,EAAE;EACzB,MAAM,QAAQ,QAAQ,QAAQ,MAAM,KAAK,KAAK;EAC9C,MAAM,KAAK,QAAQ,QAAQ,OAAO,MAAM,IAAI;EAC5C,MAAM,OAAO,iBAAiB,aAAa,IAAc,GAAG,OAAO;EACnE,IAAI,QAAQ,UAAU,OAAO,OAAO,SAAS,MAAM,EAAE;EACrD,MAAM,IAAI,sBAAsB,GAAG,IAAI,CAAC,CAAC,UAAU,IAAI;EACvD,OAAO,cAAc,GAAG,EAAE;CAC5B;CACA,MAAM,2BAAW,IAAI,IAA2B;CAChD,MAAM,aAAa,UAAiC;EAClD,IAAI,SAAS,IAAI,KAAK,GAAG,OAAO,SAAS,IAAI,KAAK;EAElD,IAAI,OAAsB;EAC1B,IAAI,YAAY;EAChB,MAAM,QAAQ,UAAyB,UAAwB;GAC7D,KAAK,MAAM,MAAM,aAAa,OAAO,MAAM,QAAQ,MAAM,WAAW,QAAQ,GAAG;IAC7E,IAAI,SAAS,IAAI,EAAE,GAAG;IACtB,MAAM,OAAO,MAAM,IAAI,EAAE;IACzB,IAAI,CAAC,MAAM;IACX,IAAI,KAAK,UAAU,SAAS,SAAS,aAChC,UAAU,UAAU,EAAY,MAAM,QAAQ,MAAM,IAAI,IAAI,KAAK,QAAQ,OAAO,EAAE,GAAG;KACxF,OAAO;KACP,YAAY;IACd;IACA,KAAK,IAAI,QAAQ,CAAC;GACpB;EACF;EACA,KAAK,MAAM,CAAC;EACZ,SAAS,IAAI,OAAO,IAAI;EACxB,OAAO;CACT;CACA,KAAK,MAAM,MAAM,KAAK;EACpB,MAAM,OAAO,MAAM,IAAI,EAAE;EACzB,MAAM,SAAS,MAAM,UAAU;EAC/B,IAAI,CAAC,QAAQ,WAAW,MAAM;EAC9B,MAAM,SAAS,UAAU,UAAU,MAAgB;EACnD,IAAI,CAAC,UAAU,MAAM,QAAQ,MAAM,GAAG;EACtC,IAAI,IAAI,IAAI,UAAU,KAAK,KAAK,CAAC;CACnC;CACA,OAAO;AACT"}

package/dist/interactions/actions/move/session.js

@@ -1,3 +1,4 @@
+import { admitsChild } from "../admitsChild.js";
 import { nodeDescriptors, poseDescriptorOf } from "../poseDescriptorDep.js";
 import { transformFinisher } from "../transformFinish.js";
 import { commitGestureOps, readGestureLifecycle } from "../gestureLifecycle.js";
@@ -11,10 +12,9 @@ import { lazySnapSession } from "../../../features/snap/lazySession.js";
 import { DRAG_THRESHOLD_PX, isPathEditPart, resolveParams } from "@weasel-js/routing";
 
 //#region src/interactions/actions/move/session.ts
-function admitsOf(canDropInto, ids) {
-	if (canDropInto === void 0) return () => true;
+function admitsOf(canDropInto, ids, scene) {
 	const roots = ids;
-	return (parent) => canDropInto(parent, roots);
+	return (parent) => admitsChild(scene, parent, roots, canDropInto);
 }
 /** Capture a drag at press. Null when there is nothing to move. Runs each
 *  behavior's `onStart`. `frame` reads the drag's latest frame, for the
@@ -81,7 +81,7 @@ function beginMove(ctx, opts, frame) {
 		geometryProjection,
 		lifecycle,
 		nodeAtPoint: ctx.deps.nodeAtPoint,
-		admits: admitsOf(ctx.deps.canDropInto, ids),
+		admits: admitsOf(ctx.deps.canDropInto, ids, scene),
 		reparentOnDrop: () => resolveParams(opts?.params)?.["reparentOnDrop"] ?? "off",
 		dragThresholdPx,
 		snap: lazySnapSession(ctx.deps.snap, {

package/dist/interactions/actions/move/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","names":[],"sources":["../../../../src/interactions/actions/move/session.ts"],"sourcesContent":["import type { BindingOpts, InvocationCtx } from '@weasel-js/routing';\nimport { DRAG_THRESHOLD_PX, isPathEditPart, resolveParams } from '@weasel-js/routing';\nimport type { Op } from 'core/ops/types';\nimport type { NodeId, Scene } from 'core/scene/types';\nimport type { PoseDescriptor } from 'core/geometry/poseDescriptor';\nimport type { PoseComposition } from 'core/scene/composePose';\nimport { gestureReaders, type GestureReaders } from '../../gestures/shared/screenTolerance';\nimport type { GestureContext, MoveBehavior } from '../../gestures/types';\nimport type { CanDropIntoDep, LayoutDep, NodeAtPointDep } from '../depSchema';\nimport type { GeometryProjection } from '../geometryProjection';\nimport { commitGestureOps, readGestureLifecycle, type GestureLifecycle } from '../gestureLifecycle';\nimport { transformFinisher, type TransformFinisher } from '../transformFinish';\nimport { nodeDescriptors, poseDescriptorOf } from '../poseDescriptorDep';\nimport { moveSources } from '../selectionSubtree';\nimport { layoutDrop } from './behaviors/layoutDrop';\nimport { reparentOnDrop } from './behaviors/reparentOnDrop';\nimport { buildGestureContext, captureFrames, capturePlaneRefs, captureStartPoses } from './capture';\nimport { moveGestureAdapter, type MoveGestureAdapter } from './gestureAdapter';\nimport type { SnapSession } from '../snapDep';\nimport { lazySnapSession } from 'features/snap/lazySession';\n\n/** Allowed values for the `reparentOnDrop` binding param. `'off'` (the\n *  default) preserves the legacy translate-only commit. `'top'` lands the\n *  moved node at the top of the container under the cursor. `'above'`\n *  lands it immediately above the hit sibling in z-order (falls back to\n *  `'top'` semantics when the hit is itself a container or when the hit\n *  and moved node share no parent). */\nexport type ReparentOnDrop = 'off' | 'top' | 'above';\n\n/** What a move captured at press. Nothing here changes during the drag. */\nexport interface MoveSession {\n  readonly scene: Scene<unknown, string, unknown>;\n  /** The drag roots. */\n  readonly ids: readonly NodeId[];\n  /** Descendants of the roots, previewed along with them. */\n  readonly cascadeIds: readonly NodeId[];\n  /** Start pose of every root and descendant. */\n  readonly startPoses: ReadonlyMap<NodeId, unknown>;\n  /** Ids whose frame is itself moving, so they ride it and are not translated. */\n  readonly carried: ReadonlySet<NodeId>;\n  /** For each moved id stored under a frame: its world pose and the frame's, at press. */\n  readonly frames: ReadonlyMap<NodeId, { world: unknown; frameWorld: unknown }>;\n  /** Ids grabbed mid-glide, with how far the pose shown stood from the document's. */\n  readonly caught: ReadonlyMap<NodeId, { dx: number; dy: number }>;\n  /** Per layer on another plane than the edited one: a point of its first root, in both. */\n  readonly planeRefs: ReadonlyMap<string, { own: { x: number; y: number }; edited: { x: number; y: number } }>;\n  readonly view: unknown;\n  readonly projection: PoseDescriptor<unknown>;\n  readonly descriptorOf: (id: NodeId | string) => PoseDescriptor<unknown>;\n  readonly pc: PoseComposition<unknown>;\n  /** The binding's behaviors, then the ones the action adds: a layout drop\n   *  when the `layout` dep is present, and reparent-on-drop. */\n  readonly behaviors: readonly MoveBehavior<unknown>[];\n  /** Reused across the drag; behaviors mutate its `scratch`. */\n  readonly gestureCtx: GestureContext<unknown>;\n  readonly adapter: MoveGestureAdapter<unknown>;\n  readonly layout: LayoutDep | undefined;\n  readonly applyOps?: (ops: Op[], label: string) => void;\n  /** Finishes the committed batch with the other nodes that change with it. */\n  readonly finish?: TransformFinisher;\n  readonly geometryProjection?: GeometryProjection;\n  readonly lifecycle: GestureLifecycle;\n  readonly nodeAtPoint: NodeAtPointDep | undefined;\n  /** Whether a container admits the dragged roots; every one does when absent. */\n  readonly admits: (parent: NodeId) => boolean;\n  /** Read at release: a binding's params may be a thunk. */\n  readonly reparentOnDrop: () => ReparentOnDrop;\n  readonly dragThresholdPx: number;\n  /** The drag's snapping, begun once the drag passes its threshold; null\n   *  with no `snap` dep. */\n  readonly snap: SnapSession | null;\n  /** The press, in the coordinates the drag's delta is measured in. */\n  readonly press: { x: number; y: number };\n}\n\n/** What one `onMove` produced. Replaced, not mutated, by the next. */\nexport interface MoveFrame {\n  readonly delta: { dx: number; dy: number };\n  /** Stored-frame pose of every displaced id, roots and descendants, and of\n   *  any other id a behavior posed. */\n  readonly previews: Map<NodeId, unknown>;\n  /** Ids the behaviors asked to have painted at full opacity. */\n  readonly opaque: ReadonlySet<NodeId>;\n}\n\n/** What the behaviors the action builds itself read of the drag they belong\n *  to. Neither is readable from `onStart`, which runs before the session\n *  exists. */\nexport interface MoveGesture {\n  session(): MoveSession;\n  /** The latest frame: the previous one while an `onMove` is running. */\n  frame(): MoveFrame;\n}\n\nfunction admitsOf(\n  canDropInto: CanDropIntoDep | undefined,\n  ids: readonly NodeId[],\n): (parent: NodeId) => boolean {\n  if (canDropInto === undefined) return () => true;\n  const roots = ids as readonly string[];\n  return (parent) => canDropInto(parent as string, roots);\n}\n\n/** Capture a drag at press. Null when there is nothing to move. Runs each\n *  behavior's `onStart`. `frame` reads the drag's latest frame, for the\n *  behaviors appended to the binding's own. */\nexport function beginMove(\n  ctx: InvocationCtx,\n  opts: BindingOpts | undefined,\n  frame: () => MoveFrame,\n): { session: MoveSession; readers: GestureReaders } | null {\n  const selection = ctx.deps.selection;\n  const scene = ctx.deps.scene;\n  const projection = poseDescriptorOf(ctx.deps.poseDescriptor);\n  const layout = ctx.deps.layout;\n  const applyOps = ctx.deps.applyOps;\n  const geometryProjection = ctx.deps.geometryProjection;\n  const finish = transformFinisher(ctx.deps);\n\n  if (!selection || !scene) return null;\n  const pc = scene.composition;\n  // Anchors, segments, and balance grips sit on the selected body, and this binding ties the\n  // path-edit drags' on specificity; with no mode registry to filter move out, declining is what\n  // lets them through.\n  if (isPathEditPart(ctx.drag?.affordance)) return null;\n\n  const params = resolveParams(opts?.params);\n  const expandIds = params?.['expandIds'] as ((ids: string[]) => string[]) | undefined;\n  const selected = [...selection.get()] as string[];\n  const ids = moveSources(scene, expandIds ? expandIds(selected) : selected) as NodeId[];\n  if (ids.length === 0) return null;\n\n  const reflow = layout?.reflow ?? null;\n  const { startPoses, cascadeIds, caught } = captureStartPoses(scene, ids, reflow, projection);\n  const { carried, frames } = captureFrames(scene, ids, startPoses);\n\n  // Everything a move does beyond translating is a behavior: the binding's\n  // own, then the layout drop, then reparent-on-drop. On release the first to\n  // answer owns the commit, so each preempts the ones after it.\n  const gesture: MoveGesture = { session: () => session, frame };\n  const behaviors: MoveBehavior<unknown>[] = [\n    ...((opts?.behaviors ?? []) as MoveBehavior<unknown>[]),\n    ...(layout ? [layoutDrop(gesture)] : []),\n    reparentOnDrop(gesture),\n  ];\n  const dragThresholdPx = (params?.['dragThresholdPx'] as number | undefined)\n    ?? ctx.deps.kitSettings?.get('gestures.dragPx') ?? DRAG_THRESHOLD_PX;\n  const lifecycle = readGestureLifecycle(params, 'Move', behaviors);\n  // A behavior that commits after the gesture has ended, a coast coming to\n  // rest, lands its batch the way the gesture's own commit does.\n  const adapter = moveGestureAdapter<unknown>(scene, (ops, _label, through) =>\n    commitGestureOps({ scene, applyOps, adapter: through, finish }, lifecycle, ops), selection.adapterMethods);\n  const readers = gestureReaders(ctx.deps);\n  const gestureCtx = buildGestureContext(ctx, scene, ids, startPoses, adapter, readers);\n  for (const b of behaviors) b.onStart?.(gestureCtx);\n\n  const press = ctx.drag?.start ?? ctx.world;\n  const session: MoveSession = {\n    startPoses,\n    ids,\n    cascadeIds,\n    carried,\n    frames,\n    scene,\n    view: ctx.deps.view,\n    planeRefs: capturePlaneRefs(scene, ids, ctx.deps.view, frames, startPoses, projection),\n    caught,\n    projection,\n    descriptorOf: nodeDescriptors(scene, projection),\n    behaviors,\n    gestureCtx,\n    adapter,\n    layout,\n    pc,\n    applyOps,\n    finish,\n    geometryProjection,\n    lifecycle,\n    nodeAtPoint: ctx.deps.nodeAtPoint,\n    admits: admitsOf(ctx.deps.canDropInto, ids),\n    reparentOnDrop: () => (resolveParams(opts?.params)?.['reparentOnDrop'] as ReparentOnDrop | undefined) ?? 'off',\n    dragThresholdPx,\n    snap: lazySnapSession(ctx.deps.snap, { gesture: 'move', ids, press, constrain: 'axis' }),\n    press,\n  };\n  return { session, readers };\n}\n"],"mappings":";;;;;;;;;;;;;AA8FA,SAAS,SACP,aACA,KAC6B;CAC7B,IAAI,gBAAgB,QAAW,aAAa;CAC5C,MAAM,QAAQ;CACd,QAAQ,WAAW,YAAY,QAAkB,KAAK;AACxD;;;;AAKA,SAAgB,UACd,KACA,MACA,OAC0D;CAC1D,MAAM,YAAY,IAAI,KAAK;CAC3B,MAAM,QAAQ,IAAI,KAAK;CACvB,MAAM,aAAa,iBAAiB,IAAI,KAAK,cAAc;CAC3D,MAAM,SAAS,IAAI,KAAK;CACxB,MAAM,WAAW,IAAI,KAAK;CAC1B,MAAM,qBAAqB,IAAI,KAAK;CACpC,MAAM,SAAS,kBAAkB,IAAI,IAAI;CAEzC,IAAI,CAAC,aAAa,CAAC,OAAO,OAAO;CACjC,MAAM,KAAK,MAAM;CAIjB,IAAI,eAAe,IAAI,MAAM,UAAU,GAAG,OAAO;CAEjD,MAAM,SAAS,cAAc,MAAM,MAAM;CACzC,MAAM,YAAY,SAAS;CAC3B,MAAM,WAAW,CAAC,GAAG,UAAU,IAAI,CAAC;CACpC,MAAM,MAAM,YAAY,OAAO,YAAY,UAAU,QAAQ,IAAI,QAAQ;CACzE,IAAI,IAAI,WAAW,GAAG,OAAO;CAE7B,MAAM,SAAS,QAAQ,UAAU;CACjC,MAAM,EAAE,YAAY,YAAY,WAAW,kBAAkB,OAAO,KAAK,QAAQ,UAAU;CAC3F,MAAM,EAAE,SAAS,WAAW,cAAc,OAAO,KAAK,UAAU;CAKhE,MAAM,UAAuB;EAAE,eAAe;EAAS;CAAM;CAC7D,MAAM,YAAqC;EACzC,GAAK,MAAM,aAAa,CAAC;EACzB,GAAI,SAAS,CAAC,WAAW,OAAO,CAAC,IAAI,CAAC;EACtC,eAAe,OAAO;CACxB;CACA,MAAM,kBAAmB,SAAS,sBAC7B,IAAI,KAAK,aAAa,IAAI,iBAAiB,KAAK;CACrD,MAAM,YAAY,qBAAqB,QAAQ,QAAQ,SAAS;CAGhE,MAAM,UAAU,mBAA4B,QAAQ,KAAK,QAAQ,YAC/D,iBAAiB;EAAE;EAAO;EAAU,SAAS;EAAS;CAAO,GAAG,WAAW,GAAG,GAAG,UAAU,cAAc;CAC3G,MAAM,UAAU,eAAe,IAAI,IAAI;CACvC,MAAM,aAAa,oBAAoB,KAAK,OAAO,KAAK,YAAY,SAAS,OAAO;CACpF,KAAK,MAAM,KAAK,WAAW,EAAE,UAAU,UAAU;CAEjD,MAAM,QAAQ,IAAI,MAAM,SAAS,IAAI;CACrC,MAAM,UAAuB;EAC3B;EACA;EACA;EACA;EACA;EACA;EACA,MAAM,IAAI,KAAK;EACf,WAAW,iBAAiB,OAAO,KAAK,IAAI,KAAK,MAAM,QAAQ,YAAY,UAAU;EACrF;EACA;EACA,cAAc,gBAAgB,OAAO,UAAU;EAC/C;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,aAAa,IAAI,KAAK;EACtB,QAAQ,SAAS,IAAI,KAAK,aAAa,GAAG;EAC1C,sBAAuB,cAAc,MAAM,MAAM,CAAC,GAAG,qBAAoD;EACzG;EACA,MAAM,gBAAgB,IAAI,KAAK,MAAM;GAAE,SAAS;GAAQ;GAAK;GAAO,WAAW;EAAO,CAAC;EACvF;CACF;CACA,OAAO;EAAE;EAAS;CAAQ;AAC5B"}
+{"version":3,"file":"session.js","names":[],"sources":["../../../../src/interactions/actions/move/session.ts"],"sourcesContent":["import type { BindingOpts, InvocationCtx } from '@weasel-js/routing';\nimport { DRAG_THRESHOLD_PX, isPathEditPart, resolveParams } from '@weasel-js/routing';\nimport type { Op } from 'core/ops/types';\nimport type { NodeId, Scene } from 'core/scene/types';\nimport type { PoseDescriptor } from 'core/geometry/poseDescriptor';\nimport type { PoseComposition } from 'core/scene/composePose';\nimport { gestureReaders, type GestureReaders } from '../../gestures/shared/screenTolerance';\nimport type { GestureContext, MoveBehavior } from '../../gestures/types';\nimport type { CanDropIntoDep, LayoutDep, NodeAtPointDep } from '../depSchema';\nimport { admitsChild } from '../admitsChild';\nimport type { GeometryProjection } from '../geometryProjection';\nimport { commitGestureOps, readGestureLifecycle, type GestureLifecycle } from '../gestureLifecycle';\nimport { transformFinisher, type TransformFinisher } from '../transformFinish';\nimport { nodeDescriptors, poseDescriptorOf } from '../poseDescriptorDep';\nimport { moveSources } from '../selectionSubtree';\nimport { layoutDrop } from './behaviors/layoutDrop';\nimport { reparentOnDrop } from './behaviors/reparentOnDrop';\nimport { buildGestureContext, captureFrames, capturePlaneRefs, captureStartPoses } from './capture';\nimport { moveGestureAdapter, type MoveGestureAdapter } from './gestureAdapter';\nimport type { SnapSession } from '../snapDep';\nimport { lazySnapSession } from 'features/snap/lazySession';\n\n/** Allowed values for the `reparentOnDrop` binding param. `'off'` (the\n *  default) preserves the legacy translate-only commit. `'top'` lands the\n *  moved node at the top of the container under the cursor. `'above'`\n *  lands it immediately above the hit sibling in z-order (falls back to\n *  `'top'` semantics when the hit is itself a container or when the hit\n *  and moved node share no parent). */\nexport type ReparentOnDrop = 'off' | 'top' | 'above';\n\n/** What a move captured at press. Nothing here changes during the drag. */\nexport interface MoveSession {\n  readonly scene: Scene<unknown, string, unknown>;\n  /** The drag roots. */\n  readonly ids: readonly NodeId[];\n  /** Descendants of the roots, previewed along with them. */\n  readonly cascadeIds: readonly NodeId[];\n  /** Start pose of every root and descendant. */\n  readonly startPoses: ReadonlyMap<NodeId, unknown>;\n  /** Ids whose frame is itself moving, so they ride it and are not translated. */\n  readonly carried: ReadonlySet<NodeId>;\n  /** For each moved id stored under a frame: its world pose and the frame's, at press. */\n  readonly frames: ReadonlyMap<NodeId, { world: unknown; frameWorld: unknown }>;\n  /** Ids grabbed mid-glide, with how far the pose shown stood from the document's. */\n  readonly caught: ReadonlyMap<NodeId, { dx: number; dy: number }>;\n  /** Per layer on another plane than the edited one: a point of its first root, in both. */\n  readonly planeRefs: ReadonlyMap<string, { own: { x: number; y: number }; edited: { x: number; y: number } }>;\n  readonly view: unknown;\n  readonly projection: PoseDescriptor<unknown>;\n  readonly descriptorOf: (id: NodeId | string) => PoseDescriptor<unknown>;\n  readonly pc: PoseComposition<unknown>;\n  /** The binding's behaviors, then the ones the action adds: a layout drop\n   *  when the `layout` dep is present, and reparent-on-drop. */\n  readonly behaviors: readonly MoveBehavior<unknown>[];\n  /** Reused across the drag; behaviors mutate its `scratch`. */\n  readonly gestureCtx: GestureContext<unknown>;\n  readonly adapter: MoveGestureAdapter<unknown>;\n  readonly layout: LayoutDep | undefined;\n  readonly applyOps?: (ops: Op[], label: string) => void;\n  /** Finishes the committed batch with the other nodes that change with it. */\n  readonly finish?: TransformFinisher;\n  readonly geometryProjection?: GeometryProjection;\n  readonly lifecycle: GestureLifecycle;\n  readonly nodeAtPoint: NodeAtPointDep | undefined;\n  /** Whether a node admits the dragged roots; with no `canDropInto`, a group does and a mark does not. */\n  readonly admits: (parent: NodeId) => boolean;\n  /** Read at release: a binding's params may be a thunk. */\n  readonly reparentOnDrop: () => ReparentOnDrop;\n  readonly dragThresholdPx: number;\n  /** The drag's snapping, begun once the drag passes its threshold; null\n   *  with no `snap` dep. */\n  readonly snap: SnapSession | null;\n  /** The press, in the coordinates the drag's delta is measured in. */\n  readonly press: { x: number; y: number };\n}\n\n/** What one `onMove` produced. Replaced, not mutated, by the next. */\nexport interface MoveFrame {\n  readonly delta: { dx: number; dy: number };\n  /** Stored-frame pose of every displaced id, roots and descendants, and of\n   *  any other id a behavior posed. */\n  readonly previews: Map<NodeId, unknown>;\n  /** Ids the behaviors asked to have painted at full opacity. */\n  readonly opaque: ReadonlySet<NodeId>;\n}\n\n/** What the behaviors the action builds itself read of the drag they belong\n *  to. Neither is readable from `onStart`, which runs before the session\n *  exists. */\nexport interface MoveGesture {\n  session(): MoveSession;\n  /** The latest frame: the previous one while an `onMove` is running. */\n  frame(): MoveFrame;\n}\n\nfunction admitsOf(\n  canDropInto: CanDropIntoDep | undefined,\n  ids: readonly NodeId[],\n  scene: { get(id: NodeId): { kind: string } | undefined },\n): (parent: NodeId) => boolean {\n  const roots = ids as readonly string[];\n  return (parent) => admitsChild(scene, parent, roots, canDropInto);\n}\n\n/** Capture a drag at press. Null when there is nothing to move. Runs each\n *  behavior's `onStart`. `frame` reads the drag's latest frame, for the\n *  behaviors appended to the binding's own. */\nexport function beginMove(\n  ctx: InvocationCtx,\n  opts: BindingOpts | undefined,\n  frame: () => MoveFrame,\n): { session: MoveSession; readers: GestureReaders } | null {\n  const selection = ctx.deps.selection;\n  const scene = ctx.deps.scene;\n  const projection = poseDescriptorOf(ctx.deps.poseDescriptor);\n  const layout = ctx.deps.layout;\n  const applyOps = ctx.deps.applyOps;\n  const geometryProjection = ctx.deps.geometryProjection;\n  const finish = transformFinisher(ctx.deps);\n\n  if (!selection || !scene) return null;\n  const pc = scene.composition;\n  // Anchors, segments, and balance grips sit on the selected body, and this binding ties the\n  // path-edit drags' on specificity; with no mode registry to filter move out, declining is what\n  // lets them through.\n  if (isPathEditPart(ctx.drag?.affordance)) return null;\n\n  const params = resolveParams(opts?.params);\n  const expandIds = params?.['expandIds'] as ((ids: string[]) => string[]) | undefined;\n  const selected = [...selection.get()] as string[];\n  const ids = moveSources(scene, expandIds ? expandIds(selected) : selected) as NodeId[];\n  if (ids.length === 0) return null;\n\n  const reflow = layout?.reflow ?? null;\n  const { startPoses, cascadeIds, caught } = captureStartPoses(scene, ids, reflow, projection);\n  const { carried, frames } = captureFrames(scene, ids, startPoses);\n\n  // Everything a move does beyond translating is a behavior: the binding's\n  // own, then the layout drop, then reparent-on-drop. On release the first to\n  // answer owns the commit, so each preempts the ones after it.\n  const gesture: MoveGesture = { session: () => session, frame };\n  const behaviors: MoveBehavior<unknown>[] = [\n    ...((opts?.behaviors ?? []) as MoveBehavior<unknown>[]),\n    ...(layout ? [layoutDrop(gesture)] : []),\n    reparentOnDrop(gesture),\n  ];\n  const dragThresholdPx = (params?.['dragThresholdPx'] as number | undefined)\n    ?? ctx.deps.kitSettings?.get('gestures.dragPx') ?? DRAG_THRESHOLD_PX;\n  const lifecycle = readGestureLifecycle(params, 'Move', behaviors);\n  // A behavior that commits after the gesture has ended, a coast coming to\n  // rest, lands its batch the way the gesture's own commit does.\n  const adapter = moveGestureAdapter<unknown>(scene, (ops, _label, through) =>\n    commitGestureOps({ scene, applyOps, adapter: through, finish }, lifecycle, ops), selection.adapterMethods);\n  const readers = gestureReaders(ctx.deps);\n  const gestureCtx = buildGestureContext(ctx, scene, ids, startPoses, adapter, readers);\n  for (const b of behaviors) b.onStart?.(gestureCtx);\n\n  const press = ctx.drag?.start ?? ctx.world;\n  const session: MoveSession = {\n    startPoses,\n    ids,\n    cascadeIds,\n    carried,\n    frames,\n    scene,\n    view: ctx.deps.view,\n    planeRefs: capturePlaneRefs(scene, ids, ctx.deps.view, frames, startPoses, projection),\n    caught,\n    projection,\n    descriptorOf: nodeDescriptors(scene, projection),\n    behaviors,\n    gestureCtx,\n    adapter,\n    layout,\n    pc,\n    applyOps,\n    finish,\n    geometryProjection,\n    lifecycle,\n    nodeAtPoint: ctx.deps.nodeAtPoint,\n    admits: admitsOf(ctx.deps.canDropInto, ids, scene),\n    reparentOnDrop: () => (resolveParams(opts?.params)?.['reparentOnDrop'] as ReparentOnDrop | undefined) ?? 'off',\n    dragThresholdPx,\n    snap: lazySnapSession(ctx.deps.snap, { gesture: 'move', ids, press, constrain: 'axis' }),\n    press,\n  };\n  return { session, readers };\n}\n"],"mappings":";;;;;;;;;;;;;;AA+FA,SAAS,SACP,aACA,KACA,OAC6B;CAC7B,MAAM,QAAQ;CACd,QAAQ,WAAW,YAAY,OAAO,QAAQ,OAAO,WAAW;AAClE;;;;AAKA,SAAgB,UACd,KACA,MACA,OAC0D;CAC1D,MAAM,YAAY,IAAI,KAAK;CAC3B,MAAM,QAAQ,IAAI,KAAK;CACvB,MAAM,aAAa,iBAAiB,IAAI,KAAK,cAAc;CAC3D,MAAM,SAAS,IAAI,KAAK;CACxB,MAAM,WAAW,IAAI,KAAK;CAC1B,MAAM,qBAAqB,IAAI,KAAK;CACpC,MAAM,SAAS,kBAAkB,IAAI,IAAI;CAEzC,IAAI,CAAC,aAAa,CAAC,OAAO,OAAO;CACjC,MAAM,KAAK,MAAM;CAIjB,IAAI,eAAe,IAAI,MAAM,UAAU,GAAG,OAAO;CAEjD,MAAM,SAAS,cAAc,MAAM,MAAM;CACzC,MAAM,YAAY,SAAS;CAC3B,MAAM,WAAW,CAAC,GAAG,UAAU,IAAI,CAAC;CACpC,MAAM,MAAM,YAAY,OAAO,YAAY,UAAU,QAAQ,IAAI,QAAQ;CACzE,IAAI,IAAI,WAAW,GAAG,OAAO;CAE7B,MAAM,SAAS,QAAQ,UAAU;CACjC,MAAM,EAAE,YAAY,YAAY,WAAW,kBAAkB,OAAO,KAAK,QAAQ,UAAU;CAC3F,MAAM,EAAE,SAAS,WAAW,cAAc,OAAO,KAAK,UAAU;CAKhE,MAAM,UAAuB;EAAE,eAAe;EAAS;CAAM;CAC7D,MAAM,YAAqC;EACzC,GAAK,MAAM,aAAa,CAAC;EACzB,GAAI,SAAS,CAAC,WAAW,OAAO,CAAC,IAAI,CAAC;EACtC,eAAe,OAAO;CACxB;CACA,MAAM,kBAAmB,SAAS,sBAC7B,IAAI,KAAK,aAAa,IAAI,iBAAiB,KAAK;CACrD,MAAM,YAAY,qBAAqB,QAAQ,QAAQ,SAAS;CAGhE,MAAM,UAAU,mBAA4B,QAAQ,KAAK,QAAQ,YAC/D,iBAAiB;EAAE;EAAO;EAAU,SAAS;EAAS;CAAO,GAAG,WAAW,GAAG,GAAG,UAAU,cAAc;CAC3G,MAAM,UAAU,eAAe,IAAI,IAAI;CACvC,MAAM,aAAa,oBAAoB,KAAK,OAAO,KAAK,YAAY,SAAS,OAAO;CACpF,KAAK,MAAM,KAAK,WAAW,EAAE,UAAU,UAAU;CAEjD,MAAM,QAAQ,IAAI,MAAM,SAAS,IAAI;CACrC,MAAM,UAAuB;EAC3B;EACA;EACA;EACA;EACA;EACA;EACA,MAAM,IAAI,KAAK;EACf,WAAW,iBAAiB,OAAO,KAAK,IAAI,KAAK,MAAM,QAAQ,YAAY,UAAU;EACrF;EACA;EACA,cAAc,gBAAgB,OAAO,UAAU;EAC/C;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,aAAa,IAAI,KAAK;EACtB,QAAQ,SAAS,IAAI,KAAK,aAAa,KAAK,KAAK;EACjD,sBAAuB,cAAc,MAAM,MAAM,CAAC,GAAG,qBAAoD;EACzG;EACA,MAAM,gBAAgB,IAAI,KAAK,MAAM;GAAE,SAAS;GAAQ;GAAK;GAAO,WAAW;EAAO,CAAC;EACvF;CACF;CACA,OAAO;EAAE;EAAS;CAAQ;AAC5B"}

package/dist/interactions/actions/outlines/createOutlinesAction.js

@@ -36,11 +36,14 @@ var createOutlinesAction = {
 	label: "Create Outlines",
 	icon: /* @icon */ "core:createOutlines",
 	group: "text",
-	defaultBinding: {
-		kind: "key",
-		key: "Enter",
-		mods: { mod: true }
-	},
+	defaultBinding: [{
+		spec: {
+			kind: "key",
+			key: "Enter",
+			mods: { mod: true }
+		},
+		opts: { id: "createOutlines.key" }
+	}],
 	eligible: { capability: "creates-shapes" },
 	requires: ["selection", "createOutlinesAdapter"],
 	invoker: {

package/dist/interactions/actions/outlines/createOutlinesAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"createOutlinesAction.js","names":[],"sources":["../../../../src/interactions/actions/outlines/createOutlinesAction.tsx"],"sourcesContent":["import type { Action, ImmediateInvoker } from '@weasel-js/routing';\nimport { ActionDisabledReason } from '@weasel-js/routing';\nimport type { NodeId } from 'core/scene/types';\nimport { loadTextOutlines, type TextNodeSource, type TextOutlinesError } from '@weasel-js/text';\nimport {\n  applyCreateOutlines, type CreateOutlinesAdapter, type CreateOutlinesResult,\n} from './createOutlines';\nimport { icon } from '../../../icons.gen';\n\n/** What an outline conversion answers when a text face had no outlines. */\ntype OutlinesFailure = { kind: 'failed'; error: TextOutlinesError };\n\n/**\n * Run `apply`, an outline conversion of `adapter`'s selection, waiting first\n * for any face whose outlines are registered but not yet loaded — a face is\n * parsed on first use, so the first conversion in a session would otherwise\n * fail. Warns under `tag` with the reason when the selection still cannot be\n * converted.\n */\nexport async function withTextOutlines<R extends { kind: string } | OutlinesFailure>(\n  adapter: CreateOutlinesAdapter,\n  apply: () => R,\n  tag: string,\n): Promise<R> {\n  const failure = (r: R): TextOutlinesError | null => (r.kind === 'failed' ? (r as OutlinesFailure).error : null);\n  let result = apply();\n  if (failure(result)?.reason === 'outlines-loading') {\n    const texts = [...adapter.getSelection()]\n      .map((id) => adapter.getTextSource(id as NodeId))\n      .filter((t): t is TextNodeSource => t !== undefined);\n    await Promise.all(texts.map((t) => loadTextOutlines(t.data)));\n    result = apply();\n  }\n  const error = failure(result);\n  if (error) console.warn(`[${tag}] ${error.message}`);\n  return result;\n}\n\n/** {@link applyCreateOutlines} through {@link withTextOutlines}. */\nexport function runCreateOutlines(adapter: CreateOutlinesAdapter): Promise<CreateOutlinesResult> {\n  return withTextOutlines(adapter, () => applyCreateOutlines(adapter), 'createOutlines');\n}\n\n/**\n * Static descriptor for Create Outlines: replace the selected\n * text nodes with path nodes carrying their glyph outlines. Reads the\n * `createOutlinesAdapter` dep, published with `useCreateOutlinesAdapter`.\n */\nexport const createOutlinesAction: Action = {\n  id: 'createOutlines',\n  label: 'Create Outlines',\n  icon: icon('createOutlines'),\n  group: 'text',\n  // Affinity's Convert to Curves; Illustrator's Mod+Shift+O is Chrome's bookmark manager.\n  defaultBinding: { kind: 'key', key: 'Enter', mods: { mod: true } },\n  eligible: { capability: 'creates-shapes' },\n  requires: ['selection', 'createOutlinesAdapter'],\n  invoker: {\n    timing: 'immediate',\n    run: (deps) => {\n      const adapter = deps.createOutlinesAdapter;\n      if (adapter) void runCreateOutlines(adapter);\n    },\n  } satisfies ImmediateInvoker,\n  enabled: (deps) => {\n    const ids = deps?.selection?.get() ?? [];\n    if (ids.length === 0) return ActionDisabledReason.SelectionRequired;\n    const adapter = deps?.createOutlinesAdapter;\n    return adapter && ids.some((id) => adapter.getTextSource(id) !== undefined)\n      ? true\n      : ActionDisabledReason.NotApplicable;\n  },\n};\n"],"mappings":"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"}
+{"version":3,"file":"createOutlinesAction.js","names":[],"sources":["../../../../src/interactions/actions/outlines/createOutlinesAction.tsx"],"sourcesContent":["import type { Action, ImmediateInvoker } from '@weasel-js/routing';\nimport { ActionDisabledReason } from '@weasel-js/routing';\nimport type { NodeId } from 'core/scene/types';\nimport { loadTextOutlines, type TextNodeSource, type TextOutlinesError } from '@weasel-js/text';\nimport {\n  applyCreateOutlines, type CreateOutlinesAdapter, type CreateOutlinesResult,\n} from './createOutlines';\nimport { icon } from '../../../icons.gen';\n\n/** What an outline conversion answers when a text face had no outlines. */\ntype OutlinesFailure = { kind: 'failed'; error: TextOutlinesError };\n\n/**\n * Run `apply`, an outline conversion of `adapter`'s selection, waiting first\n * for any face whose outlines are registered but not yet loaded — a face is\n * parsed on first use, so the first conversion in a session would otherwise\n * fail. Warns under `tag` with the reason when the selection still cannot be\n * converted.\n */\nexport async function withTextOutlines<R extends { kind: string } | OutlinesFailure>(\n  adapter: CreateOutlinesAdapter,\n  apply: () => R,\n  tag: string,\n): Promise<R> {\n  const failure = (r: R): TextOutlinesError | null => (r.kind === 'failed' ? (r as OutlinesFailure).error : null);\n  let result = apply();\n  if (failure(result)?.reason === 'outlines-loading') {\n    const texts = [...adapter.getSelection()]\n      .map((id) => adapter.getTextSource(id as NodeId))\n      .filter((t): t is TextNodeSource => t !== undefined);\n    await Promise.all(texts.map((t) => loadTextOutlines(t.data)));\n    result = apply();\n  }\n  const error = failure(result);\n  if (error) console.warn(`[${tag}] ${error.message}`);\n  return result;\n}\n\n/** {@link applyCreateOutlines} through {@link withTextOutlines}. */\nexport function runCreateOutlines(adapter: CreateOutlinesAdapter): Promise<CreateOutlinesResult> {\n  return withTextOutlines(adapter, () => applyCreateOutlines(adapter), 'createOutlines');\n}\n\n/**\n * Static descriptor for Create Outlines: replace the selected\n * text nodes with path nodes carrying their glyph outlines. Reads the\n * `createOutlinesAdapter` dep, published with `useCreateOutlinesAdapter`.\n */\nexport const createOutlinesAction: Action = {\n  id: 'createOutlines',\n  label: 'Create Outlines',\n  icon: icon('createOutlines'),\n  group: 'text',\n  // Affinity's Convert to Curves; Illustrator's Mod+Shift+O is Chrome's bookmark manager.\n  defaultBinding: [{ spec: { kind: 'key', key: 'Enter', mods: { mod: true } }, opts: { id: 'createOutlines.key' } }],\n  eligible: { capability: 'creates-shapes' },\n  requires: ['selection', 'createOutlinesAdapter'],\n  invoker: {\n    timing: 'immediate',\n    run: (deps) => {\n      const adapter = deps.createOutlinesAdapter;\n      if (adapter) void runCreateOutlines(adapter);\n    },\n  } satisfies ImmediateInvoker,\n  enabled: (deps) => {\n    const ids = deps?.selection?.get() ?? [];\n    if (ids.length === 0) return ActionDisabledReason.SelectionRequired;\n    const adapter = deps?.createOutlinesAdapter;\n    return adapter && ids.some((id) => adapter.getTextSource(id) !== undefined)\n      ? true\n      : ActionDisabledReason.NotApplicable;\n  },\n};\n"],"mappings":"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"}

package/dist/interactions/actions/outlines/outlineStroke.js

@@ -1,5 +1,6 @@
 import { strokeRegion } from "./strokeRegion.js";
 import { replaceWithPaths } from "./replaceWithPaths.js";
+import { resolveFill, resolveStroke } from "@weasel-js/paint";
 import { TextOutlinesError, textToPathsByPaint } from "@weasel-js/text";
 
 //#region src/interactions/actions/outlines/outlineStroke.ts
@@ -44,7 +45,8 @@ function applyOutlineStroke(adapter, opts = {}) {
 			const paths = [];
 			let outlined = false;
 			for (const { path, fill, stroke } of paintedPaths(adapter, id)) {
-				const outline = stroke?.paint == null ? null : strokeRegion(path, stroke, frame, opts);
+				const painted = resolveStroke(stroke);
+				const outline = painted === null ? null : strokeRegion(path, painted, frame, opts);
 				if (!outline || outline.commands.length === 0) {
 					paths.push(stroke ? {
 						path,
@@ -57,13 +59,13 @@ function applyOutlineStroke(adapter, opts = {}) {
 					continue;
 				}
 				outlined = true;
-				if (fill !== null) paths.push({
+				if (resolveFill(fill) !== null) paths.push({
 					path,
 					fill
 				});
 				paths.push({
 					path: outline,
-					fill: { paint: stroke.paint }
+					fill: { paint: painted.paint }
 				});
 			}
 			if (outlined) converted.push({

package/dist/interactions/actions/outlines/outlineStroke.js.map

@@ -1 +1 @@
-{"version":3,"file":"outlineStroke.js","names":[],"sources":["../../../../src/interactions/actions/outlines/outlineStroke.ts"],"sourcesContent":["/**\n * Outline Stroke: replace each selected stroked path, or stroked text, with\n * the region its stroke covers, as a path filled in the stroke's paint. A node\n * that is also filled keeps its fill as a path of its own underneath. One\n * undoable batch; the replacement takes the node's slot.\n */\nimport { textToPathsByPaint, TextOutlinesError, type TextNodeSource } from '@weasel-js/text';\nimport type { NodeId } from 'core/scene/types';\nimport type { CreateOutlinesAdapter } from './createOutlines';\nimport { replaceWithPaths, type PaintedPath } from './replaceWithPaths';\nimport { strokeRegion, type StrokeRegionOptions } from './strokeRegion';\n\n/** Outcome of {@link applyOutlineStroke}. */\nexport type OutlineStrokeResult =\n  /** `resultIds` are what replaced the stroked nodes at their level — a\n   *  path, a container, or a run of flat paths each — and are now selected in\n   *  their place. */\n  | { kind: 'applied'; resultIds: string[] }\n  /** Nothing selected is a path or text with a stroke that has width. */\n  | { kind: 'noop'; reason: 'no-stroke' }\n  /** Some selected stroked text has no outline geometry; nothing was changed. */\n  | { kind: 'failed'; reason: 'text-outlines'; error: TextOutlinesError };\n\n/** Whether a text node wears a stroke anywhere: its own, or a run's. */\nexport function textIsStroked(text: TextNodeSource | undefined): boolean {\n  return text != null && (text.data.stroke != null || !!text.data.runs?.some((r) => r.stroke != null));\n}\n\n/** What the adapter knows of `id` as painted world paths: a path node's one,\n *  or a text node's glyphs by paint. Throws as `textToPathsByPaint` does. */\nfunction paintedPaths(adapter: CreateOutlinesAdapter, id: NodeId): PaintedPath[] {\n  const path = adapter.getWorldPath?.(id);\n  if (path) {\n    const paint = adapter.getPaint?.(id);\n    return paint ? [{ path, ...paint }] : [];\n  }\n  const text = adapter.getTextSource(id);\n  // Text with no stroke stays text: its outlines are not read, so a face\n  // without them fails only the text this would convert.\n  if (!text || !textIsStroked(text)) return [];\n  return textToPathsByPaint(text.data, text.pose);\n}\n\n/**\n * Outline the stroke of every stroked path and stroked text in the selection,\n * as one batch labeled \"Outline Stroke\". Other selected nodes are left alone\n * and stay selected. Each stroke is outlined in the frame it is drawn in: see\n * {@link strokeRegion}. All or nothing: if a stroked text's face cannot\n * supply outlines the scene is untouched and the error comes back.\n */\nexport function applyOutlineStroke(\n  adapter: CreateOutlinesAdapter,\n  opts: StrokeRegionOptions = {},\n): OutlineStrokeResult {\n  const sel = [...adapter.getSelection()] as NodeId[];\n  const converted: { id: NodeId; paths: PaintedPath[] }[] = [];\n  try {\n    for (const id of sel) {\n      const frame = adapter.getStrokeFrame?.(id);\n      const paths: PaintedPath[] = [];\n      let outlined = false;\n      for (const { path, fill, stroke } of paintedPaths(adapter, id)) {\n        const outline = stroke?.paint == null ? null : strokeRegion(path, stroke, frame, opts);\n        if (!outline || outline.commands.length === 0) {\n          paths.push(stroke ? { path, fill, stroke } : { path, fill });\n          continue;\n        }\n        outlined = true;\n        if (fill !== null) paths.push({ path, fill });\n        paths.push({ path: outline, fill: { paint: stroke!.paint! } });\n      }\n      if (outlined) converted.push({ id, paths });\n    }\n  } catch (err) {\n    if (err instanceof TextOutlinesError) return { kind: 'failed', reason: 'text-outlines', error: err };\n    throw err;\n  }\n  if (converted.length === 0) return { kind: 'noop', reason: 'no-stroke' };\n  const replaced = replaceWithPaths(adapter, sel, converted, 'Outline Stroke');\n  return { kind: 'applied', resultIds: converted.flatMap((c) => replaced.get(c.id)!) };\n}\n"],"mappings":";;;;;;;;;;;;AAwBA,SAAgB,cAAc,MAA2C;CACvE,OAAO,QAAQ,SAAS,KAAK,KAAK,UAAU,QAAQ,CAAC,CAAC,KAAK,KAAK,MAAM,MAAM,MAAM,EAAE,UAAU,IAAI;AACpG;;;AAIA,SAAS,aAAa,SAAgC,IAA2B;CAC/E,MAAM,OAAO,QAAQ,eAAe,EAAE;CACtC,IAAI,MAAM;EACR,MAAM,QAAQ,QAAQ,WAAW,EAAE;EACnC,OAAO,QAAQ,CAAC;GAAE;GAAM,GAAG;EAAM,CAAC,IAAI,CAAC;CACzC;CACA,MAAM,OAAO,QAAQ,cAAc,EAAE;CAGrC,IAAI,CAAC,QAAQ,CAAC,cAAc,IAAI,GAAG,OAAO,CAAC;CAC3C,OAAO,mBAAmB,KAAK,MAAM,KAAK,IAAI;AAChD;;;;;;;;AASA,SAAgB,mBACd,SACA,OAA4B,CAAC,GACR;CACrB,MAAM,MAAM,CAAC,GAAG,QAAQ,aAAa,CAAC;CACtC,MAAM,YAAoD,CAAC;CAC3D,IAAI;EACF,KAAK,MAAM,MAAM,KAAK;GACpB,MAAM,QAAQ,QAAQ,iBAAiB,EAAE;GACzC,MAAM,QAAuB,CAAC;GAC9B,IAAI,WAAW;GACf,KAAK,MAAM,EAAE,MAAM,MAAM,YAAY,aAAa,SAAS,EAAE,GAAG;IAC9D,MAAM,UAAU,QAAQ,SAAS,OAAO,OAAO,aAAa,MAAM,QAAQ,OAAO,IAAI;IACrF,IAAI,CAAC,WAAW,QAAQ,SAAS,WAAW,GAAG;KAC7C,MAAM,KAAK,SAAS;MAAE;MAAM;MAAM;KAAO,IAAI;MAAE;MAAM;KAAK,CAAC;KAC3D;IACF;IACA,WAAW;IACX,IAAI,SAAS,MAAM,MAAM,KAAK;KAAE;KAAM;IAAK,CAAC;IAC5C,MAAM,KAAK;KAAE,MAAM;KAAS,MAAM,EAAE,OAAO,OAAQ,MAAO;IAAE,CAAC;GAC/D;GACA,IAAI,UAAU,UAAU,KAAK;IAAE;IAAI;GAAM,CAAC;EAC5C;CACF,SAAS,KAAK;EACZ,IAAI,eAAe,mBAAmB,OAAO;GAAE,MAAM;GAAU,QAAQ;GAAiB,OAAO;EAAI;EACnG,MAAM;CACR;CACA,IAAI,UAAU,WAAW,GAAG,OAAO;EAAE,MAAM;EAAQ,QAAQ;CAAY;CACvE,MAAM,WAAW,iBAAiB,SAAS,KAAK,WAAW,gBAAgB;CAC3E,OAAO;EAAE,MAAM;EAAW,WAAW,UAAU,SAAS,MAAM,SAAS,IAAI,EAAE,EAAE,CAAE;CAAE;AACrF"}
+{"version":3,"file":"outlineStroke.js","names":[],"sources":["../../../../src/interactions/actions/outlines/outlineStroke.ts"],"sourcesContent":["/**\n * Outline Stroke: replace each selected stroked path, or stroked text, with\n * the region its stroke covers, as a path filled in the stroke's paint. A node\n * that is also filled keeps its fill as a path of its own underneath. One\n * undoable batch; the replacement takes the node's slot.\n */\nimport { textToPathsByPaint, TextOutlinesError, type TextNodeSource } from '@weasel-js/text';\nimport { resolveFill, resolveStroke } from '@weasel-js/paint';\nimport type { NodeId } from 'core/scene/types';\nimport type { CreateOutlinesAdapter } from './createOutlines';\nimport { replaceWithPaths, type PaintedPath } from './replaceWithPaths';\nimport { strokeRegion, type StrokeRegionOptions } from './strokeRegion';\n\n/** Outcome of {@link applyOutlineStroke}. */\nexport type OutlineStrokeResult =\n  /** `resultIds` are what replaced the stroked nodes at their level — a\n   *  path, a container, or a run of flat paths each — and are now selected in\n   *  their place. */\n  | { kind: 'applied'; resultIds: string[] }\n  /** Nothing selected is a path or text with a stroke that has width. */\n  | { kind: 'noop'; reason: 'no-stroke' }\n  /** Some selected stroked text has no outline geometry; nothing was changed. */\n  | { kind: 'failed'; reason: 'text-outlines'; error: TextOutlinesError };\n\n/** Whether a text node wears a stroke anywhere: its own, or a run's. */\nexport function textIsStroked(text: TextNodeSource | undefined): boolean {\n  return text != null && (text.data.stroke != null || !!text.data.runs?.some((r) => r.stroke != null));\n}\n\n/** What the adapter knows of `id` as painted world paths: a path node's one,\n *  or a text node's glyphs by paint. Throws as `textToPathsByPaint` does. */\nfunction paintedPaths(adapter: CreateOutlinesAdapter, id: NodeId): PaintedPath[] {\n  const path = adapter.getWorldPath?.(id);\n  if (path) {\n    const paint = adapter.getPaint?.(id);\n    return paint ? [{ path, ...paint }] : [];\n  }\n  const text = adapter.getTextSource(id);\n  // Text with no stroke stays text: its outlines are not read, so a face\n  // without them fails only the text this would convert.\n  if (!text || !textIsStroked(text)) return [];\n  return textToPathsByPaint(text.data, text.pose);\n}\n\n/**\n * Outline the stroke of every stroked path and stroked text in the selection,\n * as one batch labeled \"Outline Stroke\". Other selected nodes are left alone\n * and stay selected. Each stroke is outlined in the frame it is drawn in: see\n * {@link strokeRegion}. All or nothing: if a stroked text's face cannot\n * supply outlines the scene is untouched and the error comes back.\n */\nexport function applyOutlineStroke(\n  adapter: CreateOutlinesAdapter,\n  opts: StrokeRegionOptions = {},\n): OutlineStrokeResult {\n  const sel = [...adapter.getSelection()] as NodeId[];\n  const converted: { id: NodeId; paths: PaintedPath[] }[] = [];\n  try {\n    for (const id of sel) {\n      const frame = adapter.getStrokeFrame?.(id);\n      const paths: PaintedPath[] = [];\n      let outlined = false;\n      for (const { path, fill, stroke } of paintedPaths(adapter, id)) {\n        const painted = resolveStroke(stroke);\n        const outline = painted === null ? null : strokeRegion(path, painted, frame, opts);\n        if (!outline || outline.commands.length === 0) {\n          paths.push(stroke ? { path, fill, stroke } : { path, fill });\n          continue;\n        }\n        outlined = true;\n        if (resolveFill(fill) !== null) paths.push({ path, fill });\n        paths.push({ path: outline, fill: { paint: painted!.paint } });\n      }\n      if (outlined) converted.push({ id, paths });\n    }\n  } catch (err) {\n    if (err instanceof TextOutlinesError) return { kind: 'failed', reason: 'text-outlines', error: err };\n    throw err;\n  }\n  if (converted.length === 0) return { kind: 'noop', reason: 'no-stroke' };\n  const replaced = replaceWithPaths(adapter, sel, converted, 'Outline Stroke');\n  return { kind: 'applied', resultIds: converted.flatMap((c) => replaced.get(c.id)!) };\n}\n"],"mappings":";;;;;;;;;;;;;AAyBA,SAAgB,cAAc,MAA2C;CACvE,OAAO,QAAQ,SAAS,KAAK,KAAK,UAAU,QAAQ,CAAC,CAAC,KAAK,KAAK,MAAM,MAAM,MAAM,EAAE,UAAU,IAAI;AACpG;;;AAIA,SAAS,aAAa,SAAgC,IAA2B;CAC/E,MAAM,OAAO,QAAQ,eAAe,EAAE;CACtC,IAAI,MAAM;EACR,MAAM,QAAQ,QAAQ,WAAW,EAAE;EACnC,OAAO,QAAQ,CAAC;GAAE;GAAM,GAAG;EAAM,CAAC,IAAI,CAAC;CACzC;CACA,MAAM,OAAO,QAAQ,cAAc,EAAE;CAGrC,IAAI,CAAC,QAAQ,CAAC,cAAc,IAAI,GAAG,OAAO,CAAC;CAC3C,OAAO,mBAAmB,KAAK,MAAM,KAAK,IAAI;AAChD;;;;;;;;AASA,SAAgB,mBACd,SACA,OAA4B,CAAC,GACR;CACrB,MAAM,MAAM,CAAC,GAAG,QAAQ,aAAa,CAAC;CACtC,MAAM,YAAoD,CAAC;CAC3D,IAAI;EACF,KAAK,MAAM,MAAM,KAAK;GACpB,MAAM,QAAQ,QAAQ,iBAAiB,EAAE;GACzC,MAAM,QAAuB,CAAC;GAC9B,IAAI,WAAW;GACf,KAAK,MAAM,EAAE,MAAM,MAAM,YAAY,aAAa,SAAS,EAAE,GAAG;IAC9D,MAAM,UAAU,cAAc,MAAM;IACpC,MAAM,UAAU,YAAY,OAAO,OAAO,aAAa,MAAM,SAAS,OAAO,IAAI;IACjF,IAAI,CAAC,WAAW,QAAQ,SAAS,WAAW,GAAG;KAC7C,MAAM,KAAK,SAAS;MAAE;MAAM;MAAM;KAAO,IAAI;MAAE;MAAM;KAAK,CAAC;KAC3D;IACF;IACA,WAAW;IACX,IAAI,YAAY,IAAI,MAAM,MAAM,MAAM,KAAK;KAAE;KAAM;IAAK,CAAC;IACzD,MAAM,KAAK;KAAE,MAAM;KAAS,MAAM,EAAE,OAAO,QAAS,MAAM;IAAE,CAAC;GAC/D;GACA,IAAI,UAAU,UAAU,KAAK;IAAE;IAAI;GAAM,CAAC;EAC5C;CACF,SAAS,KAAK;EACZ,IAAI,eAAe,mBAAmB,OAAO;GAAE,MAAM;GAAU,QAAQ;GAAiB,OAAO;EAAI;EACnG,MAAM;CACR;CACA,IAAI,UAAU,WAAW,GAAG,OAAO;EAAE,MAAM;EAAQ,QAAQ;CAAY;CACvE,MAAM,WAAW,iBAAiB,SAAS,KAAK,WAAW,gBAAgB;CAC3E,OAAO;EAAE,MAAM;EAAW,WAAW,UAAU,SAAS,MAAM,SAAS,IAAI,EAAE,EAAE,CAAE;CAAE;AACrF"}

package/dist/interactions/actions/pathCommands/cutJoin.js

@@ -137,11 +137,14 @@ var joinPathsAction = joinPathsCommand({
 	id: "joinPaths",
 	label: "Join",
 	icon: /* @icon */ "core:join",
-	defaultBinding: {
-		kind: "key",
-		key: "j",
-		mods: { mod: true }
-	}
+	defaultBinding: [{
+		spec: {
+			kind: "key",
+			key: "j",
+			mods: { mod: true }
+		},
+		opts: { id: "joinPaths.key" }
+	}]
 }, () => ({}));
 
 //#endregion