@kywi-software/core 0.8.0 → 0.10.0

package/dist/admin/layout-editor/use-editor-dnd.js

@@ -0,0 +1,373 @@
+'use client';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { PointerSensor, KeyboardSensor, KeyboardCode, useSensors, useSensor, closestCorners, getFirstCollision, } from '@dnd-kit/core';
+import { sortableKeyboardCoordinates } from '@dnd-kit/sortable';
+import { createDwellTimer, editorCollisionDetection, resolveDragEndAction, resolvePaletteDropSlot, } from './drag-utils.js';
+/**
+ * How long a drag has to hold one slot before the thin line grows into a
+ * module-sized placeholder. Long enough that sweeping across a column doesn't
+ * make every slot bloom in turn; short enough that pausing where you mean to
+ * drop shows you the room the module will take.
+ */
+const DWELL_MS = 600;
+/**
+ * The dwell timer's identity for one drop slot. Column AND index, because
+ * moving between two slots of the same column is a change of destination and
+ * has to restart the escalation just like crossing into another column does.
+ */
+function zoneKey(columnId, index) {
+    return `${columnId}:${index}`;
+}
+/**
+ * The screen-reader subject of a drag: the registry label, for both a
+ * palette item and a canvas reorder — `ModuleOverlay`'s `useSortable` data
+ * carries `moduleType` too (kywi-cms#139 review), so both sources resolve the
+ * same way now. The generic fallback only fires if drag data is ever missing
+ * `moduleType` altogether (there is no such caller today; kept for safety).
+ */
+function describeSubject(data, labelFor) {
+    if (data?.moduleType)
+        return labelFor(data.moduleType);
+    return 'the module';
+}
+/** Upper-cases the first character, for `describeSubject`'s output at the
+ * start of a sentence (`onDragOver`/`onDragEnd`) — a registry label is
+ * already capitalized ("Heading"), so this only changes anything for the
+ * generic "the module" fallback ("The module …"). */
+function capitalize(text) {
+    return text.length ? text[0].toUpperCase() + text.slice(1) : text;
+}
+/**
+ * Where a drag is over, or would drop, in words — position only, never the
+ * column's own id. Production column ids are `crypto.randomUUID()`, so
+ * speaking one (`column 3f2a9c1e-4b7d-4a1e-9c2f-8ab0d5e61a77`) would read 36
+ * hex-and-dash characters aloud on every arrow press (kywi-cms#139 review;
+ * caught late because the original tests' `col-1`/`col-2` fixtures read fine
+ * spoken and masked it). The announcement callbacks only receive `{ active,
+ * over }` (dnd-kit's `Accessibility.Arguments`) — no droppable list, no
+ * ordinal — so "column 2 of 3" isn't available without threading new layout
+ * state into the hook just to answer a screen reader once per keypress; the
+ * per-column position already on `over.data` (see `EditorDragDatum`) is.
+ * That index is deliberately the *declared* slot, not the pointer-corrected
+ * one `resolveDragEndAction` computes for a mouse drop: a keyboard drag has
+ * no pointer at all, so the declared slot is the only honest answer to
+ * "where does the screen reader say this is" that a keyboard user's own
+ * arrow presses actually produced.
+ */
+function describeLocation(over) {
+    const data = over?.data.current;
+    if (!data?.columnId)
+        return null;
+    const index = data.index ?? 0;
+    return `this column, position ${index + 1}`;
+}
+/** Arrow-key codes `sortableKeyboardCoordinates` (and this function) act on. */
+const KEYBOARD_DIRECTIONS = [
+    KeyboardCode.Down,
+    KeyboardCode.Up,
+    KeyboardCode.Left,
+    KeyboardCode.Right,
+];
+/**
+ * kywi-cms#139: `sortableKeyboardCoordinates` — the repo's standing
+ * coordinateGetter for every other keyboard drag (audience-list.tsx,
+ * site-tree.tsx, site-tree-table.tsx, menu-editor.tsx) — turned out to be
+ * silently inert for a palette item. Verified by hand: Tab to a palette item,
+ * Space to pick it up, arrow keys did *nothing* — no drop indicator, no
+ * screen-reader "over" announcement, and Space dropped it "not over a drop
+ * target" every time.
+ *
+ * The cause is in dnd-kit's own implementation, not this repo: it resolves
+ * the dragged item's OWN slot via `droppableContainers.get(active.id)`, to
+ * offset the move against where the item already sits in a shared sortable
+ * list. Every other caller drags a `useSortable` row — which, being sortable,
+ * is also its own droppable, so that lookup succeeds. A palette item
+ * (module-palette.tsx) is a plain `useDraggable` with no droppable
+ * counterpart of its own; the lookup misses, an internal guard silently
+ * fails, and the getter returns nothing — dnd-kit never even calls
+ * `onMove`, so no re-render, no collision recompute, no announcement.
+ *
+ * Delegate to the real thing whenever the active item IS also a droppable —
+ * a canvas reorder (module-overlay.tsx's `useSortable`) behaves exactly as
+ * it did before this existed. Only when that lookup misses (a palette item)
+ * does this take over, with the same direction-filter-then-closestCorners
+ * dnd-kit's own version uses, landing the drag on the target droppable's
+ * top-left corner rather than computing a same-list offset that doesn't
+ * apply here. That is enough: `resolveDragEndAction`/`resolvePaletteDropSlot`
+ * read the drop from `over.data`, not from the translate's exact pixels, so
+ * a keyboard move only has to make `over` become the right droppable — which
+ * this does — not reproduce dnd-kit's reorder-preview polish.
+ */
+export const paletteAwareKeyboardCoordinates = (event, args) => {
+    const { context } = args;
+    if (context.droppableContainers.get(args.active)) {
+        return sortableKeyboardCoordinates(event, args);
+    }
+    if (!KEYBOARD_DIRECTIONS.includes(event.code))
+        return undefined;
+    // Hoisted here (dnd-kit's own getter does the same): an arrow press that
+    // resolves no candidate below still must not fall through to the browser's
+    // native page-scroll mid-drag — that would shift `scrollAdjustedTranslate`
+    // and could move `over` without the owner having pressed anything meant to
+    // move it (kywi-cms#139 review).
+    event.preventDefault();
+    const { active, collisionRect, droppableRects, droppableContainers, over } = context;
+    if (!active || !collisionRect)
+        return undefined;
+    const candidates = [];
+    droppableContainers.getEnabled().forEach((entry) => {
+        if (!entry || entry.disabled)
+            return;
+        const rect = droppableRects.get(entry.id);
+        if (!rect)
+            return;
+        switch (event.code) {
+            case KeyboardCode.Down:
+                if (collisionRect.top < rect.top)
+                    candidates.push(entry);
+                break;
+            case KeyboardCode.Up:
+                if (collisionRect.top > rect.top)
+                    candidates.push(entry);
+                break;
+            case KeyboardCode.Left:
+                if (collisionRect.left > rect.left)
+                    candidates.push(entry);
+                break;
+            case KeyboardCode.Right:
+                if (collisionRect.left < rect.left)
+                    candidates.push(entry);
+                break;
+        }
+    });
+    const collisions = closestCorners({
+        active,
+        collisionRect,
+        droppableRects,
+        droppableContainers: candidates,
+        pointerCoordinates: null,
+    });
+    let closestId = getFirstCollision(collisions, 'id');
+    // Same "don't re-announce where we already are" rule as dnd-kit's own
+    // version: if the nearest candidate is the droppable we're already over,
+    // and there is a second one, prefer that — otherwise repeated presses in
+    // the same direction would never move past the first neighbour.
+    if (closestId === over?.id && collisions.length > 1)
+        closestId = collisions[1]?.id ?? null;
+    if (closestId == null)
+        return undefined;
+    const targetRect = droppableRects.get(closestId);
+    if (!targetRect)
+        return undefined;
+    return { x: targetRect.left, y: targetRect.top };
+};
+export function useEditorDnd({ registry, dispatch }) {
+    const sensors = useSensors(
+    // kywi-cms#134: without a distance constraint a bare CLICK on a palette
+    // item counts as a drag that starts and ends on the same spot, so dnd-kit
+    // resolves a drop target under the cursor and the editor silently inserts
+    // a module the user never dragged anywhere. Requiring 5px of travel makes
+    // a click a no-op and leaves a real drag untouched.
+    useSensor(PointerSensor, { activationConstraint: { distance: 5 } }), 
+    // kywi-cms#139: without a coordinateGetter, dnd-kit's KeyboardSensor has no
+    // way to translate an arrow-key press into a position at all — Tab could
+    // focus a palette item and Space could "pick it up", but arrows did
+    // nothing and the drag could never move. See `paletteAwareKeyboardCoordinates`
+    // above for why the repo's usual `sortableKeyboardCoordinates` doesn't
+    // reach a palette item on its own.
+    useSensor(KeyboardSensor, { coordinateGetter: paletteAwareKeyboardCoordinates }));
+    /**
+     * The pointer's live viewport position, in the same coordinate space
+     * `getBoundingClientRect()` reports. dnd-kit computes exactly this value on
+     * every frame of a drag and hands it to collision detection, so we take it
+     * from there rather than deriving our own.
+     *
+     * kywi-cms#134: the obvious derivation — `activatorEvent.clientY +
+     * event.delta.y` — is wrong whenever the page scrolls mid-drag. dnd-kit 6.3.1
+     * sets `DragEndEvent.delta` to its `scrollAdjustedTranslate` (the pointer's
+     * translation *plus* every ancestor scroll accumulated since the drag began),
+     * while `pointerCoordinates` is `activationCoordinates + translate` with no
+     * scroll term. Column and module rects are already scroll-current, so adding
+     * the delta double-counts the scroll and lands the module one or two slots off
+     * — and autoScroll is on by default in both shells, so dragging from the fixed
+     * palette rail down a long in-place page scrolls by construction.
+     *
+     * Per hook instance, never module-global: two editors on one page must not
+     * share a pointer. A keyboard drag has no coordinates at all (dnd-kit's
+     * `getEventCoordinates` returns null for a KeyboardEvent), so this stays null
+     * and `resolveDragEndAction` keeps the droppable's declared index.
+     */
+    const pointerRef = useRef(null);
+    const collisionDetection = useCallback((args) => {
+        pointerRef.current = args.pointerCoordinates;
+        return editorCollisionDetection(args);
+    }, []);
+    // ── Drag feedback (kywi-cms#134) ──────────────────────────────────────────
+    // A drag used to be entirely silent: no ghost on the cursor, no mark on the
+    // canvas. The hook already computes everything needed to say what is moving
+    // and where it would land, so it now publishes both.
+    const [activeDrag, setActiveDrag] = useState(null);
+    const [dropTarget, setDropTarget] = useState(null);
+    /**
+     * The line -> placeholder escalation timer. One per hook instance, created
+     * lazily on first render and never re-created: a fresh timer each render
+     * would drop the pending escalation on every drag frame, and a module-global
+     * one would be shared by two editors on the same page.
+     */
+    const dwellRef = useRef(null);
+    if (dwellRef.current === null) {
+        dwellRef.current = createDwellTimer(DWELL_MS, (zoneId) => {
+            // Escalate only if the drag is still on the zone the timer was armed for
+            // — a move that lands elsewhere in the same tick must not be overwritten.
+            setDropTarget(prev => prev && zoneKey(prev.columnId, prev.index) === zoneId
+                ? { ...prev, feedback: 'placeholder' }
+                : prev);
+        });
+    }
+    const dwell = dwellRef.current;
+    // The timer outlives a render but not the component: an editor unmounted
+    // mid-drag (navigating away from the Layout tab) must not fire into a
+    // setState on a dead tree.
+    useEffect(() => () => { dwellRef.current?.destroy(); }, []);
+    /**
+     * The human name for a module type. Read from the dragged item's own data on
+     * every frame rather than from `activeDrag` state: within one dnd-kit tick
+     * the start handler's `setActiveDrag` has not rendered yet, so a move that
+     * arrived in the same tick would see a stale (null) label.
+     */
+    const labelFor = useCallback((moduleType) => registry?.get(moduleType)?.label ?? moduleType, [registry]);
+    // ── Screen-reader announcements (kywi-cms#139) ────────────────────────────
+    // A keyboard drag is otherwise silent: sighted mouse users see the ghost and
+    // drop indicator this hook already publishes above, but a screen-reader
+    // user picking a palette item up with Space and moving it with arrow keys
+    // gets no feedback that anything happened at all. dnd-kit renders whatever
+    // these return into its own visually-hidden live region.
+    const announcements = useMemo(() => ({
+        onDragStart({ active }) {
+            const data = active.data.current;
+            return `Picked up ${describeSubject(data, labelFor)}.`;
+        },
+        onDragOver({ active, over }) {
+            const data = active.data.current;
+            const subject = capitalize(describeSubject(data, labelFor));
+            const location = describeLocation(over);
+            return location
+                ? `${subject} is over ${location}.`
+                : `${subject} is no longer over a drop target.`;
+        },
+        onDragEnd({ active, over }) {
+            const data = active.data.current;
+            const subject = capitalize(describeSubject(data, labelFor));
+            const location = describeLocation(over);
+            return location
+                ? `${subject} was dropped over ${location}.`
+                : `${subject} was dropped, but not over a drop target.`;
+        },
+        onDragCancel({ active }) {
+            const data = active.data.current;
+            return `${capitalize(describeSubject(data, labelFor))} drag was cancelled.`;
+        },
+    }), [labelFor]);
+    // Stable identity like `announcements` itself: DndContext takes this whole
+    // object as a prop, and dnd-kit's own Accessibility component re-subscribes
+    // its live region whenever it changes.
+    const accessibility = useMemo(() => ({ announcements }), [announcements]);
+    /** Stand the whole feedback layer down — no ghost, no indicator, no timer. */
+    const clearFeedback = useCallback(() => {
+        dwell.reset();
+        setActiveDrag(null);
+        setDropTarget(null);
+    }, [dwell]);
+    const handleDragStart = useCallback((event) => {
+        // Start clean: a projection left over from the previous drag would be drawn
+        // for the frames before this drag's first move lands.
+        dwell.reset();
+        setDropTarget(null);
+        const data = event.active.data.current;
+        // Palette-only. A canvas reorder already has dnd-kit's own sortable preview
+        // — the item lifts and its neighbours shuffle — so a second ghost of the
+        // same module would just be a duplicate chasing the cursor.
+        if (data?.source !== 'palette' || !data.moduleType) {
+            setActiveDrag(null);
+            return;
+        }
+        const moduleType = data.moduleType;
+        setActiveDrag({ moduleType, label: labelFor(moduleType) });
+    }, [dwell, labelFor]);
+    const handleDragMove = useCallback((event) => {
+        const activeData = event.active.data.current;
+        // Palette-only, deliberately (kywi-cms#134). During a CANVAS reorder the
+        // dragged module is itself a `[data-kywi-module-slot]` carrying a live
+        // dnd-kit transform, so its `getBoundingClientRect()` reports where it has
+        // been dragged TO — measuring the column would measure the moved element
+        // against itself and project a slot that shifts as the drag moves. Reorders
+        // therefore get no projection at all; dnd-kit's sortable preview is already
+        // an honest picture of where the item lands.
+        if (activeData?.source !== 'palette' || !activeData.moduleType)
+            return;
+        const label = labelFor(activeData.moduleType);
+        // The pointer comes from the collision frame, NEVER from
+        // `activatorEvent.clientY + event.delta.y`: dnd-kit's delta is
+        // scroll-adjusted, so under mid-drag auto-scroll it drifts away from the
+        // rects being measured (see `pointerRef` above).
+        const slot = resolvePaletteDropSlot(event.over, pointerRef.current?.y ?? null);
+        if (!slot) {
+            // Over dead space. The ghost stays — the drag is still live — but there
+            // is nothing to promise, and a stale line would promise a lie.
+            dwell.leaveZone();
+            setDropTarget(null);
+            return;
+        }
+        dwell.enterZone(zoneKey(slot.columnId, slot.index));
+        setDropTarget(prev => {
+            // Same slot as last frame: keep the object (and any escalation it has
+            // already earned) so the indicator doesn't restart on every mouse move.
+            if (prev && prev.columnId === slot.columnId && prev.index === slot.index)
+                return prev;
+            return { columnId: slot.columnId, index: slot.index, feedback: 'line', label };
+        });
+    }, [dwell, labelFor]);
+    const handleDragCancel = useCallback(() => {
+        clearFeedback();
+        // Same reason handleDragEnd clears it below: the captured pointer belongs
+        // to the drag that just ended, and an abandoned drag leaves one behind just
+        // as readily as a completed one. A later keyboard drag records no
+        // coordinates of its own and would silently inherit these.
+        pointerRef.current = null;
+    }, [clearFeedback]);
+    const handleDragEnd = useCallback((event) => {
+        // A drop ends the drag WITHOUT firing onDragCancel, so this is the only
+        // place the feedback layer gets stood down on the happy path — leave the
+        // dwell timer armed here and a placeholder blooms after the drag is over.
+        clearFeedback();
+        // Read and clear together. The captured pointer belongs to the drag that
+        // just ended; leaving it behind would let a keyboard drag (which never
+        // records coordinates) silently inherit the previous drag's position.
+        const pointerY = pointerRef.current?.y ?? null;
+        pointerRef.current = null;
+        const action = resolveDragEndAction(event.active, event.over, { registry, pointerY });
+        if (!action)
+            return;
+        dispatch(action);
+        // kywi-cms#134: a freshly dropped module opens its own props panel, so the
+        // drop lands somewhere visible AND immediately editable. `resolveDragEndAction`
+        // mints the id up front precisely so we can select it without reading it
+        // back out of the reducer. Canvas reorders dispatch their action and nothing
+        // else — the moved module keeps whatever selection was already in play.
+        if (action.type === 'ADD_MODULE' && action.moduleId) {
+            dispatch({ type: 'SELECT', id: action.moduleId, selectionType: 'module' });
+        }
+    }, [registry, dispatch, clearFeedback]);
+    return {
+        sensors,
+        collisionDetection,
+        activeDrag,
+        dropTarget,
+        handleDragStart,
+        handleDragMove,
+        handleDragEnd,
+        handleDragCancel,
+        accessibility,
+    };
+}
+//# sourceMappingURL=use-editor-dnd.js.map

