@weasel-js/core 1.7.1 → 1.7.3

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

@@ -1,195 +1,212 @@
-import { dropPreviewOverrides as e, syncPreviewOverrides as t } from "../previewOverrides.js";
-import { IDENTITY_POSE_COMPOSITION as n, composeWorldPose as r, frameAtOrAbove as i, rebaseLocalPose as a } from "../../../core/scene/composeFrame.js";
-import { definesFrame as o, documentPose as s, effectivePose as c } from "../../../core/scene/effectivePose.js";
-import { gesturePlaneReader as l, gestureViewReader as u } from "../../gestures/shared/screenTolerance.js";
-import { commitGestureOps as d, readGestureLifecycle as f, reduceBehaviorEnd as p, runBehaviorCancel as m } from "../gestureLifecycle.js";
-import { asNodeId as h } from "../../../core/scene/types.js";
-import { SceneArrivalRefused as g } from "../../../core/scene/arrivals.js";
-import { createTransformOp as _ } from "../../../core/ops/transform.js";
-import { createReparentOp as v } from "../../../core/ops/reparent.js";
-import { geometryDataOp as y } from "../geometryProjection.js";
-import { poseDescriptorForNode as b, translatePoseViaDescriptor as x } from "../../../core/geometry/poseDescriptor.js";
-import { poseDescriptorOf as S } from "../poseDescriptorDep.js";
-import { moveGestureAdapter as C } from "../move/gestureAdapter.js";
-import { inPlane as w, selectionLayer as T } from "../planeInput.js";
-import { pointInPath as E } from "@weasel-js/geom";
-import { DRAG_THRESHOLD_PX as ee, isAnchorOrControl as D, pastDragThreshold as O, resolveParams as k } from "@weasel-js/routing";
+import { planeToPlane as e, toPlane as t } from "../../../core/viewport/parallax.js";
+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";
 //#region src/interactions/actions/defaults/move.ts
