Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
feat(sheets): drag sheet tabs to reorder them (#7685)
teob78acf68fd24
diff --git a/apps/web/src/features/block-spreadsheet/README.md b/apps/web/src/features/block-spreadsheet/README.mdindex 5f483b50fc..7c2c7e0e6e 100644--- a/apps/web/src/features/block-spreadsheet/README.md+++ b/apps/web/src/features/block-spreadsheet/README.md@@ -137,7 +137,13 @@ the same sheet prefix. `spreadsheetSheetNames`, `spreadsheetSheetOrder`, andsheet keeps independent cells, formatting, and layout. Active tabs and rememberedselections are local; presence includes a sheet ID and shows only on that sheet.-Adding, renaming, duplicating, and deleting sheets participate in local undo.+Dragging a tab with a mouse or pen moves its sheet; touch presses keep+scrolling the tab strip, and every tab menu offers **Move left** and **Move+right**. A move writes only the moved sheet's order, between its new neighbors,+so collaborators moving other sheets at the same time keep both moves. Sheets+whose orders tie are renumbered.++Adding, renaming, duplicating, moving, and deleting sheets participate in local undo.Duplicate copies raw formulas, styles, and layout at the same coordinates.Deletion retains the sheet's CRDT data so undo can recover it and concurrentedits. The last visible sheet cannot be deleted locally; simultaneous deletesdiff --git a/apps/web/src/features/block-spreadsheet/browser-test/spreadsheet.browser.e2e.ts b/apps/web/src/features/block-spreadsheet/browser-test/spreadsheet.browser.e2e.tsindex 6ad7b8cf36..90d168210a 100644--- a/apps/web/src/features/block-spreadsheet/browser-test/spreadsheet.browser.e2e.ts+++ b/apps/web/src/features/block-spreadsheet/browser-test/spreadsheet.browser.e2e.ts@@ -697,6 +697,49 @@ test('double-click renames tabs and right-click actions target the clicked sheet).toBeDisabled();});+test('dragging a tab reorders sheets, keeps formulas, and undoes', async ({+ page,+}) => {+ const add = page.getByRole('button', { name: 'Add sheet', exact: true });+ await add.click();+ await edit(page, 'A1', '=Sheet1!B4*2');+ await add.click();+ const tabs = page.getByRole('tab');+ await expect(tabs).toHaveText(['Sheet1', 'Sheet2', 'Sheet3']);++ const tab = (name: string) => page.getByRole('tab', { name, exact: true });+ const first = await tab('Sheet1').boundingBox();+ const third = await tab('Sheet3').boundingBox();+ if (!first || !third) throw new Error('Tabs are not laid out.');+ await page.mouse.move(first.x + first.width / 2, first.y + first.height / 2);+ await page.mouse.down();+ await page.mouse.move(third.x + third.width - 4, third.y + 4, { steps: 8 });+ await expect(page.locator('[data-sheet-drop-indicator]')).toHaveCount(1);+ await page.mouse.up();+ await expect(tabs).toHaveText(['Sheet2', 'Sheet3', 'Sheet1']);+ await expect(tab('Sheet1')).toHaveAttribute('aria-selected', 'true');+ await expect(page.locator('[data-address="B4"]')).toHaveText('30');++ await tab('Sheet2').click();+ await expect(page.locator('[data-address="A1"]')).toHaveText('60');+ await page.keyboard.press('ControlOrMeta+z');+ await expect(tabs).toHaveText(['Sheet1', 'Sheet2', 'Sheet3']);++ await tab('Sheet3').click({ button: 'right' });+ await page.getByRole('menuitem', { name: 'Move left', exact: true }).click();+ await expect(tabs).toHaveText(['Sheet1', 'Sheet3', 'Sheet2']);+ await expect(tab('Sheet3')).toBeFocused();++ await page.evaluate(() => window.spreadsheetFixture.setReadonly(true));+ const before = await tab('Sheet1').boundingBox();+ if (!before) throw new Error('Tabs are not laid out.');+ await page.mouse.move(before.x + 8, before.y + 8);+ await page.mouse.down();+ await page.mouse.move(before.x + 400, before.y + 8, { steps: 8 });+ await page.mouse.up();+ await expect(tabs).toHaveText(['Sheet1', 'Sheet3', 'Sheet2']);+});+test('imports, edits and exports an independent financial workbook using real workers', async ({page,}) => {diff --git a/apps/web/src/features/block-spreadsheet/components/SpreadsheetSheetTabs.test.tsx b/apps/web/src/features/block-spreadsheet/components/SpreadsheetSheetTabs.test.tsxindex 19f7ee5ff0..e45539edcc 100644--- a/apps/web/src/features/block-spreadsheet/components/SpreadsheetSheetTabs.test.tsx+++ b/apps/web/src/features/block-spreadsheet/components/SpreadsheetSheetTabs.test.tsx@@ -41,6 +41,7 @@ function tabs(overrides: Partial<SpreadsheetSheetTabsProps> = {}) {const onRename = vi.fn();const onDuplicate = vi.fn();const onDelete = vi.fn();+ const onMove = vi.fn();const view = render(() => (<SpreadsheetSheetTabssheets={[@@ -56,10 +57,57 @@ function tabs(overrides: Partial<SpreadsheetSheetTabsProps> = {}) {onRename={onRename}onDuplicate={onDuplicate}onDelete={onDelete}+ onMove={onMove}{...overrides}/>));- return { ...view, active, onSelect, onAdd, onRename, onDuplicate, onDelete };+ return {+ ...view,+ active,+ onSelect,+ onAdd,+ onRename,+ onDuplicate,+ onDelete,+ onMove,+ };+}++/** Lay the tabs out 100px apart, as jsdom has no layout. */+function layOutTabs(view: ReturnType<typeof tabs>) {+ for (const [index, tab] of view.getAllByRole('tab').entries())+ tab.getBoundingClientRect = () =>+ DOMRect.fromRect({ x: index * 100, y: 0, width: 100, height: 30 });+}++/** jsdom has no PointerEvent; a mouse event carries the pointer fields. */+function pointer(+ target: Element | Window,+ type: 'pointerdown' | 'pointermove' | 'pointerup',+ clientX: number,+ pointerType: 'mouse' | 'touch' = 'mouse'+) {+ const event = new MouseEvent(type, {+ bubbles: true,+ cancelable: true,+ button: 0,+ clientX,+ });+ Object.defineProperties(event, {+ pointerId: { value: 1 },+ pointerType: { value: pointerType },+ });+ fireEvent(target, event);+}++function drag(+ tab: HTMLElement,+ toX: number,+ pointerType: 'mouse' | 'touch' = 'mouse'+) {+ pointer(tab, 'pointerdown', 150, pointerType);+ pointer(window, 'pointermove', toX, pointerType);+ pointer(window, 'pointerup', toX, pointerType);}describe('spreadsheet sheet tabs', () => {@@ -87,6 +135,111 @@ describe('spreadsheet sheet tabs', () => {expect(view.active()).toBe('sales');});+ it('drags a tab to the insertion point under the pointer and selects it', () => {+ const view = tabs();+ layOutTabs(view);+ const sales = view.getByRole('tab', { name: 'Sales' });+ pointer(sales, 'pointerdown', 150);+ pointer(window, 'pointermove', 290);+ expect(+ document.querySelectorAll('[data-sheet-drop-indicator]')+ ).toHaveLength(1);+ expect(sales.classList.contains('opacity-60')).toBe(true);+ pointer(window, 'pointerup', 290);+ expect(view.onMove).toHaveBeenCalledWith('sales', 2);+ expect(view.active()).toBe('sales');+ expect(document.querySelector('[data-sheet-drop-indicator]')).toBeNull();+ drag(view.getByRole('tab', { name: 'Sales' }), 10);+ expect(view.onMove).toHaveBeenLastCalledWith('sales', 0);+ });++ it('ignores drops in place, touch presses, and viewers', () => {+ const [readonly, setReadonly] = createSignal(false);+ const view = tabs({+ get readonly() {+ return readonly();+ },+ });+ layOutTabs(view);+ const sales = view.getByRole('tab', { name: 'Sales' });+ drag(sales, 160);+ drag(sales, 220);+ drag(sales, 290, 'touch');+ setReadonly(true);+ drag(sales, 290);+ expect(view.onMove).not.toHaveBeenCalled();+ });++ it.each(['readonly', 'preserveEditorFocus'] as const)(+ 'drops nothing when %s turns on during a drag',+ (guard) => {+ const [enabled, setEnabled] = createSignal(false);+ const view = tabs({+ get readonly() {+ return guard === 'readonly' && enabled();+ },+ get preserveEditorFocus() {+ return guard === 'preserveEditorFocus' && enabled();+ },+ });+ layOutTabs(view);+ pointer(view.getByRole('tab', { name: 'Sales' }), 'pointerdown', 150);+ pointer(window, 'pointermove', 290);+ setEnabled(true);+ pointer(window, 'pointerup', 290);+ expect(view.onMove).not.toHaveBeenCalled();+ expect(view.onSelect).not.toHaveBeenCalled();+ expect(document.querySelector('[data-sheet-drop-indicator]')).toBeNull();+ }+ );++ it.each([+ ['Move left', 'budget'],+ ['Move right', 'forecast'],+ ] as const)(+ '%s from the tab menu moves the right-clicked sheet',+ async (label, edge) => {+ const view = tabs();+ fireEvent.contextMenu(view.getByRole('tab', { name: 'Sales' }));+ fireEvent.keyDown(await screen.findByRole('menuitem', { name: label }), {+ key: 'Enter',+ });+ await waitFor(() =>+ expect(view.onMove).toHaveBeenCalledWith(+ 'sales',+ label === 'Move left' ? 0 : 2+ )+ );+ view.onMove.mockClear();+ fireEvent.contextMenu(+ view.getByRole('tab', {+ name: edge === 'budget' ? 'Budget' : 'Forecast',+ })+ );+ const item = await screen.findByRole('menuitem', { name: label });+ await waitFor(() =>+ expect(item.getAttribute('aria-disabled')).toBe('true')+ );+ }+ );++ it('moves the active sheet from the sheet actions menu', async () => {+ const view = tabs();+ fireEvent.keyDown(+ view.getByRole('button', { name: 'Sheet actions for Budget' }),+ { key: 'ArrowDown' }+ );+ expect(+ (await screen.findByRole('menuitem', { name: 'Move left' })).getAttribute(+ 'aria-disabled'+ )+ ).toBe('true');+ fireEvent.keyDown(screen.getByRole('menuitem', { name: 'Move right' }), {+ key: 'Enter',+ });+ expect(view.onMove).toHaveBeenCalledWith('budget', 1);+ });+it('opens rename for the double-clicked tab and prevents viewer renames', () => {const [readonly, setReadonly] = createSignal(false);const view = tabs({diff --git a/apps/web/src/features/block-spreadsheet/components/SpreadsheetSheetTabs.tsx b/apps/web/src/features/block-spreadsheet/components/SpreadsheetSheetTabs.tsxindex 7bd6d6d204..c792806ba1 100644--- a/apps/web/src/features/block-spreadsheet/components/SpreadsheetSheetTabs.tsx+++ b/apps/web/src/features/block-spreadsheet/components/SpreadsheetSheetTabs.tsx@@ -1,6 +1,8 @@import { ContextMenuContent, MenuItem } from '@core/component/ContextMenu';import { isMobileWidth } from '@core/mobile/mobileWidth';import { ContextMenu } from '@kobalte/core/context-menu';+import ArrowLeft from '@phosphor/arrow-left.svg';+import ArrowRight from '@phosphor/arrow-right.svg';import CaretDown from '@phosphor/caret-down.svg';import Copy from '@phosphor/copy.svg';import Pencil from '@phosphor/pencil-simple.svg';@@ -9,7 +11,12 @@ import Trash from '@phosphor/trash-simple.svg';import { Button } from '@ui/components/Button';import { Dropdown } from '@ui/components/Dropdown';import { Tooltip } from '@ui/components/Tooltip';-import { createEffect, For, on, onCleanup, Show } from 'solid-js';+import { createEffect, createSignal, For, on, onCleanup, Show } from 'solid-js';++/** Pointer travel before a press on a tab becomes a drag. */+const DRAG_THRESHOLD = 4;+/** Distance from the tab strip's edge that scrolls it during a drag. */+const DRAG_SCROLL_EDGE = 24;export type SpreadsheetSheetTabsProps = {sheets: { id: string; name: string }[];@@ -22,6 +29,8 @@ export type SpreadsheetSheetTabsProps = {onRename: (id: string) => void;onDuplicate: (id: string) => void;onDelete: (id: string) => void;+ /** Move a sheet to `index` in `sheets`. */+ onMove: (id: string, index: number) => void;onAddRows?: () => void;addRowsLabel?: string;};@@ -29,7 +38,14 @@ export type SpreadsheetSheetTabsProps = {function SheetActions(props: SpreadsheetSheetTabsProps) {const active = () =>props.sheets.find((sheet) => sheet.id === props.activeSheetId);+ const activeIndex = () =>+ props.sheets.findIndex((sheet) => sheet.id === props.activeSheetId);let pendingAction: (() => void) | undefined;+ function move(offset: number) {+ const sheet = active();+ if (sheet && !props.readonly)+ props.onMove(sheet.id, activeIndex() + offset);+ }function defer(action: (id: string) => void) {const sheet = active();@@ -78,6 +94,28 @@ function SheetActions(props: SpreadsheetSheetTabsProps) {Duplicate</Dropdown.Item></Dropdown.Group>+ <Dropdown.Group>+ <Dropdown.Item+ closeOnSelect+ disabled={props.readonly || activeIndex() <= 0}+ onSelect={() => move(-1)}+ >+ <ArrowLeft class="size-4" />+ Move left+ </Dropdown.Item>+ <Dropdown.Item+ closeOnSelect+ disabled={+ props.readonly ||+ activeIndex() < 0 ||+ activeIndex() >= props.sheets.length - 1+ }+ onSelect={() => move(1)}+ >+ <ArrowRight class="size-4" />+ Move right+ </Dropdown.Item>+ </Dropdown.Group><Show when={props.onAddRows && isMobileWidth()}><Dropdown.Group><Dropdown.Item@@ -111,6 +149,97 @@ function SheetActions(props: SpreadsheetSheetTabsProps) {/** Workbook navigation stays local; the owner supplies mutations and dialogs. */export function SpreadsheetSheetTabs(props: SpreadsheetSheetTabsProps) {const buttons = new Map<string, HTMLButtonElement>();+ let list: HTMLDivElement | undefined;+ const [dragging, setDragging] = createSignal<string>();+ /** Insertion point among the tabs, from 0 to `sheets.length`. */+ const [dropAt, setDropAt] = createSignal<number>();+ let endDrag: (() => void) | undefined;+ onCleanup(() => endDrag?.());++ const indexOf = (id: string) =>+ props.sheets.findIndex((sheet) => sheet.id === id);+ /** The moved sheet's resulting index, or undefined when it stays put. */+ const target = (id: string, at: number) => {+ const from = indexOf(id);+ if (from < 0) return;+ const to = at > from ? at - 1 : at;+ return to === from ? undefined : to;+ };+ const showDrop = (at: number) => {+ const id = dragging();+ return id !== undefined && dropAt() === at && target(id, at) !== undefined;+ };++ function move(id: string, index: number) {+ if (props.readonly) return;+ props.onMove(id, index);+ const button = buttons.get(id);+ button?.focus({ preventScroll: true });+ button?.scrollIntoView({ block: 'nearest', inline: 'nearest' });+ }++ function insertionPoint(clientX: number) {+ const index = props.sheets.findIndex((sheet) => {+ const rect = buttons.get(sheet.id)?.getBoundingClientRect();+ return rect && clientX < rect.left + rect.width / 2;+ });+ return index < 0 ? props.sheets.length : index;+ }++ /** Mouse and pen presses drag; touch keeps scrolling the strip. Window+ * listeners survive the tab remounting while it is dragged. */+ function startDrag(event: PointerEvent, id: string) {+ if (+ event.button !== 0 ||+ event.pointerType === 'touch' ||+ props.readonly ||+ props.preserveEditorFocus ||+ props.sheets.length < 2+ )+ return;+ endDrag?.();+ const startX = event.clientX;+ const pointerId = event.pointerId;+ const onMove = (moved: PointerEvent) => {+ if (moved.pointerId !== pointerId) return;+ if (!dragging()) {+ if (Math.abs(moved.clientX - startX) < DRAG_THRESHOLD) return;+ setDragging(id);+ }+ moved.preventDefault();+ if (list) {+ const rect = list.getBoundingClientRect();+ if (moved.clientX < rect.left + DRAG_SCROLL_EDGE)+ list.scrollLeft -= DRAG_SCROLL_EDGE / 2;+ else if (moved.clientX > rect.right - DRAG_SCROLL_EDGE)+ list.scrollLeft += DRAG_SCROLL_EDGE / 2;+ }+ setDropAt(insertionPoint(moved.clientX));+ };+ const onUp = (released: PointerEvent) => {+ if (released.pointerId !== pointerId) return;+ const at = dragging() === undefined ? undefined : dropAt();+ finish();+ // Permission or formula reference picking can change mid-drag.+ if (at === undefined || props.readonly || props.preserveEditorFocus)+ return;+ const to = target(id, at);+ if (to !== undefined) props.onMove(id, to);+ props.onSelect(id);+ };+ const finish = () => {+ window.removeEventListener('pointermove', onMove);+ window.removeEventListener('pointerup', onUp);+ window.removeEventListener('pointercancel', finish);+ setDragging();+ setDropAt();+ endDrag = undefined;+ };+ window.addEventListener('pointermove', onMove);+ window.addEventListener('pointerup', onUp);+ window.addEventListener('pointercancel', finish);+ endDrag = finish;+ }createEffect(on(@@ -153,13 +282,14 @@ export function SpreadsheetSheetTabs(props: SpreadsheetSheetTabsProps) {<Plus class="size-4" /></Button><div+ ref={list}role="tablist"aria-label="Workbook sheets"aria-orientation="horizontal"class="flex h-full min-w-0 flex-1 items-stretch overflow-x-auto overflow-y-hidden overscroll-x-contain touch:touch-pan-x"><For each={props.sheets}>- {(sheet) => {+ {(sheet, index) => {let pendingAction: (() => void) | undefined;const defer = (action: (id: string) => void) => {if (props.readonly) return;@@ -191,16 +321,18 @@ export function SpreadsheetSheetTabs(props: SpreadsheetSheetTabsProps) {role="tab"aria-selected={props.activeSheetId === sheet.id}tabIndex={props.activeSheetId === sheet.id ? 0 : -1}- class="h-full max-w-44 shrink-0 touch:min-w-[44px] truncate border-b-2 px-3 text-[13px] outline-none hover:bg-hover focus-visible:ring-1 focus-visible:ring-inset focus-visible:ring-accent"+ class="relative h-full max-w-44 shrink-0 touch:min-w-[44px] truncate border-b-2 px-3 text-[13px] outline-none hover:bg-hover focus-visible:ring-1 focus-visible:ring-inset focus-visible:ring-accent"classList={{'border-accent bg-accent-bg text-accent':props.activeSheetId === sheet.id,'border-transparent text-ink-muted':props.activeSheetId !== sheet.id,+ 'opacity-60': dragging() === sheet.id,}}onPointerDown={(event) => {if (props.preserveEditorFocus && event.button === 0)event.preventDefault();+ startDrag(event, sheet.id);}}onMouseDown={(event) => {if (props.preserveEditorFocus && event.button === 0)@@ -213,6 +345,23 @@ export function SpreadsheetSheetTabs(props: SpreadsheetSheetTabsProps) {onKeyDown={(event) => navigate(event, sheet.id)}>{sheet.name}+ <Show when={showDrop(index())}>+ <span+ data-sheet-drop-indicator+ class="absolute inset-y-1 left-0 w-0.5 rounded bg-accent"+ />+ </Show>+ <Show+ when={+ index() === props.sheets.length - 1 &&+ showDrop(props.sheets.length)+ }+ >+ <span+ data-sheet-drop-indicator+ class="absolute inset-y-1 right-0 w-0.5 rounded bg-accent"+ />+ </Show></ContextMenu.Trigger></Tooltip><ContextMenu.Portal>@@ -241,6 +390,23 @@ export function SpreadsheetSheetTabs(props: SpreadsheetSheetTabsProps) {onClick={() => defer(props.onDuplicate)}/><ContextMenu.Separator class="my-1 border-t border-edge-muted" />+ <MenuItem+ text="Move left"+ icon={ArrowLeft}+ disabled={props.readonly || index() <= 0}+ closeOnSelect+ onClick={() => defer((id) => move(id, indexOf(id) - 1))}+ />+ <MenuItem+ text="Move right"+ icon={ArrowRight}+ disabled={+ props.readonly || index() >= props.sheets.length - 1+ }+ closeOnSelect+ onClick={() => defer((id) => move(id, indexOf(id) + 1))}+ />+ <ContextMenu.Separator class="my-1 border-t border-edge-muted" /><MenuItemtext="Delete"icon={Trash}diff --git a/apps/web/src/features/block-spreadsheet/primitives/create-spreadsheet-store.test.ts b/apps/web/src/features/block-spreadsheet/primitives/create-spreadsheet-store.test.tsindex 7d5744aba7..c65ca3b1f1 100644--- a/apps/web/src/features/block-spreadsheet/primitives/create-spreadsheet-store.test.ts+++ b/apps/web/src/features/block-spreadsheet/primitives/create-spreadsheet-store.test.ts@@ -12,6 +12,8 @@ import {import {addSpreadsheetSheet,deleteSpreadsheetSheet,+ moveSpreadsheetSheet,+ readSpreadsheetSheets,} from '../core/workbook-document';import { createSpreadsheetStore } from './create-spreadsheet-store';@@ -176,6 +178,79 @@ describe('spreadsheet store', () => {doc.free();});+ it('moves sheets as undoable steps that merge with a collaborator moving another sheet', async () => {+ const doc = new LoroDoc();+ const peer = new LoroDoc();+ const b = addSpreadsheetSheet(doc, 'B');+ const c = addSpreadsheetSheet(doc, 'C');+ const d = addSpreadsheetSheet(doc, 'D');+ let dispose = () => {};+ const store = createRoot((cleanup) => {+ dispose = cleanup;+ return createSpreadsheetStore({+ canEdit: () => true,+ source: {+ doc: () => doc,+ ready: () => true,+ error: () => undefined,+ status: () => 'connected',+ peers: () => [],+ setSelection: () => {},+ },+ });+ });+ await Promise.resolve();+ const names = () => store.sheets().map((sheet) => sheet.name);+ store.moveSheet(d, 0);+ expect(names()).toEqual(['D', 'Sheet1', 'B', 'C']);+ store.moveSheet(DEFAULT_SHEET_ID, 3);+ expect(names()).toEqual(['D', 'B', 'C', 'Sheet1']);+ store.undo();+ expect(names()).toEqual(['D', 'Sheet1', 'B', 'C']);+ store.redo();+ expect(names()).toEqual(['D', 'B', 'C', 'Sheet1']);+ store.moveSheet(b, 1);+ expect(names()).toEqual(['D', 'B', 'C', 'Sheet1']);++ peer.import(doc.export({ mode: 'snapshot' }));+ moveSpreadsheetSheet(peer, c, 0);+ store.moveSheet(DEFAULT_SHEET_ID, 1);+ doc.import(peer.export({ mode: 'update' }));+ peer.import(doc.export({ mode: 'update' }));+ expect(names()).toEqual(['C', 'D', 'Sheet1', 'B']);+ expect(readSpreadsheetSheets(peer).map((sheet) => sheet.name)).toEqual(+ names()+ );+ dispose();+ peer.free();+ doc.free();+ });++ it('renumbers sheets whose orders tie when moving between them', () => {+ const doc = new LoroDoc();+ const b = addSpreadsheetSheet(doc, 'B');+ const c = addSpreadsheetSheet(doc, 'C');+ const order = doc.getMap('spreadsheetSheetOrder');+ order.set(b, 5);+ order.set(c, 5);+ doc.commit();+ // Equal orders sort by sheet id.+ const [, first, second] = readSpreadsheetSheets(doc).map(+ (sheet) => sheet.name+ );+ moveSpreadsheetSheet(doc, DEFAULT_SHEET_ID, 1);+ expect(readSpreadsheetSheets(doc).map((sheet) => sheet.name)).toEqual([+ first,+ 'Sheet1',+ second,+ ]);+ expect(Object.values(order.toJSON()).sort()).toEqual([0, 1, 2]);+ expect(() => moveSpreadsheetSheet(doc, 'missing', 0)).toThrow(+ 'no longer exists'+ );+ doc.free();+ });+it.each(['readonly', 'hydrating'] as const)('does not revive a retained fallback while %s',async (state) => {@@ -206,6 +281,7 @@ describe('spreadsheet store', () => {store.renameSheet(DEFAULT_SHEET_ID, 'Blocked');store.addSheet('Blocked');store.duplicateSheet(DEFAULT_SHEET_ID);+ store.moveSheet(DEFAULT_SHEET_ID, 1);store.undo();expect(doc.version().toJSON()).toEqual(version);expect(doc.getMap('spreadsheetDeletedSheets').get(DEFAULT_SHEET_ID)).toBe(diff --git a/apps/web/src/features/block-spreadsheet/primitives/create-spreadsheet-store.ts b/apps/web/src/features/block-spreadsheet/primitives/create-spreadsheet-store.tsindex 91038c166e..b0b083dfef 100644--- a/apps/web/src/features/block-spreadsheet/primitives/create-spreadsheet-store.ts+++ b/apps/web/src/features/block-spreadsheet/primitives/create-spreadsheet-store.ts@@ -55,6 +55,7 @@ import {addSpreadsheetSheet,deleteSpreadsheetSheet,duplicateSpreadsheetSheet,+ moveSpreadsheetSheet,prepareSpreadsheetImport,readSpreadsheetImages,readSpreadsheetWorkbook,@@ -560,6 +561,12 @@ export function createSpreadsheetStore(options: {renameSpreadsheetSheet(doc, id, name);refresh();},+ moveSheet(id: string, index: number) {+ const doc = options.source.doc();+ if (!doc || !editable()) return;+ moveSpreadsheetSheet(doc, id, index);+ refresh();+ },duplicateSheet(id: string) {const doc = options.source.doc();if (!doc || !editable()) return;diff --git a/apps/web/src/features/block-spreadsheet/primitives/create-workbook-actions.ts b/apps/web/src/features/block-spreadsheet/primitives/create-workbook-actions.tsindex 1672e267f6..fb882e16b1 100644--- a/apps/web/src/features/block-spreadsheet/primitives/create-workbook-actions.ts+++ b/apps/web/src/features/block-spreadsheet/primitives/create-workbook-actions.ts@@ -234,5 +234,7 @@ export function createWorkbookActions(options: {addSheet: () => changeSheet(() => options.store.addSheet()),duplicateSheet: (id: string) =>changeSheet(() => options.store.duplicateSheet(id)),+ moveSheet: (id: string, index: number) =>+ changeSheet(() => options.store.moveSheet(id, index)),};}diff --git a/apps/web/src/features/block-spreadsheet/views/SpreadsheetEditor.tsx b/apps/web/src/features/block-spreadsheet/views/SpreadsheetEditor.tsxindex ae02f98bc2..95fb8291ea 100644--- a/apps/web/src/features/block-spreadsheet/views/SpreadsheetEditor.tsx+++ b/apps/web/src/features/block-spreadsheet/views/SpreadsheetEditor.tsx@@ -1022,6 +1022,7 @@ export function SpreadsheetEditor(props: {});}}onDelete={(id) => workbookActions.openSheetDialog('delete', id)}+ onMove={workbookActions.moveSheet}onAddRows={editable() && props.store.rowCount() < SPREADSHEET_MAX_ROWS? () => {diff --git a/docs/AGENT_GUIDE/documents.md b/docs/AGENT_GUIDE/documents.mdindex bbc7b3650e..fa769dc01f 100644--- a/docs/AGENT_GUIDE/documents.md+++ b/docs/AGENT_GUIDE/documents.md@@ -326,8 +326,11 @@ calculated values. Clipboard menu actions use the browser clipboard; if access iunavailable, use Cmd/Ctrl+V or Cmd/Ctrl+Shift+V in the grid.Use **+** in the footer to add a sheet, select its tab to switch, and open the-adjacent sheet menu to rename, duplicate, or delete. Double-click a tab to rename it,-or right-click any tab for its Rename, Duplicate, and Delete actions. Sheet operations can be undone;+adjacent sheet menu to rename, duplicate, move, or delete. Double-click a tab to rename it,+or right-click any tab for its Rename, Duplicate, Move left, Move right, and Delete actions.+Drag a tab with the mouse to reorder sheets; a vertical accent bar marks where it will+land, and the dragged sheet becomes active. Touch drags scroll the tab strip instead,+so use Move left/right there. Sheet operations can be undone;the last sheet cannot be deleted. Each sheet remembers its selection. Tab navigationsupports Left/Right and Home/End; a view-only user can switch tabs and copy cells.Adding or duplicating a sheet focuses its grid so typing immediately edits the new sheet.diff --git a/packages/spreadsheet/src/spreadsheet-sheet-registry.ts b/packages/spreadsheet/src/spreadsheet-sheet-registry.tsindex d888bffb18..748ccb4b60 100644--- a/packages/spreadsheet/src/spreadsheet-sheet-registry.ts+++ b/packages/spreadsheet/src/spreadsheet-sheet-registry.ts@@ -77,6 +77,13 @@ function readRetainedIdentities(doc: LoroDoc): Map<string, RetainedIdentity> {/** Registry defaults never write state, so opening a legacy sheet is read-only. */export function readSpreadsheetSheets(doc: LoroDoc): SpreadsheetSheet[] {+ return readOrderedSheets(doc).map(({ id, name }) => ({ id, name }));+}++/** Visible sheets with the order value each one sorts by. */+export function readOrderedSheets(+ doc: LoroDoc+): (SpreadsheetSheet & { order: number })[] {const names = doc.getMap('spreadsheetSheetNames').toJSON();const order = doc.getMap('spreadsheetSheetOrder').toJSON();const deleted = doc.getMap('spreadsheetDeletedSheets').toJSON();@@ -125,7 +132,7 @@ export function readSpreadsheetSheets(doc: LoroDoc): SpreadsheetSheet[] {const visible = live.length ? live : candidates.slice(0, 1);const reserved = new Set(visible.map((sheet) => sheet.name.toLowerCase()));const assigned = new Set<string>();- return visible.map(({ id, name }) => {+ return visible.map(({ id, name, order: sheetOrder }) => {let unique = name;let suffix = 2;if (assigned.has(unique.toLowerCase())) {@@ -138,7 +145,7 @@ export function readSpreadsheetSheets(doc: LoroDoc): SpreadsheetSheet[] {);}assigned.add(unique.toLowerCase());- return { id, name: unique };+ return { id, name: unique, order: sheetOrder };});}diff --git a/packages/spreadsheet/src/workbook-document.ts b/packages/spreadsheet/src/workbook-document.tsindex 69e5352204..c1399b85e4 100644--- a/packages/spreadsheet/src/workbook-document.ts+++ b/packages/spreadsheet/src/workbook-document.ts@@ -38,6 +38,7 @@ import {} from './spreadsheet-document';import {+ readOrderedSheets,readSpreadsheetSheets,retainSpreadsheetSheets,reviveSpreadsheetFallback,@@ -173,6 +174,47 @@ export function renameSpreadsheetSheet(doc.commit({ origin: 'spreadsheet-sheet-rename' });}+/**+ * Move a sheet to `index` among the visible sheets. Only the moved sheet's+ * order changes, to a value between its new neighbors, so concurrent moves of+ * different sheets compose; neighbors without a gap are renumbered.+ */+export function moveSpreadsheetSheet(+ doc: LoroDoc,+ sheetId: string,+ index: number+) {+ const sheets = readOrderedSheets(doc);+ const from = sheets.findIndex((sheet) => sheet.id === sheetId);+ if (from < 0) throw new Error('This sheet no longer exists.');+ const to = Math.max(0, Math.min(sheets.length - 1, Math.trunc(index)));+ if (to === from) return;+ const others = sheets.filter((sheet) => sheet.id !== sheetId);+ const before = others[to - 1]?.order;+ const after = others[to]?.order;+ const order =+ before === undefined+ ? after! - 1+ : after === undefined+ ? before + 1+ : before + (after - before) / 2;+ reviveSpreadsheetFallback(doc, sheetId);+ const orders = doc.getMap('spreadsheetSheetOrder');+ if (+ Number.isFinite(order) &&+ (before === undefined || order > before) &&+ (after === undefined || order < after)+ )+ orders.set(sheetId, order);+ else {+ others.splice(to, 0, sheets[from]);+ for (const [position, sheet] of others.entries())+ if (orders.get(sheet.id) !== position) orders.set(sheet.id, position);+ }+ retainSpreadsheetSheets(doc, sheetId);+ doc.commit({ origin: 'spreadsheet-sheet-move' });+}+/*** The values of the deleted sheet's cells a chart reference reads, written* as fixed values: a series of numbers for values and x values, text