@grafloria/element 0.4.51 → 0.4.53

package/src/lib/dashboard-kit/grid-binder.js

@@ -50,13 +50,15 @@
  * second `bindDashboardGrid` on the section for a nested pack grid.
  */
 import { __awaiter } from "tslib";
-import { AddToGroupCommand, BatchCommand, Command, GridPackEngine, RemoveFromGroupCommand, } from '@grafloria/engine';
+import { AddToGroupCommand, BatchCommand, GridPackEngine, RemoveFromGroupCommand, } from '@grafloria/engine';
 import { LiveRegionController, registerTool } from '@grafloria/renderer';
 import { buildCommitCommands, cellFromGridItem, cellToRect, columnUnitFor, gridItemFromCell, pointToCell, rowHeightFor, sizeToSpan, } from './grid-mapping.js';
 import { ensureDashboardKitStyles } from './styles.js';
 import { captionOfGroup, captionPainted, captionPassThrough, captionKey, paintCaptionBand, sectionCaptionReserve, sizeCaptionBand } from './caption.js';
 import { TAB_STRIP_HEIGHT } from './tabs.js';
 import { BESIDE_BAND, resolve as resolveZone, resolveTabZone } from './zones.js';
+import { SequenceCommand, SetGroupCellCommand, tileCommands } from './commit.js';
+export { SequenceCommand, SetGroupCellCommand } from './commit.js';
 /** The class of the painted grip element (a child of the node host). */
 export const GRIP_CLASS = 'axdb-grip';
 /** The container class that turns the caption strip's grip dots on. */
