@weasel-js/core 1.9.2 → 1.9.4

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

@@ -2,114 +2,116 @@ import { planeToPlane as e, toPlane as t } from "../../../core/viewport/parallax
 import { dropPreviewOverrides as n, syncPreviewOverrides as r } from "../previewOverrides.js";
 import { IDENTITY_POSE_COMPOSITION as i, composeWorldPose as a, frameAtOrAbove as o, rebaseLocalPose as s } from "../../../core/scene/composeFrame.js";
 import { definesFrame as c, documentPose as l, effectivePose as u } from "../../../core/scene/effectivePose.js";
-import { gesturePlaneReader as d, gestureViewReader as f } from "../../gestures/shared/screenTolerance.js";
-import { commitGestureOps as p, readGestureLifecycle as m, reduceBehaviorEnd as h, runBehaviorCancel as g } from "../gestureLifecycle.js";
-import { asNodeId as _ } from "../../../core/scene/types.js";
-import { SceneArrivalRefused as v } from "../../../core/scene/arrivals.js";
-import { createTransformOp as y } from "../../../core/ops/transform.js";
-import { createReparentOp as b } from "../../../core/ops/reparent.js";
-import { geometryDataOp as x } from "../geometryProjection.js";
-import { poseDescriptorForNode as S, translatePoseViaDescriptor as C } from "../../../core/geometry/poseDescriptor.js";
-import { poseDescriptorOf as w } from "../poseDescriptorDep.js";
-import { moveGestureAdapter as T } from "../move/gestureAdapter.js";
-import { carryPose as E, inPlane as D, invertPlane as ee, planeOf as O, selectionLayer as k } from "../planeInput.js";
-import { pointInPath as A } from "@weasel-js/geom";
-import { DRAG_THRESHOLD_PX as te, isAnchorOrControl as j, pastDragThreshold as M, resolveParams as N } from "@weasel-js/routing";
+import { createTransformOp as d } from "../../../core/ops/transform.js";
+import { poseDescriptorForNode as f, translatePoseViaDescriptor as p } from "../../../core/geometry/poseDescriptor.js";
+import { asNodeId as m } from "../../../core/scene/types.js";
+import { SceneArrivalRefused as h } from "../../../core/scene/arrivals.js";
+import { gesturePlaneReader as g, gestureViewReader as _ } from "../../gestures/shared/screenTolerance.js";
+import { commitGestureOps as v, readGestureLifecycle as y, reduceBehaviorEnd as b, runBehaviorCancel as x } from "../gestureLifecycle.js";
+import { moveSources as S } from "../selectionSubtree.js";
+import { createReparentOp as C } from "../../../core/ops/reparent.js";
+import { geometryDataOp as w } from "../geometryProjection.js";
+import { nodeDescriptors as T, poseDescriptorOf as E } from "../poseDescriptorDep.js";
+import { moveGestureAdapter as D } from "../move/gestureAdapter.js";
+import { landedDescendantOps as ee } from "../move/landedDescendants.js";
+import { carryPose as O, inPlane as k, invertPlane as te, planeOf as A, selectionLayer as j } from "../planeInput.js";
+import { pointInPath as M } from "@weasel-js/geom";
+import { DRAG_THRESHOLD_PX as N, isAnchorOrControl as P, pastDragThreshold as F, resolveParams as I } from "@weasel-js/routing";
 //#region src/interactions/actions/defaults/move.ts
