@weasel-js/core 1.11.0 → 1.12.0

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

@@ -25,8 +25,6 @@ function commitMove(input) {
 			scene: session.scene,
 			projection: session.projection,
 			startPoses: session.startPoses,
-			carried: session.carried,
-			roots: session.ids,
 			label: session.lifecycle.label
 		}, ops);
 		return commitGestureOps(session, session.lifecycle, [...ops, ...followers]);

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../../../../src/interactions/actions/move/commit/index.ts"],"sourcesContent":["import type { Op } from 'core/ops/types';\nimport { commitGestureOps, reduceBehaviorEnd } from '../../gestureLifecycle';\nimport { draggedStoredPose } from '../delta';\nimport { landedDescendantOps } from '../landedDescendants';\nimport type { MoveSession } from '../session';\nimport { rootTranslateOps, translateOps } from '../translate';\n\nexport interface CommitInput {\n  session: MoveSession;\n  delta: { dx: number; dy: number };\n  /** Where the pointer was let go, or the last move's point when the end carried none. */\n  at: { x: number; y: number };\n}\n\n/** What the behaviors answer for the commit: ops, `null` to abort, or\n *  `undefined` when every one of them leaves it to the default translate. */\nfunction endBehaviors(\n  session: MoveSession,\n  delta: { dx: number; dy: number },\n  at: { x: number; y: number },\n): Op[] | null | undefined {\n  const { dx, dy } = delta;\n  const gctx = session.gestureCtx;\n  for (const [id, ori] of session.startPoses) {\n    gctx.current.set(id as string, draggedStoredPose(session, id, ori, dx, dy));\n  }\n  return reduceBehaviorEnd(session.behaviors, gctx, {\n    translateOps: (ids) => rootTranslateOps(session, ids, delta),\n    pointer: at,\n  });\n}\n\n/** Commit the drag. Returns whether anything reached the document: false\n *  when there was nothing to write, or a container refused what it was sent. */\nexport function commitMove(input: CommitInput): boolean {\n  const { session, at } = input;\n  // Apply the final delta as a single batch → one undo entry.\n  const { dx, dy } = input.delta;\n  const commitOps = (ops: Op[]): boolean => {\n    const followers = landedDescendantOps(\n      {\n        scene: session.scene,\n        projection: session.projection,\n        startPoses: session.startPoses,\n        carried: session.carried,\n        roots: session.ids,\n        label: session.lifecycle.label,\n      },\n      ops,\n    );\n    return commitGestureOps(session, session.lifecycle, [...ops, ...followers]);\n  };\n\n  // Behavior pipeline owns the commit if any behavior returns non-undefined.\n  const answer = endBehaviors(session, { dx, dy }, at);\n  if (answer === null) return false;           // abort (e.g. snap-back)\n  if (answer !== undefined) return commitOps(answer);\n\n  // No-op if no movement (sub-threshold drag or zero delta).\n  if (dx === 0 && dy === 0) return false;\n\n  // No behavior claimed it — translate-only commit, emitted as transform ops\n  // so it routes through the consumer `applyOps` hook (consumer history)\n  // when present, else the scene's own history. Under scene v1's\n  // absolute-pose semantics every node stores world coords\n  // independently, so a container drag must explicitly re-stamp every\n  // cascaded descendant by the same dx/dy — otherwise children stay at\n  // their old absolute positions (visually they snap to the\n  // container's former location).\n  // Translate the data-held geometry by the same (dx,dy). Opt-in via\n  // the geometryProjection seam; a no-op when the dep is absent.\n  const ops = translateOps(session, [...session.ids, ...session.cascadeIds], { dx, dy });\n  return ops.length > 0 && commitOps(ops);\n}\n"],"mappings":";;;;;;;;AAgBA,SAAS,aACP,SACA,OACA,IACyB;CACzB,MAAM,EAAE,IAAI,OAAO;CACnB,MAAM,OAAO,QAAQ;CACrB,KAAK,MAAM,CAAC,IAAI,QAAQ,QAAQ,YAC9B,KAAK,QAAQ,IAAI,IAAc,kBAAkB,SAAS,IAAI,KAAK,IAAI,EAAE,CAAC;CAE5E,OAAO,kBAAkB,QAAQ,WAAW,MAAM;EAChD,eAAe,QAAQ,iBAAiB,SAAS,KAAK,KAAK;EAC3D,SAAS;CACX,CAAC;AACH;;;AAIA,SAAgB,WAAW,OAA6B;CACtD,MAAM,EAAE,SAAS,OAAO;CAExB,MAAM,EAAE,IAAI,OAAO,MAAM;CACzB,MAAM,aAAa,QAAuB;EACxC,MAAM,YAAY,oBAChB;GACE,OAAO,QAAQ;GACf,YAAY,QAAQ;GACpB,YAAY,QAAQ;GACpB,SAAS,QAAQ;GACjB,OAAO,QAAQ;GACf,OAAO,QAAQ,UAAU;EAC3B,GACA,GACF;EACA,OAAO,iBAAiB,SAAS,QAAQ,WAAW,CAAC,GAAG,KAAK,GAAG,SAAS,CAAC;CAC5E;CAGA,MAAM,SAAS,aAAa,SAAS;EAAE;EAAI;CAAG,GAAG,EAAE;CACnD,IAAI,WAAW,MAAM,OAAO;CAC5B,IAAI,WAAW,QAAW,OAAO,UAAU,MAAM;CAGjD,IAAI,OAAO,KAAK,OAAO,GAAG,OAAO;CAYjC,MAAM,MAAM,aAAa,SAAS,CAAC,GAAG,QAAQ,KAAK,GAAG,QAAQ,UAAU,GAAG;EAAE;EAAI;CAAG,CAAC;CACrF,OAAO,IAAI,SAAS,KAAK,UAAU,GAAG;AACxC"}
+{"version":3,"file":"index.js","names":[],"sources":["../../../../../src/interactions/actions/move/commit/index.ts"],"sourcesContent":["import type { Op } from 'core/ops/types';\nimport { commitGestureOps, reduceBehaviorEnd } from '../../gestureLifecycle';\nimport { draggedStoredPose } from '../delta';\nimport { landedDescendantOps } from '../landedDescendants';\nimport type { MoveSession } from '../session';\nimport { rootTranslateOps, translateOps } from '../translate';\n\nexport interface CommitInput {\n  session: MoveSession;\n  delta: { dx: number; dy: number };\n  /** Where the pointer was let go, or the last move's point when the end carried none. */\n  at: { x: number; y: number };\n}\n\n/** What the behaviors answer for the commit: ops, `null` to abort, or\n *  `undefined` when every one of them leaves it to the default translate. */\nfunction endBehaviors(\n  session: MoveSession,\n  delta: { dx: number; dy: number },\n  at: { x: number; y: number },\n): Op[] | null | undefined {\n  const { dx, dy } = delta;\n  const gctx = session.gestureCtx;\n  for (const [id, ori] of session.startPoses) {\n    gctx.current.set(id as string, draggedStoredPose(session, id, ori, dx, dy));\n  }\n  return reduceBehaviorEnd(session.behaviors, gctx, {\n    translateOps: (ids) => rootTranslateOps(session, ids, delta),\n    pointer: at,\n  });\n}\n\n/** Commit the drag. Returns whether anything reached the document: false\n *  when there was nothing to write, or a container refused what it was sent. */\nexport function commitMove(input: CommitInput): boolean {\n  const { session, at } = input;\n  // Apply the final delta as a single batch → one undo entry.\n  const { dx, dy } = input.delta;\n  const commitOps = (ops: Op[]): boolean => {\n    const followers = landedDescendantOps(\n      {\n        scene: session.scene,\n        projection: session.projection,\n        startPoses: session.startPoses,\n        label: session.lifecycle.label,\n      },\n      ops,\n    );\n    return commitGestureOps(session, session.lifecycle, [...ops, ...followers]);\n  };\n\n  // Behavior pipeline owns the commit if any behavior returns non-undefined.\n  const answer = endBehaviors(session, { dx, dy }, at);\n  if (answer === null) return false;           // abort (e.g. snap-back)\n  if (answer !== undefined) return commitOps(answer);\n\n  // No-op if no movement (sub-threshold drag or zero delta).\n  if (dx === 0 && dy === 0) return false;\n\n  // No behavior claimed it — translate-only commit, emitted as transform ops\n  // so it routes through the consumer `applyOps` hook (consumer history)\n  // when present, else the scene's own history. Under scene v1's\n  // absolute-pose semantics every node stores world coords\n  // independently, so a container drag must explicitly re-stamp every\n  // cascaded descendant by the same dx/dy — otherwise children stay at\n  // their old absolute positions (visually they snap to the\n  // container's former location).\n  // Translate the data-held geometry by the same (dx,dy). Opt-in via\n  // the geometryProjection seam; a no-op when the dep is absent.\n  const ops = translateOps(session, [...session.ids, ...session.cascadeIds], { dx, dy });\n  return ops.length > 0 && commitOps(ops);\n}\n"],"mappings":";;;;;;;;AAgBA,SAAS,aACP,SACA,OACA,IACyB;CACzB,MAAM,EAAE,IAAI,OAAO;CACnB,MAAM,OAAO,QAAQ;CACrB,KAAK,MAAM,CAAC,IAAI,QAAQ,QAAQ,YAC9B,KAAK,QAAQ,IAAI,IAAc,kBAAkB,SAAS,IAAI,KAAK,IAAI,EAAE,CAAC;CAE5E,OAAO,kBAAkB,QAAQ,WAAW,MAAM;EAChD,eAAe,QAAQ,iBAAiB,SAAS,KAAK,KAAK;EAC3D,SAAS;CACX,CAAC;AACH;;;AAIA,SAAgB,WAAW,OAA6B;CACtD,MAAM,EAAE,SAAS,OAAO;CAExB,MAAM,EAAE,IAAI,OAAO,MAAM;CACzB,MAAM,aAAa,QAAuB;EACxC,MAAM,YAAY,oBAChB;GACE,OAAO,QAAQ;GACf,YAAY,QAAQ;GACpB,YAAY,QAAQ;GACpB,OAAO,QAAQ,UAAU;EAC3B,GACA,GACF;EACA,OAAO,iBAAiB,SAAS,QAAQ,WAAW,CAAC,GAAG,KAAK,GAAG,SAAS,CAAC;CAC5E;CAGA,MAAM,SAAS,aAAa,SAAS;EAAE;EAAI;CAAG,GAAG,EAAE;CACnD,IAAI,WAAW,MAAM,OAAO;CAC5B,IAAI,WAAW,QAAW,OAAO,UAAU,MAAM;CAGjD,IAAI,OAAO,KAAK,OAAO,GAAG,OAAO;CAYjC,MAAM,MAAM,aAAa,SAAS,CAAC,GAAG,QAAQ,KAAK,GAAG,QAAQ,UAAU,GAAG;EAAE;EAAI;CAAG,CAAC;CACrF,OAAO,IAAI,SAAS,KAAK,UAAU,GAAG;AACxC"}

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

@@ -1,8 +1,8 @@
 import { rebaseLocalPose } from "../../../../core/scene/composeFrame.js";
+import { scenePoseAdapter } from "../../../../core/scene/scenePoseAdapter.js";
 import { asNodeId } from "../../../../core/scene/types.js";
-import { createReparentOp } from "../../../../core/ops/reparent.js";
 import { createTransformOp } from "../../../../core/ops/transform.js";
-import { scenePoseAdapter } from "../../../../core/scene/scenePoseAdapter.js";
+import { createReparentOp } from "../../../../core/ops/reparent.js";
 import { rebaseTransformOp } from "./rebase.js";
 
 //#region src/interactions/actions/move/commit/layoutDrop.ts

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

@@ -1,8 +1,8 @@
 import { composeWorldPose, rebaseLocalPose } from "../../../../core/scene/composeFrame.js";
+import { scenePoseAdapter } from "../../../../core/scene/scenePoseAdapter.js";
 import { asNodeId } from "../../../../core/scene/types.js";
-import { createReparentOp } from "../../../../core/ops/reparent.js";
 import { createTransformOp } from "../../../../core/ops/transform.js";
-import { scenePoseAdapter } from "../../../../core/scene/scenePoseAdapter.js";
+import { createReparentOp } from "../../../../core/ops/reparent.js";
 import { rebaseTransformOp } from "./rebase.js";
 import { draggedWorldPose, grabbedPoseAdapter } from "../delta.js";
 import { groupBySourceContainer } from "../layout/dropPass.js";

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

@@ -1,9 +1,9 @@
 import { planeToPlane } from "../../../../core/viewport/parallax.js";
 import { rebaseLocalPose } from "../../../../core/scene/composeFrame.js";
+import { scenePoseAdapter } from "../../../../core/scene/scenePoseAdapter.js";
 import { carryPose, planeOf } from "../../planeInput.js";
-import { createReparentOp } from "../../../../core/ops/reparent.js";
 import { createTransformOp } from "../../../../core/ops/transform.js";
-import { scenePoseAdapter } from "../../../../core/scene/scenePoseAdapter.js";
+import { createReparentOp } from "../../../../core/ops/reparent.js";
 import { draggedWorldPose, grabbedPoseAdapter } from "../delta.js";
 import { translateOps } from "../translate.js";
 import { createSetLayerOp } from "../../../../core/ops/setLayer.js";
@@ -19,15 +19,21 @@ function resolveDropTarget(session, at) {
 	if (!hit) return null;
 	const hitNode = session.scene.get(hit);
 	if (!hitNode) return null;
-	if (hitNode.kind === "container") return {
+	if (hitNode.kind === "container" && session.admits(hit)) return {
 		newParent: hit,
 		newLayer: hitNode.layer,
 		hitSibling: null
 	};
+	let newParent = hitNode.parent;
+	let hitSibling = hit;
+	while (newParent !== null && !session.admits(newParent)) {
+		hitSibling = newParent;
+		newParent = session.scene.get(newParent)?.parent ?? null;
+	}
 	return {
-		newParent: hitNode.parent,
+		newParent,
 		newLayer: hitNode.layer,
-		hitSibling: hit
+		hitSibling
 	};
 }
 /** Reparent and reposition each moved root as ops, keeping the world pose the

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') {\n    return { newParent: hit, newLayer: hitNode.layer, hitSibling: null };\n  }\n  return {\n    newParent: hitNode.parent,\n    newLayer: hitNode.layer,\n    hitSibling: hit,\n  };\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,aACnB,OAAO;EAAE,WAAW;EAAK,UAAU,QAAQ;EAAO,YAAY;CAAK;CAErE,OAAO;EACL,WAAW,QAAQ;EACnB,UAAU,QAAQ;EAClB,YAAY;CACd;AACF;;;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  // 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"}

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

@@ -3,9 +3,7 @@ import { pointerStateOf } from "../pointerState.js";
 import { snapMods } from "../../../features/snap/roles.js";
 
 //#region src/interactions/actions/move/frame.ts
-function foldBehaviors(session, readers, moveCtx, dx0, dy0) {
-	let dx = dx0;
-	let dy = dy0;
+function foldBehaviors(session, readers, moveCtx, dx, dy) {
 	const posed = /* @__PURE__ */ new Map();
 	const opaque = /* @__PURE__ */ new Set();
 	const gctx = session.gestureCtx;
@@ -24,16 +22,12 @@ function foldBehaviors(session, readers, moveCtx, dx0, dy0) {
 		if (!r) continue;
 		if (r.poses) for (const [id, pose] of r.poses) posed.set(id, pose);
 		if (r.opaque) for (const id of r.opaque) opaque.add(id);
-		if (r.transform && r.transform.kind === "translate") transform = r.transform;
+		if (r.transform) transform = r.transform;
 		if (r.snap !== void 0) gctx.snap = r.snap;
 	}
-	if (transform.kind === "translate") {
-		dx = transform.dx;
-		dy = transform.dy;
-	}
 	return {
-		dx,
-		dy,
+		dx: transform.dx,
+		dy: transform.dy,
 		posed,
 		opaque
 	};

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

@@ -1 +1 @@
-{"version":3,"file":"frame.js","names":[],"sources":["../../../../src/interactions/actions/move/frame.ts"],"sourcesContent":["import type { InvocationCtx } from '@weasel-js/routing';\nimport { pointerStateOf } from '../pointerState';\nimport type { NodeId } from 'core/scene/types';\nimport type { GestureReaders } from '../../gestures/shared/screenTolerance';\nimport type { BehaviorResult, GroupTransform } from '../../gestures/types';\nimport { draggedStoredPose } from './delta';\nimport { snapMods } from 'features/snap/roles';\nimport type { MoveFrame, MoveSession } from './session';\n\nfunction foldBehaviors(\n  session: MoveSession,\n  readers: GestureReaders,\n  moveCtx: InvocationCtx,\n  dx0: number,\n  dy0: number,\n): { dx: number; dy: number; posed: Map<NodeId, unknown>; opaque: Set<NodeId> } {\n  let dx = dx0;\n  let dy = dy0;\n\n  const posed = new Map<NodeId, unknown>();\n  const opaque = new Set<NodeId>();\n  const gctx = session.gestureCtx;\n  gctx.modifiers = { ...moveCtx.modifiers };\n  gctx.pointer = pointerStateOf(moveCtx.drag!.current, moveCtx);\n  gctx.view = readers.view();\n  gctx.plane = readers.plane();\n  // `current` is pre-populated from the raw cursor delta BEFORE\n  // any behavior shapes `transform`. Unlike `onEnd`, it is NOT\n  // refreshed after each behavior runs — so onMove behaviors\n  // should derive position from `origin` + the `proposed`\n  // GroupTransform arg, NOT from `ctx.current` (which reflects\n  // the unmodified delta at this frame's start).\n  for (const [id, ori] of session.startPoses) {\n    gctx.current.set(id as string, draggedStoredPose(session, id, ori, dx, dy));\n  }\n  let transform: GroupTransform = { kind: 'translate', dx, dy };\n  for (const b of session.behaviors) {\n    const r: BehaviorResult<unknown> | void = b.onMove?.(gctx, transform);\n    if (!r) continue;\n    if (r.poses) for (const [id, pose] of r.poses) posed.set(id as NodeId, pose);\n    if (r.opaque) for (const id of r.opaque) opaque.add(id as NodeId);\n    if (r.transform && r.transform.kind === 'translate') transform = r.transform;\n    if (r.snap !== undefined) gctx.snap = r.snap;\n  }\n  if (transform.kind === 'translate') { dx = transform.dx; dy = transform.dy; }\n  return { dx, dy, posed, opaque };\n}\n\n/** The pointer's delta, moved so the subject lands on what the snap session\n *  holds it to. */\nfunction snapDelta(session: MoveSession, moveCtx: InvocationCtx): { dx: number; dy: number } {\n  const d = moveCtx.drag!.delta;\n  if (!session.snap) return { dx: d.x, dy: d.y };\n  const { press } = session;\n  const out = session.snap.at({ x: press.x + d.x, y: press.y + d.y }, snapMods(moveCtx));\n  return { dx: out.point.x - press.x, dy: out.point.y - press.y };\n}\n\n/** One move's delta and previews: the pointer's delta as the behaviors shaped\n *  it, every displaced id's stored pose under it, and whatever else the\n *  behaviors posed. */\nexport function nextFrame(session: MoveSession, readers: GestureReaders, moveCtx: InvocationCtx): MoveFrame {\n  const snapped = snapDelta(session, moveCtx);\n  const { dx, dy, posed, opaque } = foldBehaviors(session, readers, moveCtx, snapped.dx, snapped.dy);\n\n  // The delta stays in the frame — no scene writes, no history entries.\n  const delta = { dx, dy };\n  // Refresh preview poses for every displaced id (roots + cascade).\n  // The preview-ghost layer reads these via `previewIds`/`previewPose`.\n  const previews = new Map<NodeId, unknown>();\n  for (const [id, ori] of session.startPoses) {\n    const dragged = draggedStoredPose(session, id, ori, dx, dy);\n    previews.set(id, session.carried.has(id) ? dragged : posed.get(id) ?? dragged);\n  }\n  for (const [id, pose] of posed) if (!session.startPoses.has(id)) previews.set(id, pose);\n  return { delta, previews, opaque };\n}\n"],"mappings":";;;;;AASA,SAAS,cACP,SACA,SACA,SACA,KACA,KAC8E;CAC9E,IAAI,KAAK;CACT,IAAI,KAAK;CAET,MAAM,wBAAQ,IAAI,IAAqB;CACvC,MAAM,yBAAS,IAAI,IAAY;CAC/B,MAAM,OAAO,QAAQ;CACrB,KAAK,YAAY,EAAE,GAAG,QAAQ,UAAU;CACxC,KAAK,UAAU,eAAe,QAAQ,KAAM,SAAS,OAAO;CAC5D,KAAK,OAAO,QAAQ,KAAK;CACzB,KAAK,QAAQ,QAAQ,MAAM;CAO3B,KAAK,MAAM,CAAC,IAAI,QAAQ,QAAQ,YAC9B,KAAK,QAAQ,IAAI,IAAc,kBAAkB,SAAS,IAAI,KAAK,IAAI,EAAE,CAAC;CAE5E,IAAI,YAA4B;EAAE,MAAM;EAAa;EAAI;CAAG;CAC5D,KAAK,MAAM,KAAK,QAAQ,WAAW;EACjC,MAAM,IAAoC,EAAE,SAAS,MAAM,SAAS;EACpE,IAAI,CAAC,GAAG;EACR,IAAI,EAAE,OAAO,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,OAAO,MAAM,IAAI,IAAc,IAAI;EAC3E,IAAI,EAAE,QAAQ,KAAK,MAAM,MAAM,EAAE,QAAQ,OAAO,IAAI,EAAY;EAChE,IAAI,EAAE,aAAa,EAAE,UAAU,SAAS,aAAa,YAAY,EAAE;EACnE,IAAI,EAAE,SAAS,QAAW,KAAK,OAAO,EAAE;CAC1C;CACA,IAAI,UAAU,SAAS,aAAa;EAAE,KAAK,UAAU;EAAI,KAAK,UAAU;CAAI;CAC5E,OAAO;EAAE;EAAI;EAAI;EAAO;CAAO;AACjC;;;AAIA,SAAS,UAAU,SAAsB,SAAoD;CAC3F,MAAM,IAAI,QAAQ,KAAM;CACxB,IAAI,CAAC,QAAQ,MAAM,OAAO;EAAE,IAAI,EAAE;EAAG,IAAI,EAAE;CAAE;CAC7C,MAAM,EAAE,UAAU;CAClB,MAAM,MAAM,QAAQ,KAAK,GAAG;EAAE,GAAG,MAAM,IAAI,EAAE;EAAG,GAAG,MAAM,IAAI,EAAE;CAAE,GAAG,SAAS,OAAO,CAAC;CACrF,OAAO;EAAE,IAAI,IAAI,MAAM,IAAI,MAAM;EAAG,IAAI,IAAI,MAAM,IAAI,MAAM;CAAE;AAChE;;;;AAKA,SAAgB,UAAU,SAAsB,SAAyB,SAAmC;CAC1G,MAAM,UAAU,UAAU,SAAS,OAAO;CAC1C,MAAM,EAAE,IAAI,IAAI,OAAO,WAAW,cAAc,SAAS,SAAS,SAAS,QAAQ,IAAI,QAAQ,EAAE;CAGjG,MAAM,QAAQ;EAAE;EAAI;CAAG;CAGvB,MAAM,2BAAW,IAAI,IAAqB;CAC1C,KAAK,MAAM,CAAC,IAAI,QAAQ,QAAQ,YAAY;EAC1C,MAAM,UAAU,kBAAkB,SAAS,IAAI,KAAK,IAAI,EAAE;EAC1D,SAAS,IAAI,IAAI,QAAQ,QAAQ,IAAI,EAAE,IAAI,UAAU,MAAM,IAAI,EAAE,KAAK,OAAO;CAC/E;CACA,KAAK,MAAM,CAAC,IAAI,SAAS,OAAO,IAAI,CAAC,QAAQ,WAAW,IAAI,EAAE,GAAG,SAAS,IAAI,IAAI,IAAI;CACtF,OAAO;EAAE;EAAO;EAAU;CAAO;AACnC"}
+{"version":3,"file":"frame.js","names":[],"sources":["../../../../src/interactions/actions/move/frame.ts"],"sourcesContent":["import type { InvocationCtx } from '@weasel-js/routing';\nimport { pointerStateOf } from '../pointerState';\nimport type { NodeId } from 'core/scene/types';\nimport type { GestureReaders } from '../../gestures/shared/screenTolerance';\nimport type { BehaviorResult, GroupTransform } from '../../gestures/types';\nimport { draggedStoredPose } from './delta';\nimport { snapMods } from 'features/snap/roles';\nimport type { MoveFrame, MoveSession } from './session';\n\nfunction foldBehaviors(\n  session: MoveSession,\n  readers: GestureReaders,\n  moveCtx: InvocationCtx,\n  dx: number,\n  dy: number,\n): { dx: number; dy: number; posed: Map<NodeId, unknown>; opaque: Set<NodeId> } {\n  const posed = new Map<NodeId, unknown>();\n  const opaque = new Set<NodeId>();\n  const gctx = session.gestureCtx;\n  gctx.modifiers = { ...moveCtx.modifiers };\n  gctx.pointer = pointerStateOf(moveCtx.drag!.current, moveCtx);\n  gctx.view = readers.view();\n  gctx.plane = readers.plane();\n  // `current` is pre-populated from the raw cursor delta BEFORE\n  // any behavior shapes `transform`. Unlike `onEnd`, it is NOT\n  // refreshed after each behavior runs — so onMove behaviors\n  // should derive position from `origin` + the `proposed`\n  // GroupTransform arg, NOT from `ctx.current` (which reflects\n  // the unmodified delta at this frame's start).\n  for (const [id, ori] of session.startPoses) {\n    gctx.current.set(id as string, draggedStoredPose(session, id, ori, dx, dy));\n  }\n  let transform: GroupTransform = { kind: 'translate', dx, dy };\n  for (const b of session.behaviors) {\n    const r: BehaviorResult<unknown> | void = b.onMove?.(gctx, transform);\n    if (!r) continue;\n    if (r.poses) for (const [id, pose] of r.poses) posed.set(id as NodeId, pose);\n    if (r.opaque) for (const id of r.opaque) opaque.add(id as NodeId);\n    if (r.transform) transform = r.transform;\n    if (r.snap !== undefined) gctx.snap = r.snap;\n  }\n  return { dx: transform.dx, dy: transform.dy, posed, opaque };\n}\n\n/** The pointer's delta, moved so the subject lands on what the snap session\n *  holds it to. */\nfunction snapDelta(session: MoveSession, moveCtx: InvocationCtx): { dx: number; dy: number } {\n  const d = moveCtx.drag!.delta;\n  if (!session.snap) return { dx: d.x, dy: d.y };\n  const { press } = session;\n  const out = session.snap.at({ x: press.x + d.x, y: press.y + d.y }, snapMods(moveCtx));\n  return { dx: out.point.x - press.x, dy: out.point.y - press.y };\n}\n\n/** One move's delta and previews: the pointer's delta as the behaviors shaped\n *  it, every displaced id's stored pose under it, and whatever else the\n *  behaviors posed. */\nexport function nextFrame(session: MoveSession, readers: GestureReaders, moveCtx: InvocationCtx): MoveFrame {\n  const snapped = snapDelta(session, moveCtx);\n  const { dx, dy, posed, opaque } = foldBehaviors(session, readers, moveCtx, snapped.dx, snapped.dy);\n\n  // The delta stays in the frame — no scene writes, no history entries.\n  const delta = { dx, dy };\n  // Every displaced id's pose (roots + cascade), published to the scene's\n  // overrides by the action.\n  const previews = new Map<NodeId, unknown>();\n  for (const [id, ori] of session.startPoses) {\n    const dragged = draggedStoredPose(session, id, ori, dx, dy);\n    previews.set(id, session.carried.has(id) ? dragged : posed.get(id) ?? dragged);\n  }\n  for (const [id, pose] of posed) if (!session.startPoses.has(id)) previews.set(id, pose);\n  return { delta, previews, opaque };\n}\n"],"mappings":";;;;;AASA,SAAS,cACP,SACA,SACA,SACA,IACA,IAC8E;CAC9E,MAAM,wBAAQ,IAAI,IAAqB;CACvC,MAAM,yBAAS,IAAI,IAAY;CAC/B,MAAM,OAAO,QAAQ;CACrB,KAAK,YAAY,EAAE,GAAG,QAAQ,UAAU;CACxC,KAAK,UAAU,eAAe,QAAQ,KAAM,SAAS,OAAO;CAC5D,KAAK,OAAO,QAAQ,KAAK;CACzB,KAAK,QAAQ,QAAQ,MAAM;CAO3B,KAAK,MAAM,CAAC,IAAI,QAAQ,QAAQ,YAC9B,KAAK,QAAQ,IAAI,IAAc,kBAAkB,SAAS,IAAI,KAAK,IAAI,EAAE,CAAC;CAE5E,IAAI,YAA4B;EAAE,MAAM;EAAa;EAAI;CAAG;CAC5D,KAAK,MAAM,KAAK,QAAQ,WAAW;EACjC,MAAM,IAAoC,EAAE,SAAS,MAAM,SAAS;EACpE,IAAI,CAAC,GAAG;EACR,IAAI,EAAE,OAAO,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,OAAO,MAAM,IAAI,IAAc,IAAI;EAC3E,IAAI,EAAE,QAAQ,KAAK,MAAM,MAAM,EAAE,QAAQ,OAAO,IAAI,EAAY;EAChE,IAAI,EAAE,WAAW,YAAY,EAAE;EAC/B,IAAI,EAAE,SAAS,QAAW,KAAK,OAAO,EAAE;CAC1C;CACA,OAAO;EAAE,IAAI,UAAU;EAAI,IAAI,UAAU;EAAI;EAAO;CAAO;AAC7D;;;AAIA,SAAS,UAAU,SAAsB,SAAoD;CAC3F,MAAM,IAAI,QAAQ,KAAM;CACxB,IAAI,CAAC,QAAQ,MAAM,OAAO;EAAE,IAAI,EAAE;EAAG,IAAI,EAAE;CAAE;CAC7C,MAAM,EAAE,UAAU;CAClB,MAAM,MAAM,QAAQ,KAAK,GAAG;EAAE,GAAG,MAAM,IAAI,EAAE;EAAG,GAAG,MAAM,IAAI,EAAE;CAAE,GAAG,SAAS,OAAO,CAAC;CACrF,OAAO;EAAE,IAAI,IAAI,MAAM,IAAI,MAAM;EAAG,IAAI,IAAI,MAAM,IAAI,MAAM;CAAE;AAChE;;;;AAKA,SAAgB,UAAU,SAAsB,SAAyB,SAAmC;CAC1G,MAAM,UAAU,UAAU,SAAS,OAAO;CAC1C,MAAM,EAAE,IAAI,IAAI,OAAO,WAAW,cAAc,SAAS,SAAS,SAAS,QAAQ,IAAI,QAAQ,EAAE;CAGjG,MAAM,QAAQ;EAAE;EAAI;CAAG;CAGvB,MAAM,2BAAW,IAAI,IAAqB;CAC1C,KAAK,MAAM,CAAC,IAAI,QAAQ,QAAQ,YAAY;EAC1C,MAAM,UAAU,kBAAkB,SAAS,IAAI,KAAK,IAAI,EAAE;EAC1D,SAAS,IAAI,IAAI,QAAQ,QAAQ,IAAI,EAAE,IAAI,UAAU,MAAM,IAAI,EAAE,KAAK,OAAO;CAC/E;CACA,KAAK,MAAM,CAAC,IAAI,SAAS,OAAO,IAAI,CAAC,QAAQ,WAAW,IAAI,EAAE,GAAG,SAAS,IAAI,IAAI,IAAI;CACtF,OAAO;EAAE;EAAO;EAAU;CAAO;AACnC"}

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

@@ -1,41 +1,44 @@
 import { translatePoseViaDescriptor } from "../../../core/geometry/poseDescriptor.js";
-import { subtreeIds } from "../selectionSubtree.js";
+import { carriedDescendants, sceneCarrySource } from "../../../core/scene/carryDescendants.js";
 import { createTransformOp } from "../../../core/ops/transform.js";
 
 //#region src/interactions/actions/move/landedDescendants.ts
 /**
-* Ops that bring each dragged root's descendants along to wherever `ops` put
-* the root. A layout drop or a behavior places the root itself, somewhere the
-* drag delta does not describe, so each descendant moves by its root's landed
-* pose less its start pose. A descendant `ops` already writes, or that a
+* Ops that bring along the descendants of every node `ops` transforms. A
+* layout drop or a behavior places a dragged root somewhere the drag delta
+* does not describe, and a layout shifts siblings to make room, so each
+* descendant moves by its nearest transformed ancestor's landed pose less
+* that ancestor's start pose. A descendant `ops` already writes, or that a
 * moving frame carries, is left alone.
 */
 function landedDescendantOps(input, ops) {
-	const { scene, projection, startPoses, carried, label } = input;
+	const { scene, projection, startPoses, label } = input;
 	const landed = /* @__PURE__ */ new Map();
 	for (const op of ops) {
 		if (op.name !== "transform") continue;
 		const a = op.args;
-		landed.set(a.id, a.to);
+		const id = a.id;
+		landed.set(id, {
+			from: landed.get(id)?.from ?? startPoses.get(id) ?? a.from,
+			to: a.to
+		});
 	}
+	const source = sceneCarrySource(scene);
 	const out = [];
-	for (const root of input.roots) {
-		const to = landed.get(root);
-		const start = startPoses.get(root);
-		if (to === void 0 || start === void 0) continue;
-		const a = projection.getBounds(start);
+	for (const [root, { from, to }] of landed) {
+		if (from === void 0 || to === void 0) continue;
+		const a = projection.getBounds(from);
 		const b = projection.getBounds(to);
 		const dx = b.x - a.x;
 		const dy = b.y - a.y;
 		if (dx === 0 && dy === 0) continue;
-		for (const id of subtreeIds(scene, root)) {
-			if (id === root || landed.has(id) || carried.has(id)) continue;
+		const carried = carriedDescendants(source, root, (pose) => translatePoseViaDescriptor(pose, dx, dy, projection), (id) => landed.has(id));
+		for (const [id, pose] of carried) {
 			const node = scene.get(id);
-			if (!node) continue;
-			out.push(createTransformOp({
+			if (node) out.push(createTransformOp({
 				id,
 				from: node.pose,
-				to: translatePoseViaDescriptor(node.pose, dx, dy, projection),
+				to: pose,
 				label
 			}));
 		}

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

@@ -1 +1 @@
-{"version":3,"file":"landedDescendants.js","names":[],"sources":["../../../../src/interactions/actions/move/landedDescendants.ts"],"sourcesContent":["import type { NodeId, Scene } from 'core/scene/types';\nimport type { Op } from 'core/ops/types';\nimport { createTransformOp } from 'core/ops/transform';\nimport { translatePoseViaDescriptor, type PoseDescriptor } from 'core/geometry/poseDescriptor';\nimport { subtreeIds } from '../selectionSubtree';\n\n/** What a move gesture captured at its start, as this pass reads it. */\nexport interface LandedDescendantsInput {\n  scene: Scene<unknown, string, unknown>;\n  projection: PoseDescriptor<unknown>;\n  /** The dragged roots. */\n  roots: readonly NodeId[];\n  /** Start pose of every root and descendant. */\n  startPoses: ReadonlyMap<NodeId, unknown>;\n  /** Descendants stored in a moving node's frame, which that node carries. */\n  carried: ReadonlySet<NodeId>;\n  label: string;\n}\n\n/**\n * Ops that bring each dragged root's descendants along to wherever `ops` put\n * the root. A layout drop or a behavior places the root itself, somewhere the\n * drag delta does not describe, so each descendant moves by its root's landed\n * pose less its start pose. A descendant `ops` already writes, or that a\n * moving frame carries, is left alone.\n */\nexport function landedDescendantOps(input: LandedDescendantsInput, ops: readonly Op[]): Op[] {\n  const { scene, projection, startPoses, carried, label } = input;\n  const landed = new Map<string, unknown>();\n  for (const op of ops) {\n    if (op.name !== 'transform') continue;\n    const a = op.args as { id: string; to: unknown };\n    landed.set(a.id, a.to);\n  }\n  const out: Op[] = [];\n  for (const root of input.roots) {\n    const to = landed.get(root);\n    const start = startPoses.get(root);\n    if (to === undefined || start === undefined) continue;\n    const a = projection.getBounds(start);\n    const b = projection.getBounds(to);\n    const dx = b.x - a.x;\n    const dy = b.y - a.y;\n    if (dx === 0 && dy === 0) continue;\n    for (const id of subtreeIds(scene, root)) {\n      if (id === root || landed.has(id) || carried.has(id)) continue;\n      const node = scene.get(id);\n      if (!node) continue;\n      out.push(createTransformOp<unknown>({\n        id,\n        from: node.pose,\n        to: translatePoseViaDescriptor(node.pose, dx, dy, projection),\n        label,\n      }));\n    }\n  }\n  return out;\n}\n"],"mappings":";;;;;;;;;;;;AA0BA,SAAgB,oBAAoB,OAA+B,KAA0B;CAC3F,MAAM,EAAE,OAAO,YAAY,YAAY,SAAS,UAAU;CAC1D,MAAM,yBAAS,IAAI,IAAqB;CACxC,KAAK,MAAM,MAAM,KAAK;EACpB,IAAI,GAAG,SAAS,aAAa;EAC7B,MAAM,IAAI,GAAG;EACb,OAAO,IAAI,EAAE,IAAI,EAAE,EAAE;CACvB;CACA,MAAM,MAAY,CAAC;CACnB,KAAK,MAAM,QAAQ,MAAM,OAAO;EAC9B,MAAM,KAAK,OAAO,IAAI,IAAI;EAC1B,MAAM,QAAQ,WAAW,IAAI,IAAI;EACjC,IAAI,OAAO,UAAa,UAAU,QAAW;EAC7C,MAAM,IAAI,WAAW,UAAU,KAAK;EACpC,MAAM,IAAI,WAAW,UAAU,EAAE;EACjC,MAAM,KAAK,EAAE,IAAI,EAAE;EACnB,MAAM,KAAK,EAAE,IAAI,EAAE;EACnB,IAAI,OAAO,KAAK,OAAO,GAAG;EAC1B,KAAK,MAAM,MAAM,WAAW,OAAO,IAAI,GAAG;GACxC,IAAI,OAAO,QAAQ,OAAO,IAAI,EAAE,KAAK,QAAQ,IAAI,EAAE,GAAG;GACtD,MAAM,OAAO,MAAM,IAAI,EAAE;GACzB,IAAI,CAAC,MAAM;GACX,IAAI,KAAK,kBAA2B;IAClC;IACA,MAAM,KAAK;IACX,IAAI,2BAA2B,KAAK,MAAM,IAAI,IAAI,UAAU;IAC5D;GACF,CAAC,CAAC;EACJ;CACF;CACA,OAAO;AACT"}
+{"version":3,"file":"landedDescendants.js","names":[],"sources":["../../../../src/interactions/actions/move/landedDescendants.ts"],"sourcesContent":["import type { NodeId, Scene } from 'core/scene/types';\nimport type { Op } from 'core/ops/types';\nimport { createTransformOp } from 'core/ops/transform';\nimport { translatePoseViaDescriptor, type PoseDescriptor } from 'core/geometry/poseDescriptor';\nimport { carriedDescendants, sceneCarrySource } from 'core/scene/carryDescendants';\n\n/** What a move gesture captured at its start, as this pass reads it. */\nexport interface LandedDescendantsInput {\n  scene: Scene<unknown, string, unknown>;\n  projection: PoseDescriptor<unknown>;\n  /** Start pose of every root and descendant. */\n  startPoses: ReadonlyMap<NodeId, unknown>;\n  label: string;\n}\n\n/**\n * Ops that bring along the descendants of every node `ops` transforms. A\n * layout drop or a behavior places a dragged root somewhere the drag delta\n * does not describe, and a layout shifts siblings to make room, so each\n * descendant moves by its nearest transformed ancestor's landed pose less\n * that ancestor's start pose. A descendant `ops` already writes, or that a\n * moving frame carries, is left alone.\n */\nexport function landedDescendantOps(input: LandedDescendantsInput, ops: readonly Op[]): Op[] {\n  const { scene, projection, startPoses, label } = input;\n  const landed = new Map<NodeId, { from: unknown; to: unknown }>();\n  for (const op of ops) {\n    if (op.name !== 'transform') continue;\n    const a = op.args as { id: string; from: unknown; to: unknown };\n    const id = a.id as NodeId;\n    landed.set(id, { from: landed.get(id)?.from ?? startPoses.get(id) ?? a.from, to: a.to });\n  }\n  const source = sceneCarrySource(scene);\n  const out: Op[] = [];\n  for (const [root, { from, to }] of landed) {\n    if (from === undefined || to === undefined) continue;\n    const a = projection.getBounds(from);\n    const b = projection.getBounds(to);\n    const dx = b.x - a.x;\n    const dy = b.y - a.y;\n    if (dx === 0 && dy === 0) continue;\n    const carried = carriedDescendants(\n      source,\n      root,\n      (pose) => translatePoseViaDescriptor(pose, dx, dy, projection),\n      (id) => landed.has(id),\n    );\n    for (const [id, pose] of carried) {\n      const node = scene.get(id);\n      if (node) out.push(createTransformOp<unknown>({ id, from: node.pose, to: pose, label }));\n    }\n  }\n  return out;\n}\n"],"mappings":";;;;;;;;;;;;;AAuBA,SAAgB,oBAAoB,OAA+B,KAA0B;CAC3F,MAAM,EAAE,OAAO,YAAY,YAAY,UAAU;CACjD,MAAM,yBAAS,IAAI,IAA4C;CAC/D,KAAK,MAAM,MAAM,KAAK;EACpB,IAAI,GAAG,SAAS,aAAa;EAC7B,MAAM,IAAI,GAAG;EACb,MAAM,KAAK,EAAE;EACb,OAAO,IAAI,IAAI;GAAE,MAAM,OAAO,IAAI,EAAE,CAAC,EAAE,QAAQ,WAAW,IAAI,EAAE,KAAK,EAAE;GAAM,IAAI,EAAE;EAAG,CAAC;CACzF;CACA,MAAM,SAAS,iBAAiB,KAAK;CACrC,MAAM,MAAY,CAAC;CACnB,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,SAAS,QAAQ;EACzC,IAAI,SAAS,UAAa,OAAO,QAAW;EAC5C,MAAM,IAAI,WAAW,UAAU,IAAI;EACnC,MAAM,IAAI,WAAW,UAAU,EAAE;EACjC,MAAM,KAAK,EAAE,IAAI,EAAE;EACnB,MAAM,KAAK,EAAE,IAAI,EAAE;EACnB,IAAI,OAAO,KAAK,OAAO,GAAG;EAC1B,MAAM,UAAU,mBACd,QACA,OACC,SAAS,2BAA2B,MAAM,IAAI,IAAI,UAAU,IAC5D,OAAO,OAAO,IAAI,EAAE,CACvB;EACA,KAAK,MAAM,CAAC,IAAI,SAAS,SAAS;GAChC,MAAM,OAAO,MAAM,IAAI,EAAE;GACzB,IAAI,MAAM,IAAI,KAAK,kBAA2B;IAAE;IAAI,MAAM,KAAK;IAAM,IAAI;IAAM;GAAM,CAAC,CAAC;EACzF;CACF;CACA,OAAO;AACT"}

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

@@ -1,8 +1,8 @@
 import { toPlane } from "../../../../core/viewport/parallax.js";
 import { composeWorldPose } from "../../../../core/scene/composeFrame.js";
 import { poseDescriptorForNode } from "../../../../core/geometry/poseDescriptor.js";
-import { planeOf } from "../../planeInput.js";
 import { scenePoseAdapter } from "../../../../core/scene/scenePoseAdapter.js";
+import { planeOf } from "../../planeInput.js";
 import { carryDragged } from "./dragged.js";
 import { pointInPath } from "@weasel-js/geom";
 
@@ -80,6 +80,7 @@ function pickContainer(session, dragged, center) {
 		const plane = planeOf(session.view, node.layer);
 		const at = plane ? toPlane(plane, center) : center;
 		if (!testInside(id, worldPose, worldAABB, layout, at)) return;
+		if (!session.admits(id)) return;
 		if (layout.acceptsDrop) {
 			const arg = {
 				id,

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

@@ -1 +1 @@
-{"version":3,"file":"container.js","names":[],"sources":["../../../../../src/interactions/actions/move/layout/container.ts"],"sourcesContent":["import { pointInPath } from '@weasel-js/geom';\nimport type { NodeId, Scene } from 'core/scene/types';\nimport { poseDescriptorForNode } from 'core/geometry/poseDescriptor';\nimport { toPlane, type PlaneMap } from 'core/viewport/parallax';\nimport { composeWorldPose } from 'core/scene/composePose';\nimport { scenePoseAdapter } from 'core/scene/scenePoseAdapter';\nimport type { DropRegion, LayoutContainer, LayoutStrategy } from '../../../../layout/types';\nimport type { LayoutDep } from '../../depSchema';\nimport { planeOf } from '../../planeInput';\nimport type { MoveSession } from '../session';\nimport { carryDragged, type DraggedChild } from './dragged';\n\nexport interface Bounds4 { x: number; y: number; width: number; height: number }\nexport function pointInBounds(b: Bounds4, at: { x: number; y: number }): boolean {\n  return at.x >= b.x && at.x < b.x + b.width && at.y >= b.y && at.y < b.y + b.height;\n}\n\ntype Layout = LayoutStrategy<unknown>;\nexport interface Candidate {\n  id: NodeId;\n  bounds: Bounds4;\n  layout: LayoutStrategy<unknown>;\n  zPath: number[];\n  depth: number;\n  /** The edited plane into this container's. */\n  plane: PlaneMap | null;\n}\n\n/** Whether a world point falls in a drop region, which is authored relative to\n *  the top-left of the container's world bounds. */\nfunction regionContains(\n  region: DropRegion,\n  bounds: { x: number; y: number },\n  point: { x: number; y: number },\n): boolean {\n  const local = { x: point.x - bounds.x, y: point.y - bounds.y };\n  return typeof region === 'function'\n    ? region(local)\n    : pointInPath(region, local.x, local.y);\n}\n\nfunction chooseContainer(\n  scene: Scene<unknown, string, unknown>,\n  mode: NonNullable<LayoutDep['dropTarget']>,\n  candidates: readonly Candidate[],\n): Candidate | null {\n  let dest: Candidate | null = null;\n  if (mode === 'topmost') {\n    // Painted last wins, in the scene's own render order — which crosses\n    // subtrees and layers, where a sibling-index path cannot.\n    const byId = new Map<NodeId, Candidate>(candidates.map((c) => [c.id, c]));\n    for (const id of scene.renderOrder()) dest = byId.get(id) ?? dest;\n  } else {\n    // Deepest wins; sibling-index path breaks ties (higher z = later index).\n    for (const c of candidates) {\n      if (dest === null) { dest = c; continue; }\n      if (c.depth > dest.depth) { dest = c; continue; }\n      if (c.depth < dest.depth) continue;\n      let cAfter = false;\n      for (let i = 0; i < c.zPath.length; i++) {\n        if (c.zPath[i] > dest.zPath[i]) { cAfter = true; break; }\n        if (c.zPath[i] < dest.zPath[i]) { cAfter = false; break; }\n      }\n      if (cAfter) dest = c;\n    }\n  }\n  return dest;\n}\n\n/** The layout container that takes the drop at `center`, or null. */\nexport function pickContainer(\n  session: MoveSession,\n  dragged: readonly DraggedChild[],\n  center: { x: number; y: number },\n): Candidate | null {\n  const layoutDep = session.layout;\n  if (!layoutDep) return null;\n  const scene = session.scene;\n  const pc = session.pc;\n  const poseAdapter = scenePoseAdapter(scene);\n  const d = session.projection;\n  const draggedIds = new Set<NodeId>(dragged.map((c) => c.id));\n  const candidates: Candidate[] = [];\n  const mode = layoutDep.dropTarget ?? 'innermost';\n  const testInside = (\n    id: NodeId, cPose: unknown, aabb: Bounds4, layout: Layout, at: { x: number; y: number },\n  ): boolean => {\n    const region = layout.dropRegion?.({ id: id as string, bounds: aabb }) ?? null;\n    if (region) return regionContains(region, aabb, at);\n    if (mode === 'region') return false;\n    if (layout.contains) return layout.contains(cPose, at);\n    return pointInBounds(aabb, at);\n  };\n  const consider = (id: NodeId, zPath: number[]): void => {\n    const layout = layoutDep.getLayout(id as string);\n    if (!layout) return;\n    const node = scene.get(id);\n    if (!node) return;\n    const worldPose = composeWorldPose(poseAdapter, id as string, pc.compose);\n    const worldAABB = poseDescriptorForNode(d, node).getBounds(worldPose);\n    const plane = planeOf(session.view, node.layer);\n    const at = plane ? toPlane(plane, center) : center;\n    if (!testInside(id, worldPose, worldAABB, layout, at)) return;\n    if (layout.acceptsDrop) {\n      const arg: LayoutContainer = { id: id as string, bounds: worldAABB };\n      for (const c of dragged) if (!layout.acceptsDrop(arg, carryDragged(session, c, plane).arg)) return;\n    }\n    candidates.push({\n      id,\n      bounds: worldAABB,\n      layout,\n      zPath,\n      depth: zPath.length,\n      plane,\n    });\n  };\n  const walk = (parentId: NodeId | null, parentPath: number[]): void => {\n    const childIds = parentId === null ? scene.roots : scene.childrenOf(parentId);\n    for (let i = 0; i < childIds.length; i++) {\n      // A dragged root's subtree goes with it: dropping into one of its own\n      // descendants would reparent it under itself.\n      if (draggedIds.has(childIds[i])) continue;\n      const childPath = [...parentPath, i];\n      consider(childIds[i], childPath);\n      walk(childIds[i], childPath);\n    }\n  };\n  walk(null, []);\n\n  return chooseContainer(scene, mode, candidates);\n}\n"],"mappings":"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"}
+{"version":3,"file":"container.js","names":[],"sources":["../../../../../src/interactions/actions/move/layout/container.ts"],"sourcesContent":["import { pointInPath } from '@weasel-js/geom';\nimport type { NodeId, Scene } from 'core/scene/types';\nimport { poseDescriptorForNode } from 'core/geometry/poseDescriptor';\nimport { toPlane, type PlaneMap } from 'core/viewport/parallax';\nimport { composeWorldPose } from 'core/scene/composePose';\nimport { scenePoseAdapter } from 'core/scene/scenePoseAdapter';\nimport type { DropRegion, LayoutContainer, LayoutStrategy } from '../../../../layout/types';\nimport type { LayoutDep } from '../../depSchema';\nimport { planeOf } from '../../planeInput';\nimport type { MoveSession } from '../session';\nimport { carryDragged, type DraggedChild } from './dragged';\n\nexport interface Bounds4 { x: number; y: number; width: number; height: number }\nexport function pointInBounds(b: Bounds4, at: { x: number; y: number }): boolean {\n  return at.x >= b.x && at.x < b.x + b.width && at.y >= b.y && at.y < b.y + b.height;\n}\n\ntype Layout = LayoutStrategy<unknown>;\nexport interface Candidate {\n  id: NodeId;\n  bounds: Bounds4;\n  layout: LayoutStrategy<unknown>;\n  zPath: number[];\n  depth: number;\n  /** The edited plane into this container's. */\n  plane: PlaneMap | null;\n}\n\n/** Whether a world point falls in a drop region, which is authored relative to\n *  the top-left of the container's world bounds. */\nfunction regionContains(\n  region: DropRegion,\n  bounds: { x: number; y: number },\n  point: { x: number; y: number },\n): boolean {\n  const local = { x: point.x - bounds.x, y: point.y - bounds.y };\n  return typeof region === 'function'\n    ? region(local)\n    : pointInPath(region, local.x, local.y);\n}\n\nfunction chooseContainer(\n  scene: Scene<unknown, string, unknown>,\n  mode: NonNullable<LayoutDep['dropTarget']>,\n  candidates: readonly Candidate[],\n): Candidate | null {\n  let dest: Candidate | null = null;\n  if (mode === 'topmost') {\n    // Painted last wins, in the scene's own render order — which crosses\n    // subtrees and layers, where a sibling-index path cannot.\n    const byId = new Map<NodeId, Candidate>(candidates.map((c) => [c.id, c]));\n    for (const id of scene.renderOrder()) dest = byId.get(id) ?? dest;\n  } else {\n    // Deepest wins; sibling-index path breaks ties (higher z = later index).\n    for (const c of candidates) {\n      if (dest === null) { dest = c; continue; }\n      if (c.depth > dest.depth) { dest = c; continue; }\n      if (c.depth < dest.depth) continue;\n      let cAfter = false;\n      for (let i = 0; i < c.zPath.length; i++) {\n        if (c.zPath[i] > dest.zPath[i]) { cAfter = true; break; }\n        if (c.zPath[i] < dest.zPath[i]) { cAfter = false; break; }\n      }\n      if (cAfter) dest = c;\n    }\n  }\n  return dest;\n}\n\n/** The layout container that takes the drop at `center`, or null. */\nexport function pickContainer(\n  session: MoveSession,\n  dragged: readonly DraggedChild[],\n  center: { x: number; y: number },\n): Candidate | null {\n  const layoutDep = session.layout;\n  if (!layoutDep) return null;\n  const scene = session.scene;\n  const pc = session.pc;\n  const poseAdapter = scenePoseAdapter(scene);\n  const d = session.projection;\n  const draggedIds = new Set<NodeId>(dragged.map((c) => c.id));\n  const candidates: Candidate[] = [];\n  const mode = layoutDep.dropTarget ?? 'innermost';\n  const testInside = (\n    id: NodeId, cPose: unknown, aabb: Bounds4, layout: Layout, at: { x: number; y: number },\n  ): boolean => {\n    const region = layout.dropRegion?.({ id: id as string, bounds: aabb }) ?? null;\n    if (region) return regionContains(region, aabb, at);\n    if (mode === 'region') return false;\n    if (layout.contains) return layout.contains(cPose, at);\n    return pointInBounds(aabb, at);\n  };\n  const consider = (id: NodeId, zPath: number[]): void => {\n    const layout = layoutDep.getLayout(id as string);\n    if (!layout) return;\n    const node = scene.get(id);\n    if (!node) return;\n    const worldPose = composeWorldPose(poseAdapter, id as string, pc.compose);\n    const worldAABB = poseDescriptorForNode(d, node).getBounds(worldPose);\n    const plane = planeOf(session.view, node.layer);\n    const at = plane ? toPlane(plane, center) : center;\n    if (!testInside(id, worldPose, worldAABB, layout, at)) return;\n    if (!session.admits(id)) return;\n    if (layout.acceptsDrop) {\n      const arg: LayoutContainer = { id: id as string, bounds: worldAABB };\n      for (const c of dragged) if (!layout.acceptsDrop(arg, carryDragged(session, c, plane).arg)) return;\n    }\n    candidates.push({\n      id,\n      bounds: worldAABB,\n      layout,\n      zPath,\n      depth: zPath.length,\n      plane,\n    });\n  };\n  const walk = (parentId: NodeId | null, parentPath: number[]): void => {\n    const childIds = parentId === null ? scene.roots : scene.childrenOf(parentId);\n    for (let i = 0; i < childIds.length; i++) {\n      // A dragged root's subtree goes with it: dropping into one of its own\n      // descendants would reparent it under itself.\n      if (draggedIds.has(childIds[i])) continue;\n      const childPath = [...parentPath, i];\n      consider(childIds[i], childPath);\n      walk(childIds[i], childPath);\n    }\n  };\n  walk(null, []);\n\n  return chooseContainer(scene, mode, candidates);\n}\n"],"mappings":"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"}

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

@@ -1,8 +1,8 @@
 import { toPlane } from "../../../../core/viewport/parallax.js";
 import { composeWorldPose } from "../../../../core/scene/composeFrame.js";
 import { poseDescriptorForNode, translatePoseViaDescriptor } from "../../../../core/geometry/poseDescriptor.js";
-import { carryPose, invertPlane, planeOf } from "../../planeInput.js";
 import { scenePoseAdapter } from "../../../../core/scene/scenePoseAdapter.js";
+import { carryPose, invertPlane, planeOf } from "../../planeInput.js";
 import { grabbedPoseAdapter, planeDelta } from "../delta.js";
 
 //#region src/interactions/actions/move/layout/dragged.ts

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

@@ -1,7 +1,9 @@
 import { toPlane } from "../../../../core/viewport/parallax.js";
 import { composeWorldPose, rebaseLocalPose } from "../../../../core/scene/composeFrame.js";
-import { asNodeId } from "../../../../core/scene/types.js";
+import { translatePoseViaDescriptor } from "../../../../core/geometry/poseDescriptor.js";
 import { scenePoseAdapter } from "../../../../core/scene/scenePoseAdapter.js";
+import { carriedDescendants, sceneCarrySource } from "../../../../core/scene/carryDescendants.js";
+import { asNodeId } from "../../../../core/scene/types.js";
 import { carryDragged, gatherDragged, selectionCenter } from "./dragged.js";
 import { pickContainer } from "./container.js";
 
@@ -105,6 +107,16 @@ function sourceReflow(session, dragged, destId) {
 	}
 	return sourceReflow;
 }
+/** The stored poses that bring `id`'s descendants along to `world`, where a reflow shows it. */
+function reflowCarry(session, id, world, moving) {
+	const { scene, pc, projection: d } = session;
+	const a = d.getBounds(composeWorldPose(scenePoseAdapter(scene), id, pc.compose));
+	const b = d.getBounds(world);
+	const dx = b.x - a.x;
+	const dy = b.y - a.y;
+	if (dx === 0 && dy === 0) return /* @__PURE__ */ new Map();
+	return carriedDescendants(sceneCarrySource(scene), id, (pose) => translatePoseViaDescriptor(pose, dx, dy, d), moving);
+}
 /** One frame's layout result, or null with no layout dep or nothing dragged. */
 function runDropPass(session, delta, pointer) {
 	if (!session.layout) return null;
@@ -146,6 +158,11 @@ function runDropPass(session, delta, pointer) {
 		reflow.set(asNodeId(cid), rebaseLocalPose(poseAdapter, pose, parent, pc.compose, pc.decompose));
 		reflowIds.add(asNodeId(cid));
 	}
+	const draggedIds = new Set(dragged.map((c) => c.id));
+	for (const [cid, pose] of [...placed.destReflow, ...leftovers]) for (const [id, carried] of reflowCarry(session, asNodeId(cid), pose, (d) => reflow.has(d) || draggedIds.has(d))) {
+		reflow.set(id, carried);
+		reflowIds.add(id);
+	}
 	return {
 		dropCenter,
 		pass: {

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

@@ -1 +1 @@
-{"version":3,"file":"dropPass.js","names":[],"sources":["../../../../../src/interactions/actions/move/layout/dropPass.ts"],"sourcesContent":["import { asNodeId, type NodeId } from 'core/scene/types';\nimport { toPlane } from 'core/viewport/parallax';\nimport { composeWorldPose, rebaseLocalPose } from 'core/scene/composePose';\nimport { scenePoseAdapter } from 'core/scene/scenePoseAdapter';\nimport type { LayoutChild, LayoutContainer } from '../../../../layout/types';\nimport type { MoveSession } from '../session';\nimport { pickContainer, type Candidate } from './container';\nimport { carryDragged, gatherDragged, selectionCenter, type DraggedChild } from './dragged';\nimport type { DropPass, LayoutPlacement } from './types';\n\n/** Dragged ids grouped by the container they are leaving, skipping any that\n *  stay put (`exclude` is the destination) or that had no container. */\nexport function groupBySourceContainer(\n  dragged: ReadonlyArray<{ id: NodeId; sourceContainerId: string | null }>,\n  exclude: string | null,\n): Map<string, Set<NodeId>> {\n  const out = new Map<string, Set<NodeId>>();\n  for (const d of dragged) {\n    const src = d.sourceContainerId;\n    if (!src || src === exclude) continue;\n    let set = out.get(src);\n    if (!set) { set = new Set<NodeId>(); out.set(src, set); }\n    set.add(d.id);\n  }\n  return out;\n}\n\n/** Place each dragged child in `dest` in turn. Null when the snap rejects\n *  any of them: a container that cannot take every member takes none. */\nfunction placeAll(\n  session: MoveSession,\n  dest: Candidate,\n  container: LayoutContainer,\n  dragged: readonly DraggedChild[],\n  probeOffset: { x: number; y: number },\n): { placements: LayoutPlacement[]; destReflow: Map<NodeId, unknown> } | null {\n  const { scene, pc } = session;\n  const poseAdapter = scenePoseAdapter(scene);\n  const draggedIds = new Set<NodeId>(dragged.map((c) => c.id));\n  const layout = dest.layout;\n  // The container state the placements run against, advanced by each one.\n  const working: LayoutChild<unknown>[] = scene.childrenOf(dest.id).map((cid) => ({\n    id: cid as string,\n    pose: composeWorldPose(poseAdapter, cid as string, pc.compose),\n  }));\n  const setWorking = (id: string, pose: unknown): void => {\n    const at = working.findIndex((c) => c.id === id);\n    if (at >= 0) working[at] = { id, pose };\n    else working.push({ id, pose });\n  };\n\n  const placements: LayoutPlacement[] = [];\n  const destReflow = new Map<NodeId, unknown>();\n  const destPlane = dest.plane;\n  for (const edited of dragged) {\n    const dc = carryDragged(session, edited, destPlane);\n    const children = working.map((c) => ({ ...c }));\n    const targets = layout.getDropTargets(container, children, dc.arg);\n    const probe = { x: edited.center.x + probeOffset.x, y: edited.center.y + probeOffset.y };\n    const target = layout.snap.pickTarget(targets, destPlane ? toPlane(destPlane, probe) : probe);\n    // All-or-nothing: a container that cannot take every member takes none\n    // rather than splitting the selection between two homes.\n    if (!target) return null;\n    placements.push({ dragged: dc.arg, children, target });\n    const poses = layout.reflowPoses(container, children, dc.arg, target);\n    for (const [cid, pose] of poses) {\n      setWorking(cid, pose);\n      if (!draggedIds.has(asNodeId(cid))) destReflow.set(asNodeId(cid), pose);\n    }\n    setWorking(dc.arg.id, poses.get(dc.arg.id) ?? target.pose);\n  }\n  return { placements, destReflow };\n}\n\n/** World poses of the leftovers that moved in each container the selection left. */\nfunction sourceReflow(\n  session: MoveSession, dragged: readonly DraggedChild[], destId: string,\n): Map<string, unknown> {\n  const { scene, pc, projection: d } = session;\n  const poseAdapter = scenePoseAdapter(scene);\n  // Source reflow (cross-container) → fold changed leftovers into previews.\n  // One pass per container the selection left behind, with everything that\n  // left it withdrawn at once.\n  const sourceReflow = new Map<string, unknown>();\n  const layoutDep = session.layout;\n  if (!layoutDep) return sourceReflow;\n  for (const [srcId, leaving] of groupBySourceContainer(dragged.map((c) => ({\n    id: c.id,\n    sourceContainerId: c.arg.sourceContainerId,\n  })), destId)) {\n    const srcLayout = layoutDep.getLayout(srcId);\n    const srcNode = scene.get(asNodeId(srcId));\n    if (!srcLayout || !srcNode) continue;\n    const srcContainer: LayoutContainer = {\n      id: srcId,\n      bounds: d.getBounds(composeWorldPose(poseAdapter, srcId, pc.compose)),\n    };\n    const srcChildren: LayoutChild<unknown>[] = scene.childrenOf(asNodeId(srcId))\n      .filter((cid) => !leaving.has(cid))\n      .map((cid) => ({\n        id: cid as string,\n        pose: composeWorldPose(poseAdapter, cid as string, pc.compose),\n      }));\n    for (const [cid, pose] of srcLayout.childPoses(srcContainer, srcChildren)) {\n      const cur = d.getBounds(composeWorldPose(poseAdapter, cid, pc.compose));\n      const next = d.getBounds(pose);\n      const same = cur.x === next.x && cur.y === next.y\n        && cur.width === next.width && cur.height === next.height;\n      if (same) continue;\n      sourceReflow.set(cid, pose); // WORLD — rebased at each consumption point\n    }\n  }\n  return sourceReflow;\n}\n\n/** One frame's layout result, or null with no layout dep or nothing dragged. */\nexport function runDropPass(\n  session: MoveSession,\n  delta: { dx: number; dy: number },\n  pointer: { x: number; y: number },\n): DropPass | null {\n  if (!session.layout) return null;\n  const { scene, pc } = session;\n  const poseAdapter = scenePoseAdapter(scene);\n  const dragged = gatherDragged(session, delta);\n  if (dragged.length === 0) return null;\n  const dropCenter = selectionCenter(session, dragged);\n  // Each child is snapped at its own position, displaced by however far the\n  // pointer sits from that center — the group keeps its shape, and a lone\n  // child is still probed at the pointer itself.\n  const probeOffset = {\n    x: pointer.x - dropCenter.x,\n    y: pointer.y - dropCenter.y,\n  };\n\n  const dest = pickContainer(session, dragged, dropCenter);\n  if (!dest) return { dropCenter, pass: null, reflow: new Map() };\n\n  const container: LayoutContainer = { id: dest.id as string, bounds: dest.bounds };\n  const placed = placeAll(session, dest, container, dragged, probeOffset);\n  if (!placed) return { dropCenter, pass: null, reflow: new Map() };\n\n  // Destination reflow → fold into previews (the dragged children keep their\n  // pointer-following ghosts). `reflowPoses` returns world; previews are\n  // local, so rebase to the child's current parent frame first.\n  const reflow = new Map<NodeId, unknown>();\n  const reflowIds = new Set<NodeId>();\n  for (const [cid, pose] of placed.destReflow) {\n    const parent = scene.get(cid)?.parent ?? null;\n    reflow.set(cid, rebaseLocalPose(poseAdapter, pose, parent, pc.compose, pc.decompose));\n    reflowIds.add(cid);\n  }\n\n  const leftovers = sourceReflow(session, dragged, container.id);\n  for (const [cid, pose] of leftovers) {\n    const parent = scene.get(asNodeId(cid))?.parent ?? null;\n    reflow.set(asNodeId(cid), rebaseLocalPose(poseAdapter, pose, parent, pc.compose, pc.decompose));\n    reflowIds.add(asNodeId(cid));\n  }\n\n  return {\n    dropCenter,\n    pass: { layout: dest.layout, container, placements: placed.placements, sourceReflow: leftovers, reflowIds },\n    reflow,\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"dropPass.js","names":[],"sources":["../../../../../src/interactions/actions/move/layout/dropPass.ts"],"sourcesContent":["import { asNodeId, type NodeId } from 'core/scene/types';\nimport { toPlane } from 'core/viewport/parallax';\nimport { composeWorldPose, rebaseLocalPose } from 'core/scene/composePose';\nimport { scenePoseAdapter } from 'core/scene/scenePoseAdapter';\nimport { carriedDescendants, sceneCarrySource } from 'core/scene/carryDescendants';\nimport { translatePoseViaDescriptor } from 'core/geometry/poseDescriptor';\nimport type { LayoutChild, LayoutContainer } from '../../../../layout/types';\nimport type { MoveSession } from '../session';\nimport { pickContainer, type Candidate } from './container';\nimport { carryDragged, gatherDragged, selectionCenter, type DraggedChild } from './dragged';\nimport type { DropPass, LayoutPlacement } from './types';\n\n/** Dragged ids grouped by the container they are leaving, skipping any that\n *  stay put (`exclude` is the destination) or that had no container. */\nexport function groupBySourceContainer(\n  dragged: ReadonlyArray<{ id: NodeId; sourceContainerId: string | null }>,\n  exclude: string | null,\n): Map<string, Set<NodeId>> {\n  const out = new Map<string, Set<NodeId>>();\n  for (const d of dragged) {\n    const src = d.sourceContainerId;\n    if (!src || src === exclude) continue;\n    let set = out.get(src);\n    if (!set) { set = new Set<NodeId>(); out.set(src, set); }\n    set.add(d.id);\n  }\n  return out;\n}\n\n/** Place each dragged child in `dest` in turn. Null when the snap rejects\n *  any of them: a container that cannot take every member takes none. */\nfunction placeAll(\n  session: MoveSession,\n  dest: Candidate,\n  container: LayoutContainer,\n  dragged: readonly DraggedChild[],\n  probeOffset: { x: number; y: number },\n): { placements: LayoutPlacement[]; destReflow: Map<NodeId, unknown> } | null {\n  const { scene, pc } = session;\n  const poseAdapter = scenePoseAdapter(scene);\n  const draggedIds = new Set<NodeId>(dragged.map((c) => c.id));\n  const layout = dest.layout;\n  // The container state the placements run against, advanced by each one.\n  const working: LayoutChild<unknown>[] = scene.childrenOf(dest.id).map((cid) => ({\n    id: cid as string,\n    pose: composeWorldPose(poseAdapter, cid as string, pc.compose),\n  }));\n  const setWorking = (id: string, pose: unknown): void => {\n    const at = working.findIndex((c) => c.id === id);\n    if (at >= 0) working[at] = { id, pose };\n    else working.push({ id, pose });\n  };\n\n  const placements: LayoutPlacement[] = [];\n  const destReflow = new Map<NodeId, unknown>();\n  const destPlane = dest.plane;\n  for (const edited of dragged) {\n    const dc = carryDragged(session, edited, destPlane);\n    const children = working.map((c) => ({ ...c }));\n    const targets = layout.getDropTargets(container, children, dc.arg);\n    const probe = { x: edited.center.x + probeOffset.x, y: edited.center.y + probeOffset.y };\n    const target = layout.snap.pickTarget(targets, destPlane ? toPlane(destPlane, probe) : probe);\n    // All-or-nothing: a container that cannot take every member takes none\n    // rather than splitting the selection between two homes.\n    if (!target) return null;\n    placements.push({ dragged: dc.arg, children, target });\n    const poses = layout.reflowPoses(container, children, dc.arg, target);\n    for (const [cid, pose] of poses) {\n      setWorking(cid, pose);\n      if (!draggedIds.has(asNodeId(cid))) destReflow.set(asNodeId(cid), pose);\n    }\n    setWorking(dc.arg.id, poses.get(dc.arg.id) ?? target.pose);\n  }\n  return { placements, destReflow };\n}\n\n/** World poses of the leftovers that moved in each container the selection left. */\nfunction sourceReflow(\n  session: MoveSession, dragged: readonly DraggedChild[], destId: string,\n): Map<string, unknown> {\n  const { scene, pc, projection: d } = session;\n  const poseAdapter = scenePoseAdapter(scene);\n  // Source reflow (cross-container) → fold changed leftovers into previews.\n  // One pass per container the selection left behind, with everything that\n  // left it withdrawn at once.\n  const sourceReflow = new Map<string, unknown>();\n  const layoutDep = session.layout;\n  if (!layoutDep) return sourceReflow;\n  for (const [srcId, leaving] of groupBySourceContainer(dragged.map((c) => ({\n    id: c.id,\n    sourceContainerId: c.arg.sourceContainerId,\n  })), destId)) {\n    const srcLayout = layoutDep.getLayout(srcId);\n    const srcNode = scene.get(asNodeId(srcId));\n    if (!srcLayout || !srcNode) continue;\n    const srcContainer: LayoutContainer = {\n      id: srcId,\n      bounds: d.getBounds(composeWorldPose(poseAdapter, srcId, pc.compose)),\n    };\n    const srcChildren: LayoutChild<unknown>[] = scene.childrenOf(asNodeId(srcId))\n      .filter((cid) => !leaving.has(cid))\n      .map((cid) => ({\n        id: cid as string,\n        pose: composeWorldPose(poseAdapter, cid as string, pc.compose),\n      }));\n    for (const [cid, pose] of srcLayout.childPoses(srcContainer, srcChildren)) {\n      const cur = d.getBounds(composeWorldPose(poseAdapter, cid, pc.compose));\n      const next = d.getBounds(pose);\n      const same = cur.x === next.x && cur.y === next.y\n        && cur.width === next.width && cur.height === next.height;\n      if (same) continue;\n      sourceReflow.set(cid, pose); // WORLD — rebased at each consumption point\n    }\n  }\n  return sourceReflow;\n}\n\n/** The stored poses that bring `id`'s descendants along to `world`, where a reflow shows it. */\nfunction reflowCarry(\n  session: MoveSession, id: NodeId, world: unknown, moving: (id: NodeId) => boolean,\n): Map<NodeId, unknown> {\n  const { scene, pc, projection: d } = session;\n  const a = d.getBounds(composeWorldPose(scenePoseAdapter(scene), id as string, pc.compose));\n  const b = d.getBounds(world);\n  const dx = b.x - a.x;\n  const dy = b.y - a.y;\n  if (dx === 0 && dy === 0) return new Map();\n  return carriedDescendants(sceneCarrySource(scene), id, (pose) => translatePoseViaDescriptor(pose, dx, dy, d), moving);\n}\n\n/** One frame's layout result, or null with no layout dep or nothing dragged. */\nexport function runDropPass(\n  session: MoveSession,\n  delta: { dx: number; dy: number },\n  pointer: { x: number; y: number },\n): DropPass | null {\n  if (!session.layout) return null;\n  const { scene, pc } = session;\n  const poseAdapter = scenePoseAdapter(scene);\n  const dragged = gatherDragged(session, delta);\n  if (dragged.length === 0) return null;\n  const dropCenter = selectionCenter(session, dragged);\n  // Each child is snapped at its own position, displaced by however far the\n  // pointer sits from that center — the group keeps its shape, and a lone\n  // child is still probed at the pointer itself.\n  const probeOffset = {\n    x: pointer.x - dropCenter.x,\n    y: pointer.y - dropCenter.y,\n  };\n\n  const dest = pickContainer(session, dragged, dropCenter);\n  if (!dest) return { dropCenter, pass: null, reflow: new Map() };\n\n  const container: LayoutContainer = { id: dest.id as string, bounds: dest.bounds };\n  const placed = placeAll(session, dest, container, dragged, probeOffset);\n  if (!placed) return { dropCenter, pass: null, reflow: new Map() };\n\n  // Destination reflow → fold into previews (the dragged children keep their\n  // pointer-following ghosts). `reflowPoses` returns world; previews are\n  // local, so rebase to the child's current parent frame first.\n  const reflow = new Map<NodeId, unknown>();\n  const reflowIds = new Set<NodeId>();\n  for (const [cid, pose] of placed.destReflow) {\n    const parent = scene.get(cid)?.parent ?? null;\n    reflow.set(cid, rebaseLocalPose(poseAdapter, pose, parent, pc.compose, pc.decompose));\n    reflowIds.add(cid);\n  }\n\n  const leftovers = sourceReflow(session, dragged, container.id);\n  for (const [cid, pose] of leftovers) {\n    const parent = scene.get(asNodeId(cid))?.parent ?? null;\n    reflow.set(asNodeId(cid), rebaseLocalPose(poseAdapter, pose, parent, pc.compose, pc.decompose));\n    reflowIds.add(asNodeId(cid));\n  }\n  const draggedIds = new Set<NodeId>(dragged.map((c) => c.id));\n  for (const [cid, pose] of [...placed.destReflow, ...leftovers] as [string, unknown][]) {\n    for (const [id, carried] of reflowCarry(session, asNodeId(cid), pose, (d) => reflow.has(d) || draggedIds.has(d))) {\n      reflow.set(id, carried);\n      reflowIds.add(id);\n    }\n  }\n\n  return {\n    dropCenter,\n    pass: { layout: dest.layout, container, placements: placed.placements, sourceReflow: leftovers, reflowIds },\n    reflow,\n  };\n}\n"],"mappings":"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"}

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

@@ -1,17 +1,17 @@
 import { toPlane } from "../../../../core/viewport/parallax.js";
 import { composeWorldPose } from "../../../../core/scene/composeFrame.js";
 import { poseDescriptorForNode } from "../../../../core/geometry/poseDescriptor.js";
-import { planeOf } from "../../planeInput.js";
 import { scenePoseAdapter } from "../../../../core/scene/scenePoseAdapter.js";
+import { planeOf } from "../../planeInput.js";
 import { pointInBounds } from "./container.js";
 
 //#region src/interactions/actions/move/layout/exits.ts
 /** Where each dragged root that leaves its layout container on release lands.
 *  A root leaves when the drop center falls outside the body of the layout
 *  container holding it, and lands under the innermost plain container beneath
-*  the drop — a layout container there has already declined it — or at the top
-*  level of its layer. A root whose parent has no layout is not this pass's to
-*  move; `reparentOnDrop` decides for those. */
+*  the drop that admits it (`canDropInto`) — a layout container there has
+*  already declined it — or at the top level of its layer. A root whose parent
+*  has no layout is not this pass's to move; `reparentOnDrop` decides for those. */
 function resolveLayoutExits(session, dropCenter, ids) {
 	const out = /* @__PURE__ */ new Map();
 	const layoutDep = session.layout;
@@ -39,7 +39,7 @@ function resolveLayoutExits(session, dropCenter, ids) {
 				if (excluded.has(id)) continue;
 				const node = scene.get(id);
 				if (!node || node.kind !== "container") continue;
-				if (node.layer === layer && depth >= bestDepth && layoutDep.getLayout(id) === null && holds(id, null)) {
+				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 — a layout container there has already declined it — or at the top\n *  level of its layer. A root whose parent has no layout is not this pass's to\n *  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)) {\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,GAAG;KAClE,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 || 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"}

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

@@ -1,4 +1,5 @@
 import { nodeDescriptors, poseDescriptorOf } from "../poseDescriptorDep.js";
+import { transformFinisher } from "../transformFinish.js";
 import { commitGestureOps, readGestureLifecycle } from "../gestureLifecycle.js";
 import { gestureReaders } from "../../gestures/shared/screenTolerance.js";
 import { moveSources } from "../selectionSubtree.js";
@@ -6,9 +7,15 @@ import { layoutDrop } from "./behaviors/layoutDrop.js";
 import { reparentOnDrop } from "./behaviors/reparentOnDrop.js";
 import { buildGestureContext, captureFrames, capturePlaneRefs, captureStartPoses } from "./capture.js";
 import { moveGestureAdapter } from "./gestureAdapter.js";
+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;
+	const roots = ids;
+	return (parent) => canDropInto(parent, roots);
+}
 /** 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
 *  behaviors appended to the binding's own. */
@@ -19,6 +26,7 @@ function beginMove(ctx, opts, frame) {
 	const layout = ctx.deps.layout;
 	const applyOps = ctx.deps.applyOps;
 	const geometryProjection = ctx.deps.geometryProjection;
+	const finish = transformFinisher(ctx.deps);
 	if (!selection || !scene) return null;
 	const pc = scene.composition;
 	if (isPathEditPart(ctx.drag?.affordance)) return null;
@@ -44,7 +52,8 @@ function beginMove(ctx, opts, frame) {
 	const adapter = moveGestureAdapter(scene, (ops, _label, through) => commitGestureOps({
 		scene,
 		applyOps,
-		adapter: through
+		adapter: through,
+		finish
 	}, lifecycle, ops), selection.adapterMethods);
 	const readers = gestureReaders(ctx.deps);
 	const gestureCtx = buildGestureContext(ctx, scene, ids, startPoses, adapter, readers);
@@ -68,17 +77,19 @@ function beginMove(ctx, opts, frame) {
 		layout,
 		pc,
 		applyOps,
+		finish,
 		geometryProjection,
 		lifecycle,
 		nodeAtPoint: ctx.deps.nodeAtPoint,
+		admits: admitsOf(ctx.deps.canDropInto, ids),
 		reparentOnDrop: () => resolveParams(opts?.params)?.["reparentOnDrop"] ?? "off",
 		dragThresholdPx,
-		snap: ctx.deps.snap?.begin({
+		snap: lazySnapSession(ctx.deps.snap, {
 			gesture: "move",
 			ids,
 			press,
 			constrain: "axis"
-		}) ?? null,
+		}),
 		press
 	};
 	return {