From 9ede1f079a545cbc215d91ba09b4d1bc2a0b99ee Mon Sep 17 00:00:00 2001 From: Adam Malczewski Date: Mon, 7 Sep 2026 17:45:57 +0900 Subject: feat(workspaces): reserve the append canvas for the whole drag — no scrollbar change mid-drag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously the grid kept `width: max-content` during a drag, so the canvas grew/shrunk as the preview placed the tile at each hovered cell — the scrollbar resized mid-drag, making placement harder. Now the moment a drag starts the grid's growth axis becomes a FIXED reservation: the append limit (committed content edge + 3, span-aware) computed at drag start, so the 3 spaces "pop in" immediately, the scroller size is constant for the entire gesture, and the unused reservation disappears when the drag ends (the canvas returns to max-content / auto). The dragged tile's span room is included so its body always stays inside the reserved canvas. Also: the scroll-measure effect now tracks `dragging`, so canPan and the scroll indicator re-measure when the reservation appears and disappears. Test: the drag test now asserts the grid's style is a fixed px width while dragging (never max-content) and back to max-content after the drop. (This caught a missing `px` unit that would have silently voided the reservation.) Update the handoff bullet to describe the reservation. Verification: svelte-check 0 errors/0 warnings; vitest 1693/1693; biome clean on touched files; build ok. --- src/features/workspaces/ui/HomeTileGrid.svelte | 56 ++++++++++++++++++------- src/features/workspaces/ui/HomeTileGrid.test.ts | 10 +++++ 2 files changed, 51 insertions(+), 15 deletions(-) (limited to 'src/features') diff --git a/src/features/workspaces/ui/HomeTileGrid.svelte b/src/features/workspaces/ui/HomeTileGrid.svelte index adcdf08..ccbf96b 100644 --- a/src/features/workspaces/ui/HomeTileGrid.svelte +++ b/src/features/workspaces/ui/HomeTileGrid.svelte @@ -317,9 +317,11 @@ } $effect(() => { - // Re-measure when the geometry flips or the content first renders/changes. + // Re-measure when the geometry flips, the content changes, or a drag + // starts/ends (the reserved canvas appears then disappears). void geometry.mode; void placements.length; + void dragging; updateScroll(); }); @@ -342,30 +344,54 @@ // ── Grid + tile styles (the geometry decides; no breakpoint classes) ────── const dragging = $derived(phase.kind === "dragging"); + /** + * The canvas tracks reserved while dragging, on the growth axis: the append + * limit (committed content edge + 3) PLUS the dragged tile's span room — the + * tile may be anchored anywhere in the 3 spaces while its body stays inside + * the reserved canvas. Computed from the COMMITTED layout at drag start, so + * it is CONSTANT for the whole drag — the scroller never resizes mid-drag. + */ + const reservedExtent = $derived( + dragging && draggedPlacement + ? dragAppendLimit(placements, geometry) + + (geometry.mode === "wide" ? draggedPlacement.colSpan : draggedPlacement.rowSpan) - + 1 + : 0, + ); + const gridStyle = $derived.by(() => { + const wide = geometry.mode === "wide"; + // The grid's own size on the growth axis: `max-content` (wide) / auto + // (tall) when idle — the canvas hugs the committed content. While DRAGGING + // it becomes a FIXED reservation (the 3 append spaces + span room), so the + // spaces "show up" at drag start and the scrollbar size never changes + // until the drag ends (then the unused reservation disappears). + const canvas = dragging + ? wide + ? `width: ${reservedExtent * pitchX - geometry.unit.gap}px;` + : `height: ${reservedExtent * pitchY - geometry.unit.gap}px;` + : wide + ? "width: max-content;" + : "height: auto;"; const base = - geometry.mode === "wide" + (wide ? `grid-template-rows: repeat(${geometry.flowRows}, ${geometry.unit.height}px);` + - ` grid-auto-flow: column; grid-auto-columns: ${geometry.unit.width}px;` + - ` gap: ${geometry.unit.gap}px; width: max-content;` + ` grid-auto-flow: column; grid-auto-columns: ${geometry.unit.width}px;` : `grid-template-columns: repeat(${geometry.flowCols}, minmax(0, 1fr));` + - ` grid-auto-flow: row; grid-auto-rows: ${geometry.unit.height}px;` + - ` gap: ${geometry.unit.gap}px;`; + ` grid-auto-flow: row; grid-auto-rows: ${geometry.unit.height}px;`) + + ` gap: ${geometry.unit.gap}px; ${canvas}`; if (!dragging) return base; // The drop-target dots: one faint dot at each unit cell's CENTER, painted - // as a background whose tile is the cell pitch. One extra pitch of padding - // past the content end gives the append-slot a dot too. - const dotSize = - geometry.mode === "wide" ? `${pitchX}px` : `calc(100% / ${geometry.flowCols})`; - const dotX = geometry.mode === "wide" ? geometry.unit.width / 2 : 0; + // as a background whose tile is the cell pitch. The reserved canvas IS the + // append area, so the 3 spaces (and the dragged tile's span room) get dots + // with no extra padding. + const dotSize = wide ? `${pitchX}px` : `calc(100% / ${geometry.flowCols})`; + const dotX = wide ? geometry.unit.width / 2 : 0; const dot = ` background-image: radial-gradient(circle 2.5px,` + ` color-mix(in oklab, var(--color-base-content) 22%, transparent) 98%, transparent 100%);` + ` background-size: ${dotSize} ${pitchY}px;` + - ` background-position: ${dotX}px ${geometry.unit.height / 2}px;` + - (geometry.mode === "wide" - ? ` padding-right: ${pitchX}px;` - : ` padding-bottom: ${pitchY}px;`); + ` background-position: ${dotX}px ${geometry.unit.height / 2}px;`; return base + dot; }); diff --git a/src/features/workspaces/ui/HomeTileGrid.test.ts b/src/features/workspaces/ui/HomeTileGrid.test.ts index d70c673..9f163fd 100644 --- a/src/features/workspaces/ui/HomeTileGrid.test.ts +++ b/src/features/workspaces/ui/HomeTileGrid.test.ts @@ -105,10 +105,18 @@ describe("HomeTileGrid", () => { }); const wrapper = screen.getByRole("button", { name: "Open workspace Workspace A" }); + const grid = container.querySelector(".grid"); // The cell math resolves against the grid element's rect (jsdom: 0s). fireEvent.pointerDown(wrapper, { button: 0, clientX: 10, clientY: 10, pointerType: "mouse" }); fireEvent.pointerMove(wrapper, { clientX: 80, clientY: 40 }); + // While dragging the canvas is a FIXED reservation (content edge + 3, plus + // the dragged tile's span room) — never max-content, so the scroller can't + // resize mid-drag. + const pitchX = WIDE.unit.width + WIDE.unit.gap; + expect(grid?.getAttribute("style")).toContain(`width: ${5 * pitchX - WIDE.unit.gap}px`); + expect(grid?.getAttribute("style")).not.toContain("width: max-content"); + // The dashed landing ghost appears… const ghost = container.querySelector("[aria-hidden='true'].border-dashed"); expect(ghost).not.toBeNull(); @@ -119,6 +127,8 @@ describe("HomeTileGrid", () => { fireEvent.pointerUp(wrapper); // The ghost + follow disappear on drop… expect(container.querySelector("[aria-hidden='true'].border-dashed")).toBeNull(); + // …and the reservation is gone too (the canvas hugs the committed content). + expect(grid?.getAttribute("style")).toContain("width: max-content"); // …and the drop committed a PLACE at the hovered cell (a lands where it // already was — the pointer hovered its own slot; a no-move drop). expect(props.onPlace).toHaveBeenCalledWith("a", { col: 1, row: 1 }); -- cgit v1.2.3