-function P(e, n) {
+function L(e, n) {
 	let r = e.layout;
 	if (!r || !n.drag) return;
-	let i = e.scene, o = e.pc, c = V(i), { dx: l, dy: u } = e.currentDelta, d = (t, n) => {
+	let i = e.scene, o = e.pc, c = U(i), { dx: l, dy: u } = e.currentDelta, d = (t, n) => {
 		r.reflow ? e.reflowTargets.set(t, n) : e.previews.set(t, n);
-	}, f = e.projection, p = H(e, c), m = [];
+	}, h = e.projection, g = W(e, c), _ = [];
 	for (let t of e.ids) {
 		let n = i.get(t);
 		if (!n) continue;
-		let r = a(p, t, o.compose), s = S(f, n), c = z(e, t, l, u), d = ee(O(e.view, n.layer)), h = E(s, C(r, c.dx, c.dy, s), d), g = s.getBounds(h);
-		m.push({
+		let r = a(g, t, o.compose), s = f(h, n), c = V(e, t, l, u), d = te(A(e.view, n.layer)), m = O(s, p(r, c.dx, c.dy, s), d), v = s.getBounds(m);
+		_.push({
 			id: t,
 			arg: {
 				id: t,
-				originPose: E(s, r, d),
-				pose: h,
+				originPose: O(s, r, d),
+				pose: m,
 				sourceContainerId: n.parent ?? null
 			},
 			center: {
-				x: g.x + g.width / 2,
-				y: g.y + g.height / 2
+				x: v.x + v.width / 2,
+				y: v.y + v.height / 2
 			}
 		});
 	}
-	let h = (e, n) => {
+	let v = (e, n) => {
 		if (n === null) return e;
-		let r = S(f, i.get(e.id));
+		let r = f(h, i.get(e.id));
 		return {
 			id: e.id,
 			arg: {
 				...e.arg,
-				originPose: E(r, e.arg.originPose, n),
-				pose: E(r, e.arg.pose, n)
+				originPose: O(r, e.arg.originPose, n),
+				pose: O(r, e.arg.pose, n)
 			},
 			center: t(n, e.center)
 		};
 	};
-	if (m.length === 0) return;
-	let g = new Set(m.map((e) => e.id)), v = Infinity, y = Infinity, b = -Infinity, x = -Infinity;
-	for (let e of m) {
-		let t = f.getBounds(e.arg.pose);
-		v = Math.min(v, t.x), y = Math.min(y, t.y), b = Math.max(b, t.x + t.width), x = Math.max(x, t.y + t.height);
+	if (_.length === 0) return;
+	let y = new Set(_.map((e) => e.id)), b = Infinity, x = Infinity, S = -Infinity, C = -Infinity;
+	for (let e of _) {
+		let t = h.getBounds(e.arg.pose);
+		b = Math.min(b, t.x), x = Math.min(x, t.y), S = Math.max(S, t.x + t.width), C = Math.max(C, t.y + t.height);
 	}
 	let w = {
-		x: (v + b) / 2,
-		y: (y + x) / 2
+		x: (b + S) / 2,
+		y: (x + C) / 2
 	};
 	e.dropCenter = w;
 	let T = {
 		x: n.drag.current.x - w.x,
 		y: n.drag.current.y - w.y
-	}, D = [], k = r.dropTarget ?? "innermost", A = (e, t, n, r, i) => {
+	}, E = [], D = r.dropTarget ?? "innermost", ee = (e, t, n, r, i) => {
 		let a = r.dropRegion?.({
 			id: e,
 			bounds: n
 		}) ?? null;
-		return a ? F(a, n, i) : k === "region" ? !1 : r.contains ? r.contains(t, i) : i.x >= n.x && i.x < n.x + n.width && i.y >= n.y && i.y < n.y + n.height;
-	}, te = (n, s) => {
-		if (g.has(n)) return;
+		return a ? R(a, n, i) : D === "region" ? !1 : r.contains ? r.contains(t, i) : i.x >= n.x && i.x < n.x + n.width && i.y >= n.y && i.y < n.y + n.height;
+	}, k = (n, s) => {
+		if (y.has(n)) return;
 		let l = r.getLayout(n);
 		if (!l) return;
 		let u = i.get(n);
 		if (!u) return;
-		let d = a(c, n, o.compose), p = S(f, u).getBounds(d), _ = O(e.view, u.layer), v = _ ? t(_, w) : w;
-		if (A(n, d, p, l, v)) {
+		let d = a(c, n, o.compose), p = f(h, u).getBounds(d), m = A(e.view, u.layer), g = m ? t(m, w) : w;
+		if (ee(n, d, p, l, g)) {
 			if (l.acceptsDrop) {
 				let e = {
 					id: n,
 					bounds: p
 				};
-				for (let t of m) if (!l.acceptsDrop(e, h(t, _).arg)) return;
+				for (let t of _) if (!l.acceptsDrop(e, v(t, m).arg)) return;
 			}
-			D.push({
+			E.push({
 				id: n,
 				bounds: p,
 				layout: l,
 				zPath: s,
 				depth: s.length,
-				plane: _
+				plane: m
 			});
 		}
 	}, j = (e, t) => {
 		let n = e === null ? i.roots : i.childrenOf(e);
 		for (let e = 0; e < n.length; e++) {
 			let r = [...t, e];
-			te(n[e], r), j(n[e], r);
+			k(n[e], r), j(n[e], r);
 		}
 	};
 	j(null, []);
 	let M = null;
-	if (k === "topmost") {
-		let e = new Map(D.map((e) => [e.id, e]));
+	if (D === "topmost") {
+		let e = new Map(E.map((e) => [e.id, e]));
 		for (let t of i.renderOrder()) M = e.get(t) ?? M;
-	} else for (let e of D) {
+	} else for (let e of E) {
 		if (M === null) {
 			M = e;
 			continue;
@@ -136,75 +138,75 @@ function P(e, n) {
 	let N = M.layout, P = {
 		id: M.id,
 		bounds: M.bounds
-	}, I = i.childrenOf(M.id).map((e) => ({
+	}, F = i.childrenOf(M.id).map((e) => ({
 		id: e,
 		pose: a(c, e, o.compose)
-	})), L = (e, t) => {
-		let n = I.findIndex((t) => t.id === e);
-		n >= 0 ? I[n] = {
+	})), I = (e, t) => {
+		let n = F.findIndex((t) => t.id === e);
+		n >= 0 ? F[n] = {
 			id: e,
 			pose: t
-		} : I.push({
+		} : F.push({
 			id: e,
 			pose: t
 		});
-	}, R = [], B = /* @__PURE__ */ new Map(), U = M.plane;
-	for (let e of m) {
-		let n = h(e, U), r = I.map((e) => ({ ...e })), i = N.getDropTargets(P, r, n.arg), a = {
+	}, L = [], re = /* @__PURE__ */ new Map(), z = M.plane;
+	for (let e of _) {
+		let n = v(e, z), r = F.map((e) => ({ ...e })), i = N.getDropTargets(P, r, n.arg), a = {
 			x: e.center.x + T.x,
 			y: e.center.y + T.y
-		}, o = N.snap.pickTarget(i, U ? t(U, a) : a);
+		}, o = N.snap.pickTarget(i, z ? t(z, a) : a);
 		if (!o) return;
-		R.push({
+		L.push({
 			dragged: n.arg,
 			children: r,
 			target: o
 		});
 		let s = N.reflowPoses(P, r, n.arg, o);
-		for (let [e, t] of s) L(e, t), g.has(_(e)) || B.set(_(e), t);
-		L(n.arg.id, s.get(n.arg.id) ?? o.pose);
+		for (let [e, t] of s) I(e, t), y.has(m(e)) || re.set(m(e), t);
+		I(n.arg.id, s.get(n.arg.id) ?? o.pose);
 	}
-	let W = /* @__PURE__ */ new Set();
-	for (let [e, t] of B) {
+	let B = /* @__PURE__ */ new Set();
+	for (let [e, t] of re) {
 		let n = i.get(e)?.parent ?? null;
-		d(e, s(c, t, n, o.compose, o.decompose)), W.add(e);
+		d(e, s(c, t, n, o.compose, o.decompose)), B.add(e);
 	}
-	let G = /* @__PURE__ */ new Map();
-	for (let [e, t] of ne(m.map((e) => ({
+	let H = /* @__PURE__ */ new Map();
+	for (let [e, t] of ne(_.map((e) => ({
 		id: e.id,
 		sourceContainerId: e.arg.sourceContainerId
 	})), P.id)) {
-		let n = r.getLayout(e), l = i.get(_(e));
+		let n = r.getLayout(e), l = i.get(m(e));
 		if (!n || !l) continue;
 		let u = {
 			id: e,
-			bounds: f.getBounds(a(c, e, o.compose))
-		}, p = i.childrenOf(_(e)).filter((e) => !t.has(e)).map((e) => ({
+			bounds: h.getBounds(a(c, e, o.compose))
+		}, f = i.childrenOf(m(e)).filter((e) => !t.has(e)).map((e) => ({
 			id: e,
 			pose: a(c, e, o.compose)
 		}));
-		for (let [e, t] of n.childPoses(u, p)) {
-			let n = f.getBounds(a(c, e, o.compose)), r = f.getBounds(t);
+		for (let [e, t] of n.childPoses(u, f)) {
+			let n = h.getBounds(a(c, e, o.compose)), r = h.getBounds(t);
 			if (n.x === r.x && n.y === r.y && n.width === r.width && n.height === r.height) continue;
-			G.set(e, t);
-			let l = i.get(_(e))?.parent ?? null;
-			d(_(e), s(c, t, l, o.compose, o.decompose)), W.add(_(e));
+			H.set(e, t);
+			let l = i.get(m(e))?.parent ?? null;
+			d(m(e), s(c, t, l, o.compose, o.decompose)), B.add(m(e));
 		}
 	}
 	e.layoutPass = {
 		layout: N,
 		container: P,
-		placements: R,
-		sourceReflow: G,
-		reflowIds: W
+		placements: L,
+		sourceReflow: H,
+		reflowIds: B
 	};
 }
-function F(e, t, n) {
+function R(e, t, n) {
 	let r = {
 		x: n.x - t.x,
 		y: n.y - t.y
 	};
-	return typeof e == "function" ? e(r) : A(e, r.x, r.y);
+	return typeof e == "function" ? e(r) : M(e, r.x, r.y);
 }
 function ne(e, t) {
 	let n = /* @__PURE__ */ new Map();
@@ -216,40 +218,40 @@ function ne(e, t) {
 	}
 	return n;
 }
-function I(e, n) {
+function re(e, n) {
 	let r = /* @__PURE__ */ new Map(), i = e.layout, o = e.dropCenter;
 	if (!i || !o) return r;
-	let { scene: s, pc: c, projection: l } = e, u = V(s), d = /* @__PURE__ */ new Set([...e.ids, ...e.cascadeIds]), f = (n, r) => {
-		let i = s.get(n), d = O(e.view, i.layer), f = d ? t(d, o) : o, p = a(u, n, c.compose);
-		if (r?.contains) return r.contains(p, f);
-		let m = S(l, i).getBounds(p);
-		return f.x >= m.x && f.x < m.x + m.width && f.y >= m.y && f.y < m.y + m.height;
-	}, p = /* @__PURE__ */ new Map(), m = (e) => {
-		if (p.has(e)) return p.get(e);
+	let { scene: s, pc: c, projection: l } = e, u = U(s), d = /* @__PURE__ */ new Set([...e.ids, ...e.cascadeIds]), p = (n, r) => {
+		let i = s.get(n), d = A(e.view, i.layer), p = d ? t(d, o) : o, m = a(u, n, c.compose);
+		if (r?.contains) return r.contains(m, p);
+		let h = f(l, i).getBounds(m);
+		return p.x >= h.x && p.x < h.x + h.width && p.y >= h.y && p.y < h.y + h.height;
+	}, m = /* @__PURE__ */ new Map(), h = (e) => {
+		if (m.has(e)) return m.get(e);
 		let t = null, n = -1, r = (a, o) => {
 			for (let c of a === null ? s.roots : s.childrenOf(a)) {
 				if (d.has(c)) continue;
 				let a = s.get(c);
-				a && a.kind === "container" && (a.layer === e && o >= n && i.getLayout(c) === null && f(c, null) && (t = c, n = o), r(c, o + 1));
+				a && a.kind === "container" && (a.layer === e && o >= n && i.getLayout(c) === null && p(c, null) && (t = c, n = o), r(c, o + 1));
 			}
 		};
-		return r(null, 0), p.set(e, t), t;
+		return r(null, 0), m.set(e, t), t;
 	};
 	for (let e of n) {
 		let t = s.get(e), n = t?.parent ?? null;
 		if (!t || n === null) continue;
 		let a = i.getLayout(n);
-		a && !f(n, a) && r.set(e, m(t.layer));
+		a && !p(n, a) && r.set(e, h(t.layer));
 	}
 	return r;
 }
-function L(e, t, n, r) {
+function z(e, t, n, r) {
 	let i = [];
 	for (let a of t) {
 		if (!e.startPoses.has(a) || e.carried.has(a)) continue;
 		let t = e.scene.get(a);
 		if (!t) continue;
-		let o = R(e, a, n, r), s = e.caught.get(a);
+		let o = B(e, a, n, r), s = e.caught.get(a);
 		s && (o.dx += s.dx, o.dy += s.dy);
 		let c = [
 			1,
@@ -259,13 +261,13 @@ function L(e, t, n, r) {
 			o.dx,
 			o.dy
 		], l = t.pose;
-		if (i.push(y({
+		if (i.push(d({
 			id: a,
 			from: l,
-			to: C(l, o.dx, o.dy, e.projection),
+			to: p(l, o.dx, o.dy, e.descriptorOf(a)),
 			label: e.lifecycle.label
 		})), e.geometryProjection) {
-			let n = x(e.geometryProjection, {
+			let n = w(e.geometryProjection, {
 				id: a,
 				data: t.data,
 				pose: l
@@ -275,25 +277,25 @@ function L(e, t, n, r) {
 	}
 	return i;
 }
-function R(e, t, n, r) {
-	let { dx: i, dy: a } = z(e, t, n, r), o = e.frames.get(t);
+function B(e, t, n, r) {
+	let { dx: i, dy: a } = V(e, t, n, r), o = e.frames.get(t);
 	if (o === void 0) return {
 		dx: i,
 		dy: a
 	};
-	let { pc: s, projection: c } = e, l = c.getBounds(s.decompose(o.frameWorld, o.world)), u = c.getBounds(s.decompose(o.frameWorld, C(o.world, i, a, c)));
+	let { pc: s } = e, c = e.descriptorOf(t), l = c.getBounds(s.decompose(o.frameWorld, o.world)), u = c.getBounds(s.decompose(o.frameWorld, p(o.world, i, a, c)));
 	return {
 		dx: u.x - l.x,
 		dy: u.y - l.y
 	};
 }
-function z(e, n, r, i) {
+function V(e, n, r, i) {
 	let a = e.scene.get(n)?.layer, o = a === void 0 ? void 0 : e.planeRefs.get(a);
 	if (!o) return {
 		dx: r,
 		dy: i
 	};
-	let s = O(e.view, a), c = {
+	let s = A(e.view, a), c = {
 		x: o.edited.x + r,
 		y: o.edited.y + i
 	}, l = s ? t(s, c) : c;
@@ -302,7 +304,7 @@ function z(e, n, r, i) {
 		dy: l.y - o.own.y
 	};
 }
-function B(e, t) {
+function H(e, t) {
 	let n = new Set(e.ids), r = e.ids.filter((e) => !t.has(e));
 	for (let i of e.cascadeIds) {
 		let a = e.scene.get(i)?.parent ?? null, o = !1;
@@ -318,7 +320,7 @@ function B(e, t) {
 	}
 	return r;
 }
-function V(e) {
+function U(e) {
 	return {
 		getPose: (t) => l(e, e.get(t)),
 		getParent: (t) => e.get(t)?.parent ?? null,
@@ -328,14 +330,14 @@ function V(e) {
 		}
 	};
 }
-function H(e, t) {
+function W(e, t) {
 	return e.caught.size === 0 ? t : {
 		...t,
 		getPose: (n) => e.caught.has(n) ? e.startPoses.get(n) : t.getPose(n)
 	};
 }
-function U(e) {
-	let t = /* @__PURE__ */ new Map(), { scene: n, pc: r } = e, i = V(n);
+function ie(e) {
+	let t = /* @__PURE__ */ new Map(), { scene: n, pc: r } = e, i = U(n);
 	for (let s of e.startPoses.keys()) {
 		let c = e.previews.get(s);
 		if (c === void 0) continue;
@@ -348,8 +350,8 @@ function U(e) {
 	}
 	return t;
 }
-function W(e, t, n) {
-	let { scene: r, pc: i } = e, a = V(r);
+function ae(e, t, n) {
+	let { scene: r, pc: i } = e, a = U(r);
 	for (let o of e.startPoses.keys()) {
 		let c = n.get(o);
 		if (!c) {
@@ -360,10 +362,12 @@ function W(e, t, n) {
 		t.settle(o, { from: u });
 	}
 }
-function G(e, t) {
-	let n = e.deps.nodeAtPoint;
+function oe(e, t) {
+	let n = t.nodeAtPoint;
 	if (!n) return null;
-	let r = /* @__PURE__ */ new Set([...t.ids, ...t.cascadeIds]), i = n(e.world, r);
+	let r = e.drag ? e.world : t.lastWorld;
+	if (!r) return null;
+	let i = n(r, /* @__PURE__ */ new Set([...t.ids, ...t.cascadeIds]));
 	if (!i) return null;
 	let a = t.scene.get(i);
 	return a ? a.kind === "container" ? {
@@ -376,21 +380,22 @@ function G(e, t) {
 		hitSibling: i
 	} : null;
 }
-function re(t, n, r, i, o, c) {
-	let l = t.scene, u = V(l);
+function se(t, n, r, i, o, c) {
+	let l = t.scene, u = U(l), d = z(t, t.cascadeIds, i, o);
 	for (let d of t.ids) {
 		if (!t.startPoses.has(d)) continue;
-		let f = a(u, d, c.compose), p = z(t, d, i, o), m = l.get(d).layer, h = E(t.projection, C(f, p.dx, p.dy, t.projection), m === n.newLayer ? null : e(O(t.view, m), O(t.view, n.newLayer))), g = s(u, h, n.newParent, c.compose, c.decompose), _ = l.get(d);
-		_.layer !== n.newLayer && (_.parent !== null && l.move(d, null), l.setLayer(d, n.newLayer));
-		let v;
+		let f = a(u, d, c.compose), m = V(t, d, i, o), h = l.get(d).layer, g = O(t.descriptorOf(d), p(f, m.dx, m.dy, t.descriptorOf(d)), h === n.newLayer ? null : e(A(t.view, h), A(t.view, n.newLayer))), _ = s(u, g, n.newParent, c.compose, c.decompose), v = l.get(d);
+		v.layer !== n.newLayer && (v.parent !== null && l.move(d, null), l.setLayer(d, n.newLayer));
+		let y;
 		if (r === "above" && n.hitSibling) {
 			let e = (n.newParent === null ? l.roots : l.childrenOf(n.newParent)).filter((e) => e !== d).indexOf(n.hitSibling);
-			e >= 0 && (v = e + 1);
+			e >= 0 && (y = e + 1);
 		}
-		l.move(d, n.newParent, v), l.setPose(d, g);
+		l.move(d, n.newParent, y), l.setPose(d, _);
 	}
+	for (let e of d) e.apply(t.adapter);
 }
-var K = D({
+var G = k({
 	id: "move",
 	label: "Move",
 	activeCursor: "move",
@@ -413,56 +418,60 @@ var K = D({
 	invoker: {
 		timing: "ongoing",
 		start(e, c) {
-			let x = e.deps.selection, S = e.deps.scene, E = w(e.deps.poseDescriptor), D = e.deps.layout, k = e.deps.applyOps, A = e.deps.geometryProjection, F = e.deps.poseComposition ?? i;
-			if (!x || !S || j(e.drag?.affordance)) return {};
-			let K = N(c?.params), ie = K?.expandIds, ae = [...x.get()], q = ie ? ie(ae) : ae;
-			if (q.length === 0) return {};
-			let J = /* @__PURE__ */ new Map(), oe = [], Y = /* @__PURE__ */ new Set(), X = [], Z = D?.reflow ?? null, se = /* @__PURE__ */ new Map(), ce = (e, t) => {
-				let n = Z?.poseOf(e);
-				if (!Z || n === void 0) return;
-				Z.glide(e, n, { from: n });
-				let r = E.getBounds(n), i = E.getBounds(l(S, t));
-				se.set(e, {
+			let f = e.deps.selection, w = e.deps.scene, O = E(e.deps.poseDescriptor), k = e.deps.layout, j = e.deps.applyOps, M = e.deps.geometryProjection, R = e.deps.poseComposition ?? i;
+			if (!f || !w || P(e.drag?.affordance)) return {};
+			let G = I(c?.params), ce = G?.expandIds, le = [...f.get()], K = S(w, ce ? ce(le) : le);
+			if (K.length === 0) return {};
+			let q = /* @__PURE__ */ new Map(), ue = [], J = /* @__PURE__ */ new Set(), Y = [], X = k?.reflow ?? null, de = /* @__PURE__ */ new Map(), fe = (e, t) => {
+				let n = X?.poseOf(e);
+				if (!X || n === void 0) return;
+				X.glide(e, n, { from: n });
+				let r = O.getBounds(n), i = O.getBounds(l(w, t));
+				de.set(e, {
 					dx: r.x - i.x,
 					dy: r.y - i.y
 				});
 			};
-			for (let e of q) {
-				let t = S.get(e);
-				t && (ce(e, t), J.set(e, u(S, t)), Y.add(e), X.push(e));
+			for (let e of K) {
+				let t = w.get(e);
+				t && (fe(e, t), q.set(e, u(w, t)), J.add(e), Y.push(e));
 			}
-			for (; X.length > 0;) {
-				let e = X.shift();
-				for (let t of S.childrenOf(e)) {
-					if (Y.has(t)) continue;
-					Y.add(t);
-					let e = S.get(t);
-					e && (ce(t, e), J.set(t, u(S, e)), oe.push(t), X.push(t));
+			for (; Y.length > 0;) {
+				let e = Y.shift();
+				for (let t of w.childrenOf(e)) {
+					if (J.has(t)) continue;
+					J.add(t);
+					let e = w.get(t);
+					e && (fe(t, e), q.set(t, u(w, e)), ue.push(t), Y.push(t));
 				}
 			}
-			let le = /* @__PURE__ */ new Set(), ue = /* @__PURE__ */ new Map();
-			if (F.closure !== "identity") {
-				let e = V(S);
-				for (let t of J.keys()) {
-					let n = o(e, S.get(t)?.parent ?? null);
+			let pe = /* @__PURE__ */ new Set(), Z = /* @__PURE__ */ new Map();
+			if (R.closure !== "identity") {
+				let e = U(w);
+				for (let t of q.keys()) {
+					let n = o(e, w.get(t)?.parent ?? null);
 					if (n !== null) {
-						if (J.has(_(n))) {
-							le.add(t);
+						if (q.has(m(n))) {
+							pe.add(t);
 							continue;
 						}
-						ue.set(t, {
-							world: a(e, t, F.compose),
-							frameWorld: a(e, n, F.compose)
+						Z.set(t, {
+							world: a(e, t, R.compose),
+							frameWorld: a(e, n, R.compose)
 						});
 					}
 				}
 			}
-			let de = c?.behaviors ?? [], fe = K?.dragThresholdPx ?? te, Q = m(K, "Move", de), pe = !1, me = T(S), he = /* @__PURE__ */ new Map();
-			for (let [e, t] of J) he.set(e, t);
-			let ge = f(e.deps), _e = d(e.deps), ve = {
-				draggedIds: q,
-				origin: he,
-				current: new Map(he),
+			let me = c?.behaviors ?? [], he = G?.dragThresholdPx ?? N, Q = y(G, "Move", me), ge = !1, _e = D(w, (e, t, n) => v({
+				scene: w,
+				applyOps: j,
+				adapter: n
+			}, Q, e)), ve = /* @__PURE__ */ new Map();
+			for (let [e, t] of q) ve.set(e, t);
+			let ye = _(e.deps), be = g(e.deps), xe = {
+				draggedIds: K,
+				origin: ve,
+				current: new Map(ve),
 				snap: null,
 				modifiers: { ...e.modifiers },
 				pointer: {
@@ -471,19 +480,19 @@ var K = D({
 					clientX: 0,
 					clientY: 0
 				},
-				view: ge(),
-				plane: _e(),
-				adapter: me,
+				view: ye(),
+				plane: be(),
+				adapter: _e,
 				scratch: {}
 			};
-			for (let e of de) e.onStart?.(ve);
+			for (let e of me) e.onStart?.(xe);
 			let $ = {
-				startPoses: J,
-				ids: q,
-				cascadeIds: oe,
-				carried: le,
-				frames: ue,
-				scene: S,
+				startPoses: q,
+				ids: K,
+				cascadeIds: ue,
+				carried: pe,
+				frames: Z,
+				scene: w,
 				currentDelta: {
 					dx: 0,
 					dy: 0
@@ -494,55 +503,63 @@ var K = D({
 				overrideEntries: /* @__PURE__ */ new Map(),
 				reflowTargets: /* @__PURE__ */ new Map(),
 				gliding: /* @__PURE__ */ new Set(),
-				caught: se,
-				projection: E,
-				behaviors: de,
-				gestureCtx: ve,
-				adapter: me,
-				layout: D,
+				caught: de,
+				projection: O,
+				descriptorOf: T(w, O),
+				behaviors: me,
+				gestureCtx: xe,
+				adapter: _e,
+				layout: k,
 				layoutPass: null,
 				dropCenter: null,
-				pc: F,
-				applyOps: k,
-				geometryProjection: A,
-				lifecycle: Q
+				pc: R,
+				applyOps: j,
+				geometryProjection: M,
+				lifecycle: Q,
+				nodeAtPoint: e.deps.nodeAtPoint,
+				lastWorld: null
 			};
-			for (let e of q) {
-				let n = S.get(e)?.layer;
+			for (let e of K) {
+				let n = w.get(e)?.layer;
 				if (n === void 0 || $.planeRefs.has(n)) continue;
-				let r = O($.view, n);
+				let r = A($.view, n);
 				if (r === null) continue;
-				let i = ue.get(e)?.world ?? J.get(e);
+				let i = Z.get(e)?.world ?? q.get(e);
 				if (i === void 0) continue;
-				let a = E.getBounds(i), o = {
+				let a = O.getBounds(i), o = {
 					x: a.x,
 					y: a.y
 				};
 				$.planeRefs.set(n, {
 					own: o,
-					edited: t(ee(r), o)
+					edited: t(te(r), o)
 				});
 			}
-			let ye = (e) => {
+			let Se = (e) => {
 				let { dx: t, dy: n } = $.currentDelta, r = !1, i = (e) => {
-					p($, Q, e), r = !0;
+					let t = ee({
+						...$,
+						roots: $.ids,
+						label: Q.label
+					}, e);
+					v($, Q, [...e, ...t]), r = !0;
 				};
 				if ($.behaviors.length > 0) {
 					let e = $.gestureCtx;
 					for (let [r, i] of $.startPoses) {
-						let a = z($, r, t, n);
-						e.current.set(r, C(i, a.dx, a.dy, $.projection));
+						let a = V($, r, t, n);
+						e.current.set(r, p(i, a.dx, a.dy, $.descriptorOf(r)));
 					}
-					let r = h($.behaviors, e);
+					let r = b($.behaviors, e);
 					if (r === null) return !1;
 					if (r !== void 0) return i(r), !0;
 				}
 				if (t === 0 && n === 0) return !1;
 				if ($.layout && $.layoutPass) {
-					let e = $.layoutPass, t = $.pc, n = V($.scene), a = e.container.id, o = new Set($.ids.map((e) => e)), c = (e) => {
+					let e = $.layoutPass, t = $.pc, n = U($.scene), a = e.container.id, o = new Set($.ids.map((e) => e)), c = (e) => {
 						if (e.name !== "transform") return e;
-						let r = e.args, i = $.scene.get(_(r.id))?.parent ?? null, c = o.has(r.id) ? a : i;
-						return y({
+						let r = e.args, i = $.scene.get(m(r.id))?.parent ?? null, c = o.has(r.id) ? a : i;
+						return d({
 							id: r.id,
 							from: s(n, r.from, i, t.compose, t.decompose),
 							to: s(n, r.to, c, t.compose, t.decompose),
@@ -551,7 +568,7 @@ var K = D({
 						});
 					}, l = [], u = [];
 					for (let t of e.placements) {
-						t.dragged.sourceContainerId !== a && l.push(b({
+						t.dragged.sourceContainerId !== a && l.push(C({
 							id: t.dragged.id,
 							fromParentId: t.dragged.sourceContainerId,
 							toParentId: a,
@@ -560,29 +577,29 @@ var K = D({
 						let n = e.layout.commitDrop(e.container, t.children, t.dragged, t.target);
 						for (let e of n) u.push(c(e));
 					}
-					let d = [];
+					let f = [];
 					for (let [r, i] of e.sourceReflow) {
-						let e = $.scene.get(_(r))?.parent ?? null;
-						d.push(y({
+						let e = $.scene.get(m(r))?.parent ?? null;
+						f.push(d({
 							id: r,
-							from: $.scene.get(_(r)).pose,
+							from: $.scene.get(m(r)).pose,
 							to: s(n, i, e, t.compose, t.decompose),
 							label: "Source reflow"
 						}));
 					}
-					let f = [
+					let p = [
 						...l,
 						...u,
-						...d
+						...f
 					];
-					return f.length > 0 && i(f), r;
+					return p.length > 0 && i(p), r;
 				}
-				let o = /* @__PURE__ */ new Set(), l = [], u = /* @__PURE__ */ new Map(), d = [];
+				let o = /* @__PURE__ */ new Set(), l = [], u = /* @__PURE__ */ new Map(), f = [];
 				if ($.layout && !$.layoutPass) {
-					let e = $.pc, r = V($.scene), i = (t) => {
+					let e = $.pc, r = U($.scene), i = (t) => {
 						if (t.name !== "transform") return t;
-						let n = t.args, i = $.scene.get(_(n.id))?.parent ?? null;
-						return y({
+						let n = t.args, i = $.scene.get(m(n.id))?.parent ?? null;
+						return d({
 							id: n.id,
 							from: s(r, n.from, i, e.compose, e.decompose),
 							to: s(r, n.to, i, e.compose, e.decompose),
@@ -599,42 +616,42 @@ var K = D({
 						let d = {
 							id: s,
 							bounds: $.projection.getBounds(a(r, s, e.compose))
-						}, f = $.scene.childrenOf(_(s)).filter((e) => !u.has(e)).map((t) => ({
+						}, f = $.scene.childrenOf(m(s)).filter((e) => !u.has(e)).map((t) => ({
 							id: t,
 							pose: a(r, t, e.compose)
 						}));
-						for (let p of u) {
-							let u = a(H($, r), p, e.compose), m = z($, p, t, n), h = c.releaseDrop(d, f, {
-								id: p,
+						for (let m of u) {
+							let u = a(W($, r), m, e.compose), h = V($, m, t, n), g = c.releaseDrop(d, f, {
+								id: m,
 								originPose: u,
-								pose: C(u, m.dx, m.dy, $.projection),
+								pose: p(u, h.dx, h.dy, $.descriptorOf(m)),
 								sourceContainerId: s
 							});
-							if (h === null) continue;
-							o.add(p);
-							let g = u;
-							for (let e of h) {
+							if (g === null) continue;
+							o.add(m);
+							let _ = u;
+							for (let e of g) {
 								let t = e.args;
-								e.name === "transform" && t.id === p && (g = t.to), l.push(i(e));
+								e.name === "transform" && t.id === m && (_ = t.to), l.push(i(e));
 							}
 							f = [...f, {
-								id: p,
-								pose: g
+								id: m,
+								pose: _
 							}];
 						}
 					}
-					u = I($, $.ids.filter((e) => !o.has(e)));
+					u = re($, $.ids.filter((e) => !o.has(e)));
 					for (let [i, o] of u) {
-						let c = $.scene.get(i), l = a(H($, r), i, e.compose), u = z($, i, t, n), f = C(l, u.dx, u.dy, $.projection);
-						d.push(b({
+						let c = $.scene.get(i), l = a(W($, r), i, e.compose), u = V($, i, t, n), m = p(l, u.dx, u.dy, $.descriptorOf(i));
+						f.push(C({
 							id: i,
 							fromParentId: c.parent,
 							toParentId: o,
 							label: "Reparent"
-						})), d.push(y({
+						})), f.push(d({
 							id: i,
 							from: c.pose,
-							to: s(r, f, o, e.compose, e.decompose),
+							to: s(r, m, o, e.compose, e.decompose),
 							label: Q.label
 						}));
 					}
@@ -642,21 +659,21 @@ var K = D({
 				if (o.size > 0 || u.size > 0) {
 					let e = [
 						...l,
-						...d,
-						...L($, B($, o).filter((e) => !u.has(e)), t, n)
+						...f,
+						...z($, H($, o).filter((e) => !u.has(e)), t, n)
 					];
 					return e.length > 0 && i(e), r;
 				}
-				let f = N(c?.params)?.reparentOnDrop ?? "off", m = f === "off" ? null : G(e, $);
-				if (m) {
-					let e = () => re($, m, f, t, n, $.pc);
+				let g = I(c?.params)?.reparentOnDrop ?? "off", _ = g === "off" ? null : oe(e, $);
+				if (_) {
+					let e = () => se($, _, g, t, n, $.pc);
 					try {
 						Q.transient ? $.scene.untracked(e) : $.scene.batch(Q.label, e), r = !0;
 					} catch (e) {
-						if (!(e instanceof v)) throw e;
+						if (!(e instanceof h)) throw e;
 					}
 				} else {
-					let e = L($, [...$.ids, ...$.cascadeIds], t, n);
+					let e = z($, [...$.ids, ...$.cascadeIds], t, n);
 					e.length > 0 && i(e);
 				}
 				return r;
@@ -665,18 +682,18 @@ var K = D({
 				kind: "move",
 				onMove(e) {
 					if (!e.drag) return;
-					if (!pe) {
+					if ($.lastWorld = e.world, !ge) {
 						let t = e.drag.screenDelta;
-						if (t && !M({
+						if (t && !F({
 							clientX: 0,
 							clientY: 0
 						}, {
 							clientX: t.x,
 							clientY: t.y
-						}, fe)) return;
-						pe = !0, Q.start($.ids);
+						}, he)) return;
+						ge = !0, Q.start($.ids);
 					}
-					let t = e.drag.delta.x, n = e.drag.delta.y;
+					let t = e.drag.delta.x, n = e.drag.delta.y, i = /* @__PURE__ */ new Map();
 					if ($.behaviors.length > 0) {
 						let r = $.gestureCtx;
 						r.modifiers = { ...e.modifiers }, r.pointer = {
@@ -684,25 +701,26 @@ var K = D({
 							worldY: e.drag.current.y,
 							clientX: 0,
 							clientY: 0
-						}, r.view = ge(), r.plane = _e();
+						}, r.view = ye(), r.plane = be();
 						for (let [e, i] of $.startPoses) {
-							let a = z($, e, t, n);
-							r.current.set(e, C(i, a.dx, a.dy, $.projection));
+							let a = V($, e, t, n);
+							r.current.set(e, p(i, a.dx, a.dy, $.descriptorOf(e)));
 						}
-						let i = {
+						let a = {
 							kind: "translate",
 							dx: t,
 							dy: n
-						}, a = $.ids[0];
+						}, o = $.ids[0];
 						for (let e of $.behaviors) {
-							let t = e.onMove?.(r, i);
+							let t = e.onMove?.(r, a);
 							if (t) {
-								if (t.transform && t.transform.kind === "translate") i = t.transform;
-								else if (t.pose !== void 0 && a !== void 0) {
-									let e = $.startPoses.get(a);
+								if (t.poses) for (let [e, n] of t.poses) i.set(e, n);
+								if (t.transform && t.transform.kind === "translate") a = t.transform;
+								else if (t.pose !== void 0 && o !== void 0) {
+									let e = $.startPoses.get(o);
 									if (e !== void 0) {
 										let n = $.projection.getBounds(e), r = $.projection.getBounds(t.pose);
-										i = {
+										a = {
 											kind: "translate",
 											dx: r.x - n.x,
 											dy: r.y - n.y
@@ -712,7 +730,7 @@ var K = D({
 								t.snap !== void 0 && (r.snap = t.snap);
 							}
 						}
-						i.kind === "translate" && (t = i.dx, n = i.dy);
+						a.kind === "translate" && (t = a.dx, n = a.dy);
 					}
 					$.currentDelta = {
 						dx: t,
@@ -723,25 +741,25 @@ var K = D({
 							$.previews.set(e, r);
 							continue;
 						}
-						let i = R($, e, t, n);
-						$.previews.set(e, C(r, i.dx, i.dy, $.projection));
+						let a = B($, e, t, n);
+						$.previews.set(e, i.get(e) ?? p(r, a.dx, a.dy, $.descriptorOf(e)));
 					}
-					$.layoutPass = null, $.dropCenter = null, $.reflowTargets.clear(), P($, e);
-					let i = $.layout?.reflow;
-					if (i) {
-						for (let [e, t] of $.reflowTargets) i.glide(e, t), $.gliding.add(e);
-						for (let e of $.gliding) $.reflowTargets.has(e) || (i.settle(e), $.gliding.delete(e));
+					$.layoutPass = null, $.dropCenter = null, $.reflowTargets.clear(), L($, e);
+					let a = $.layout?.reflow;
+					if (a) {
+						for (let [e, t] of $.reflowTargets) a.glide(e, t), $.gliding.add(e);
+						for (let e of $.gliding) $.reflowTargets.has(e) || (a.settle(e), $.gliding.delete(e));
 					}
 					r($);
 				},
 				onEnd(e, t) {
-					let r = !1, i = $.layout?.reflow ?? null, a = i ? U($) : null;
+					let r = !1, i = $.layout?.reflow ?? null, a = i ? ie($) : null;
 					try {
-						t === "commit" ? r = ye(e) : g($.behaviors, $.gestureCtx);
+						t === "commit" && ge ? r = Se(e) : x($.behaviors, $.gestureCtx);
 					} finally {
 						if (n($), $.previews.clear(), i && a) {
 							for (let e of $.gliding) i.settle(e);
-							W($, i, a);
+							ae($, i, a);
 						}
 						$.gliding.clear(), Q.end(r);
 					}
@@ -753,8 +771,8 @@ var K = D({
 		}
 	},
 	enabled: () => !0
-}, k);
+}, j);
 //#endregion
-export { K as moveAction };
+export { G as moveAction };
 
 //# sourceMappingURL=move.js.map