-function A(e, t) {
-	let n = e.layout;
-	if (!n || !t.drag) return;
-	let i = e.scene, o = e.pc, s = I(i), { dx: c, dy: l } = e.currentDelta, u = (t, r) => {
-		n.reflow ? e.reflowTargets.set(t, r) : e.previews.set(t, r);
-	}, d = e.projection, f = te(e, s), p = [];
+function P(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) => {
+		r.reflow ? e.reflowTargets.set(t, n) : e.previews.set(t, n);
+	}, f = e.projection, p = H(e, c), m = [];
 	for (let t of e.ids) {
-		let e = i.get(t);
-		if (!e) continue;
-		let n = r(f, t, o.compose), a = b(d, e), s = x(n, c, l, a), u = a.getBounds(s);
-		p.push({
+		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({
 			id: t,
 			arg: {
 				id: t,
-				originPose: n,
-				pose: s,
-				sourceContainerId: e.parent ?? null
+				originPose: E(s, r, d),
+				pose: h,
+				sourceContainerId: n.parent ?? null
 			},
 			center: {
-				x: u.x + u.width / 2,
-				y: u.y + u.height / 2
+				x: g.x + g.width / 2,
+				y: g.y + g.height / 2
 			}
 		});
 	}
-	if (p.length === 0) return;
-	let m = new Set(p.map((e) => e.id)), g = Infinity, _ = Infinity, v = -Infinity, y = -Infinity;
-	for (let e of p) {
-		let t = d.getBounds(e.arg.pose);
-		g = Math.min(g, t.x), _ = Math.min(_, t.y), v = Math.max(v, t.x + t.width), y = Math.max(y, t.y + t.height);
+	let h = (e, n) => {
+		if (n === null) return e;
+		let r = S(f, 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)
+			},
+			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);
 	}
-	let S = {
-		x: (g + v) / 2,
-		y: (_ + y) / 2
-	}, C = {
-		x: t.drag.current.x - S.x,
-		y: t.drag.current.y - S.y
-	}, w = [], T = n.dropTarget ?? "innermost", E = (e, t, n, r) => {
-		let i = r.dropRegion?.({
+	let w = {
+		x: (v + b) / 2,
+		y: (y + x) / 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) => {
+		let a = r.dropRegion?.({
 			id: e,
 			bounds: n
 		}) ?? null;
-		return i ? j(i, n, S) : T === "region" ? !1 : r.contains ? r.contains(t, S) : S.x >= n.x && S.x < n.x + n.width && S.y >= n.y && S.y < n.y + n.height;
-	}, ee = (e, t) => {
-		if (m.has(e)) return;
-		let a = n.getLayout(e);
-		if (!a) return;
-		let c = i.get(e);
-		if (!c) return;
-		let l = r(s, e, o.compose), u = b(d, c).getBounds(l);
-		if (E(e, l, u, a)) {
-			if (a.acceptsDrop) {
-				let t = {
-					id: e,
-					bounds: u
+		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;
+		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)) {
+			if (l.acceptsDrop) {
+				let e = {
+					id: n,
+					bounds: p
 				};
-				for (let e of p) if (!a.acceptsDrop(t, e.arg)) return;
+				for (let t of m) if (!l.acceptsDrop(e, h(t, _).arg)) return;
 			}
-			w.push({
-				id: e,
-				bounds: u,
-				layout: a,
-				zPath: t,
-				depth: t.length
+			D.push({
+				id: n,
+				bounds: p,
+				layout: l,
+				zPath: s,
+				depth: s.length,
+				plane: _
 			});
 		}
-	}, D = (e, t) => {
+	}, j = (e, t) => {
 		let n = e === null ? i.roots : i.childrenOf(e);
 		for (let e = 0; e < n.length; e++) {
 			let r = [...t, e];
-			ee(n[e], r), D(n[e], r);
+			te(n[e], r), j(n[e], r);
 		}
 	};
-	D(null, []);
-	let O = null;
-	if (T === "topmost") {
-		let e = new Map(w.map((e) => [e.id, e]));
-		for (let t of i.renderOrder()) O = e.get(t) ?? O;
-	} else for (let e of w) {
-		if (O === null) {
-			O = e;
+	j(null, []);
+	let M = null;
+	if (k === "topmost") {
+		let e = new Map(D.map((e) => [e.id, e]));
+		for (let t of i.renderOrder()) M = e.get(t) ?? M;
+	} else for (let e of D) {
+		if (M === null) {
+			M = e;
 			continue;
 		}
-		if (e.depth > O.depth) {
-			O = e;
+		if (e.depth > M.depth) {
+			M = e;
 			continue;
 		}
-		if (e.depth < O.depth) continue;
+		if (e.depth < M.depth) continue;
 		let t = !1;
 		for (let n = 0; n < e.zPath.length; n++) {
-			if (e.zPath[n] > O.zPath[n]) {
+			if (e.zPath[n] > M.zPath[n]) {
 				t = !0;
 				break;
 			}
-			if (e.zPath[n] < O.zPath[n]) {
+			if (e.zPath[n] < M.zPath[n]) {
 				t = !1;
 				break;
 			}
 		}
-		t && (O = e);
+		t && (M = e);
 	}
-	if (!O) return;
-	let k = O.layout, A = {
-		id: O.id,
-		bounds: O.bounds
-	}, N = i.childrenOf(O.id).map((e) => ({
+	if (!M) return;
+	let N = M.layout, P = {
+		id: M.id,
+		bounds: M.bounds
+	}, I = i.childrenOf(M.id).map((e) => ({
 		id: e,
-		pose: r(s, e, o.compose)
-	})), P = (e, t) => {
-		let n = N.findIndex((t) => t.id === e);
-		n >= 0 ? N[n] = {
+		pose: a(c, e, o.compose)
+	})), L = (e, t) => {
+		let n = I.findIndex((t) => t.id === e);
+		n >= 0 ? I[n] = {
 			id: e,
 			pose: t
-		} : N.push({
+		} : I.push({
 			id: e,
 			pose: t
 		});
-	}, F = [], L = /* @__PURE__ */ new Map();
-	for (let e of p) {
-		let t = N.map((e) => ({ ...e })), n = k.getDropTargets(A, t, e.arg), r = k.snap.pickTarget(n, {
-			x: e.center.x + C.x,
-			y: e.center.y + C.y
+	}, 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 = {
+			x: e.center.x + T.x,
+			y: e.center.y + T.y
+		}, o = N.snap.pickTarget(i, U ? t(U, a) : a);
+		if (!o) return;
+		R.push({
+			dragged: n.arg,
+			children: r,
+			target: o
 		});
-		if (!r) return;
-		F.push({
-			dragged: e.arg,
-			children: t,
-			target: r
-		});
-		let i = k.reflowPoses(A, t, e.arg, r);
-		for (let [e, t] of i) P(e, t), m.has(h(e)) || L.set(h(e), t);
-		P(e.arg.id, i.get(e.arg.id) ?? r.pose);
+		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);
 	}
-	let R = /* @__PURE__ */ new Set();
-	for (let [e, t] of L) {
+	let W = /* @__PURE__ */ new Set();
+	for (let [e, t] of B) {
 		let n = i.get(e)?.parent ?? null;
-		u(e, a(s, t, n, o.compose, o.decompose)), R.add(e);
+		d(e, s(c, t, n, o.compose, o.decompose)), W.add(e);
 	}
-	let z = /* @__PURE__ */ new Map();
-	for (let [e, t] of M(p.map((e) => ({
+	let G = /* @__PURE__ */ new Map();
+	for (let [e, t] of ne(m.map((e) => ({
 		id: e.id,
 		sourceContainerId: e.arg.sourceContainerId
-	})), A.id)) {
-		let c = n.getLayout(e), l = i.get(h(e));
-		if (!c || !l) continue;
-		let f = {
+	})), P.id)) {
+		let n = r.getLayout(e), l = i.get(_(e));
+		if (!n || !l) continue;
+		let u = {
 			id: e,
-			bounds: d.getBounds(r(s, e, o.compose))
-		}, p = i.childrenOf(h(e)).filter((e) => !t.has(e)).map((e) => ({
+			bounds: f.getBounds(a(c, e, o.compose))
+		}, p = i.childrenOf(_(e)).filter((e) => !t.has(e)).map((e) => ({
 			id: e,
-			pose: r(s, e, o.compose)
+			pose: a(c, e, o.compose)
 		}));
-		for (let [e, t] of c.childPoses(f, p)) {
-			let n = d.getBounds(r(s, e, o.compose)), c = d.getBounds(t);
-			if (n.x === c.x && n.y === c.y && n.width === c.width && n.height === c.height) continue;
-			z.set(e, t);
-			let l = i.get(h(e))?.parent ?? null;
-			u(h(e), a(s, t, l, o.compose, o.decompose)), R.add(h(e));
+		for (let [e, t] of n.childPoses(u, p)) {
+			let n = f.getBounds(a(c, e, o.compose)), r = f.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));
 		}
 	}
 	e.layoutPass = {
-		layout: k,
-		container: A,
-		placements: F,
-		sourceReflow: z,
-		reflowIds: R
+		layout: N,
+		container: P,
+		placements: R,
+		sourceReflow: G,
+		reflowIds: W
 	};
 }
-function j(e, t, n) {
+function F(e, t, n) {
 	let r = {
 		x: n.x - t.x,
 		y: n.y - t.y
 	};
-	return typeof e == "function" ? e(r) : E(e, r.x, r.y);
+	return typeof e == "function" ? e(r) : A(e, r.x, r.y);
 }
-function M(e, t) {
+function ne(e, t) {
 	let n = /* @__PURE__ */ new Map();
 	for (let r of e) {
 		let e = r.sourceContainerId;
@@ -199,13 +216,40 @@ function M(e, t) {
 	}
 	return n;
 }
-function N(e, t, n, r) {
+function I(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 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));
+			}
+		};
+		return r(null, 0), p.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));
+	}
+	return r;
+}
+function L(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 = P(e, a, n, r), s = e.caught.get(a);
+		let o = R(e, a, n, r), s = e.caught.get(a);
 		s && (o.dx += s.dx, o.dy += s.dy);
 		let c = [
 			1,
@@ -215,13 +259,13 @@ function N(e, t, n, r) {
 			o.dx,
 			o.dy
 		], l = t.pose;
-		if (i.push(_({
+		if (i.push(y({
 			id: a,
 			from: l,
-			to: x(l, o.dx, o.dy, e.projection),
+			to: C(l, o.dx, o.dy, e.projection),
 			label: e.lifecycle.label
 		})), e.geometryProjection) {
-			let n = y(e.geometryProjection, {
+			let n = x(e.geometryProjection, {
 				id: a,
 				data: t.data,
 				pose: l
@@ -231,19 +275,34 @@ function N(e, t, n, r) {
 	}
 	return i;
 }
-function P(e, t, n, r) {
-	let i = e.frames.get(t);
-	if (i === void 0) return {
-		dx: n,
-		dy: r
+function R(e, t, n, r) {
+	let { dx: i, dy: a } = z(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)));
+	return {
+		dx: u.x - l.x,
+		dy: u.y - l.y
+	};
+}
+function z(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 { pc: a, projection: o } = e, s = o.getBounds(a.decompose(i.frameWorld, i.world)), c = o.getBounds(a.decompose(i.frameWorld, x(i.world, n, r, o)));
+	let s = O(e.view, a), c = {
+		x: o.edited.x + r,
+		y: o.edited.y + i
+	}, l = s ? t(s, c) : c;
 	return {
-		dx: c.x - s.x,
-		dy: c.y - s.y
+		dx: l.x - o.own.x,
+		dy: l.y - o.own.y
 	};
 }
-function F(e, t) {
+function B(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;
@@ -259,28 +318,28 @@ function F(e, t) {
 	}
 	return r;
 }
-function I(e) {
+function V(e) {
 	return {
-		getPose: (t) => s(e, e.get(t)),
+		getPose: (t) => l(e, e.get(t)),
 		getParent: (t) => e.get(t)?.parent ?? null,
 		definesFrame: (t) => {
 			let n = e.get(t);
-			return n === void 0 || o(n);
+			return n === void 0 || c(n);
 		}
 	};
 }
-function te(e, t) {
+function H(e, t) {
 	return e.caught.size === 0 ? t : {
 		...t,
 		getPose: (n) => e.caught.has(n) ? e.startPoses.get(n) : t.getPose(n)
 	};
 }
-function L(e) {
-	let t = /* @__PURE__ */ new Map(), { scene: n, pc: a } = e, o = I(n);
+function U(e) {
+	let t = /* @__PURE__ */ new Map(), { scene: n, pc: r } = e, i = V(n);
 	for (let s of e.startPoses.keys()) {
 		let c = e.previews.get(s);
 		if (c === void 0) continue;
-		let l = n.get(s)?.parent ?? null, u = i(o, l), d = u === null ? c : a.compose(r(o, u, a.compose), c);
+		let l = n.get(s)?.parent ?? null, u = o(i, l), d = u === null ? c : r.compose(a(i, u, r.compose), c);
 		t.set(s, {
 			local: c,
 			parent: l,
@@ -289,19 +348,19 @@ function L(e) {
 	}
 	return t;
 }
-function R(e, t, n) {
-	let { scene: r, pc: i } = e, o = I(r);
-	for (let s of e.startPoses.keys()) {
-		let c = n.get(s);
+function W(e, t, n) {
+	let { scene: r, pc: i } = e, a = V(r);
+	for (let o of e.startPoses.keys()) {
+		let c = n.get(o);
 		if (!c) {
-			e.caught.has(s) && t.settle(s);
+			e.caught.has(o) && t.settle(o);
 			continue;
 		}
-		let l = r.get(s)?.parent ?? null, u = l === c.parent ? c.local : a(o, c.world, l, i.compose, i.decompose);
-		t.settle(s, { from: u });
+		let l = r.get(o)?.parent ?? null, u = l === c.parent ? c.local : s(a, c.world, l, i.compose, i.decompose);
+		t.settle(o, { from: u });
 	}
 }
-function z(e, t) {
+function G(e, t) {
 	let n = e.deps.nodeAtPoint;
 	if (!n) return null;
 	let r = /* @__PURE__ */ new Set([...t.ids, ...t.cascadeIds]), i = n(e.world, r);
@@ -317,21 +376,21 @@ function z(e, t) {
 		hitSibling: i
 	} : null;
 }
-function ne(e, t, n, i, o, s) {
-	let c = e.scene, l = I(c);
-	for (let u of e.ids) {
-		if (!e.startPoses.has(u)) continue;
-		let d = r(l, u, s.compose), f = x(d, i, o, e.projection), p = a(l, f, t.newParent, s.compose, s.decompose), m = c.get(u);
-		m.layer !== t.newLayer && (m.parent !== null && c.move(u, null), c.setLayer(u, t.newLayer));
-		let h;
-		if (n === "above" && t.hitSibling) {
-			let e = (t.newParent === null ? c.roots : c.childrenOf(t.newParent)).filter((e) => e !== u).indexOf(t.hitSibling);
-			e >= 0 && (h = e + 1);
+function re(t, n, r, i, o, c) {
+	let l = t.scene, u = V(l);
+	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;
+		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);
 		}
-		c.move(u, t.newParent, h), c.setPose(u, p);
+		l.move(d, n.newParent, v), l.setPose(d, g);
 	}
 }
-var B = w({
+var K = D({
 	id: "move",
 	label: "Move",
 	activeCursor: "move",
@@ -353,126 +412,149 @@ var B = w({
 	],
 	invoker: {
 		timing: "ongoing",
-		start(o, y) {
-			let b = o.deps.selection, w = o.deps.scene, T = S(o.deps.poseDescriptor), E = o.deps.layout, j = o.deps.applyOps, B = o.deps.geometryProjection, V = o.deps.poseComposition ?? n;
-			if (!b || !w || D(o.drag?.affordance)) return {};
-			let H = k(y?.params), U = H?.expandIds, W = [...b.get()], G = U ? U(W) : W;
-			if (G.length === 0) return {};
-			let K = /* @__PURE__ */ new Map(), re = [], q = /* @__PURE__ */ new Set(), J = [], Y = E?.reflow ?? null, ie = /* @__PURE__ */ new Map(), ae = (e, t) => {
-				let n = Y?.poseOf(e);
-				if (!Y || n === void 0) return;
-				Y.glide(e, n, { from: n });
-				let r = T.getBounds(n), i = T.getBounds(s(w, t));
-				ie.set(e, {
+		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, {
 					dx: r.x - i.x,
 					dy: r.y - i.y
 				});
 			};
-			for (let e of G) {
-				let t = w.get(e);
-				t && (ae(e, t), K.set(e, c(w, t)), q.add(e), J.push(e));
+			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 (; J.length > 0;) {
-				let e = J.shift();
-				for (let t of w.childrenOf(e)) {
-					if (q.has(t)) continue;
-					q.add(t);
-					let e = w.get(t);
-					e && (ae(t, e), K.set(t, c(w, e)), re.push(t), J.push(t));
+			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));
 				}
 			}
-			let oe = /* @__PURE__ */ new Set(), se = /* @__PURE__ */ new Map();
-			if (V.closure !== "identity") {
-				let e = I(w);
-				for (let t of K.keys()) {
-					let n = i(e, w.get(t)?.parent ?? null);
+			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);
 					if (n !== null) {
-						if (K.has(h(n))) {
-							oe.add(t);
+						if (J.has(_(n))) {
+							le.add(t);
 							continue;
 						}
-						se.set(t, {
-							world: r(e, t, V.compose),
-							frameWorld: r(e, n, V.compose)
+						ue.set(t, {
+							world: a(e, t, F.compose),
+							frameWorld: a(e, n, F.compose)
 						});
 					}
 				}
 			}
-			let X = y?.behaviors ?? [], ce = H?.dragThresholdPx ?? ee, Z = f(H, "Move", X), le = !1, ue = C(w), Q = /* @__PURE__ */ new Map();
-			for (let [e, t] of K) Q.set(e, t);
-			let de = u(o.deps), fe = l(o.deps), pe = {
-				draggedIds: G,
-				origin: Q,
-				current: new Map(Q),
+			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),
 				snap: null,
-				modifiers: { ...o.modifiers },
+				modifiers: { ...e.modifiers },
 				pointer: {
-					worldX: o.world.x,
-					worldY: o.world.y,
+					worldX: e.world.x,
+					worldY: e.world.y,
 					clientX: 0,
 					clientY: 0
 				},
-				view: de(),
-				plane: fe(),
-				adapter: ue,
+				view: ge(),
+				plane: _e(),
+				adapter: me,
 				scratch: {}
 			};
-			for (let e of X) e.onStart?.(pe);
+			for (let e of de) e.onStart?.(ve);
 			let $ = {
-				startPoses: K,
-				ids: G,
-				cascadeIds: re,
-				carried: oe,
-				frames: se,
-				scene: w,
+				startPoses: J,
+				ids: q,
+				cascadeIds: oe,
+				carried: le,
+				frames: ue,
+				scene: S,
 				currentDelta: {
 					dx: 0,
 					dy: 0
 				},
+				view: e.deps.view,
+				planeRefs: /* @__PURE__ */ new Map(),
 				previews: /* @__PURE__ */ new Map(),
 				overrideEntries: /* @__PURE__ */ new Map(),
 				reflowTargets: /* @__PURE__ */ new Map(),
 				gliding: /* @__PURE__ */ new Set(),
-				caught: ie,
-				projection: T,
-				behaviors: X,
-				gestureCtx: pe,
-				adapter: ue,
-				layout: E,
+				caught: se,
+				projection: E,
+				behaviors: de,
+				gestureCtx: ve,
+				adapter: me,
+				layout: D,
 				layoutPass: null,
-				pc: V,
-				applyOps: j,
-				geometryProjection: B,
-				lifecycle: Z
-			}, me = (e) => {
-				let { dx: t, dy: n } = $.currentDelta, i = !1, o = (e) => {
-					d($, Z, e), i = !0;
+				dropCenter: null,
+				pc: F,
+				applyOps: k,
+				geometryProjection: A,
+				lifecycle: Q
+			};
+			for (let e of q) {
+				let n = S.get(e)?.layer;
+				if (n === void 0 || $.planeRefs.has(n)) continue;
+				let r = O($.view, n);
+				if (r === null) continue;
+				let i = ue.get(e)?.world ?? J.get(e);
+				if (i === void 0) continue;
+				let a = E.getBounds(i), o = {
+					x: a.x,
+					y: a.y
+				};
+				$.planeRefs.set(n, {
+					own: o,
+					edited: t(ee(r), o)
+				});
+			}
+			let ye = (e) => {
+				let { dx: t, dy: n } = $.currentDelta, r = !1, i = (e) => {
+					p($, Q, e), r = !0;
 				};
 				if ($.behaviors.length > 0) {
 					let e = $.gestureCtx;
-					for (let [r, i] of $.startPoses) e.current.set(r, x(i, t, n, $.projection));
-					let r = p($.behaviors, e);
+					for (let [r, i] of $.startPoses) {
+						let a = z($, r, t, n);
+						e.current.set(r, C(i, a.dx, a.dy, $.projection));
+					}
+					let r = h($.behaviors, e);
 					if (r === null) return !1;
-					if (r !== void 0) return o(r), !0;
+					if (r !== void 0) return i(r), !0;
 				}
 				if (t === 0 && n === 0) return !1;
 				if ($.layout && $.layoutPass) {
-					let e = $.layoutPass, t = $.pc, n = I($.scene), r = e.container.id, s = new Set($.ids.map((e) => e)), c = (e) => {
+					let e = $.layoutPass, t = $.pc, n = V($.scene), a = e.container.id, o = new Set($.ids.map((e) => e)), c = (e) => {
 						if (e.name !== "transform") return e;
-						let i = e.args, o = $.scene.get(h(i.id))?.parent ?? null, c = s.has(i.id) ? r : o;
-						return _({
-							id: i.id,
-							from: a(n, i.from, o, t.compose, t.decompose),
-							to: a(n, i.to, c, t.compose, t.decompose),
-							label: i.label,
-							coalesceKey: i.coalesceKey
+						let r = e.args, i = $.scene.get(_(r.id))?.parent ?? null, c = o.has(r.id) ? a : i;
+						return y({
+							id: r.id,
+							from: s(n, r.from, i, t.compose, t.decompose),
+							to: s(n, r.to, c, t.compose, t.decompose),
+							label: r.label,
+							coalesceKey: r.coalesceKey
 						});
 					}, l = [], u = [];
 					for (let t of e.placements) {
-						t.dragged.sourceContainerId !== r && l.push(v({
+						t.dragged.sourceContainerId !== a && l.push(b({
 							id: t.dragged.id,
 							fromParentId: t.dragged.sourceContainerId,
-							toParentId: r,
+							toParentId: a,
 							label: "Reparent"
 						}));
 						let n = e.layout.commitDrop(e.container, t.children, t.dragged, t.target);
@@ -480,11 +562,11 @@ var B = w({
 					}
 					let d = [];
 					for (let [r, i] of e.sourceReflow) {
-						let e = $.scene.get(h(r))?.parent ?? null;
-						d.push(_({
+						let e = $.scene.get(_(r))?.parent ?? null;
+						d.push(y({
 							id: r,
-							from: $.scene.get(h(r)).pose,
-							to: a(n, i, e, t.compose, t.decompose),
+							from: $.scene.get(_(r)).pose,
+							to: s(n, i, e, t.compose, t.decompose),
 							label: "Source reflow"
 						}));
 					}
@@ -493,153 +575,175 @@ var B = w({
 						...u,
 						...d
 					];
-					return f.length > 0 && o(f), i;
+					return f.length > 0 && i(f), r;
 				}
-				let s = /* @__PURE__ */ new Set(), c = [];
+				let o = /* @__PURE__ */ new Set(), l = [], u = /* @__PURE__ */ new Map(), d = [];
 				if ($.layout && !$.layoutPass) {
-					let e = $.pc, i = I($.scene), o = (t) => {
+					let e = $.pc, r = V($.scene), i = (t) => {
 						if (t.name !== "transform") return t;
-						let n = t.args, r = $.scene.get(h(n.id))?.parent ?? null;
-						return _({
+						let n = t.args, i = $.scene.get(_(n.id))?.parent ?? null;
+						return y({
 							id: n.id,
-							from: a(i, n.from, r, e.compose, e.decompose),
-							to: a(i, n.to, r, e.compose, e.decompose),
+							from: s(r, n.from, i, e.compose, e.decompose),
+							to: s(r, n.to, i, e.compose, e.decompose),
 							label: n.label,
 							coalesceKey: n.coalesceKey
 						});
-					}, l = M($.ids.map((e) => ({
+					}, c = ne($.ids.map((e) => ({
 						id: e,
 						sourceContainerId: $.scene.get(e)?.parent ?? null
 					})), null);
-					for (let [a, u] of l) {
-						let l = $.layout.getLayout(a);
-						if (!l?.releaseDrop) continue;
+					for (let [s, u] of c) {
+						let c = $.layout.getLayout(s);
+						if (!c?.releaseDrop) continue;
 						let d = {
-							id: a,
-							bounds: $.projection.getBounds(r(i, a, e.compose))
-						}, f = $.scene.childrenOf(h(a)).filter((e) => !u.has(e)).map((t) => ({
+							id: s,
+							bounds: $.projection.getBounds(a(r, s, e.compose))
+						}, f = $.scene.childrenOf(_(s)).filter((e) => !u.has(e)).map((t) => ({
 							id: t,
-							pose: r(i, t, e.compose)
+							pose: a(r, t, e.compose)
 						}));
 						for (let p of u) {
-							let u = r(te($, i), p, e.compose), m = l.releaseDrop(d, f, {
+							let u = a(H($, r), p, e.compose), m = z($, p, t, n), h = c.releaseDrop(d, f, {
 								id: p,
 								originPose: u,
-								pose: x(u, t, n, $.projection),
-								sourceContainerId: a
+								pose: C(u, m.dx, m.dy, $.projection),
+								sourceContainerId: s
 							});
-							if (m === null) continue;
-							s.add(p);
-							let h = u;
-							for (let e of m) {
+							if (h === null) continue;
+							o.add(p);
+							let g = u;
+							for (let e of h) {
 								let t = e.args;
-								e.name === "transform" && t.id === p && (h = t.to), c.push(o(e));
+								e.name === "transform" && t.id === p && (g = t.to), l.push(i(e));
 							}
 							f = [...f, {
 								id: p,
-								pose: h
+								pose: g
 							}];
 						}
 					}
+					u = I($, $.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({
+							id: i,
+							fromParentId: c.parent,
+							toParentId: o,
+							label: "Reparent"
+						})), d.push(y({
+							id: i,
+							from: c.pose,
+							to: s(r, f, o, e.compose, e.decompose),
+							label: Q.label
+						}));
+					}
 				}
-				if (s.size > 0) {
-					let e = [...c, ...N($, F($, s), t, n)];
-					return e.length > 0 && o(e), i;
+				if (o.size > 0 || u.size > 0) {
+					let e = [
+						...l,
+						...d,
+						...L($, B($, o).filter((e) => !u.has(e)), t, n)
+					];
+					return e.length > 0 && i(e), r;
 				}
-				let l = k(y?.params)?.reparentOnDrop ?? "off", u = l === "off" ? null : z(e, $);
-				if (u) {
-					let e = () => ne($, u, l, t, n, $.pc);
+				let f = N(c?.params)?.reparentOnDrop ?? "off", m = f === "off" ? null : G(e, $);
+				if (m) {
+					let e = () => re($, m, f, t, n, $.pc);
 					try {
-						Z.transient ? $.scene.untracked(e) : $.scene.batch(Z.label, e), i = !0;
+						Q.transient ? $.scene.untracked(e) : $.scene.batch(Q.label, e), r = !0;
 					} catch (e) {
-						if (!(e instanceof g)) throw e;
+						if (!(e instanceof v)) throw e;
 					}
 				} else {
-					let e = N($, [...$.ids, ...$.cascadeIds], t, n);
-					e.length > 0 && o(e);
+					let e = L($, [...$.ids, ...$.cascadeIds], t, n);
+					e.length > 0 && i(e);
 				}
-				return i;
+				return r;
 			};
 			return {
 				kind: "move",
 				onMove(e) {
 					if (!e.drag) return;
-					if (!le) {
+					if (!pe) {
 						let t = e.drag.screenDelta;
-						if (t && !O({
+						if (t && !M({
 							clientX: 0,
 							clientY: 0
 						}, {
 							clientX: t.x,
 							clientY: t.y
-						}, ce)) return;
-						le = !0, Z.start($.ids);
+						}, fe)) return;
+						pe = !0, Q.start($.ids);
 					}
-					let n = e.drag.delta.x, r = e.drag.delta.y;
+					let t = e.drag.delta.x, n = e.drag.delta.y;
 					if ($.behaviors.length > 0) {
-						let t = $.gestureCtx;
-						t.modifiers = { ...e.modifiers }, t.pointer = {
+						let r = $.gestureCtx;
+						r.modifiers = { ...e.modifiers }, r.pointer = {
 							worldX: e.drag.current.x,
 							worldY: e.drag.current.y,
 							clientX: 0,
 							clientY: 0
-						}, t.view = de(), t.plane = fe();
-						for (let [e, i] of $.startPoses) t.current.set(e, x(i, n, r, $.projection));
+						}, r.view = ge(), r.plane = _e();
+						for (let [e, i] of $.startPoses) {
+							let a = z($, e, t, n);
+							r.current.set(e, C(i, a.dx, a.dy, $.projection));
+						}
 						let i = {
 							kind: "translate",
-							dx: n,
-							dy: r
+							dx: t,
+							dy: n
 						}, a = $.ids[0];
 						for (let e of $.behaviors) {
-							let n = e.onMove?.(t, i);
-							if (n) {
-								if (n.transform && n.transform.kind === "translate") i = n.transform;
-								else if (n.pose !== void 0 && a !== void 0) {
+							let t = e.onMove?.(r, i);
+							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 (e !== void 0) {
-										let t = $.projection.getBounds(e), r = $.projection.getBounds(n.pose);
+										let n = $.projection.getBounds(e), r = $.projection.getBounds(t.pose);
 										i = {
 											kind: "translate",
-											dx: r.x - t.x,
-											dy: r.y - t.y
+											dx: r.x - n.x,
+											dy: r.y - n.y
 										};
 									}
 								}
-								n.snap !== void 0 && (t.snap = n.snap);
+								t.snap !== void 0 && (r.snap = t.snap);
 							}
 						}
-						i.kind === "translate" && (n = i.dx, r = i.dy);
+						i.kind === "translate" && (t = i.dx, n = i.dy);
 					}
 					$.currentDelta = {
-						dx: n,
-						dy: r
+						dx: t,
+						dy: n
 					}, $.previews.clear();
-					for (let [e, t] of $.startPoses) {
+					for (let [e, r] of $.startPoses) {
 						if ($.carried.has(e)) {
-							$.previews.set(e, t);
+							$.previews.set(e, r);
 							continue;
 						}
-						let i = P($, e, n, r);
-						$.previews.set(e, x(t, i.dx, i.dy, $.projection));
+						let i = R($, e, t, n);
+						$.previews.set(e, C(r, i.dx, i.dy, $.projection));
 					}
-					$.layoutPass = null, $.reflowTargets.clear(), A($, 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));
 					}
-					t($);
+					r($);
 				},
-				onEnd(t, n) {
-					let r = !1, i = $.layout?.reflow ?? null, a = i ? L($) : null;
+				onEnd(e, t) {
+					let r = !1, i = $.layout?.reflow ?? null, a = i ? U($) : null;
 					try {
-						n === "commit" ? r = me(t) : m($.behaviors, $.gestureCtx);
+						t === "commit" ? r = ye(e) : g($.behaviors, $.gestureCtx);
 					} finally {
-						if (e($), $.previews.clear(), i && a) {
+						if (n($), $.previews.clear(), i && a) {
 							for (let e of $.gliding) i.settle(e);
-							R($, i, a);
+							W($, i, a);
 						}
-						$.gliding.clear(), Z.end(r);
+						$.gliding.clear(), Q.end(r);
 					}
 				},
 				previewIds: () => $.previews.keys(),
@@ -649,8 +753,8 @@ var B = w({
 		}
 	},
 	enabled: () => !0
-}, T);
+}, k);
 //#endregion
-export { B as moveAction };
+export { K as moveAction };
 
 //# sourceMappingURL=move.js.map