Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

feat(sheets): insert and delete rows and columns in shared workbooks (#7681)

teo44ef02aa5805
diff --git a/apps/web/src/features/block-spreadsheet/browser-test/collaboration.browser.e2e.ts b/apps/web/src/features/block-spreadsheet/browser-test/collaboration.browser.e2e.ts
index 48ef1f913a..986e9b66ce 100644
--- a/apps/web/src/features/block-spreadsheet/browser-test/collaboration.browser.e2e.ts
+++ b/apps/web/src/features/block-spreadsheet/browser-test/collaboration.browser.e2e.ts
@@ -150,6 +150,70 @@ test('connected workbooks insert rows and columns for every collaborator', async
}
});
+test('inserts and deletes columns in a shared workbook while connected', async ({
+ browser,
+}) => {
+ const id = await seedDocument();
+ const contexts = await Promise.all(
+ ['alice', 'bob'].map(() => browser.newContext())
+ );
+ const [alice, bob] = await Promise.all(
+ contexts.map((context) => context.newPage())
+ );
+ try {
+ await openConnected(alice, id, 'alice');
+ await openConnected(bob, id, 'bob');
+ await alice.getByRole('button', { name: 'Add sheet', exact: true }).click();
+ await expect(
+ bob.getByRole('tab', { name: 'Sheet2', exact: true })
+ ).toBeVisible();
+ await bob.getByRole('tab', { name: 'Sheet2', exact: true }).click();
+ const edit = async (address: string, value: string) => {
+ await alice.locator(`[data-address="${address}"]`).dblclick();
+ await alice
+ .getByRole('textbox', { name: `Edit ${address}`, exact: true })
+ .fill(value);
+ await alice.keyboard.press('Enter');
+ };
+ await edit('B2', '7');
+ await edit('C2', '=B2*2');
+ await expect(bob.locator('[data-address="C2"]')).toHaveText('14');
+
+ const columnMenu = async (column: string) => {
+ await alice
+ .getByRole('button', { name: `Select column ${column}`, exact: true })
+ .click({ button: 'right' });
+ };
+ await columnMenu('B');
+ await alice
+ .getByRole('menuitem', { name: 'Insert 1 column left', exact: true })
+ .click();
+ await expect(bob.locator('[data-address="C2"]')).toHaveText('7');
+ await expect(bob.locator('[data-address="D2"]')).toHaveText('14');
+ await expect(bob.locator('[data-address="B2"]')).toHaveText('');
+ await expect
+ .poll(async () => {
+ const sheets = await bob.evaluate(() =>
+ window.spreadsheetFixture.snapshot()
+ );
+ return sheets.find((sheet) => sheet.name === 'Sheet2')?.cells.D2;
+ })
+ .toMatchObject({ value: '=C2*2' });
+
+ await columnMenu('B');
+ await alice
+ .getByRole('menuitem', { name: 'Delete 1 column', exact: true })
+ .click();
+ await expect(bob.locator('[data-address="B2"]')).toHaveText('7');
+ await expect(bob.locator('[data-address="C2"]')).toHaveText('14');
+ await alice.getByRole('grid').press('ControlOrMeta+z');
+ await expect(bob.locator('[data-address="C2"]')).toHaveText('7');
+ await expect(bob.locator('[data-address="D2"]')).toHaveText('14');
+ } finally {
+ await Promise.all(contexts.map((context) => context.close()));
+ }
+});
+
test('live edits, named colored ranges, offline recovery and departing cursors', async ({
browser,
}) => {
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.ts
index c65ca3b1f1..f99e28c3f1 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
@@ -6,6 +6,7 @@ import {
DEFAULT_SHEET_ID,
readSpreadsheetCells,
readSpreadsheetLayout,
+ resizeSpreadsheetColumn,
type SpreadsheetSelection,
writeSpreadsheetCells,
} from '../core/spreadsheet-document';
@@ -67,6 +68,91 @@ describe('spreadsheet store', () => {
doc.free();
});
+ it("rejects a shift prepared before a collaborator's width or layout change", async () => {
+ const doc = new LoroDoc();
+ writeSpreadsheetCells(doc, { A1: { value: 'Name' } });
+ resizeSpreadsheetColumn(doc, 1, 150);
+ 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();
+ store.setMetadata({ hiddenColumns: [1] });
+ const peer = new LoroDoc();
+ peer.import(doc.export({ mode: 'snapshot' }));
+ // Insert a column at A, as the calculation worker would return it.
+ const shift = () => {
+ const before = structuredClone(store.workbook());
+ const next = before.map((sheet) => ({
+ ...sheet,
+ cells: { B1: sheet.cells.A1 },
+ metadata: { ...sheet.metadata, hiddenColumns: [2] },
+ layout: {
+ ...sheet.layout,
+ columnCount: sheet.layout.columnCount + 1,
+ columnWidths: Object.fromEntries(
+ Object.entries(sheet.layout.columnWidths).map(([key, width]) => [
+ Number(key) + 1,
+ width,
+ ])
+ ),
+ },
+ }));
+ return { before, next, revision: store.revision() };
+ };
+ const sync = () => {
+ doc.import(peer.export({ mode: 'update', from: doc.oplogVersion() }));
+ peer.import(doc.export({ mode: 'update', from: peer.oplogVersion() }));
+ };
+
+ let pending = shift();
+ resizeSpreadsheetColumn(peer, 2, 240);
+ sync();
+ expect(() =>
+ store.applyStructure(pending.before, pending.next, pending.revision)
+ ).toThrow('workbook changed');
+ expect(readSpreadsheetLayout(doc).columnWidths[2]).toBe(240);
+ expect(store.cells().A1.value).toBe('Name');
+
+ pending = shift();
+ peer
+ .getMap('spreadsheetSheetMetadata')
+ .set(
+ DEFAULT_SHEET_ID,
+ JSON.stringify({ hiddenColumns: [1], hiddenRows: [4] })
+ );
+ peer.commit();
+ sync();
+ expect(() =>
+ store.applyStructure(pending.before, pending.next, pending.revision)
+ ).toThrow('workbook changed');
+ expect(store.activeSheet().metadata).toEqual({
+ hiddenColumns: [1],
+ hiddenRows: [4],
+ });
+
+ // A shift prepared after both changes moves them with the cells.
+ pending = shift();
+ store.applyStructure(pending.before, pending.next, pending.revision);
+ expect(store.cells().B1.value).toBe('Name');
+ expect(readSpreadsheetLayout(doc).columnWidths[3]).toBe(240);
+ expect(store.activeSheet().metadata?.hiddenRows).toEqual([4]);
+ dispose();
+ peer.free();
+ doc.free();
+ });
+
it('shifts coordinates in a connected workbook and keeps inserted columns', async () => {
const doc = new LoroDoc();
writeSpreadsheetCells(doc, { A1: { value: 'Name' }, B1: { value: '=A1' } });
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.ts
index b0b083dfef..66a8e5ae2a 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
@@ -178,6 +178,29 @@ function sheetLayout(
};
}
+/**
+ * Whether a sheet's layout or metadata changed since `expected` was read, or
+ * the sheet was removed. `revision` counts only cell changes, so a structural
+ * edit checks these too before writing its shifted copies over them.
+ */
+function sheetLayoutChanged(
+ live: SpreadsheetWorkbookSheet[],
+ expected: SpreadsheetWorkbookSheet[]
+) {
+ const sheets = new Map(live.map((sheet) => [sheet.id, sheet]));
+ return expected.some((sheet) => {
+ const current = sheets.get(sheet.id);
+ return (
+ !current ||
+ current.layout.rowCount !== sheet.layout.rowCount ||
+ current.layout.columnCount !== sheet.layout.columnCount ||
+ JSON.stringify(current.layout.columnWidths) !==
+ JSON.stringify(sheet.layout.columnWidths) ||
+ JSON.stringify(current.metadata) !== JSON.stringify(sheet.metadata)
+ );
+ });
+}
+
export function createSpreadsheetStore(options: {
source: SpreadsheetDocumentSource;
canEdit: Accessor<boolean>;
@@ -654,7 +677,10 @@ export function createSpreadsheetStore(options: {
throw new Error('This spreadsheet is view only.');
if (!canShiftCoordinates())
throw new Error('Reconnect to insert or delete rows or columns.');
- if (revision() !== expectedRevision)
+ if (
+ revision() !== expectedRevision ||
+ sheetLayoutChanged(workbook(), expected)
+ )
throw new Error(
'The workbook changed while moving cells. No changes were applied; try again.'
);