package/dist/admin/layout-editor/use-editor-dnd.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-editor-dnd.js","sourceRoot":"","sources":["../../../src/admin/layout-editor/use-editor-dnd.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAc,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAChF,OAAO,EACL,aAAa,EACb,cAAc,EACd,YAAY,EACZ,UAAU,EACV,SAAS,EACT,cAAc,EACd,iBAAiB,GAClB,MAAM,eAAe,CAAA;AAYtB,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAA;AAG/D,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,oBAAoB,EACpB,sBAAsB,GAGvB,MAAM,iBAAiB,CAAA;AA4CxB;;;;;GAKG;AACH,MAAM,QAAQ,GAAG,GAAG,CAAA;AAEpB;;;;GAIG;AACH,SAAS,OAAO,CAAC,QAAgB,EAAE,KAAa;IAC9C,OAAO,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAA;AAC/B,CAAC;AAED;;;;;;GAMG;AACH,SAAS,eAAe,CACtB,IAAiC,EACjC,QAAwC;IAExC,IAAI,IAAI,EAAE,UAAU;QAAE,OAAO,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACtD,OAAO,YAAY,CAAA;AACrB,CAAC;AAED;;;qDAGqD;AACrD,SAAS,UAAU,CAAC,IAAY;IAC9B,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;AACpE,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,SAAS,gBAAgB,CAAC,IAA2C;IACnE,MAAM,IAAI,GAAG,IAAI,EAAE,IAAI,CAAC,OAAsC,CAAA;IAC9D,IAAI,CAAC,IAAI,EAAE,QAAQ;QAAE,OAAO,IAAI,CAAA;IAChC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC,CAAA;IAC7B,OAAO,yBAAyB,KAAK,GAAG,CAAC,EAAE,CAAA;AAC7C,CAAC;AAED,gFAAgF;AAChF,MAAM,mBAAmB,GAAa;IACpC,YAAY,CAAC,IAAI;IACjB,YAAY,CAAC,EAAE;IACf,YAAY,CAAC,IAAI;IACjB,YAAY,CAAC,KAAK;CACnB,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAA6B,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;IACvF,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;IACxB,IAAI,OAAO,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACjD,OAAO,2BAA2B,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IACjD,CAAC;IAED,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAA;IAC/D,yEAAyE;IACzE,2EAA2E;IAC3E,2EAA2E;IAC3E,2EAA2E;IAC3E,iCAAiC;IACjC,KAAK,CAAC,cAAc,EAAE,CAAA;IACtB,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,mBAAmB,EAAE,IAAI,EAAE,GAAG,OAAO,CAAA;IACpF,IAAI,CAAC,MAAM,IAAI,CAAC,aAAa;QAAE,OAAO,SAAS,CAAA;IAE/C,MAAM,UAAU,GAAyB,EAAE,CAAA;IAC3C,mBAAmB,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,CAAC,KAAqC,EAAE,EAAE;QACjF,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,QAAQ;YAAE,OAAM;QACpC,MAAM,IAAI,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QACzC,IAAI,CAAC,IAAI;YAAE,OAAM;QACjB,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,YAAY,CAAC,IAAI;gBACpB,IAAI,aAAa,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG;oBAAE,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBACxD,MAAK;YACP,KAAK,YAAY,CAAC,EAAE;gBAClB,IAAI,aAAa,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG;oBAAE,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBACxD,MAAK;YACP,KAAK,YAAY,CAAC,IAAI;gBACpB,IAAI,aAAa,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI;oBAAE,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBAC1D,MAAK;YACP,KAAK,YAAY,CAAC,KAAK;gBACrB,IAAI,aAAa,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI;oBAAE,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBAC1D,MAAK;QACT,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,MAAM,UAAU,GAAG,cAAc,CAAC;QAChC,MAAM;QACN,aAAa;QACb,cAAc;QACd,mBAAmB,EAAE,UAAU;QAC/B,kBAAkB,EAAE,IAAI;KACzB,CAAC,CAAA;IACF,IAAI,SAAS,GAAG,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IACnD,sEAAsE;IACtE,yEAAyE;IACzE,yEAAyE;IACzE,gEAAgE;IAChE,IAAI,SAAS,KAAK,IAAI,EAAE,EAAE,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;QAAE,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,IAAI,CAAA;IAE1F,IAAI,SAAS,IAAI,IAAI;QAAE,OAAO,SAAS,CAAA;IACvC,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IAChD,IAAI,CAAC,UAAU;QAAE,OAAO,SAAS,CAAA;IAEjC,OAAO,EAAE,CAAC,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,EAAE,UAAU,CAAC,GAAG,EAAE,CAAA;AAClD,CAAC,CAAA;AAED,MAAM,UAAU,YAAY,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAoB;IACnE,MAAM,OAAO,GAAG,UAAU;IACxB,wEAAwE;IACxE,0EAA0E;IAC1E,0EAA0E;IAC1E,0EAA0E;IAC1E,oDAAoD;IACpD,SAAS,CAAC,aAAa,EAAE,EAAE,oBAAoB,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;IACnE,4EAA4E;IAC5E,yEAAyE;IACzE,oEAAoE;IACpE,+EAA+E;IAC/E,uEAAuE;IACvE,mCAAmC;IACnC,SAAS,CAAC,cAAc,EAAE,EAAE,gBAAgB,EAAE,+BAA+B,EAAE,CAAC,CACjF,CAAA;IAED;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,MAAM,UAAU,GAAG,MAAM,CAAkC,IAAI,CAAC,CAAA;IAEhE,MAAM,kBAAkB,GAAG,WAAW,CAAqB,CAAC,IAAI,EAAE,EAAE;QAClE,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAA;QAC5C,OAAO,wBAAwB,CAAC,IAAI,CAAC,CAAA;IACvC,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,6EAA6E;IAC7E,4EAA4E;IAC5E,4EAA4E;IAC5E,qDAAqD;IAErD,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAoB,IAAI,CAAC,CAAA;IACrE,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAoB,IAAI,CAAC,CAAA;IAErE;;;;;OAKG;IACH,MAAM,QAAQ,GAAG,MAAM,CAAyB,IAAI,CAAC,CAAA;IACrD,IAAI,QAAQ,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;QAC9B,QAAQ,CAAC,OAAO,GAAG,gBAAgB,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;YACvD,yEAAyE;YACzE,0EAA0E;YAC1E,aAAa,CAAC,IAAI,CAAC,EAAE,CACnB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,MAAM;gBACnD,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE;gBACtC,CAAC,CAAC,IAAI,CACT,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAA;IAE9B,yEAAyE;IACzE,sEAAsE;IACtE,2BAA2B;IAC3B,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,CAAA,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IAE1D;;;;;OAKG;IACH,MAAM,QAAQ,GAAG,WAAW,CAC1B,CAAC,UAAkB,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC,UAAU,CAAC,EAAE,KAAK,IAAI,UAAU,EACtE,CAAC,QAAQ,CAAC,CACX,CAAA;IAED,6EAA6E;IAC7E,6EAA6E;IAC7E,wEAAwE;IACxE,0EAA0E;IAC1E,2EAA2E;IAC3E,yDAAyD;IACzD,MAAM,aAAa,GAAG,OAAO,CAAgB,GAAG,EAAE,CAAC,CAAC;QAClD,WAAW,CAAC,EAAE,MAAM,EAAsB;YACxC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAsC,CAAA;YAC/D,OAAO,aAAa,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAA;QACxD,CAAC;QACD,UAAU,CAAC,EAAE,MAAM,EAAE,IAAI,EAAyC;YAChE,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAsC,CAAA;YAC/D,MAAM,OAAO,GAAG,UAAU,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAA;YAC3D,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAA;YACvC,OAAO,QAAQ;gBACb,CAAC,CAAC,GAAG,OAAO,YAAY,QAAQ,GAAG;gBACnC,CAAC,CAAC,GAAG,OAAO,mCAAmC,CAAA;QACnD,CAAC;QACD,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,EAAyC;YAC/D,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAsC,CAAA;YAC/D,MAAM,OAAO,GAAG,UAAU,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAA;YAC3D,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAA;YACvC,OAAO,QAAQ;gBACb,CAAC,CAAC,GAAG,OAAO,qBAAqB,QAAQ,GAAG;gBAC5C,CAAC,CAAC,GAAG,OAAO,2CAA2C,CAAA;QAC3D,CAAC;QACD,YAAY,CAAC,EAAE,MAAM,EAAsB;YACzC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAsC,CAAA;YAC/D,OAAO,GAAG,UAAU,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,sBAAsB,CAAA;QAC7E,CAAC;KACF,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEf,2EAA2E;IAC3E,4EAA4E;IAC5E,uCAAuC;IACvC,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;IAEzE,8EAA8E;IAC9E,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE;QACrC,KAAK,CAAC,KAAK,EAAE,CAAA;QACb,aAAa,CAAC,IAAI,CAAC,CAAA;QACnB,aAAa,CAAC,IAAI,CAAC,CAAA;IACrB,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;IAEX,MAAM,eAAe,GAAG,WAAW,CAAC,CAAC,KAAqB,EAAE,EAAE;QAC5D,4EAA4E;QAC5E,sDAAsD;QACtD,KAAK,CAAC,KAAK,EAAE,CAAA;QACb,aAAa,CAAC,IAAI,CAAC,CAAA;QAEnB,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAsC,CAAA;QACrE,4EAA4E;QAC5E,yEAAyE;QACzE,4DAA4D;QAC5D,IAAI,IAAI,EAAE,MAAM,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACnD,aAAa,CAAC,IAAI,CAAC,CAAA;YACnB,OAAM;QACR,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAA;QAClC,aAAa,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;IAC5D,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;IAErB,MAAM,cAAc,GAAG,WAAW,CAAC,CAAC,KAAoB,EAAE,EAAE;QAC1D,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAsC,CAAA;QAC3E,yEAAyE;QACzE,uEAAuE;QACvE,2EAA2E;QAC3E,yEAAyE;QACzE,4EAA4E;QAC5E,4EAA4E;QAC5E,6CAA6C;QAC7C,IAAI,UAAU,EAAE,MAAM,KAAK,SAAS,IAAI,CAAC,UAAU,CAAC,UAAU;YAAE,OAAM;QACtE,MAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;QAE7C,yDAAyD;QACzD,+DAA+D;QAC/D,yEAAyE;QACzE,iDAAiD;QACjD,MAAM,IAAI,GAAG,sBAAsB,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,IAAI,IAAI,CAAC,CAAA;QAC9E,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,wEAAwE;YACxE,+DAA+D;YAC/D,KAAK,CAAC,SAAS,EAAE,CAAA;YACjB,aAAa,CAAC,IAAI,CAAC,CAAA;YACnB,OAAM;QACR,CAAC;QAED,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;QACnD,aAAa,CAAC,IAAI,CAAC,EAAE;YACnB,sEAAsE;YACtE,wEAAwE;YACxE,IAAI,IAAI,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,CAAA;YACrF,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAA;QAChF,CAAC,CAAC,CAAA;IACJ,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;IAErB,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,EAAE;QACxC,aAAa,EAAE,CAAA;QACf,0EAA0E;QAC1E,4EAA4E;QAC5E,kEAAkE;QAClE,2DAA2D;QAC3D,UAAU,CAAC,OAAO,GAAG,IAAI,CAAA;IAC3B,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;IAEnB,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,KAAmB,EAAE,EAAE;QACxD,wEAAwE;QACxE,yEAAyE;QACzE,0EAA0E;QAC1E,aAAa,EAAE,CAAA;QAEf,yEAAyE;QACzE,uEAAuE;QACvE,sEAAsE;QACtE,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC,IAAI,IAAI,CAAA;QAC9C,UAAU,CAAC,OAAO,GAAG,IAAI,CAAA;QAEzB,MAAM,MAAM,GAAG,oBAAoB,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAA;QACrF,IAAI,CAAC,MAAM;YAAE,OAAM;QACnB,QAAQ,CAAC,MAAM,CAAC,CAAA;QAChB,2EAA2E;QAC3E,gFAAgF;QAChF,yEAAyE;QACzE,6EAA6E;QAC7E,wEAAwE;QACxE,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpD,QAAQ,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC5E,CAAC;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAA;IAEvC,OAAO;QACL,OAAO;QACP,kBAAkB;QAClB,UAAU;QACV,UAAU;QACV,eAAe;QACf,cAAc;QACd,aAAa;QACb,gBAAgB;QAChB,aAAa;KACd,CAAA;AACH,CAAC"}