@@ -158,38 +160,6 @@ export function pressOnDragHandle(sel, target, hostEl, clientX, clientY) {
 export const CAPTION_BAND = 28;
 /** A torn-out page never arrives shorter than this: a strip with no room under it is not a group. */
 export const TEAR_OUT_MIN_ROWS = 2;
-/**
- * Steps that depend on each other's RESULT — create a group, then move a page
- * into it, then place the group on the board; or remove a member and then the
- * group it emptied — run as one history step. A batch checks every member's
- * `canExecute` before running any of them and every member's `canUndo` before
- * undoing any, and a membership command's precondition (its group exists) is
- * exactly what a neighbouring step creates or removes. This runs the chain in
- * order and reverses it on undo, judging nothing up front.
- */
-export class SequenceCommand extends Command {
-    constructor(name, steps) {
-        super(name);
-        this.steps = steps;
-    }
-    execute(context) {
-        for (const c of this.steps)
-            c.execute(context);
-    }
-    undo(context) {
-        for (let i = this.steps.length - 1; i >= 0; i--)
-            this.steps[i].undo(context);
-    }
-    canExecute() {
-        return true;
-    }
-    canUndo() {
-        return true;
-    }
-    serialize() {
-        return { id: this.id, name: this.name, timestamp: this.timestamp, data: { steps: this.steps.map((c) => c.serialize()) } };
-    }
-}
 /**
  * Binders on the same canvas find each other here. A WeakMap: a canvas that
  * is gone takes its (empty) peer set with it — the strong Map it replaced kept
@@ -256,50 +226,6 @@ function directionName(dx, dy) {
 function describeCell(c) {
     return `column ${c.x + 1}, row ${c.y + 1}, ${c.w} by ${c.h}`;
 }
-/**
- * Undoable cell+frame write for a GROUP member (the strip's slab). The engine
- * has Move/Resize commands for nodes but none for a group's frame, and slab
- * cells live in group metadata — this closes nested height escalation into
- * the gesture's single BatchCommand so one undo restores the strip too.
- */
-class SetGroupCellCommand extends Command {
-    constructor(groupId, cellBefore, cellAfter, frameBefore, frameAfter) {
-        super('Resize section');
-        this.groupId = groupId;
-        this.cellBefore = cellBefore;
-        this.cellAfter = cellAfter;
-        this.frameBefore = frameBefore;
-        this.frameAfter = frameAfter;
-    }
-    apply(context, cell, frame) {
-        const diagram = context.diagram;
-        const grp = diagram === null || diagram === void 0 ? void 0 : diagram.getGroup(this.groupId);
-        if (!grp)
-            return;
-        grp.setMetadata('gridItem', gridItemFromCell(cell));
-        grp.setFrame(Object.assign({}, frame));
-    }
-    execute(context) {
-        this.apply(context, this.cellAfter, this.frameAfter);
-    }
-    undo(context) {
-        this.apply(context, this.cellBefore, this.frameBefore);
-    }
-    serialize() {
-        return {
-            id: this.id,
-            name: this.name,
-            timestamp: this.timestamp,
-            data: {
-                groupId: this.groupId,
-                cellBefore: this.cellBefore,
-                cellAfter: this.cellAfter,
-                frameBefore: this.frameBefore,
-                frameAfter: this.frameAfter,
-            },
-        };
-    }
-}
 const DRAG_THRESHOLD = 4;
 const GLIDE_OFF_DELAY = 400;
 /** A press this close (CSS px) to a tile's border takes that edge for a resize. */
@@ -367,8 +293,8 @@ export function bindDashboardGrid(api, group, options = {}) {
     const fluid = options.fluid === true;
     const overflow = (_h = options.overflow) !== null && _h !== void 0 ? _h : 'bounded';
     let isStatic = options.static === true;
-    /** The deepest board a drop may enter — a root is 0; two levels are what the gates exercise (tile first, step 2). */
-    const nesting = (_j = options.nesting) !== null && _j !== void 0 ? _j : 2;
+    /** The deepest board a drop may enter — a root is 0. Unbounded unless asked for: three-level drops are in the specs today (tile first, step 2). */
+    const nesting = (_j = options.nesting) !== null && _j !== void 0 ? _j : Number.POSITIVE_INFINITY;
     let dragHandle = normalizeDragHandle(options.dragHandle);
     let dragSel = dragHandleSelector(dragHandle);
     api.container.classList.toggle(DRAG_HANDLE_CLASS, dragHandle === true);
@@ -624,10 +550,14 @@ export function bindDashboardGrid(api, group, options = {}) {
         const cell = grp
             ? cellFromGridItem((_g = grp.getMetadata) === null || _g === void 0 ? void 0 : _g.call(grp, 'gridItem'))
             : null;
-        // Member groups are LOCKED slabs (see the module doc).
+        // A member group is a SOLID tile (tile first, step 3): a widget carried
+        // over it slides aside and it never packs — the board under the hand
+        // holds still, so its zones (into, a tab, beside) stay reachable — and
+        // it is moved by INTENT: placed beside, pushed by a moved section, a
+        // dock or a widget it refused, moved by its own gesture.
         if (cell)
-            return Object.assign(Object.assign({ id }, cell), { locked: true });
-        return { id, x: 0, y: 0, w: columns, h: 1, locked: true, autoPosition: true };
+            return Object.assign(Object.assign({ id }, cell), { solid: true });
+        return { id, x: 0, y: 0, w: columns, h: 1, solid: true, autoPosition: true };
     };
     /** Persist adopted cells so save/undo round-trips them. */
     const persistAdoptedCell = (id, item) => {
@@ -1000,19 +930,6 @@ export function bindDashboardGrid(api, group, options = {}) {
         }
         return out;
     };
-    /** The member groups a gesture displaced, as their own cell commands — `buildCommitCommands` skips groups by design. */
-    const groupCellCommands = (deltas) => {
-        const out = [];
-        for (const d of deltas) {
-            if (!d.isGroup || (d.cellBefore.x === d.cellAfter.x && d.cellBefore.y === d.cellAfter.y && d.cellBefore.w === d.cellAfter.w && d.cellBefore.h === d.cellAfter.h))
-                continue;
-            const og = diagram.getGroup(d.id);
-            if (!og)
-                continue;
-            out.push(new SetGroupCellCommand(d.id, d.cellBefore, d.cellAfter, { x: d.posBefore.x, y: d.posBefore.y, width: d.sizeBefore.width, height: d.sizeBefore.height }, frameOfGroup(og)));
-        }
-        return out;
-    };
     const execute = (name, commands) => {
         if (commands.length === 0)
             return false;
@@ -1020,10 +937,23 @@ export function bindDashboardGrid(api, group, options = {}) {
         return true;
     };
     // -- membership + bounds sync ----------------------------------------------
+    /**
+     * A DROP LEAVES ITS TILE IN THE ENGINE, waiting for the member the commit
+     * adds under the same id — or, for a palette drop, for whatever the host's
+     * command adds: a host that mints its own id would otherwise leave the
+     * ghost behind as a phantom holding the cell. The next member to arrive
+     * claims the phantom's place: the same id simply takes it over, another id
+     * removes it first and lands where the drop settled.
+     */
+    let pendingDrop = null;
     const onMemberAdded = (id) => {
-        var _a;
+        var _a, _b;
         if (disposed)
             return;
+        if (pendingDrop && pendingDrop !== id && engine.getItem(pendingDrop) && !((_a = group.members) !== null && _a !== void 0 ? _a : new Set()).has(pendingDrop)) {
+            engine.remove(pendingDrop);
+        }
+        pendingDrop = null;
         if (!engine.getItem(id)) {
             const item = itemFor(id);
             let placed = engine.add(item);
@@ -1033,7 +963,7 @@ export function bindDashboardGrid(api, group, options = {}) {
                 // for this adoption — it floors at the content on the next refresh.
                 capacity = undefined;
                 engine = engineFrom([...engine.getItems().map((i) => (Object.assign({}, i))), item]);
-                placed = (_a = engine.getItem(id)) !== null && _a !== void 0 ? _a : null;
+                placed = (_b = engine.getItem(id)) !== null && _b !== void 0 ? _b : null;
                 refreshCapacity();
             }
             if (placed)
@@ -1288,7 +1218,13 @@ export function bindDashboardGrid(api, group, options = {}) {
      * carried along the top of a tall panel to its far right means "after it",
      * not "above it". The shift is undone if the pointer leaves the band.
      */
-    /** The container a BESIDE drop unlocked (and maybe shifted): relocked, and put back if asked, when the zone or the gesture ends. */
+    /**
+     * The beside the hand holds (tile first, step 3): the container's cell and
+     * frame AT REST (the resolve reads the held container at rest), the cell
+     * the widget took, and the row it took it at. The shift itself is the
+     * engine's `placeBeside`; the sections it pushed remember their cells and
+     * come back by themselves when the widget leaves (S2).
+     */
     let beside = null;
     const endBeside = (restore) => {
         if (!beside)
@@ -1296,104 +1232,64 @@ export function bindDashboardGrid(api, group, options = {}) {
         const it = engine.getItem(beside.id);
         let moved = false;
         if (it && restore && (it.x !== beside.from.x || it.y !== beside.from.y))
-            moved = engine.moveCheck(beside.id, beside.from.x, beside.from.y, { gate: false }).changed || moved;
-        if (restore) {
-            // The sections the shift pushed come back with it.
-            for (const [oid, c] of beside.others) {
-                const o = engine.getItem(oid);
-                if (o && (o.x !== c.x || o.y !== c.y))
-                    moved = engine.moveCheck(oid, c.x, c.y, { gate: false }).changed || moved;
-            }
-        }
-        if (it)
-            it.locked = true;
-        relockOthersForSlab();
+            moved = engine.moveCheck(beside.id, beside.from.x, beside.from.y, { gate: false }).changed;
         beside = null;
         // The frames the zone test reads are the MODEL's: a restore that moved
         // the container without projecting left its frame where the push had
-        // put it, so the next test read the pointer as OUTSIDE it (the user's
-        // 3440-px corner on 0.4.48: along the top band the panel was pushed
-        // down, and the corner never turned into "right").
+        // put it (the user's 3440-px corner on 0.4.48).
         if (moved)
             project();
     };
-    const applyBeside = (g, z) => {
-        var _a;
+    /** The row of this board's grid under a world y — where a beside lands (D3: the pointer's row, not the container's top). */
+    const rowOfPoint = (y) => {
+        const r0 = cellToRect({ x: 0, y: 0, w: 1, h: 1 }, frame(), geom(), rows());
+        const r1 = cellToRect({ x: 0, y: 1, w: 1, h: 1 }, frame(), geom(), rows());
+        const pitch = Math.max(1, r1.y - r0.y);
+        return Math.max(0, Math.floor((y - r0.y) / pitch));
+    };
+    /**
+     * The ghost `id` (spanning `spans`) beside container `z.id` on THIS board at
+     * `row`: the engine shifts the container or pushes what stands behind it,
+     * and the beside is remembered for the resolve's stickiness. One function
+     * for a tile of this board and for a tile another board's gesture placed
+     * here through its leg.
+     */
+    const besideOn = (id, spans, z, row) => {
         const tc = engine.getItem(z.id);
         if (!tc)
             return;
-        if (g.leg) {
-            g.leg.adopted.abort();
-            g.leg = null;
-        }
-        const w = g.spans.w;
-        const h = g.spans.h;
-        if (g.removedFromBoard) {
-            g.removedFromBoard = false;
-            (_a = hostOf(g.id)) === null || _a === void 0 ? void 0 : _a.classList.remove('axdb-out');
-            engine.add({ id: g.id, x: 0, y: engine.rows(), w, h });
-        }
         if (beside && (beside.id !== z.id || beside.side !== z.side))
-            endBeside(true); // another container, or another side of it: start over from the rest layout
-        const from = beside ? beside.from : { x: tc.x, y: tc.y };
-        let cell;
-        let shiftTo = null;
-        switch (z.side) {
-            case 'right':
-                cell = { x: from.x + tc.w, y: from.y };
-                if (cell.x + w > columns) {
-                    shiftTo = { x: columns - w - tc.w, y: from.y };
-                    cell = { x: columns - w, y: from.y };
-                }
-                break;
-            case 'left':
-                cell = { x: from.x - w, y: from.y };
-                if (cell.x < 0) {
-                    shiftTo = { x: w, y: from.y };
-                    cell = { x: 0, y: from.y };
-                }
-                break;
-            case 'top':
-                cell = { x: Math.max(0, Math.min(from.x, columns - w)), y: from.y }; // the ghost takes the container's rows; the container is pushed down under it
-                break;
-            default:
-                cell = { x: Math.max(0, Math.min(from.x, columns - w)), y: from.y + tc.h };
-        }
-        if (shiftTo && shiftTo.x < 0)
-            shiftTo = null; // no room even shifted: the widget goes where it can
+            endBeside(true); // another container, or another side of it: from the rest layout
         if (!beside) {
-            // The other sections give way to the shift the way they give way to a
-            // moved group (0.4.44): on the demo the Operations section spans the
-            // row under the panel and a locked tile refused the shift outright.
-            // Their cells are kept so they come back if the pointer leaves.
-            const others = new Map();
-            for (const o of engine.getItems())
-                if (o.id !== z.id && o.id !== g.id && isGroupMember(o.id))
-                    others.set(o.id, { x: o.x, y: o.y });
             const grp0 = diagram.getGroup(z.id);
-            beside = { id: z.id, side: z.side, from, frame0: grp0 ? frameOfGroup(grp0) : cellToRect({ x: from.x, y: from.y, w: tc.w, h: tc.h }, frame(), geom(), rows()), vacated: cell, others };
-            unlockOthersForSlab(z.id);
+            beside = { id: z.id, side: z.side, from: { x: tc.x, y: tc.y }, frame0: grp0 ? frameOfGroup(grp0) : cellToRect({ x: tc.x, y: tc.y, w: tc.w, h: tc.h }, frame(), geom(), rows()), vacated: { x: tc.x, y: tc.y }, row };
         }
-        tc.locked = false; // for the gesture: it shifts, or the ghost pushes it
-        // The ghost steps off the board while the container shifts: the engine
-        // will not push the dragged tile, so a chart as wide as the panel had its
-        // own cell as the panel's target and the shift was refused (lab L94).
-        // Then it takes the cell the shift vacated.
-        if (shiftTo && (tc.x !== shiftTo.x || tc.y !== shiftTo.y)) {
-            if (engine.getItem(g.id))
-                engine.remove(g.id);
-            engine.moveCheck(z.id, shiftTo.x, shiftTo.y, { gate: false });
+        const r = engine.placeBeside(id, z.id, z.side, row);
+        const at = engine.getItem(id);
+        if (r.changed && at) {
+            beside.vacated = { x: at.x, y: at.y };
+            beside.row = row;
         }
-        beside.vacated = cell;
-        if (!engine.getItem(g.id))
-            engine.add({ id: g.id, x: 0, y: engine.rows(), w, h });
-        if (!engine.moveCheck(g.id, cell.x, cell.y, { gate: false }).changed) {
-            const at = engine.getItem(g.id);
-            if (!at || at.x !== cell.x || at.y !== cell.y)
-                placeNear(g.id, cell.x, cell.y, w);
+        else if (at) {
+            // Refused (a bound): the widget goes where it can, as any refused cell does.
+            placeNear(id, at.x, at.y, spans.w);
         }
         project();
     };
+    const applyBeside = (g, z, row) => {
+        if (!engine.getItem(z.id))
+            return;
+        if (g.leg) {
+            g.leg.adopted.abort();
+            g.leg = null;
+        }
+        if (g.removedFromBoard) {
+            g.removedFromBoard = false;
+            setDim(g, false);
+            engine.add({ id: g.id, x: 0, y: engine.rows(), w: g.spans.w, h: g.spans.h });
+        }
+        besideOn(g.id, g.spans, z, row);
+    };
     /**
      * CARRIED (0.4.43): a group dragged by its strip or band moves as ONE thing.
      * The held TILE is transition-exempt (the ghost), but a group has no host of
@@ -1610,13 +1506,6 @@ export function bindDashboardGrid(api, group, options = {}) {
             },
             move: false,
         };
-        // A TOP or LEFT edge moves the slab's origin, and the engine refuses to
-        // move a locked tile: the move never landed, only the resize did, and a
-        // section pulled up by its caption grew DOWNWARD a row per pointer step
-        // — 18 rows for a 2-row pull (identification round, F16). Unlocked for
-        // its own gesture, as a move is; relocked on release.
-        if (edges.n || edges.w)
-            it.locked = false;
         capturePointer(slabGesture.pointerId);
         api.container.style.cursor = cursorFor(edges);
     };
@@ -1633,24 +1522,6 @@ export function bindDashboardGrid(api, group, options = {}) {
      * pushes it; a group's children ride along: the frame moves, the nested
      * board re-projects. The others relock on release.
      */
-    let slabUnlocked = [];
-    const unlockOthersForSlab = (id) => {
-        slabUnlocked = [];
-        for (const o of engine.getItems()) {
-            if (o.id !== id && o.locked && isGroupMember(o.id)) {
-                o.locked = false;
-                slabUnlocked.push(o.id);
-            }
-        }
-    };
-    const relockOthersForSlab = () => {
-        for (const oid of slabUnlocked) {
-            const o = engine.getItem(oid);
-            if (o)
-                o.locked = true;
-        }
-        slabUnlocked = [];
-    };
     const beginSlabMove = (id, ev) => {
         const grp = diagram.getGroup(id);
         const it = engine.getItem(id);
@@ -1658,8 +1529,6 @@ export function bindDashboardGrid(api, group, options = {}) {
             return;
         engine.beginGesture();
         const snap = snapshotAll();
-        it.locked = false;
-        unlockOthersForSlab(id);
         slabGesture = {
             id,
             edges: NO_EDGES,
@@ -1676,11 +1545,6 @@ export function bindDashboardGrid(api, group, options = {}) {
         capturePointer(slabGesture.pointerId);
         api.container.style.cursor = 'grabbing';
     };
-    const relockSlab = (id) => {
-        const it = engine.getItem(id);
-        if (it)
-            it.locked = true;
-    };
     /** The cell a slab move asked for and could not have — painted so the refusal is visible; null clears it. */
     let refusal = null;
     const showRefusal = (cell, w, h) => {
@@ -1734,7 +1598,7 @@ export function bindDashboardGrid(api, group, options = {}) {
                 // Along its ROW only: a section dragged LEFT that wandered DOWN its
                 // column (the row search) read as the wrong tile moving.
                 const was = { x: it.x, y: it.y };
-                const moved = engine.moveCheck(g.id, cell.x, cell.y, { gate: false }).changed || placeOnRow(g.id, cell.x, cell.y, it.w);
+                const moved = engine.moveCheck(g.id, cell.x, cell.y, { gate: false, pushSolid: true }).changed || placeOnRow(g.id, cell.x, cell.y, it.w, true); // a moved section pushes the sections in its way (0.4.44)
                 if (moved) {
                     project();
                     setCarried(g.id, true); // chrome repainted by the projection is carried too
@@ -1781,7 +1645,7 @@ export function bindDashboardGrid(api, group, options = {}) {
         }
         let changed = false;
         if (x !== it.x || y !== it.y)
-            changed = engine.moveCheck(g.id, x, y, { gate: false }).changed || changed;
+            changed = engine.moveCheck(g.id, x, y, { gate: false, pushSolid: true }).changed || changed;
         if (w !== it.w || h !== it.h)
             changed = engine.resizeCheck(g.id, w, h).changed || changed;
         if (changed)
@@ -1796,8 +1660,6 @@ export function bindDashboardGrid(api, group, options = {}) {
         showRefusal(null, 0, 0);
         releasePointer(g.pointerId);
         api.container.style.cursor = '';
-        relockSlab(g.id);
-        relockOthersForSlab();
         if (g.move && g.started)
             setCarried(g.id, false); // exempt through the drop write, then the glides resume
         if (!g.started) {
@@ -1806,19 +1668,9 @@ export function bindDashboardGrid(api, group, options = {}) {
         }
         engine.endGesture();
         project();
-        const it = engine.getItem(g.id);
-        const grp = diagram.getGroup(g.id);
-        const deltas = deltasSince(g.startCells, g.startGeom, g.id);
-        const commands = buildCommitCommands(deltas);
-        // The sections and groups the move PUSHED (0.4.44): the tile commit skips
-        // groups by design (a group's cell is its own command), so they are
-        // committed here the way a dock commits the groups it displaced — or the
-        // model snapped every one of them, and the mover, straight back.
-        commands.push(...groupCellCommands(deltas));
-        const b = g.cellBefore;
-        if (it && grp && (b.x !== it.x || b.y !== it.y || b.w !== it.w || b.h !== it.h)) {
-            commands.push(new SetGroupCellCommand(g.id, b, { x: it.x, y: it.y, w: it.w, h: it.h }, g.frameBefore, frameOfGroup(grp)));
-        }
+        // The mover and the sections it PUSHED (0.4.44) commit alike: a group's
+        // cell-and-frame command comes out of the same deltas as a node's.
+        const commands = tileCommands(deltasSince(g.startCells, g.startGeom));
         const changed = execute(g.move ? 'Move section' : 'Resize section', commands);
         disarmGlideSoon();
         syncHandles();
@@ -1833,8 +1685,6 @@ export function bindDashboardGrid(api, group, options = {}) {
         slabGesture = null;
         releasePointer(g.pointerId);
         api.container.style.cursor = '';
-        relockSlab(g.id);
-        relockOthersForSlab();
         if (g.move && g.started)
             setCarried(g.id, false);
         if (g.started)
@@ -1905,6 +1755,12 @@ export function bindDashboardGrid(api, group, options = {}) {
         if (rect.height !== undefined)
             el.style.height = `${rect.height}px`;
     };
+    /** "A release here lands nowhere": the ghost's host dims, and so does a palette chip (which has no host). */
+    const setDim = (g, on) => {
+        var _a, _b;
+        (_a = hostOf(g.id)) === null || _a === void 0 ? void 0 : _a.classList.toggle('axdb-out', on);
+        (_b = g.chip) === null || _b === void 0 ? void 0 : _b.classList.toggle('axdb-out', on);
+    };
     const cleanupGestureVisuals = (g) => {
         var _a;
         if (g.kind !== 'palette')
@@ -1935,8 +1791,7 @@ export function bindDashboardGrid(api, group, options = {}) {
         gesture = null;
         project();
         const deltas = deltasSince(g.startCells, g.startGeom);
-        const commands = buildCommitCommands(deltas);
-        commands.push(...groupCellCommands(deltas)); // a container a BESIDE drop shifted (0.4.45)
+        const commands = tileCommands(deltas); // a container a BESIDE drop shifted commits with the widgets (0.4.45)
         endBeside(false);
         if (g.esc && g.esc.rowsAdded !== 0) {
             commands.push(new SetGroupCellCommand(group.id, g.esc.cellBefore, g.esc.cellAfter, g.esc.frameBefore, g.esc.frameAfter));
@@ -1953,7 +1808,7 @@ export function bindDashboardGrid(api, group, options = {}) {
         (_a = options.onGesture) === null || _a === void 0 ? void 0 : _a.call(options, { type: 'commit', kind: g.kind, nodeId: g.id, changed });
     };
     const cancelActiveGesture = (notify = true) => {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c;
         if (gesture === null || gesture === void 0 ? void 0 : gesture.strip) {
             (_a = options.tabDrop) === null || _a === void 0 ? void 0 : _a.markDrop(null, null);
             gesture.strip = null;
@@ -1968,31 +1823,20 @@ export function bindDashboardGrid(api, group, options = {}) {
         if (!g)
             return;
         gesture = null;
-        if (g.kind !== 'palette' && g.leg) {
+        if (g.leg) {
             g.leg.adopted.abort(); // target board back to its pre-entry layout
             g.leg = null;
         }
-        if (g.kind !== 'palette' && g.esc && g.esc.rowsAdded !== 0) {
+        if (g.esc && g.esc.rowsAdded !== 0) {
             g.esc.peer.resizeMemberBy(group.id, -g.esc.rowsAdded); // slab back down
             g.esc = null;
         }
         endBeside(true);
         if (g.started) {
-            if (g.removedFromBoard || g.kind === 'palette') {
-                // The engine cannot resurrect a removed item — rebuild from the
-                // gesture-start snapshot (cells are pure data; the constructor
-                // honours legal layouts verbatim).
-                engine.endGesture();
-                const items = [];
-                for (const [id, c] of g.startCells) {
-                    const lockedNode = ((_d = (_c = diagram.getNode(id)) === null || _c === void 0 ? void 0 : _c.state) === null || _d === void 0 ? void 0 : _d.locked) === true;
-                    items.push(Object.assign(Object.assign({ id }, c), { locked: lockedNode || isGroupMember(id) }));
-                }
-                engine = engineFrom(items);
-            }
-            else {
-                engine.cancelGesture();
-            }
+            // The engine's gesture snapshot restores cells, sizes AND membership
+            // (engine 0.3.8): a ghost removed mid-gesture comes back at its start
+            // cell, a palette tile added mid-gesture is gone.
+            engine.cancelGesture();
             if (designRows !== undefined) {
                 maxRows = liveBound(engine.getItems());
                 engine.maxRows = maxRows;
@@ -2033,7 +1877,7 @@ export function bindDashboardGrid(api, group, options = {}) {
         enforceBoardHeight();
         api.renderNow();
         if (notify) {
-            (_e = options.onGesture) === null || _e === void 0 ? void 0 : _e.call(options, { type: 'cancel', kind: g.kind, nodeId: g.id, changed: false });
+            (_c = options.onGesture) === null || _c === void 0 ? void 0 : _c.call(options, { type: 'cancel', kind: g.kind, nodeId: g.id, changed: false });
         }
     };
     /** Centre a w×h-span tile's top-left under the cursor, in world px. */
@@ -2047,141 +1891,186 @@ export function bindDashboardGrid(api, group, options = {}) {
             y: worldY - (spans.h * (rh + gap) - gap) / 2,
         };
     };
-    const onToolMove = (ev) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-        const g = gesture;
-        if (!g || g.kind === 'palette')
+    /**
+     * THE GHOST FOLLOWS THE HAND — for a tile of this board and for a palette
+     * chip alike (tile first, step 4a): the zone under the pointer is resolved
+     * once over the boards' membership tree, and whichever board it names
+     * takes the ghost through a leg — beside a container of that board, with
+     * intent where a section of that board refused it (D2), or on a plain cell.
+     */
+    const moveGhost = (g, ev) => {
+        var _a;
+        const desired = { x: ev.world.x - g.grab.dx, y: ev.world.y - g.grab.dy };
+        g.node.setPosition(desired.x, desired.y);
+        ghostStyleFastPath(g, desired);
+        g.lastWorld = { x: ev.world.x, y: ev.world.y };
+        g.lastScreen = { x: ev.screen.x, y: ev.screen.y };
+        /** The ghost's pixel size on THIS board — a palette chip has spans, not a size. */
+        const pxSize = () => {
+            if (g.kind !== 'palette')
+                return { width: g.node.size.width, height: g.node.size.height };
+            const f = frame();
+            const gg = geom();
+            return { width: g.spans.w * (columnUnitFor(gg, f.width) + gap) - gap, height: g.spans.h * (rowHeightFor(gg, rows()) + gap) - gap };
+        };
+        /** The ghost leaves THIS board's engine (survivors settle home); the old leg is closed first. */
+        const leaveSelf = () => {
+            if (g.leg) {
+                g.leg.adopted.abort();
+                g.leg = null;
+            }
+            if (!g.removedFromBoard) {
+                g.removedFromBoard = true;
+                engine.remove(g.id);
+                project();
+            }
+        };
+        /** A leg on `peer`, entered with `opts`; the old leg (another board's) is closed first. Answers whether the peer took the ghost. */
+        const enterLeg = (peer, opts) => {
+            if (g.leg && g.leg.peer !== peer) {
+                g.leg.adopted.abort();
+                g.leg = null;
+            }
+            if (!g.removedFromBoard) {
+                g.removedFromBoard = true;
+                engine.remove(g.id); // survivors settle home (gesture memory intact)
+                project();
+            }
+            if (!g.leg) {
+                const adopted = peer.adopt(g.node, ev.world, pxSize(), opts);
+                if (!adopted)
+                    return false;
+                g.leg = { peer, adopted };
+            }
+            return true;
+        };
+        // THE ZONE (tile first, step 2): one recursive resolve over the boards'
+        // membership tree — a strip slot, a cell beside a container, a plain
+        // cell on the deepest board the pointer may enter, or off — decided
+        // BEFORE any engine is asked anything. The strip still wins over every
+        // board; a band's stickiness and the vacated cell still hold a beside.
+        const z = resolveTileZone(g, ev);
+        if (z.kind === 'strip' && options.tabDrop && !isStatic && g.kind !== 'palette') {
+            // -- INTO A STRIP: the widget becomes a new tab there, so it leaves
+            // this board (survivors settle home) and the strip marks the slot.
+            endBeside(true); // a band's shift gives way to the strip: the container comes back
+            leaveSelf();
+            setDim(g, false);
+            if (!g.strip || g.strip.containerId !== z.containerId || g.strip.index !== z.index) {
+                options.tabDrop.markDrop(z.containerId, z.index);
+            }
+            g.strip = { containerId: z.containerId, index: z.index };
+            syncPlaceholder();
+            api.render();
             return;
-        if (!g.started) {
-            const dx = ev.screen.x - g.downClient.x;
-            const dy = ev.screen.y - g.downClient.y;
-            if (Math.abs(dx) + Math.abs(dy) < DRAG_THRESHOLD)
-                return;
-            beginGestureVisuals(g);
         }
-        if (g.kind === 'move') {
-            const desired = { x: ev.world.x - g.grab.dx, y: ev.world.y - g.grab.dy };
-            g.node.setPosition(desired.x, desired.y);
-            ghostStyleFastPath(g, desired);
-            g.lastWorld = { x: ev.world.x, y: ev.world.y };
-            g.lastScreen = { x: ev.screen.x, y: ev.screen.y };
-            // THE ZONE (tile first, step 2): one recursive resolve over the boards'
-            // membership tree — a strip slot, a cell beside a container, a plain
-            // cell on the deepest board the pointer may enter, or off — decided
-            // BEFORE any engine is asked anything. The strip still wins over every
-            // board; a band's stickiness and the vacated cell still hold a beside.
-            const z = resolveTileZone(g, ev);
-            if (z.kind === 'strip' && options.tabDrop && !isStatic) {
-                // -- INTO A STRIP: the widget becomes a new tab there, so it leaves
-                // this board (survivors settle home) and the strip marks the slot.
+        if (g.strip) {
+            (_a = options.tabDrop) === null || _a === void 0 ? void 0 : _a.markDrop(null, null);
+            g.strip = null;
+        }
+        // -- BESIDE a tab container: its outer band puts the widget next to it
+        // — at the board's edge the container shifts over to make room, live
+        // and gliding, like any widget gives way (0.4.48). On THIS board the
+        // engine is driven directly; on another board its leg drives it (4a).
+        if (z.kind === 'beside' && !isStatic && z.board.ref === selfPeer) {
+            const row = rowOfPoint(ev.world.y);
+            if (!z.kept || !beside || beside.row !== row)
+                applyBeside(g, { id: z.containerId, side: z.side }, row);
+            syncPlaceholder();
+            return;
+        }
+        if (beside)
+            endBeside(true); // the hand left the band: the container comes back
+        if (z.kind === 'beside' && !isStatic) {
+            const peer = z.board.ref;
+            if (g.leg && g.leg.peer === peer)
+                g.leg.adopted.beside(z.containerId, z.side, ev.world);
+            else if (enterLeg(peer, { beside: { containerId: z.containerId, side: z.side } }))
+                g.refusedPeer = null;
+            setDim(g, !g.leg);
+            syncPlaceholder();
+            return;
+        }
+        // Last resort: the grace band — a small slip past the edge stays ON
+        // this board (the engine clamps the cell; prototype parity).
+        const onSelf = z.kind !== 'off' && z.kind !== 'strip' && z.board.ref === selfPeer;
+        const inside = onSelf || (z.kind === 'off' && worldInsideBoardGrace(ev.world.x, ev.world.y));
+        const peer = !onSelf && z.kind !== 'off' && z.kind !== 'strip' ? z.board.ref : null;
+        /** A section that refused the widget is PUSHED by it on the board that holds the section (D2): this board directly, another through its leg. */
+        const pushRefused = (refused) => {
+            const parent = parentPeerOf(api.container, refused.group.id);
+            if (parent === selfPeer) {
                 if (g.leg) {
                     g.leg.adopted.abort();
                     g.leg = null;
                 }
-                endBeside(true); // a band's shift gives way to the strip: the container comes back
-                if (!g.removedFromBoard) {
-                    g.removedFromBoard = true;
-                    engine.remove(g.id);
-                    project();
-                }
-                (_a = hostOf(g.id)) === null || _a === void 0 ? void 0 : _a.classList.remove('axdb-out');
-                if (!g.strip || g.strip.containerId !== z.containerId || g.strip.index !== z.index) {
-                    options.tabDrop.markDrop(z.containerId, z.index);
-                }
-                g.strip = { containerId: z.containerId, index: z.index };
-                syncPlaceholder();
-                api.render();
-                return;
+                placeOnSelf(g, desired, true);
+                setDim(g, false);
             }
-            if (g.strip) {
-                (_b = options.tabDrop) === null || _b === void 0 ? void 0 : _b.markDrop(null, null);
-                g.strip = null;
+            else if (parent && g.leg && g.leg.peer === parent) {
+                g.leg.adopted.move(ev.world, { push: true });
+                setDim(g, false);
             }
-            // -- BESIDE a tab container of THIS board: its outer band puts the
-            // widget next to it — at the board's edge the container shifts over
-            // to make room, live and gliding, like any widget gives way (0.4.48).
-            // (A container on another board still resolves as a plain cell there
-            // until the gesture scope spans boards — step 3.)
-            if (z.kind === 'beside' && !isStatic && z.board.ref === selfPeer) {
-                if (!z.kept)
-                    applyBeside(g, { id: z.containerId, side: z.side });
-                syncPlaceholder();
-                return;
+            else if (parent && enterLeg(parent, { push: true })) {
+                setDim(g, false);
             }
-            if (beside)
-                endBeside(true); // the hand left the band: the container comes back
-            // Last resort: the grace band — a small slip past the edge stays ON
-            // this board (the engine clamps the cell; prototype parity).
-            const onSelf = z.kind !== 'off' && z.kind !== 'strip' && z.board.ref === selfPeer;
-            const inside = onSelf || (z.kind === 'off' && worldInsideBoardGrace(ev.world.x, ev.world.y));
-            const peer = !onSelf && z.kind !== 'off' && z.kind !== 'strip' ? z.board.ref : null;
-            if (peer) {
-                // -- HANDOFF: the pointer is over another board -------------------
-                if (g.leg && g.leg.peer === peer) {
-                    g.leg.adopted.move(ev.world);
-                }
-                else {
-                    if (g.leg) {
-                        g.leg.adopted.abort();
-                        g.leg = null;
-                    }
-                    if (!g.removedFromBoard) {
-                        g.removedFromBoard = true;
-                        engine.remove(g.id); // survivors settle home (gesture memory intact)
-                        project();
-                    }
-                    const adopted = peer.adopt(g.node, ev.world, {
-                        width: g.node.size.width,
-                        height: g.node.size.height,
-                    });
-                    if (adopted) {
-                        (_c = hostOf(g.id)) === null || _c === void 0 ? void 0 : _c.classList.remove('axdb-out');
-                        g.leg = { peer, adopted };
-                        g.leg.adopted.move(ev.world);
-                    }
-                    else {
-                        // Bounded/full board refused the adoption: dim = will snap home.
-                        (_d = hostOf(g.id)) === null || _d === void 0 ? void 0 : _d.classList.add('axdb-out');
-                    }
-                }
+            else {
+                // No board holds the refusing section (a view): dim = will snap home.
+                leaveSelf();
+                setDim(g, true);
             }
-            else if (inside) {
-                // -- back on (or still on) our own board --------------------------
-                if (g.leg) {
-                    g.leg.adopted.abort();
-                    g.leg = null;
-                }
-                if (g.removedFromBoard) {
-                    g.removedFromBoard = false;
-                    (_e = hostOf(g.id)) === null || _e === void 0 ? void 0 : _e.classList.remove('axdb-out');
-                    const cell = pointToCell(desired.x, desired.y, frame(), geom(), rows(), g.spans.w);
-                    // Re-enter at the bottom edge (collision-free), then take the cursor
-                    // cell GATELESSLY — a first placement skips the anti-jitter gate.
-                    engine.add({ id: g.id, x: 0, y: engine.rows(), w: g.spans.w, h: g.spans.h });
-                    engine.moveCheck(g.id, cell.x, cell.y, { gate: false });
-                    project();
-                }
-                else {
-                    const spanW = (_g = (_f = engine.getItem(g.id)) === null || _f === void 0 ? void 0 : _f.w) !== null && _g !== void 0 ? _g : g.spans.w;
-                    const cell = pointToCell(desired.x, desired.y, frame(), geom(), rows(), spanW);
-                    if (engine.moveCheck(g.id, cell.x, cell.y).changed)
-                        project();
-                }
+        };
+        if (peer && g.refusedPeer === peer) {
+            // -- REFUSED, PUSHED (D2): asked once; every move over it pushes.
+            pushRefused(peer);
+        }
+        else if (peer) {
+            // -- HANDOFF: the pointer is over another board -------------------
+            if (g.leg && g.leg.peer === peer) {
+                g.leg.adopted.move(ev.world);
+            }
+            else if (enterLeg(peer, {})) {
+                g.refusedPeer = null;
+                setDim(g, false);
+                g.leg.adopted.move(ev.world);
             }
             else {
-                // -- outside every board ------------------------------------------
-                if (g.leg) {
-                    g.leg.adopted.abort();
-                    g.leg = null;
-                }
-                if (!g.removedFromBoard) {
-                    g.removedFromBoard = true;
-                    engine.remove(g.id); // survivors settle home; cells minted nowhere
-                    (_h = hostOf(g.id)) === null || _h === void 0 ? void 0 : _h.classList.add('axdb-out');
-                    project();
-                }
+                // The board refused (full, fit): the widget pushes it on its parent (D2).
+                g.refusedPeer = peer;
+                pushRefused(peer);
             }
-            syncPlaceholder();
+        }
+        else if (inside) {
+            // -- back on (or still on) our own board --------------------------
+            g.refusedPeer = null;
+            if (g.leg) {
+                g.leg.adopted.abort();
+                g.leg = null;
+            }
+            setDim(g, false);
+            placeOnSelf(g, desired);
+        }
+        else {
+            // -- outside every board ------------------------------------------
+            leaveSelf();
+            setDim(g, true);
+        }
+        syncPlaceholder();
+    };
+    const onToolMove = (ev) => {
+        var _a, _b, _c;
+        const g = gesture;
+        if (!g || g.kind === 'palette')
+            return;
+        if (!g.started) {
+            const dx = ev.screen.x - g.downClient.x;
+            const dy = ev.screen.y - g.downClient.y;
+            if (Math.abs(dx) + Math.abs(dy) < DRAG_THRESHOLD)
+                return;
+            beginGestureVisuals(g);
+        }
+        if (g.kind === 'move') {
+            moveGhost(g, ev);
             return;
         }
         // resize: fluid pixel preview on the ghost, cell-stepped live push.
@@ -2287,7 +2176,7 @@ export function bindDashboardGrid(api, group, options = {}) {
                     maxRows = n;
                     engine.maxRows = n;
                 };
-                const slabRows = (_k = (_j = parent.memberCell(group.id)) === null || _j === void 0 ? void 0 : _j.h) !== null && _k !== void 0 ? _k : maxRows;
+                const slabRows = (_b = (_a = parent.memberCell(group.id)) === null || _a === void 0 ? void 0 : _a.h) !== null && _b !== void 0 ? _b : maxRows;
                 const inner = maxRows;
                 const rhNow = rowHeightFor(geom(), rows());
                 const rowPx = rhNow + gap;
@@ -2451,7 +2340,7 @@ export function bindDashboardGrid(api, group, options = {}) {
         const anchorBottom = liveRect ? liveRect.y + liveRect.height : bottom;
         const px = E.w ? anchorRight - w : anchorLeft;
         const py = E.n ? anchorBottom - h : anchorTop;
-        g.node.setSize(w, h, (_l = g.node.size.depth) !== null && _l !== void 0 ? _l : 0);
+        g.node.setSize(w, h, (_c = g.node.size.depth) !== null && _c !== void 0 ? _c : 0);
         g.node.setPosition(px, py);
         ghostStyleFastPath(g, { x: px, y: py, width: w, height: h });
         const spanF = bound() !== undefined ? frame() : f;
@@ -2509,7 +2398,7 @@ export function bindDashboardGrid(api, group, options = {}) {
                 g.leg.adopted.abort();
                 g.leg = null;
             }
-            const displaced = buildCommitCommands(deltasSince(g.startCells, g.startGeom, g.id));
+            const displaced = tileCommands(deltasSince(g.startCells, g.startGeom, g.id));
             const snap = g.startGeom.get(g.id);
             if (snap) {
                 g.node.setPosition(snap.pos.x, snap.pos.y);
@@ -2550,7 +2439,7 @@ export function bindDashboardGrid(api, group, options = {}) {
             finally {
                 writing = false;
             }
-            const sourceDisplaced = buildCommitCommands(deltasSince(g.startCells, g.startGeom, g.id));
+            const sourceDisplaced = tileCommands(deltasSince(g.startCells, g.startGeom, g.id));
             const before = g.startCells.get(g.id);
             const geomBefore = g.startGeom.get(g.id);
             const crossing = [
@@ -2615,7 +2504,7 @@ export function bindDashboardGrid(api, group, options = {}) {
         }
         if (g.removedFromBoard && dragOut === 'remove') {
             // Release OUTSIDE the board → remove via the page's atomic command path.
-            const displaced = buildCommitCommands(deltasSince(g.startCells, g.startGeom, g.id));
+            const displaced = tileCommands(deltasSince(g.startCells, g.startGeom, g.id));
             const snap = g.startGeom.get(g.id);
             if (snap) {
                 // Park the node on its start rect so the page's RemoveNodeCommand
@@ -2695,10 +2584,30 @@ export function bindDashboardGrid(api, group, options = {}) {
         });
         return peers.filter((p) => !p.group.parentGroupId).map((p) => boardRef(p, 0));
     };
+    /** The ghost takes the cell under the hand on THIS board: re-entering at the bottom edge first (collision-free), then gatelessly; a tile already here moves through the gate. */
+    const placeOnSelf = (g, desired, pushSolid = false) => {
+        var _a, _b;
+        if (g.removedFromBoard) {
+            g.removedFromBoard = false;
+            setDim(g, false);
+            const cell = pointToCell(desired.x, desired.y, frame(), geom(), rows(), g.spans.w);
+            engine.add({ id: g.id, x: 0, y: engine.rows(), w: g.spans.w, h: g.spans.h });
+            if (!engine.moveCheck(g.id, cell.x, cell.y, { gate: false, pushSolid }).changed)
+                placeNear(g.id, cell.x, cell.y, g.spans.w, pushSolid);
+            project();
+        }
+        else {
+            const spanW = (_b = (_a = engine.getItem(g.id)) === null || _a === void 0 ? void 0 : _a.w) !== null && _b !== void 0 ? _b : g.spans.w;
+            const cell = pointToCell(desired.x, desired.y, frame(), geom(), rows(), spanW);
+            if (engine.moveCheck(g.id, cell.x, cell.y, { pushSolid }).changed)
+                project();
+        }
+    };
     /** What the pointer means for the dragged tile: the resolve over the live tree, with the beside the hand holds. */
     const resolveTileZone = (g, ev) => {
+        var _a, _b;
         let strip = null;
-        if (options.tabDrop && !isStatic) {
+        if (options.tabDrop && !isStatic && g.kind !== 'palette') {
             const crect = api.container.getBoundingClientRect();
             strip = options.tabDrop.stripAt(crect.left + ev.screen.x, crect.top + ev.screen.y);
         }
@@ -2707,13 +2616,26 @@ export function bindDashboardGrid(api, group, options = {}) {
             y: ev.world.y,
             roots: zoneRoots(),
             strip,
-            prev: beside ? { containerId: beside.id, side: beside.side, frame0: beside.frame0, vacated: cellToRect({ x: beside.vacated.x, y: beside.vacated.y, w: g.spans.w, h: g.spans.h }, frame(), geom(), rows()) } : null,
+            prev: beside
+                ? { containerId: beside.id, side: beside.side, frame0: beside.frame0, vacated: cellToRect({ x: beside.vacated.x, y: beside.vacated.y, w: g.spans.w, h: g.spans.h }, frame(), geom(), rows()) }
+                : ((_b = (_a = g.leg) === null || _a === void 0 ? void 0 : _a.adopted.besideState()) !== null && _b !== void 0 ? _b : null), // a beside another board holds for the ghost, through its leg
             maxDepth: nesting,
             ghostDepth: 0,
             ghostSubtree: EMPTY_SUBTREE,
             gap,
+            homeChain: homeChain(),
         });
     };
+    /** The groups this board sits in, all the way up: their bands never apply to a tile of this board. */
+    const homeChain = () => {
+        const out = new Set();
+        let cur = group;
+        for (let i = 0; cur && i < 32; i++) {
+            out.add(cur.id);
+            cur = cur.parentGroupId ? diagram.getGroup(cur.parentGroupId) : undefined;
+        }
+        return out;
+    };
     /** The board whose engine holds OUR group as an item (nesting parent). */
     const parentPeer = () => {
         for (const p of peersOnCanvas()) {
@@ -2756,7 +2678,7 @@ export function bindDashboardGrid(api, group, options = {}) {
      * wherever the last swing left it. Ask where the tile IS, not whether the
      * call moved it.
      */
-    const placeOnRow = (id, x, y, w) => {
+    const placeOnRow = (id, x, y, w, pushSolid = false) => {
         const at = (cx) => {
             const i = engine.getItem(id);
             return !!i && i.x === cx && i.y === y;
@@ -2764,7 +2686,7 @@ export function bindDashboardGrid(api, group, options = {}) {
         const maxX = Math.max(0, columns - w);
         if (at(x))
             return true;
-        if (engine.moveCheck(id, x, y, { gate: false }).changed)
+        if (engine.moveCheck(id, x, y, { gate: false, pushSolid }).changed)
             return true;
         for (let d = 1; d <= columns; d++) {
             for (const cx of [x - d, x + d]) {
@@ -2772,14 +2694,14 @@ export function bindDashboardGrid(api, group, options = {}) {
                     continue;
                 if (at(cx))
                     return true;
-                if (engine.moveCheck(id, cx, y, { gate: false }).changed)
+                if (engine.moveCheck(id, cx, y, { gate: false, pushSolid }).changed)
                     return true;
             }
         }
         return false;
     };
-    const placeNear = (id, x, y, w) => {
-        if (placeOnRow(id, x, y, w))
+    const placeNear = (id, x, y, w, pushSolid = false) => {
+        if (placeOnRow(id, x, y, w, pushSolid))
             return true;
         // EVERY column on that row refused — which is what a locked section
         // spanning the full width does, and there are plenty of those. Sliding
@@ -2791,7 +2713,7 @@ export function bindDashboardGrid(api, group, options = {}) {
             for (const cy of [y - d, y + d]) {
                 if (cy < 0)
                     continue;
-                if (placeOnRow(id, x, cy, w))
+                if (placeOnRow(id, x, cy, w, pushSolid))
                     return true;
             }
         }
@@ -2806,7 +2728,7 @@ export function bindDashboardGrid(api, group, options = {}) {
     const fitHeightAt = (id, x, y, w, hNatural) => {
         let limit = hNatural;
         for (const it of engine.getItems()) {
-            if (it.id === id || !it.locked)
+            if (it.id === id || !(it.locked || it.solid))
                 continue;
             if (!(it.x < x + w && x < it.x + it.w))
                 continue;
@@ -2916,11 +2838,16 @@ export function bindDashboardGrid(api, group, options = {}) {
             const tl = centredTopLeft(wx, wy, { w: itemW, h: opts.anchor === 'top' ? 0 : itemH });
             return pointToCell(tl.x, tl.y, frame(), geom(), rows(), itemW);
         };
-        const place = (cell, itemW) => opts.fit === 'shrink' ? placeFitting(node.id, cell.x, cell.y, itemW, hNatural) : placeNear(node.id, cell.x, cell.y, itemW);
+        const place = (cell, itemW, push = false) => opts.fit === 'shrink' ? placeFitting(node.id, cell.x, cell.y, itemW, hNatural) : placeNear(node.id, cell.x, cell.y, itemW, push);
         let lastWant = null;
-        const cell0 = wantedCell(world.x, world.y, span.w, span.h);
-        lastWant = cell0;
-        place(cell0, span.w);
+        if (opts.beside) {
+            besideOn(node.id, span, { id: opts.beside.containerId, side: opts.beside.side }, rowOfPoint(world.y));
+        }
+        else {
+            const cell0 = wantedCell(world.x, world.y, span.w, span.h);
+            lastWant = cell0;
+            place(cell0, span.w, opts.push);
+        }
         armGlide();
         project();
         syncPlaceholder();
@@ -2935,7 +2862,7 @@ export function bindDashboardGrid(api, group, options = {}) {
                 const it = engine.getItem(node.id);
                 return it ? cellToRect(it, frame(), geom(), rows()) : null;
             },
-            place: (cell) => {
+            place: (cell, pushSolid = false) => {
                 if (!engine.getItem(node.id) && !engine.add({ id: node.id, x: 0, y: engine.rows(), w: cell.w, h: cell.h }))
                     return false;
                 const it = engine.getItem(node.id);
@@ -2952,32 +2879,46 @@ export function bindDashboardGrid(api, group, options = {}) {
                     engine.resizeCheck(node.id, w0, h0);
                 const moved = engine.getItem(node.id);
                 if (moved && (moved.x !== cell.x || moved.y !== cell.y))
-                    engine.moveCheck(node.id, cell.x, cell.y, { gate: false });
+                    engine.moveCheck(node.id, cell.x, cell.y, { gate: false, pushSolid });
                 const now = engine.getItem(node.id);
                 if (now && (now.w !== cell.w || now.h !== cell.h))
-                    engine.resizeCheck(node.id, cell.w, cell.h);
+                    engine.resizeCheck(node.id, cell.w, cell.h, { pushSolid });
                 lastWant = null;
                 project();
                 syncPlaceholder();
                 const at = engine.getItem(node.id);
                 return !!at && at.x === cell.x && at.y === cell.y && at.w === cell.w && at.h === cell.h;
             },
-            move: (w) => {
+            move: (w, o) => {
                 const item = engine.getItem(node.id);
                 if (!item)
                     return;
+                if (beside)
+                    endBeside(true); // the hand left the band: the container comes back before the tile takes a plain cell
                 const cell = wantedCell(w.x, w.y, item.w, opts.fit === 'shrink' ? hNatural : item.h);
                 // The search is worth running once per wanted cell, not per pixel.
                 if (lastWant && lastWant.x === cell.x && lastWant.y === cell.y)
                     return;
                 lastWant = cell;
-                if (place(cell, item.w))
+                if (place(cell, item.w, !!(o === null || o === void 0 ? void 0 : o.push)))
                     project();
                 syncPlaceholder();
             },
+            beside: (containerId, side, w) => {
+                if (!engine.getItem(node.id) && !engine.add({ id: node.id, x: 0, y: engine.rows(), w: span.w, h: hNatural }))
+                    return;
+                const row = rowOfPoint(w.y);
+                if (beside && beside.id === containerId && beside.side === side && beside.row === row)
+                    return;
+                lastWant = null;
+                besideOn(node.id, span, { id: containerId, side }, row);
+                syncPlaceholder();
+            },
+            besideState: () => beside ? { containerId: beside.id, side: beside.side, frame0: beside.frame0, vacated: cellToRect({ x: beside.vacated.x, y: beside.vacated.y, w: span.w, h: hNatural }, frame(), geom(), rows()) } : null,
             leave: () => {
                 if (!engine.getItem(node.id))
                     return;
+                endBeside(true); // a container shifted for the tile comes back by itself: the shift was deliberate, so the memory never brings it
                 engine.remove(node.id); // displaced tiles come home (gesture memory)
                 lastWant = null;
                 project();
@@ -2996,6 +2937,7 @@ export function bindDashboardGrid(api, group, options = {}) {
                 syncPlaceholder();
             },
             abort: () => {
+                beside = null; // the snapshot restores the container with everything else
                 if (engine.getItem(node.id))
                     engine.remove(node.id);
                 engine.cancelGesture(); // pre-entry layout, memory cleared
@@ -3006,6 +2948,7 @@ export function bindDashboardGrid(api, group, options = {}) {
                 syncPlaceholder();
             },
             finalize: () => {
+                endBeside(false); // the shift stays: the deltas below carry it
                 const item = engine.getItem(node.id);
                 if (!item) {
                     engine.endGesture();
@@ -3015,26 +2958,11 @@ export function bindDashboardGrid(api, group, options = {}) {
                 }
                 const cell = { x: item.x, y: item.y, w: item.w, h: item.h };
                 const rect = cellToRect(item, frame(), geom(), rows());
-                const commands = buildCommitCommands(deltasSince(startCells, startGeom, node.id));
-                const groups = [];
-                for (const [id, before] of startCells) {
-                    if (!isGroupMember(id))
-                        continue;
-                    const it = engine.getItem(id);
-                    const g0 = startGeom.get(id);
-                    if (!it || !g0)
-                        continue;
-                    if (it.x === before.x && it.y === before.y && it.w === before.w && it.h === before.h)
-                        continue;
-                    groups.push({
-                        id,
-                        cellBefore: before,
-                        cellAfter: { x: it.x, y: it.y, w: it.w, h: it.h },
-                        frameBefore: { x: g0.pos.x, y: g0.pos.y, width: g0.size.width, height: g0.size.height },
-                        frameAfter: cellToRect(it, frame(), geom(), rows()),
-                    });
-                }
+                // Widgets AND sections this board's adoption displaced, as one list: a
+                // dock or a push that moved a section commits it with the drop.
+                const commands = tileCommands(deltasSince(startCells, startGeom, node.id));
                 engine.endGesture();
+                pendingDrop = node.id; // the tile stays for the member the commit (or the host's drop-in) adds
                 if (squeezeRoom !== undefined) {
                     // What the board now HOLDS is its bound, not the squeeze's room.
                     squeezeRoom = undefined;
@@ -3043,7 +2971,7 @@ export function bindDashboardGrid(api, group, options = {}) {
                 adoptedGhostId = null;
                 disarmGlideSoon();
                 syncPlaceholder();
-                return { commands, cell, rect, groups };
+                return { commands, cell, rect };
             },
         };
     };
@@ -4005,32 +3933,6 @@ export function bindDashboardGrid(api, group, options = {}) {
             }
         };
         const zoneKey = (z) => JSON.stringify(z, (k, v) => (k === 'target' ? v.id : k === 'peer' ? v.group.id : v));
-        // DOCKING PUSHES SECTIONS. A section is a locked tile so that a widget
-        // never pushes it; a group docked against the board's edge is the one
-        // gesture that must — everything below the top band moves down. For the
-        // preview every member group is unlocked; they are relocked when the
-        // pointer leaves the band, and their moved cells are committed with the
-        // dock.
-        let unlockedGroups = [];
-        const unlockGroups = () => {
-            if (unlockedGroups.length > 0)
-                return;
-            for (const it of engine.getItems()) {
-                if (it.id !== plan.arrivingId && it.locked && isGroupMember(it.id)) {
-                    it.locked = false;
-                    unlockedGroups.push(it.id);
-                }
-            }
-        };
-        const relockGroups = () => {
-            for (const id of unlockedGroups) {
-                const it = engine.getItem(id);
-                if (it)
-                    it.locked = true;
-            }
-            unlockedGroups = [];
-        };
-        const groupCommands = (fin, except) => fin.groups.filter((g) => g.id !== except).map((g) => new SetGroupCellCommand(g.id, g.cellBefore, g.cellAfter, g.frameBefore, g.frameAfter));
         // A TOP DOCK INSERTS ROWS. The engine's push cascade resolves the band's
         // collisions one tile at a time and scrambles what stood beneath it (the
         // demo's KPI row came apart, two of its tiles under the chart). VS Code
@@ -4097,18 +3999,24 @@ export function bindDashboardGrid(api, group, options = {}) {
                     engine.moveCheck(split.id, split.before.x, split.before.y, { gate: false });
                 if (it.w !== split.before.w || it.h !== split.before.h)
                     engine.resizeCheck(split.id, split.before.w, split.before.h);
-                it.locked = true;
             }
             split = null;
             project();
         };
         const previewSplit = (z, world) => {
             const it = engine.getItem(z.target.id);
+            if (!it)
+                return false;
+            // The target's cell AT REST is the one the commit restores — read it
+            // BEFORE the leg enters: the arriving ghost is placed under the pointer
+            // first, and a target that is a tile like any other is pushed by it
+            // for a moment (tile first, step 3) until it takes its half below.
+            const before = { x: it.x, y: it.y, w: it.w, h: it.h };
+            const frameBefore = frameOfGroup(z.target);
             const l = ensureLeg(world, null);
-            if (!it || !l)
+            if (!l)
                 return false;
-            split = { id: z.target.id, before: { x: it.x, y: it.y, w: it.w, h: it.h }, frameBefore: frameOfGroup(z.target), keep: z.keep };
-            it.locked = false; // its own gesture for the moment: it may shrink and shift
+            split = { id: z.target.id, before, frameBefore, keep: z.keep };
             if (it.w !== z.keep.w || it.h !== z.keep.h)
                 engine.resizeCheck(z.target.id, z.keep.w, z.keep.h);
             const now = engine.getItem(z.target.id);
@@ -4130,8 +4038,7 @@ export function bindDashboardGrid(api, group, options = {}) {
             const l = ensureLeg(world, null);
             if (!l)
                 return false;
-            unlockGroups();
-            l.place(z.cell);
+            l.place(z.cell, true); // DOCKING PUSHES SECTIONS: everything below the band moves down, solid or not
             insertRows(z.cell, l);
             project();
             placeholder === null || placeholder === void 0 ? void 0 : placeholder.remove();
@@ -4153,7 +4060,6 @@ export function bindDashboardGrid(api, group, options = {}) {
             }
             undoSplitPreview();
             undoInsertRows();
-            relockGroups();
             plan.markDrop(null, null);
             hideOverlay();
             // A PREVIEW IS AN OVERLAY. A split and a dock used to be applied LIVE
@@ -4241,7 +4147,6 @@ export function bindDashboardGrid(api, group, options = {}) {
             if (!commit || z.kind === 'home' || z.kind === 'off' || (z.kind === 'root' && !ensureLeg(world, null)) || (z.kind === 'board' && (!ensureLeg(world, (_a = z.peer) !== null && _a !== void 0 ? _a : null) || landingHidden()))) {
                 undoSplitPreview();
                 leg === null || leg === void 0 ? void 0 : leg.abort();
-                relockGroups();
                 done(false, 'cancel');
                 return;
             }
@@ -4278,25 +4183,17 @@ export function bindDashboardGrid(api, group, options = {}) {
                     return;
                 }
                 const fin = (_b = leg === null || leg === void 0 ? void 0 : leg.finalize()) !== null && _b !== void 0 ? _b : null;
-                const it = engine.getItem(z.target.id);
-                const before = split;
-                if (it)
-                    it.locked = true;
+                const halved = !!split && !!engine.getItem(z.target.id);
                 split = null;
-                if (!fin || !before || !it) {
+                if (!fin || !halved) {
                     leg === null || leg === void 0 ? void 0 : leg.abort();
                     done(false, 'cancel');
                     return;
                 }
-                const keep = { x: it.x, y: it.y, w: it.w, h: it.h };
                 const planned = plan.commands(fin.cell, fin.rect, group.id);
-                const changed = execute('Split group', [
-                    ...fin.commands,
-                    ...groupCommands(fin, z.target.id),
-                    new SetGroupCellCommand(z.target.id, before.before, keep, before.frameBefore, cellToRect(keep, frame(), geom(), rows())),
-                    ...planned.move,
-                    ...planned.collapse,
-                ]);
+                // The target's halving is in the leg's own deltas: its cell at rest was
+                // snapshotted when the ghost entered, and its half is where it stands now.
+                const changed = execute('Split group', [...fin.commands, ...planned.move, ...planned.collapse]);
                 done(changed, 'commit');
                 return;
             }
@@ -4309,13 +4206,12 @@ export function bindDashboardGrid(api, group, options = {}) {
             hideOverlay(); // a re-applied zone repaints its preview; the release is not a preview
             plan.markDrop(null, null);
             const fin = (_c = leg === null || leg === void 0 ? void 0 : leg.finalize()) !== null && _c !== void 0 ? _c : null;
-            relockGroups();
             if (!fin) {
                 done(false, 'cancel');
                 return;
             }
             const planned = plan.commands(fin.cell, fin.rect, (_d = leg === null || leg === void 0 ? void 0 : leg.groupId) !== null && _d !== void 0 ? _d : group.id);
-            done(execute(z.kind === 'root' ? 'Dock tab' : 'Move tab out', [...fin.commands, ...groupCommands(fin), ...planned.move, ...planned.collapse]), 'commit');
+            done(execute(z.kind === 'root' ? 'Dock tab' : 'Move tab out', [...fin.commands, ...planned.move, ...planned.collapse]), 'commit');
         };
         const onUp = () => finish(true);
         const onCancel = () => finish(false);
@@ -4387,43 +4283,39 @@ export function bindDashboardGrid(api, group, options = {}) {
                     return;
                 }
                 beginGestureVisuals(g);
+                // The chip is held by its middle: the ghost centres under the hand.
+                const f = frame();
+                const gg = geom();
+                g.grab = { dx: (g.spans.w * (columnUnitFor(gg, f.width) + gap) - gap) / 2, dy: (g.spans.h * (rowHeightFor(gg, rows()) + gap) - gap) / 2 };
             }
             if (chip) {
                 chip.style.left = `${e.clientX + 6}px`;
                 chip.style.top = `${e.clientY + 6}px`;
             }
+            // THE SAME PATH AS A TILE OF THIS BOARD (tile first, step 4a): the zone
+            // under the hand names the board — this one, a page, a section — and
+            // that board takes the ghost. The palette used to test "inside this
+            // board" and nothing else, so a chip over a page landed under it.
+            const rect = api.container.getBoundingClientRect();
             const world = toWorld(e.clientX, e.clientY);
-            const inside = worldInsideBoard(world.x, world.y);
-            if (inside) {
-                const tl = centredTopLeft(world.x, world.y, g.spans);
-                const cell = pointToCell(tl.x, tl.y, frame(), geom(), rows(), g.spans.w);
-                if (g.removedFromBoard) {
-                    g.removedFromBoard = false;
-                    // Enter at the bottom edge (collision-free), then take the cursor
-                    // cell GATELESSLY — gridstack's drag-in skips the gate on entry.
-                    // A bounded board with no room refuses the entry: the chip dims to
-                    // say so, and the release will snap it home.
-                    const entered = engine.add({ id: g.id, x: 0, y: engine.rows(), w: g.spans.w, h: g.spans.h });
-                    chip === null || chip === void 0 ? void 0 : chip.classList.toggle('axdb-out', !entered);
-                    if (entered)
-                        engine.moveCheck(g.id, cell.x, cell.y, { gate: false });
-                    project();
-                }
-                else if (engine.moveCheck(g.id, cell.x, cell.y).changed) {
-                    project();
-                }
-            }
-            else if (!g.removedFromBoard) {
-                g.removedFromBoard = true;
-                chip === null || chip === void 0 ? void 0 : chip.classList.remove('axdb-out');
-                engine.remove(g.id); // displaced tiles come home (gesture memory)
-                project();
-            }
-            syncPlaceholder();
+            moveGhost(g, { type: 'move', world, screen: { x: e.clientX - rect.left, y: e.clientY - rect.top }, modifiers: { shift: e.shiftKey, ctrl: e.ctrlKey, alt: e.altKey, meta: e.metaKey } });
             api.render();
         };
-        const finish = (commit) => {
+        /** The drop, on whichever board holds the ghost: the node carries its cell, the host's command adds it there. */
+        const dropOn = (boardId, cell, displaced) => {
             var _a, _b;
+            node.setGridItem(gridItemFromCell(cell));
+            if (boardId === group.id)
+                pendingDrop = g.id; // on another board its own finalize() pended it
+            engine.endGesture();
+            cleanupGestureVisuals(g);
+            gesture = null;
+            void ((_a = options.onDropIn) === null || _a === void 0 ? void 0 : _a.call(options, node, cell, displaced, { boardId }));
+            persistLayouts();
+            (_b = options.onGesture) === null || _b === void 0 ? void 0 : _b.call(options, { type: 'drop-in', kind: 'palette', nodeId: g.id, changed: true });
+            api.renderNow();
+        };
+        const finish = (commit) => {
             detach();
             if (gesture !== g)
                 return;
@@ -4434,18 +4326,21 @@ export function bindDashboardGrid(api, group, options = {}) {
                 chip === null || chip === void 0 ? void 0 : chip.remove();
                 return;
             }
-            if (commit && !g.removedFromBoard && engine.getItem(g.id)) {
+            if (commit && g.leg) {
+                // Dropped into another board (a page, a section): its leg closes with
+                // that board's displaced tiles; this board displaced nothing.
+                const fin = g.leg.adopted.finalize();
+                const boardId = g.leg.adopted.groupId;
+                g.leg = null;
+                if (fin) {
+                    dropOn(boardId, fin.cell, [...tileCommands(deltasSince(g.startCells, g.startGeom, g.id)), ...fin.commands]);
+                    return;
+                }
+            }
+            else if (commit && !g.removedFromBoard && engine.getItem(g.id)) {
                 const item = engine.getItem(g.id);
-                const cell = { x: item.x, y: item.y, w: item.w, h: item.h };
-                node.setGridItem(gridItemFromCell(cell));
-                const displaced = buildCommitCommands(deltasSince(g.startCells, g.startGeom, g.id));
-                engine.endGesture();
-                cleanupGestureVisuals(g);
-                gesture = null;
-                void ((_a = options.onDropIn) === null || _a === void 0 ? void 0 : _a.call(options, node, cell, displaced));
-                persistLayouts();
-                (_b = options.onGesture) === null || _b === void 0 ? void 0 : _b.call(options, { type: 'drop-in', kind: 'palette', nodeId: g.id, changed: true });
-                api.renderNow();
+                endBeside(false); // a container that shifted for the chip stays shifted: its delta commits with the drop
+                dropOn(group.id, { x: item.x, y: item.y, w: item.w, h: item.h }, tileCommands(deltasSince(g.startCells, g.startGeom, g.id)));
                 return;
             }
             // Abort (released outside, or Escape): restore the board.
@@ -4472,14 +4367,7 @@ export function bindDashboardGrid(api, group, options = {}) {
             return false;
         engine.beginGesture();
         const snap = snapshotAll();
-        // A section is a LOCKED tile; for ITS OWN move it is the one moving.
-        const self = engine.getItem(id);
-        const wasLocked = !!(self === null || self === void 0 ? void 0 : self.locked);
-        if (self && isGroupMember(id))
-            self.locked = false;
         const ok = op();
-        if (self && isGroupMember(id))
-            self.locked = wasLocked;
         if (!ok) {
             engine.endGesture();
             return false;
@@ -4495,18 +4383,7 @@ export function bindDashboardGrid(api, group, options = {}) {
         finally {
             writing = false;
         }
-        const commands = buildCommitCommands(deltasSince(snap.cells, snap.geoms));
-        if (isGroupMember(id)) {
-            // A SECTION: its cell lives in group metadata and its frame is written
-            // by project(); the node commands above skip groups (D5 of the review).
-            const it = engine.getItem(id);
-            const grp = diagram.getGroup(id);
-            const cb = snap.cells.get(id);
-            const gb = snap.geoms.get(id);
-            if (it && grp && cb && gb && (cb.x !== it.x || cb.y !== it.y || cb.w !== it.w || cb.h !== it.h)) {
-                commands.push(new SetGroupCellCommand(id, cb, { x: it.x, y: it.y, w: it.w, h: it.h }, { x: gb.pos.x, y: gb.pos.y, width: gb.size.width, height: gb.size.height }, frameOfGroup(grp)));
-            }
-        }
+        const commands = tileCommands(deltasSince(snap.cells, snap.geoms)); // a section's cell-and-frame command rides with the nodes'
         engine.endGesture();
         disarmGlideSoon();
         enforceBoardHeight();
@@ -4547,6 +4424,7 @@ export function bindDashboardGrid(api, group, options = {}) {
             return;
         }
         applyFluidFrame();
+        pendingDrop = null; // rebuilt from the members: a phantom is gone with the engine
         const items = [];
         for (const id of (_a = group.members) !== null && _a !== void 0 ? _a : []) {
             if (!memberEntity(id))
@@ -4763,10 +4641,10 @@ export function bindDashboardGrid(api, group, options = {}) {
                     sizeAfter: { width: target.width, height: target.height },
                 });
             }
-            return buildCommitCommands(deltas);
+            return tileCommands(deltas);
         },
         moveTo(id, x, y) {
-            return programmatic('Move widget', id, () => engine.moveCheck(id, x, y).changed);
+            return programmatic('Move widget', id, () => engine.moveCheck(id, x, y, { pushSolid: isGroupMember(id) }).changed);
         },
         resizeTo(id, w, h) {
             const hh = isGroupMember(id) ? Math.max(h, innerRowsOf(id)) : h; // a section: never below its children