@weasel-js/core 1.10.1 → 1.11.1

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["endBehaviors","delta","gctx","session","id","ori","draggedStoredPose","dx","dy","reduceBehaviorEnd","rootTranslateOps","ids","at","commitMove","input","commitOps","followers","landedDescendantOps","ops","commitGestureOps","answer","translateOps"],"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,SAASA,EACP,GACA,GACA,GACyB;CACzB,IAAM,EAAE,OAAI,UAAOC,GACbC,IAAOC,EAAQ;CACrB,KAAK,IAAM,CAACC,GAAIC,MAAQF,EAAQ,YAC9B,EAAK,QAAQ,IAAIC,GAAcE,EAAkBH,GAASC,GAAIC,GAAKE,GAAIC,CAAE,CAAC;CAE5E,OAAOC,EAAkBN,EAAQ,WAAWD,GAAM;EAChD,eAAe,MAAQQ,EAAiBP,GAASQ,GAAKV,CAAK;EAC3D,SAASW;CACX,CAAC;AACH;AAIA,SAAgBC,EAAW,GAA6B;CACtD,IAAM,EAAE,YAAS,UAAOC,GAElB,EAAE,OAAI,UAAOA,EAAM,OACnBC,KAAa,MAAuB;EACxC,IAAMC,IAAYC,EAChB;GACE,OAAOd,EAAQ;GACf,YAAYA,EAAQ;GACpB,YAAYA,EAAQ;GACpB,SAASA,EAAQ;GACjB,OAAOA,EAAQ;GACf,OAAOA,EAAQ,UAAU;EAC3B,GACAe,CACF;EACA,OAAOC,EAAiBhB,GAASA,EAAQ,WAAW,CAAC,GAAGe,GAAK,GAAGF,CAAS,CAAC;CAC5E,GAGMI,IAASpB,EAAaG,GAAS;EAAE;EAAI;CAAG,GAAGS,CAAE;CACnD,IAAIQ,MAAW,MAAM,OAAO;CAC5B,IAAIA,MAAW,KAAA,GAAW,OAAOL,EAAUK,CAAM;CAGjD,IAAIb,MAAO,KAAKC,MAAO,GAAG,OAAO;CAYjC,IAAMU,IAAMG,EAAalB,GAAS,CAAC,GAAGA,EAAQ,KAAK,GAAGA,EAAQ,UAAU,GAAG;EAAE;EAAI;CAAG,CAAC;CACrF,OAAOe,EAAI,SAAS,KAAKH,EAAUG,CAAG;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,44 +1,55 @@
-import { rebaseLocalPose as e } from "../../../../core/scene/composeFrame.js";
-import { asNodeId as t } from "../../../../core/scene/types.js";
-import { createReparentOp as n } from "../../../../core/ops/reparent.js";
-import { createTransformOp as r } from "../../../../core/ops/transform.js";
-import { scenePoseAdapter as i } from "../../../../core/scene/scenePoseAdapter.js";
-import { rebaseTransformOp as a } from "./rebase.js";
+import { rebaseLocalPose } from "../../../../core/scene/composeFrame.js";
+import { scenePoseAdapter } from "../../../../core/scene/scenePoseAdapter.js";
+import { asNodeId } from "../../../../core/scene/types.js";
+import { createTransformOp } from "../../../../core/ops/transform.js";
+import { createReparentOp } from "../../../../core/ops/reparent.js";
+import { rebaseTransformOp } from "./rebase.js";
+
 //#region src/interactions/actions/move/commit/layoutDrop.ts