package/dist/admin/styles/admin.css

@@ -191,6 +191,14 @@
   --kywi-editor-selected-border: var(--kywi-green-400);
   --kywi-editor-drop-line: var(--kywi-green-500);
   --kywi-editor-placeholder-bg: rgba(18, 128, 95, 0.1);
+  /* The dwell placeholder is overlay chrome now (kywi-cms#138): it floats over
+     real page content rather than occupying flow, so it needs its own
+     near-opaque fill instead of the faint tint above. Without a green-tinted
+     value here the admin Layout tab would inherit editor.css's indigo-white
+     default inside the green admin theme. `--kywi-green-50` at 0.95 — same
+     lightness and alpha as editor.css's default, green hue family.
+     Pinned against editor.css by overlay-editor.test.tsx. */
+  --kywi-editor-placeholder-overlay-bg: rgba(233, 245, 239, 0.95);
   --kywi-editor-region-border: rgba(18, 128, 95, 0.32);
 }
 

package/dist/admin/surfaces/layouts/layout-editor-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout-editor-client.d.ts","sourceRoot":"","sources":["../../../../src/admin/surfaces/layouts/layout-editor-client.tsx"],"names":[],"mappings":"AA2BA,OAAO,EAA4C,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAE5F,UAAU,uBAAuB;IAC/B,6DAA6D;IAC7D,MAAM,CAAC,EAAE,SAAS,CAAA;CACnB;AAED,wBAAgB,kBAAkB,CAAC,EAAE,MAAM,EAAE,EAAE,uBAAuB,2CAkHrE"}
+{"version":3,"file":"layout-editor-client.d.ts","sourceRoot":"","sources":["../../../../src/admin/surfaces/layouts/layout-editor-client.tsx"],"names":[],"mappings":"AA2BA,OAAO,EAA4C,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAE5F,UAAU,uBAAuB;IAC/B,6DAA6D;IAC7D,MAAM,CAAC,EAAE,SAAS,CAAA;CACnB;AAED,wBAAgB,kBAAkB,CAAC,EAAE,MAAM,EAAE,EAAE,uBAAuB,2CA6HrE"}