-function o(o, s) {
-	let c = s, l = o.pc, u = i(o.scene), d = c.container.id, f = new Set(o.ids.map((e) => e)), p = (e) => {
-		let n = e.args?.id;
-		if (n === void 0) return e;
-		let r = o.scene.get(t(n))?.parent ?? null, i = f.has(n) ? d : r;
-		return a(e, u, l, r, i);
-	}, m = [], h = [];
-	for (let e of c.placements) {
-		e.dragged.sourceContainerId !== d && m.push(n({
-			id: e.dragged.id,
-			fromParentId: e.dragged.sourceContainerId,
-			toParentId: d,
+/** The ops of a drop a layout container accepted: reparents, then each
+*  placement's `commitDrop`, then the source containers' reflow. */
+function layoutDropOps(session, pass) {
+	const lp = pass;
+	const pc = session.pc;
+	const commitAdapter = scenePoseAdapter(session.scene);
+	const destId = lp.container.id;
+	const draggedIds = new Set(session.ids.map((id) => id));
+	const rebaseOpToLocal = (op) => {
+		const id = op.args?.id;
+		if (id === void 0) return op;
+		const curParent = session.scene.get(asNodeId(id))?.parent ?? null;
+		const toParent = draggedIds.has(id) ? destId : curParent;
+		return rebaseTransformOp(op, commitAdapter, pc, curParent, toParent);
+	};
+	const reparentOps = [];
+	const dropOps = [];
+	for (const placement of lp.placements) {
+		if (placement.dragged.sourceContainerId !== destId) reparentOps.push(createReparentOp({
+			id: placement.dragged.id,
+			fromParentId: placement.dragged.sourceContainerId,
+			toParentId: destId,
 			label: "Reparent"
 		}));
-		let t = c.layout.commitDrop(c.container, e.children, e.dragged, e.target);
-		for (let e of t) h.push(p(e));
+		const ops = lp.layout.commitDrop(lp.container, placement.children, placement.dragged, placement.target);
+		for (const op of ops) dropOps.push(rebaseOpToLocal(op));
 	}
-	let g = [];
-	for (let [n, i] of c.sourceReflow) {
-		let a = o.scene.get(t(n))?.parent ?? null;
-		g.push(r({
-			id: n,
-			from: o.scene.get(t(n)).pose,
-			to: e(u, i, a, l.compose, l.decompose),
+	const reflowOps = [];
+	for (const [cid, worldPose] of lp.sourceReflow) {
+		const parent = session.scene.get(asNodeId(cid))?.parent ?? null;
+		reflowOps.push(createTransformOp({
+			id: cid,
+			from: session.scene.get(asNodeId(cid)).pose,
+			to: rebaseLocalPose(commitAdapter, worldPose, parent, pc.compose, pc.decompose),
 			label: "Source reflow"
 		}));
 	}
 	return [
-		...m,
-		...h,
-		...g
+		...reparentOps,
+		...dropOps,
+		...reflowOps
 	];
 }
-//#endregion
-export { o as layoutDropOps };
 
+//#endregion
+export { layoutDropOps };
 //# sourceMappingURL=layoutDrop.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"layoutDrop.js","names":["layoutDropOps","lp","pass","pc","session","commitAdapter","scenePoseAdapter","destId","draggedIds","id","rebaseOpToLocal","op","curParent","asNodeId","toParent","rebaseTransformOp","reparentOps","dropOps","placement","createReparentOp","ops","reflowOps","cid","worldPose","parent","createTransformOp","rebaseLocalPose"],"sources":["../../../../../src/interactions/actions/move/commit/layoutDrop.ts"],"sourcesContent":["import { createReparentOp } from 'core/ops/reparent';\nimport { createTransformOp } from 'core/ops/transform';\nimport type { Op } from 'core/ops/types';\nimport { asNodeId } from 'core/scene/types';\nimport { rebaseLocalPose } from 'core/scene/composePose';\nimport { scenePoseAdapter } from 'core/scene/scenePoseAdapter';\nimport type { LayoutPass } from '../layout/types';\nimport type { MoveSession } from '../session';\nimport { rebaseTransformOp } from './rebase';\n\n/** The ops of a drop a layout container accepted: reparents, then each\n *  placement's `commitDrop`, then the source containers' reflow. */\nexport function layoutDropOps(session: MoveSession, pass: LayoutPass): Op[] {\n  const lp = pass;\n  const pc = session.pc;\n  const commitAdapter = scenePoseAdapter(session.scene);\n  const destId = lp.container.id;\n  const draggedIds = new Set<string>(session.ids.map((id) => id as string));\n  // commitDrop returns world poses (the contract is world in/out).\n  // Rebase each transform op to local: a dragged id lands under the\n  // destination container; any other id keeps its current parent.\n  // `from` rebases under the node's PRE-commit parent.\n  const rebaseOpToLocal = (op: Op): Op => {\n    const id = (op.args as { id?: string } | undefined)?.id;\n    if (id === undefined) return op;\n    const curParent = session.scene.get(asNodeId(id))?.parent ?? null;\n    const toParent = draggedIds.has(id) ? destId : curParent;\n    return rebaseTransformOp(op, commitAdapter, pc, curParent, toParent);\n  };\n  // Cross-container drop: reparent each dragged node under the\n  // destination container so its tree position matches its new\n  // visual home. Scene v1's absolute-pose semantics mean the\n  // subsequent pose op still lands the child at the snapped cell.\n  // Every reparent precedes every drop.\n  const reparentOps: Op[] = [];\n  const dropOps: Op[] = [];\n  for (const placement of lp.placements) {\n    if (placement.dragged.sourceContainerId !== destId) {\n      reparentOps.push(createReparentOp({\n        id: placement.dragged.id,\n        fromParentId: placement.dragged.sourceContainerId,\n        toParentId: destId,\n        label: 'Reparent',\n      }));\n    }\n    const ops = lp.layout.commitDrop(\n      lp.container,\n      placement.children,\n      placement.dragged,\n      placement.target,\n    );\n    for (const op of ops) dropOps.push(rebaseOpToLocal(op));\n  }\n  const reflowOps: Op[] = [];\n  for (const [cid, worldPose] of lp.sourceReflow) {\n    const parent = session.scene.get(asNodeId(cid))?.parent ?? null;\n    // Source-reflow siblings keep their parent, so `from` is already\n    // the live local pose (no rebase); only `to` (a world pose stored\n    // in `lp.sourceReflow`) is rebased to local. This is the\n    // intentional counterpart to the dropOps rebaser above, where\n    // `from` comes from a world `commitDrop` op and so does rebase.\n    reflowOps.push(createTransformOp<unknown>({\n      id: cid,\n      from: session.scene.get(asNodeId(cid))!.pose,\n      to: rebaseLocalPose(commitAdapter, worldPose, parent, pc.compose, pc.decompose),\n      label: 'Source reflow',\n    }));\n  }\n  return [...reparentOps, ...dropOps, ...reflowOps];\n}\n"],"mappings":";;;;;;;AAYA,SAAgBA,EAAc,GAAsB,GAAwB;CAC1E,IAAMC,IAAKC,GACLC,IAAKC,EAAQ,IACbC,IAAgBC,EAAiBF,EAAQ,KAAK,GAC9CG,IAASN,EAAG,UAAU,IACtBO,IAAa,IAAI,IAAYJ,EAAQ,IAAI,KAAK,MAAOK,CAAY,CAAC,GAKlEC,KAAmB,MAAe;EACtC,IAAMD,IAAME,EAAG,MAAsC;EACrD,IAAIF,MAAO,KAAA,GAAW,OAAOE;EAC7B,IAAMC,IAAYR,EAAQ,MAAM,IAAIS,EAASJ,CAAE,CAAC,CAAC,EAAE,UAAU,MACvDK,IAAWN,EAAW,IAAIC,CAAE,IAAIF,IAASK;EAC/C,OAAOG,EAAkBJ,GAAIN,GAAeF,GAAIS,GAAWE,CAAQ;CACrE,GAMME,IAAoB,CAAC,GACrBC,IAAgB,CAAC;CACvB,KAAK,IAAMC,KAAajB,EAAG,YAAY;EACrC,AAAIiB,EAAU,QAAQ,sBAAsBX,KAC1CS,EAAY,KAAKG,EAAiB;GAChC,IAAID,EAAU,QAAQ;GACtB,cAAcA,EAAU,QAAQ;GAChC,YAAYX;GACZ,OAAO;EACT,CAAC,CAAC;EAEJ,IAAMa,IAAMnB,EAAG,OAAO,WACpBA,EAAG,WACHiB,EAAU,UACVA,EAAU,SACVA,EAAU,MACZ;EACA,KAAK,IAAMP,KAAMS,GAAK,EAAQ,KAAKV,EAAgBC,CAAE,CAAC;CACxD;CACA,IAAMU,IAAkB,CAAC;CACzB,KAAK,IAAM,CAACC,GAAKC,MAActB,EAAG,cAAc;EAC9C,IAAMuB,IAASpB,EAAQ,MAAM,IAAIS,EAASS,CAAG,CAAC,CAAC,EAAE,UAAU;EAM3D,EAAU,KAAKG,EAA2B;GACxC,IAAIH;GACJ,MAAMlB,EAAQ,MAAM,IAAIS,EAASS,CAAG,CAAC,CAAC,CAAE;GACxC,IAAII,EAAgBrB,GAAekB,GAAWC,GAAQrB,EAAG,SAASA,EAAG,SAAS;GAC9E,OAAO;EACT,CAAC,CAAC;CACJ;CACA,OAAO;EAAC,GAAGa;EAAa,GAAGC;EAAS,GAAGI;CAAS;AAClD"}
+{"version":3,"file":"layoutDrop.js","names":[],"sources":["../../../../../src/interactions/actions/move/commit/layoutDrop.ts"],"sourcesContent":["import { createReparentOp } from 'core/ops/reparent';\nimport { createTransformOp } from 'core/ops/transform';\nimport type { Op } from 'core/ops/types';\nimport { asNodeId } from 'core/scene/types';\nimport { rebaseLocalPose } from 'core/scene/composePose';\nimport { scenePoseAdapter } from 'core/scene/scenePoseAdapter';\nimport type { LayoutPass } from '../layout/types';\nimport type { MoveSession } from '../session';\nimport { rebaseTransformOp } from './rebase';\n\n/** The ops of a drop a layout container accepted: reparents, then each\n *  placement's `commitDrop`, then the source containers' reflow. */\nexport function layoutDropOps(session: MoveSession, pass: LayoutPass): Op[] {\n  const lp = pass;\n  const pc = session.pc;\n  const commitAdapter = scenePoseAdapter(session.scene);\n  const destId = lp.container.id;\n  const draggedIds = new Set<string>(session.ids.map((id) => id as string));\n  // commitDrop returns world poses (the contract is world in/out).\n  // Rebase each transform op to local: a dragged id lands under the\n  // destination container; any other id keeps its current parent.\n  // `from` rebases under the node's PRE-commit parent.\n  const rebaseOpToLocal = (op: Op): Op => {\n    const id = (op.args as { id?: string } | undefined)?.id;\n    if (id === undefined) return op;\n    const curParent = session.scene.get(asNodeId(id))?.parent ?? null;\n    const toParent = draggedIds.has(id) ? destId : curParent;\n    return rebaseTransformOp(op, commitAdapter, pc, curParent, toParent);\n  };\n  // Cross-container drop: reparent each dragged node under the\n  // destination container so its tree position matches its new\n  // visual home. Scene v1's absolute-pose semantics mean the\n  // subsequent pose op still lands the child at the snapped cell.\n  // Every reparent precedes every drop.\n  const reparentOps: Op[] = [];\n  const dropOps: Op[] = [];\n  for (const placement of lp.placements) {\n    if (placement.dragged.sourceContainerId !== destId) {\n      reparentOps.push(createReparentOp({\n        id: placement.dragged.id,\n        fromParentId: placement.dragged.sourceContainerId,\n        toParentId: destId,\n        label: 'Reparent',\n      }));\n    }\n    const ops = lp.layout.commitDrop(\n      lp.container,\n      placement.children,\n      placement.dragged,\n      placement.target,\n    );\n    for (const op of ops) dropOps.push(rebaseOpToLocal(op));\n  }\n  const reflowOps: Op[] = [];\n  for (const [cid, worldPose] of lp.sourceReflow) {\n    const parent = session.scene.get(asNodeId(cid))?.parent ?? null;\n    // Source-reflow siblings keep their parent, so `from` is already\n    // the live local pose (no rebase); only `to` (a world pose stored\n    // in `lp.sourceReflow`) is rebased to local. This is the\n    // intentional counterpart to the dropOps rebaser above, where\n    // `from` comes from a world `commitDrop` op and so does rebase.\n    reflowOps.push(createTransformOp<unknown>({\n      id: cid,\n      from: session.scene.get(asNodeId(cid))!.pose,\n      to: rebaseLocalPose(commitAdapter, worldPose, parent, pc.compose, pc.decompose),\n      label: 'Source reflow',\n    }));\n  }\n  return [...reparentOps, ...dropOps, ...reflowOps];\n}\n"],"mappings":";;;;;;;;;;AAYA,SAAgB,cAAc,SAAsB,MAAwB;CAC1E,MAAM,KAAK;CACX,MAAM,KAAK,QAAQ;CACnB,MAAM,gBAAgB,iBAAiB,QAAQ,KAAK;CACpD,MAAM,SAAS,GAAG,UAAU;CAC5B,MAAM,aAAa,IAAI,IAAY,QAAQ,IAAI,KAAK,OAAO,EAAY,CAAC;CAKxE,MAAM,mBAAmB,OAAe;EACtC,MAAM,KAAM,GAAG,MAAsC;EACrD,IAAI,OAAO,QAAW,OAAO;EAC7B,MAAM,YAAY,QAAQ,MAAM,IAAI,SAAS,EAAE,CAAC,CAAC,EAAE,UAAU;EAC7D,MAAM,WAAW,WAAW,IAAI,EAAE,IAAI,SAAS;EAC/C,OAAO,kBAAkB,IAAI,eAAe,IAAI,WAAW,QAAQ;CACrE;CAMA,MAAM,cAAoB,CAAC;CAC3B,MAAM,UAAgB,CAAC;CACvB,KAAK,MAAM,aAAa,GAAG,YAAY;EACrC,IAAI,UAAU,QAAQ,sBAAsB,QAC1C,YAAY,KAAK,iBAAiB;GAChC,IAAI,UAAU,QAAQ;GACtB,cAAc,UAAU,QAAQ;GAChC,YAAY;GACZ,OAAO;EACT,CAAC,CAAC;EAEJ,MAAM,MAAM,GAAG,OAAO,WACpB,GAAG,WACH,UAAU,UACV,UAAU,SACV,UAAU,MACZ;EACA,KAAK,MAAM,MAAM,KAAK,QAAQ,KAAK,gBAAgB,EAAE,CAAC;CACxD;CACA,MAAM,YAAkB,CAAC;CACzB,KAAK,MAAM,CAAC,KAAK,cAAc,GAAG,cAAc;EAC9C,MAAM,SAAS,QAAQ,MAAM,IAAI,SAAS,GAAG,CAAC,CAAC,EAAE,UAAU;EAM3D,UAAU,KAAK,kBAA2B;GACxC,IAAI;GACJ,MAAM,QAAQ,MAAM,IAAI,SAAS,GAAG,CAAC,CAAC,CAAE;GACxC,IAAI,gBAAgB,eAAe,WAAW,QAAQ,GAAG,SAAS,GAAG,SAAS;GAC9E,OAAO;EACT,CAAC,CAAC;CACJ;CACA,OAAO;EAAC,GAAG;EAAa,GAAG;EAAS,GAAG;CAAS;AAClD"}

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

@@ -1,100 +1,120 @@
-import { composeWorldPose as e, rebaseLocalPose as t } from "../../../../core/scene/composeFrame.js";
-import { asNodeId as n } from "../../../../core/scene/types.js";
-import { createReparentOp as r } from "../../../../core/ops/reparent.js";
-import { createTransformOp as i } from "../../../../core/ops/transform.js";
-import { scenePoseAdapter as a } from "../../../../core/scene/scenePoseAdapter.js";
-import { rebaseTransformOp as o } from "./rebase.js";
-import { draggedWorldPose as s, grabbedPoseAdapter as c } from "../delta.js";
-import { groupBySourceContainer as l } from "../layout/dropPass.js";
-import { resolveLayoutExits as u } from "../layout/exits.js";
-import { translateOps as d, unreleasedIds as f } from "../translate.js";
+import { composeWorldPose, rebaseLocalPose } from "../../../../core/scene/composeFrame.js";
+import { scenePoseAdapter } from "../../../../core/scene/scenePoseAdapter.js";
+import { asNodeId } from "../../../../core/scene/types.js";
+import { createTransformOp } from "../../../../core/ops/transform.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";
+import { resolveLayoutExits } from "../layout/exits.js";
+import { translateOps, unreleasedIds } from "../translate.js";
+
 //#region src/interactions/actions/move/commit/layoutRelease.ts
-function p(t, r, i, a, l) {
-	let { dx: u, dy: d } = r, f = t.pc, p = [], m = [], h = (e) => {
-		let r = e.args?.id;
-		if (r === void 0) return e;
-		let i = t.scene.get(n(r))?.parent ?? null;
-		return o(e, l, f, i, i);
-	}, g = t.layout?.getLayout(i);
-	if (!g?.releaseDrop) return {
-		ops: m,
-		released: p
+function releaseFrom(session, delta, srcId, leaving, commitAdapter) {
+	const { dx, dy } = delta;
+	const pc = session.pc;
+	const released = [];
+	const releasedOps = [];
+	const rebaseReleased = (op) => {
+		const id = op.args?.id;
+		if (id === void 0) return op;
+		const parent = session.scene.get(asNodeId(id))?.parent ?? null;
+		return rebaseTransformOp(op, commitAdapter, pc, parent, parent);
+	};
+	const srcLayout = session.layout?.getLayout(srcId);
+	if (!srcLayout?.releaseDrop) return {
+		ops: releasedOps,
+		released
+	};
+	const srcContainer = {
+		id: srcId,
+		bounds: session.projection.getBounds(composeWorldPose(commitAdapter, srcId, pc.compose))
 	};
-	let _ = {
-		id: i,
-		bounds: t.projection.getBounds(e(l, i, f.compose))
-	}, v = t.scene.childrenOf(n(i)).filter((e) => !a.has(e)).map((t) => ({
-		id: t,
-		pose: e(l, t, f.compose)
+	let srcChildren = session.scene.childrenOf(asNodeId(srcId)).filter((cid) => !leaving.has(cid)).map((cid) => ({
+		id: cid,
+		pose: composeWorldPose(commitAdapter, cid, pc.compose)
 	}));
-	for (let n of a) {
-		let r = e(c(t, l), n, f.compose), a = g.releaseDrop(_, v, {
-			id: n,
-			originPose: r,
-			pose: s(t, c(t, l), n, {
-				dx: u,
-				dy: d
+	for (const id of leaving) {
+		const startWorld = composeWorldPose(grabbedPoseAdapter(session, commitAdapter), id, pc.compose);
+		const ops = srcLayout.releaseDrop(srcContainer, srcChildren, {
+			id,
+			originPose: startWorld,
+			pose: draggedWorldPose(session, grabbedPoseAdapter(session, commitAdapter), id, {
+				dx,
+				dy
 			}),
-			sourceContainerId: i
+			sourceContainerId: srcId
 		});
-		if (a === null) continue;
-		p.push(n);
-		let o = r;
-		for (let e of a) {
-			let t = e.args;
-			e.name === "transform" && t.id === n && (o = t.to), m.push(h(e));
+		if (ops === null) continue;
+		released.push(id);
+		let landed = startWorld;
+		for (const op of ops) {
+			const a = op.args;
+			if (op.name === "transform" && a.id === id) landed = a.to;
+			releasedOps.push(rebaseReleased(op));
 		}
-		v = [...v, {
-			id: n,
-			pose: o
+		srcChildren = [...srcChildren, {
+			id,
+			pose: landed
 		}];
 	}
 	return {
-		ops: m,
-		released: p
+		ops: releasedOps,
+		released
 	};
 }
-function m(e, n, o) {
-	let { dx: m, dy: h } = n, g = /* @__PURE__ */ new Set(), _ = [], v = /* @__PURE__ */ new Map(), y = [];
-	if (e.layout) {
-		let d = e.pc, f = a(e.scene), b = l(e.ids.map((t) => ({
-			id: t,
-			sourceContainerId: e.scene.get(t)?.parent ?? null
+/** What the source layouts and the exits decide for a drop no container took.
+*  `undefined` when none of them claims any dragged id. */
+function layoutReleaseOps(session, delta, dropCenter) {
+	const { dx, dy } = delta;
+	const released = /* @__PURE__ */ new Set();
+	const releasedOps = [];
+	let exits = /* @__PURE__ */ new Map();
+	const exitOps = [];
+	if (session.layout) {
+		const pc = session.pc;
+		const commitAdapter = scenePoseAdapter(session.scene);
+		const sources = groupBySourceContainer(session.ids.map((id) => ({
+			id,
+			sourceContainerId: session.scene.get(id)?.parent ?? null
 		})), null);
-		for (let [t, r] of b) {
-			let i = p(e, n, t, r, f);
-			for (let e of i.released) g.add(e);
-			_.push(...i.ops);
+		for (const [srcId, leaving] of sources) {
+			const from = releaseFrom(session, delta, srcId, leaving, commitAdapter);
+			for (const id of from.released) released.add(id);
+			releasedOps.push(...from.ops);
 		}
-		v = u(e, o, e.ids.filter((e) => !g.has(e)));
-		for (let [n, a] of v) {
-			let o = e.scene.get(n), l = s(e, c(e, f), n, {
-				dx: m,
-				dy: h
+		exits = resolveLayoutExits(session, dropCenter, session.ids.filter((id) => !released.has(id)));
+		for (const [id, toParent] of exits) {
+			const node = session.scene.get(id);
+			const world = draggedWorldPose(session, grabbedPoseAdapter(session, commitAdapter), id, {
+				dx,
+				dy
 			});
-			y.push(r({
-				id: n,
-				fromParentId: o.parent,
-				toParentId: a,
+			exitOps.push(createReparentOp({
+				id,
+				fromParentId: node.parent,
+				toParentId: toParent,
 				label: "Reparent"
-			})), y.push(i({
-				id: n,
-				from: o.pose,
-				to: t(f, l, a, d.compose, d.decompose),
-				label: e.lifecycle.label
+			}));
+			exitOps.push(createTransformOp({
+				id,
+				from: node.pose,
+				to: rebaseLocalPose(commitAdapter, world, toParent, pc.compose, pc.decompose),
+				label: session.lifecycle.label
 			}));
 		}
 	}
-	if (g.size !== 0 || v.size !== 0) return [
-		..._,
-		...y,
-		...d(e, f(e, g).filter((e) => !v.has(e)), {
-			dx: m,
-			dy: h
+	if (released.size === 0 && exits.size === 0) return void 0;
+	return [
+		...releasedOps,
+		...exitOps,
+		...translateOps(session, unreleasedIds(session, released).filter((id) => !exits.has(id)), {
+			dx,
+			dy
 		})
 	];
 }
-//#endregion
-export { m as layoutReleaseOps };
 
+//#endregion
+export { layoutReleaseOps };
 //# sourceMappingURL=layoutRelease.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"layoutRelease.js","names":["releaseFrom","delta","pc","session","released","releasedOps","rebaseReleased","id","op","parent","asNodeId","rebaseTransformOp","commitAdapter","srcLayout","srcId","srcContainer","composeWorldPose","srcChildren","leaving","cid","startWorld","grabbedPoseAdapter","ops","draggedWorldPose","landed","a","layoutReleaseOps","exits","exitOps","scenePoseAdapter","sources","groupBySourceContainer","from","resolveLayoutExits","dropCenter","toParent","node","world","createReparentOp","createTransformOp","rebaseLocalPose","translateOps","unreleasedIds"],"sources":["../../../../../src/interactions/actions/move/commit/layoutRelease.ts"],"sourcesContent":["import { createReparentOp } from 'core/ops/reparent';\nimport { createTransformOp } from 'core/ops/transform';\nimport type { Op } from 'core/ops/types';\nimport { asNodeId, type NodeId } from 'core/scene/types';\nimport { composeWorldPose, rebaseLocalPose, type PoseAdapter } from 'core/scene/composePose';\nimport { scenePoseAdapter } from 'core/scene/scenePoseAdapter';\nimport type { LayoutChild, LayoutContainer } from '../../../../layout/types';\nimport { draggedWorldPose, grabbedPoseAdapter } from '../delta';\nimport { groupBySourceContainer } from '../layout/dropPass';\nimport { resolveLayoutExits } from '../layout/exits';\nimport type { MoveSession } from '../session';\nimport { translateOps, unreleasedIds } from '../translate';\nimport { rebaseTransformOp } from './rebase';\n\nfunction releaseFrom(\n  session: MoveSession,\n  delta: { dx: number; dy: number },\n  srcId: string,\n  leaving: Set<NodeId>,\n  commitAdapter: PoseAdapter<unknown>,\n): { ops: Op[]; released: NodeId[] } {\n  const { dx, dy } = delta;\n  const pc = session.pc;\n  const released: NodeId[] = [];\n  const releasedOps: Op[] = [];\n  // Released children keep their parent, so both ends of a transform\n  // rebase under the same frame.\n  const rebaseReleased = (op: Op): Op => {\n    const id = (op.args as { id?: string } | undefined)?.id;\n    if (id === undefined) return op;\n    const parent = session.scene.get(asNodeId(id))?.parent ?? null;\n    return rebaseTransformOp(op, commitAdapter, pc, parent, parent);\n  };\n  const srcLayout = session.layout?.getLayout(srcId);\n  if (!srcLayout?.releaseDrop) return { ops: releasedOps, released };\n  const srcContainer: LayoutContainer = {\n    id: srcId,\n    bounds: session.projection.getBounds(\n      composeWorldPose(commitAdapter, srcId, pc.compose),\n    ),\n  };\n  // What the container is left holding — grown back as each\n  // release puts one of its own home again.\n  let srcChildren: LayoutChild<unknown>[] =\n    session.scene.childrenOf(asNodeId(srcId))\n      .filter((cid) => !leaving.has(cid))\n      .map((cid) => ({\n        id: cid as string,\n        pose: composeWorldPose(commitAdapter, cid as string, pc.compose),\n      }));\n  for (const id of leaving) {\n    const startWorld = composeWorldPose(\n      grabbedPoseAdapter(session, commitAdapter), id as string, pc.compose,\n    );\n    const ops = srcLayout.releaseDrop!(srcContainer, srcChildren, {\n      id: id as string,\n      originPose: startWorld,\n      pose: draggedWorldPose(session, grabbedPoseAdapter(session, commitAdapter), id, { dx, dy }),\n      sourceContainerId: srcId,\n    });\n    if (ops === null) continue;\n    released.push(id);\n    let landed: unknown = startWorld;\n    for (const op of ops) {\n      const a = op.args as { id?: string; to?: unknown };\n      if (op.name === 'transform' && a.id === (id as string)) landed = a.to;\n      releasedOps.push(rebaseReleased(op));\n    }\n    srcChildren = [...srcChildren, { id: id as string, pose: landed }];\n  }\n  return { ops: releasedOps, released };\n}\n\n/** What the source layouts and the exits decide for a drop no container took.\n *  `undefined` when none of them claims any dragged id. */\nexport function layoutReleaseOps(\n  session: MoveSession,\n  delta: { dx: number; dy: number },\n  dropCenter: { x: number; y: number } | null,\n): Op[] | undefined {\n  const { dx, dy } = delta;\n  // No container accepted the drop. Each source layout gets a say\n  // over its own children before they are left wherever the pointer\n  // stopped; the rest of the selection falls through to the translate.\n  const released = new Set<NodeId>();\n  const releasedOps: Op[] = [];\n  let exits = new Map<NodeId, NodeId | null>();\n  const exitOps: Op[] = [];\n  if (session.layout) {\n    const pc = session.pc;\n    const commitAdapter = scenePoseAdapter(session.scene);\n    const sources = groupBySourceContainer(\n      session.ids.map((id) => ({\n        id,\n        sourceContainerId: (session.scene.get(id)?.parent ?? null) as string | null,\n      })),\n      null,\n    );\n    for (const [srcId, leaving] of sources) {\n      const from = releaseFrom(session, delta, srcId, leaving, commitAdapter);\n      for (const id of from.released) released.add(id);\n      releasedOps.push(...from.ops);\n    }\n    // A child its container let go of outside that container leaves it,\n    // keeping the world pose it was dropped at.\n    exits = resolveLayoutExits(session, dropCenter, session.ids.filter((id) => !released.has(id)));\n    for (const [id, toParent] of exits) {\n      const node = session.scene.get(id)!;\n      const world = draggedWorldPose(session, grabbedPoseAdapter(session, commitAdapter), id, { dx, dy });\n      exitOps.push(createReparentOp({\n        id: id as string,\n        fromParentId: node.parent as string | null,\n        toParentId: toParent as string | null,\n        label: 'Reparent',\n      }));\n      exitOps.push(createTransformOp<unknown>({\n        id: id as string,\n        from: node.pose,\n        to: rebaseLocalPose(commitAdapter, world, toParent as string | null, pc.compose, pc.decompose),\n        label: session.lifecycle.label,\n      }));\n    }\n  }\n  if (released.size === 0 && exits.size === 0) return undefined;\n  return [\n    ...releasedOps,\n    ...exitOps,\n    ...translateOps(\n      session,\n      unreleasedIds(session, released).filter((id) => !exits.has(id)),\n      { dx, dy },\n    ),\n  ];\n}\n"],"mappings":"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"}
+{"version":3,"file":"layoutRelease.js","names":[],"sources":["../../../../../src/interactions/actions/move/commit/layoutRelease.ts"],"sourcesContent":["import { createReparentOp } from 'core/ops/reparent';\nimport { createTransformOp } from 'core/ops/transform';\nimport type { Op } from 'core/ops/types';\nimport { asNodeId, type NodeId } from 'core/scene/types';\nimport { composeWorldPose, rebaseLocalPose, type PoseAdapter } from 'core/scene/composePose';\nimport { scenePoseAdapter } from 'core/scene/scenePoseAdapter';\nimport type { LayoutChild, LayoutContainer } from '../../../../layout/types';\nimport { draggedWorldPose, grabbedPoseAdapter } from '../delta';\nimport { groupBySourceContainer } from '../layout/dropPass';\nimport { resolveLayoutExits } from '../layout/exits';\nimport type { MoveSession } from '../session';\nimport { translateOps, unreleasedIds } from '../translate';\nimport { rebaseTransformOp } from './rebase';\n\nfunction releaseFrom(\n  session: MoveSession,\n  delta: { dx: number; dy: number },\n  srcId: string,\n  leaving: Set<NodeId>,\n  commitAdapter: PoseAdapter<unknown>,\n): { ops: Op[]; released: NodeId[] } {\n  const { dx, dy } = delta;\n  const pc = session.pc;\n  const released: NodeId[] = [];\n  const releasedOps: Op[] = [];\n  // Released children keep their parent, so both ends of a transform\n  // rebase under the same frame.\n  const rebaseReleased = (op: Op): Op => {\n    const id = (op.args as { id?: string } | undefined)?.id;\n    if (id === undefined) return op;\n    const parent = session.scene.get(asNodeId(id))?.parent ?? null;\n    return rebaseTransformOp(op, commitAdapter, pc, parent, parent);\n  };\n  const srcLayout = session.layout?.getLayout(srcId);\n  if (!srcLayout?.releaseDrop) return { ops: releasedOps, released };\n  const srcContainer: LayoutContainer = {\n    id: srcId,\n    bounds: session.projection.getBounds(\n      composeWorldPose(commitAdapter, srcId, pc.compose),\n    ),\n  };\n  // What the container is left holding — grown back as each\n  // release puts one of its own home again.\n  let srcChildren: LayoutChild<unknown>[] =\n    session.scene.childrenOf(asNodeId(srcId))\n      .filter((cid) => !leaving.has(cid))\n      .map((cid) => ({\n        id: cid as string,\n        pose: composeWorldPose(commitAdapter, cid as string, pc.compose),\n      }));\n  for (const id of leaving) {\n    const startWorld = composeWorldPose(\n      grabbedPoseAdapter(session, commitAdapter), id as string, pc.compose,\n    );\n    const ops = srcLayout.releaseDrop!(srcContainer, srcChildren, {\n      id: id as string,\n      originPose: startWorld,\n      pose: draggedWorldPose(session, grabbedPoseAdapter(session, commitAdapter), id, { dx, dy }),\n      sourceContainerId: srcId,\n    });\n    if (ops === null) continue;\n    released.push(id);\n    let landed: unknown = startWorld;\n    for (const op of ops) {\n      const a = op.args as { id?: string; to?: unknown };\n      if (op.name === 'transform' && a.id === (id as string)) landed = a.to;\n      releasedOps.push(rebaseReleased(op));\n    }\n    srcChildren = [...srcChildren, { id: id as string, pose: landed }];\n  }\n  return { ops: releasedOps, released };\n}\n\n/** What the source layouts and the exits decide for a drop no container took.\n *  `undefined` when none of them claims any dragged id. */\nexport function layoutReleaseOps(\n  session: MoveSession,\n  delta: { dx: number; dy: number },\n  dropCenter: { x: number; y: number } | null,\n): Op[] | undefined {\n  const { dx, dy } = delta;\n  // No container accepted the drop. Each source layout gets a say\n  // over its own children before they are left wherever the pointer\n  // stopped; the rest of the selection falls through to the translate.\n  const released = new Set<NodeId>();\n  const releasedOps: Op[] = [];\n  let exits = new Map<NodeId, NodeId | null>();\n  const exitOps: Op[] = [];\n  if (session.layout) {\n    const pc = session.pc;\n    const commitAdapter = scenePoseAdapter(session.scene);\n    const sources = groupBySourceContainer(\n      session.ids.map((id) => ({\n        id,\n        sourceContainerId: (session.scene.get(id)?.parent ?? null) as string | null,\n      })),\n      null,\n    );\n    for (const [srcId, leaving] of sources) {\n      const from = releaseFrom(session, delta, srcId, leaving, commitAdapter);\n      for (const id of from.released) released.add(id);\n      releasedOps.push(...from.ops);\n    }\n    // A child its container let go of outside that container leaves it,\n    // keeping the world pose it was dropped at.\n    exits = resolveLayoutExits(session, dropCenter, session.ids.filter((id) => !released.has(id)));\n    for (const [id, toParent] of exits) {\n      const node = session.scene.get(id)!;\n      const world = draggedWorldPose(session, grabbedPoseAdapter(session, commitAdapter), id, { dx, dy });\n      exitOps.push(createReparentOp({\n        id: id as string,\n        fromParentId: node.parent as string | null,\n        toParentId: toParent as string | null,\n        label: 'Reparent',\n      }));\n      exitOps.push(createTransformOp<unknown>({\n        id: id as string,\n        from: node.pose,\n        to: rebaseLocalPose(commitAdapter, world, toParent as string | null, pc.compose, pc.decompose),\n        label: session.lifecycle.label,\n      }));\n    }\n  }\n  if (released.size === 0 && exits.size === 0) return undefined;\n  return [\n    ...releasedOps,\n    ...exitOps,\n    ...translateOps(\n      session,\n      unreleasedIds(session, released).filter((id) => !exits.has(id)),\n      { dx, dy },\n    ),\n  ];\n}\n"],"mappings":"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"}

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

@@ -1,18 +1,21 @@
-import { rebaseLocalPose as e } from "../../../../core/scene/composeFrame.js";
-import { createTransformOp as t } from "../../../../core/ops/transform.js";
+import { rebaseLocalPose } from "../../../../core/scene/composeFrame.js";
+import { createTransformOp } from "../../../../core/ops/transform.js";
+
 //#region src/interactions/actions/move/commit/rebase.ts
-function n(n, r, i, a, o) {
-	if (n.name !== "transform") return n;
-	let s = n.args;
-	return t({
-		id: s.id,
-		from: e(r, s.from, a, i.compose, i.decompose),
-		to: e(r, s.to, o, i.compose, i.decompose),
-		label: s.label,
-		coalesceKey: s.coalesceKey
+/** A world-posed transform op as one in its node's stored frame: `from` under
+*  `fromParent`, `to` under `toParent`. Any other op is returned as it is. */
+function rebaseTransformOp(op, adapter, pc, fromParent, toParent) {
+	if (op.name !== "transform") return op;
+	const a = op.args;
+	return createTransformOp({
+		id: a.id,
+		from: rebaseLocalPose(adapter, a.from, fromParent, pc.compose, pc.decompose),
+		to: rebaseLocalPose(adapter, a.to, toParent, pc.compose, pc.decompose),
+		label: a.label,
+		coalesceKey: a.coalesceKey
 	});
 }
-//#endregion
-export { n as rebaseTransformOp };
 
+//#endregion
+export { rebaseTransformOp };
 //# sourceMappingURL=rebase.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"rebase.js","names":["rebaseTransformOp","op","a","createTransformOp","rebaseLocalPose","adapter","fromParent","pc","toParent"],"sources":["../../../../../src/interactions/actions/move/commit/rebase.ts"],"sourcesContent":["import { createTransformOp } from 'core/ops/transform';\nimport type { Op } from 'core/ops/types';\nimport { rebaseLocalPose, type PoseAdapter, type PoseComposition } from 'core/scene/composePose';\n\n/** A world-posed transform op as one in its node's stored frame: `from` under\n *  `fromParent`, `to` under `toParent`. Any other op is returned as it is. */\nexport function rebaseTransformOp(\n  op: Op,\n  adapter: PoseAdapter<unknown>,\n  pc: PoseComposition<unknown>,\n  fromParent: string | null,\n  toParent: string | null,\n): Op {\n  if (op.name !== 'transform') return op;\n  const a = op.args as { id: string; from: unknown; to: unknown; label?: string; coalesceKey?: string };\n  return createTransformOp<unknown>({\n    id: a.id,\n    from: rebaseLocalPose(adapter, a.from, fromParent, pc.compose, pc.decompose),\n    to: rebaseLocalPose(adapter, a.to, toParent, pc.compose, pc.decompose),\n    label: a.label,\n    coalesceKey: a.coalesceKey,\n  });\n}\n"],"mappings":";;;AAMA,SAAgBA,EACd,GACA,GACA,GACA,GACA,GACI;CACJ,IAAIC,EAAG,SAAS,aAAa,OAAOA;CACpC,IAAMC,IAAID,EAAG;CACb,OAAOE,EAA2B;EAChC,IAAID,EAAE;EACN,MAAME,EAAgBC,GAASH,EAAE,MAAMI,GAAYC,EAAG,SAASA,EAAG,SAAS;EAC3E,IAAIH,EAAgBC,GAASH,EAAE,IAAIM,GAAUD,EAAG,SAASA,EAAG,SAAS;EACrE,OAAOL,EAAE;EACT,aAAaA,EAAE;CACjB,CAAC;AACH"}
+{"version":3,"file":"rebase.js","names":[],"sources":["../../../../../src/interactions/actions/move/commit/rebase.ts"],"sourcesContent":["import { createTransformOp } from 'core/ops/transform';\nimport type { Op } from 'core/ops/types';\nimport { rebaseLocalPose, type PoseAdapter, type PoseComposition } from 'core/scene/composePose';\n\n/** A world-posed transform op as one in its node's stored frame: `from` under\n *  `fromParent`, `to` under `toParent`. Any other op is returned as it is. */\nexport function rebaseTransformOp(\n  op: Op,\n  adapter: PoseAdapter<unknown>,\n  pc: PoseComposition<unknown>,\n  fromParent: string | null,\n  toParent: string | null,\n): Op {\n  if (op.name !== 'transform') return op;\n  const a = op.args as { id: string; from: unknown; to: unknown; label?: string; coalesceKey?: string };\n  return createTransformOp<unknown>({\n    id: a.id,\n    from: rebaseLocalPose(adapter, a.from, fromParent, pc.compose, pc.decompose),\n    to: rebaseLocalPose(adapter, a.to, toParent, pc.compose, pc.decompose),\n    label: a.label,\n    coalesceKey: a.coalesceKey,\n  });\n}\n"],"mappings":";;;;;;AAMA,SAAgB,kBACd,IACA,SACA,IACA,YACA,UACI;CACJ,IAAI,GAAG,SAAS,aAAa,OAAO;CACpC,MAAM,IAAI,GAAG;CACb,OAAO,kBAA2B;EAChC,IAAI,EAAE;EACN,MAAM,gBAAgB,SAAS,EAAE,MAAM,YAAY,GAAG,SAAS,GAAG,SAAS;EAC3E,IAAI,gBAAgB,SAAS,EAAE,IAAI,UAAU,GAAG,SAAS,GAAG,SAAS;EACrE,OAAO,EAAE;EACT,aAAa,EAAE;CACjB,CAAC;AACH"}

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

@@ -1,65 +1,97 @@
-import { planeToPlane as e } from "../../../../core/viewport/parallax.js";
-import { rebaseLocalPose as t } from "../../../../core/scene/composeFrame.js";
-import { carryPose as n, planeOf as r } from "../../planeInput.js";
-import { createReparentOp as i } from "../../../../core/ops/reparent.js";
-import { createTransformOp as a } from "../../../../core/ops/transform.js";
-import { scenePoseAdapter as o } from "../../../../core/scene/scenePoseAdapter.js";
-import { draggedWorldPose as s, grabbedPoseAdapter as c } from "../delta.js";
-import { translateOps as l } from "../translate.js";
-import { createSetLayerOp as u } from "../../../../core/ops/setLayer.js";
+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 { createTransformOp } from "../../../../core/ops/transform.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";
+
 //#region src/interactions/actions/move/commit/reparent.ts
-function d(e, t) {
-	let n = e.nodeAtPoint;
-	if (!n) return null;
-	let r = n(t, /* @__PURE__ */ new Set([...e.ids, ...e.cascadeIds]));
-	if (!r) return null;
-	let i = e.scene.get(r);
-	return i ? i.kind === "container" ? {
-		newParent: r,
-		newLayer: i.layer,
+/** Walk the hit chain to find the appropriate drop target. Returns
+*  `null` when no reparent should happen (drop on empty canvas, or the
+*  only hits are the moved subtree itself). */
+function resolveDropTarget(session, at) {
+	const dep = session.nodeAtPoint;
+	if (!dep) return null;
+	const hit = dep(at, /* @__PURE__ */ new Set([...session.ids, ...session.cascadeIds]));
+	if (!hit) return null;
+	const hitNode = session.scene.get(hit);
+	if (!hitNode) return null;
+	if (hitNode.kind === "container" && session.admits(hit)) return {
+		newParent: hit,
+		newLayer: hitNode.layer,
 		hitSibling: null
-	} : {
-		newParent: i.parent,
-		newLayer: i.layer,
-		hitSibling: r
-	} : 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,
+		newLayer: hitNode.layer,
+		hitSibling
+	};
 }
-function f(d, f, p, m) {
-	let { scene: h, pc: g, view: _ } = d, v = o(h), y = d.lifecycle.label, b = [], x = [...f.newParent === null ? h.roots : h.childrenOf(f.newParent)];
-	for (let o of d.ids) {
-		if (!d.startPoses.has(o)) continue;
-		let l = h.get(o), S = l.layer !== f.newLayer, C = n(d.descriptorOf(o), s(d, c(d, v), o, m), S ? e(r(_, l.layer), r(_, f.newLayer)) : null), w = t(v, C, f.newParent, g.compose, g.decompose), T = l.parent;
-		S && (T !== null && (b.push(i({
-			id: o,
-			fromParentId: T,
-			toParentId: null,
-			label: y,
-			coalesceKey: `reparent:${o}:orphan`
-		})), T = null), b.push(u({
-			id: o,
-			from: l.layer,
-			to: f.newLayer,
-			label: y
-		})));
-		let E = x.indexOf(o);
-		E >= 0 && x.splice(E, 1);
-		let D = p === "above" && f.hitSibling ? x.indexOf(f.hitSibling) : -1, O = D >= 0 ? D + 1 : void 0;
-		O === void 0 ? x.push(o) : x.splice(O, 0, o), b.push(i({
-			id: o,
-			fromParentId: T,
-			toParentId: f.newParent,
-			toIndex: O,
-			label: y
-		})), b.push(a({
-			id: o,
-			from: l.pose,
-			to: w,
-			label: y
+/** Reparent and reposition each moved root as ops, keeping the world pose the
+*  drag showed, then the ops that bring uncarried descendants along. */
+function reparentOps(session, target, mode, delta) {
+	const { scene, pc, view } = session;
+	const adapter = scenePoseAdapter(scene);
+	const label = session.lifecycle.label;
+	const ops = [];
+	const siblings = [...target.newParent === null ? scene.roots : scene.childrenOf(target.newParent)];
+	for (const id of session.ids) {
+		if (!session.startPoses.has(id)) continue;
+		const node = scene.get(id);
+		const crossing = node.layer !== target.newLayer;
+		const world = carryPose(session.descriptorOf(id), draggedWorldPose(session, grabbedPoseAdapter(session, adapter), id, delta), crossing ? planeToPlane(planeOf(view, node.layer), planeOf(view, target.newLayer)) : null);
+		const to = rebaseLocalPose(adapter, world, target.newParent, pc.compose, pc.decompose);
+		let from = node.parent;
+		if (crossing) {
+			if (from !== null) {
+				ops.push(createReparentOp({
+					id,
+					fromParentId: from,
+					toParentId: null,
+					label,
+					coalesceKey: `reparent:${id}:orphan`
+				}));
+				from = null;
+			}
+			ops.push(createSetLayerOp({
+				id,
+				from: node.layer,
+				to: target.newLayer,
+				label
+			}));
+		}
+		const was = siblings.indexOf(id);
+		if (was >= 0) siblings.splice(was, 1);
+		const hit = mode === "above" && target.hitSibling ? siblings.indexOf(target.hitSibling) : -1;
+		const toIndex = hit >= 0 ? hit + 1 : void 0;
+		if (toIndex === void 0) siblings.push(id);
+		else siblings.splice(toIndex, 0, id);
+		ops.push(createReparentOp({
+			id,
+			fromParentId: from,
+			toParentId: target.newParent,
+			toIndex,
+			label
+		}));
+		ops.push(createTransformOp({
+			id,
+			from: node.pose,
+			to,
+			label
 		}));
 	}
-	return [...b, ...l(d, d.cascadeIds, m)];
+	return [...ops, ...translateOps(session, session.cascadeIds, delta)];
 }
-//#endregion
-export { f as reparentOps, d as resolveDropTarget };
 
+//#endregion
+export { reparentOps, resolveDropTarget };
 //# sourceMappingURL=reparent.js.map