package/dist/admin/surfaces/layouts/layout-editor-client.js

@@ -58,7 +58,14 @@ export function LayoutEditorClient({ layout }) {
         setError(null);
         if (!name.trim()) {
             setError('A layout name is required before saving.');
-            return;
+            // kywi-cms#142: an explicit `false` is the only way LayoutEditor's
+            // `onSave !== false` contract (layout-editor.tsx ~177-195) reads a save
+            // as failed. Resolving `undefined` here — LayoutEditor's own "treat as
+            // success" default for a caller that reports nothing — let a blank-name
+            // guard rejection dispatch MARK_SAVED anyway, marking the canvas clean
+            // (Save disables, Cancel stops confirming) over an edit that never
+            // reached the server.
+            return false;
         }
         setSaving(true);
         try {
@@ -73,6 +80,10 @@ export function LayoutEditorClient({ layout }) {
         catch (e) {
             setError(e instanceof Error ? e.message : 'Save failed');
             setSaving(false);
+            // Same contract violation as the blank-name branch above: a request
+            // failure must report `false`, not resolve `undefined` into an
+            // optimistic MARK_SAVED.
+            return false;
         }
     }, [name, category, isEdit, layout, navigate, adminFetch]);
     return (_jsxs("div", { className: "kywi-layout-editor-page", children: [_jsxs("div", { className: "kywi-admin-page-header", children: [_jsxs("div", { children: [_jsx("h1", { children: isEdit ? `Edit layout: ${layout.name}` : 'New layout' }), _jsxs("p", { className: "kywi-text-muted", children: ["Build a reusable layout, then click ", _jsx("strong", { children: "Save" }), " in the editor toolbar to persist it."] })] }), _jsx("button", { type: "button", className: "kywi-btn kywi-btn-secondary", onClick: () => navigate('/admin/layouts'), children: "Back to layouts" })] }), error && _jsx(ErrorState, { message: error }), saving && _jsx("p", { className: "kywi-text-muted", role: "status", children: "Saving\u2026" }), _jsxs("div", { className: "kywi-layout-editor-meta", children: [_jsxs("div", { className: "kywi-field", children: [_jsx("label", { htmlFor: "layout-name", className: "kywi-field-label", children: "Layout name" }), _jsx("input", { id: "layout-name", type: "text", className: "kywi-input", value: name, onChange: e => setName(e.target.value), placeholder: "Landing hero + features" })] }), _jsxs("div", { className: "kywi-field", children: [_jsx("label", { htmlFor: "layout-category", className: "kywi-field-label", children: "Category" }), _jsx("input", { id: "layout-category", type: "text", className: "kywi-input", value: category, onChange: e => setCategory(e.target.value), placeholder: "general" })] })] }), _jsx("div", { className: "kywi-layout-editor-host", children: _jsx(LayoutEditor, { initialLayout: initialLayout, contentId: layout?.id ?? 'new', contentType: "layout", moduleRegistry: moduleRegistry, moduleComponents: layoutModuleComponents, audiences: audiences, onSave: persist, onCancel: () => navigate('/admin/layouts') }) })] }));

package/dist/admin/surfaces/layouts/layout-editor-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"layout-editor-client.js","sourceRoot":"","sources":["../../../../src/admin/surfaces/layouts/layout-editor-client.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"layout-editor-client.js","sourceRoot":"","sources":["../../../../src/admin/surfaces/layouts/layout-editor-client.tsx"],"names":[],"mappings":"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"}

package/dist/api/content-routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"content-routes.d.ts","sourceRoot":"","sources":["../../src/api/content-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAgB,MAAM,aAAa,CAAA;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AACpF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAE7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAoCxD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AAEtE,UAAU,mBAAmB;IAC3B,MAAM,EAAE,UAAU,CAAA;IAClB,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;IAC9C,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAA;IACpD,YAAY,EAAE,YAAY,CAAA;IAC1B,OAAO,EAAE,WAAW,CAAA;IACpB,aAAa,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACnC;AAMD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,mBAAmB,GAAG,IAAI,CAixBpF"}
+{"version":3,"file":"content-routes.d.ts","sourceRoot":"","sources":["../../src/api/content-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAgB,MAAM,aAAa,CAAA;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AACpF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAE7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAoCxD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AAEtE,UAAU,mBAAmB;IAC3B,MAAM,EAAE,UAAU,CAAA;IAClB,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;IAC9C,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAA;IACpD,YAAY,EAAE,YAAY,CAAA;IAC1B,OAAO,EAAE,WAAW,CAAA;IACpB,aAAa,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACnC;AAMD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,mBAAmB,GAAG,IAAI,CA6yBpF"}

package/dist/api/content-routes.js

@@ -13,7 +13,7 @@ import { listContent, getContentById, getContentBySlug, createContent, updateCon
 import { getChildren, cascadeSlugPath } from '../db/tree-queries.js';
 import { recordContentVersion } from '../db/version-queries.js';
 import { incrementViews, getStats } from '../db/stats-queries.js';
-import { listDeletedContent, listAllDeletedContent, restoreContentWithRecovery, emptyTrashForSite, emptyTrashGlobal, } from '../db/content-restore.js';
+import { getDeletedContentById, listDeletedContent, listAllDeletedContent, restoreContentWithRecovery, emptyTrashForSite, emptyTrashGlobal, } from '../db/content-restore.js';
 import { syncContentTags } from './tag-usage-wiring.js';
 import { archivePath } from '../db/filename-archive-queries.js';
 async function authenticate(req, authSecret, db) {
@@ -93,9 +93,32 @@ export function registerContentRoutes(router, ctx) {
         const siteDenied = assertSiteAccess(auth.user, siteId);
         if (siteDenied)
             return siteDenied;
+        // Read the row before deleting: it is both the 404 guard and the hook
+        // payload. Without it this route dispatched nothing at all, so the cache
+        // subscribers never ran and the slug-keyed entry kept serving the trashed
+        // row after a delete + recreate (#137). Mirrors the typed DELETE below.
+        const base = await getContentById(db, null, params.id, siteId);
+        if (!base)
+            return notFound('Content not found');
+        // Re-read through the type's custom-field table so hook subscribers get the
+        // same merged shape the typed route hands them (same pattern as the by-id
+        // GET). An unregistered/orphaned content type just means no dispatch — the
+        // delete itself still proceeds (mirrors the by-id publish route).
+        const contentType = getContentType(base.contentTypeName);
+        const customTable = contentType ? customTableMap.get(contentType.name) ?? null : null;
+        const existing = customTable
+            ? (await getContentById(db, customTable, params.id, siteId)) ?? base
+            : base;
+        const dispatch = contentType
+            ? createContentHookDispatcher(contentType, ctx.hookRegistry, { ...ctx.kywiCtx, user: auth.user })
+            : null;
+        if (dispatch)
+            await dispatch.beforeDelete(existing);
         const deleted = await deleteContent(db, params.id, siteId);
         if (!deleted)
             return notFound('Content not found');
+        if (dispatch)
+            await dispatch.afterDelete(existing);
         return jsonOk({ deleted: true });
     });
     // POST /content/by-id/:id/publish — Publish (auth required, publish role)
@@ -175,14 +198,17 @@ export function registerContentRoutes(router, ctx) {
             return forbidden();
         if (!(await checkDocumentMutationAccess(db, params.id, auth.user, 'write')))
             return forbidden();
-        // Fetch the content before restoring so we can pass it to hooks. Both the
-        // fetch and the restore are scoped to the request's resolved site so a
-        // foreign-site id can't be restored by id alone (cross-site guard).
+        // Fetch the content before restoring so we can pass it to hooks. The row is
+        // in the trash, so it has to come from getDeletedContentById — getContentById
+        // filters `deleted_at IS NULL` and always resolved to null here, which meant
+        // the trash hooks (and with them the cache invalidation) never fired (#137).
+        // Both the fetch and the restore are scoped to the request's resolved site
+        // so a foreign-site id can't be restored by id alone (cross-site guard).
         const restoreSiteId = resolveSiteId(req, ctx.config, ctx.siteIdMap);
         const siteDenied = assertSiteAccess(auth.user, restoreSiteId);
         if (siteDenied)
             return siteDenied;
-        const existing = await getContentById(db, null, params.id, restoreSiteId);
+        const existing = await getDeletedContentById(db, params.id, restoreSiteId);
         const { restored, movedToRecovered } = await restoreContentWithRecovery(db, params.id, restoreSiteId);
         if (!restored)
             return notFound('Content not found or not deleted');
@@ -201,14 +227,15 @@ export function registerContentRoutes(router, ctx) {
             return forbidden();
         if (!(await checkDocumentMutationAccess(db, params.id, auth.user, 'delete')))
             return forbidden();
-        // Fetch the content before deleting so we can pass it to hooks. Both the
+        // Fetch the content before deleting so we can pass it to hooks — from the
+        // trash, for the same reason as the restore route above (#137). Both the
         // fetch and the permanent delete are scoped to the request's resolved site so
         // a foreign-site id can't be purged by id alone (cross-site guard).
         const permSiteId = resolveSiteId(req, ctx.config, ctx.siteIdMap);
         const siteDenied = assertSiteAccess(auth.user, permSiteId);
         if (siteDenied)
             return siteDenied;
-        const existing = await getContentById(db, null, params.id, permSiteId);
+        const existing = await getDeletedContentById(db, params.id, permSiteId);
         const deleted = await permanentDeleteContent(db, params.id, permSiteId);
         if (!deleted)
             return notFound('Content not found or not in trash');