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.

fix(sheets): keep the viewport in place on select all (#7679)

teo88ebdb9cdb0b
diff --git a/apps/web/src/features/block-spreadsheet/browser-test/editor-interactions.browser.e2e.ts b/apps/web/src/features/block-spreadsheet/browser-test/editor-interactions.browser.e2e.ts
index 39655ad0c2..31df5434b7 100644
--- a/apps/web/src/features/block-spreadsheet/browser-test/editor-interactions.browser.e2e.ts
+++ b/apps/web/src/features/block-spreadsheet/browser-test/editor-interactions.browser.e2e.ts
@@ -53,6 +53,24 @@ test('selected cells own typing and arrow keys before app capture-phase shortcut
).toBe(1);
});
+test('select all keeps the viewport where it is', async ({ page }) => {
+ const grid = page.getByRole('grid', { name: 'Spreadsheet' });
+ await page.locator('[data-address="C3"]').click();
+ await grid.evaluate((element) => {
+ element.scrollTop = 300;
+ });
+ await page.locator('[data-address="C20"]').click();
+ const scroll = () =>
+ grid.evaluate((element) => [element.scrollTop, element.scrollLeft]);
+ const before = await scroll();
+ await grid.press('ControlOrMeta+a');
+ await expect(page.getByRole('textbox', { name: 'Go to cell' })).toHaveValue(
+ 'A1:Z200'
+ );
+ await page.waitForTimeout(200);
+ expect(await scroll()).toEqual(before);
+});
+
test('selects multiple rows and columns by dragging and shift-clicking headers', async ({
page,
}) => {
diff --git a/apps/web/src/features/block-spreadsheet/components/SpreadsheetGrid.test.tsx b/apps/web/src/features/block-spreadsheet/components/SpreadsheetGrid.test.tsx
index 800a8b0ba1..d815df9b5c 100644
--- a/apps/web/src/features/block-spreadsheet/components/SpreadsheetGrid.test.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/SpreadsheetGrid.test.tsx
@@ -6,7 +6,15 @@ import {
waitFor,
} from '@solidjs/testing-library';
import { type Accessor, type ComponentProps, createSignal } from 'solid-js';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import {
+ afterEach,
+ beforeEach,
+ describe,
+ expect,
+ it,
+ onTestFinished,
+ vi,
+} from 'vitest';
import type { SpreadsheetCells } from '../core/spreadsheet-document';
import {
createGridController,
@@ -696,6 +704,26 @@ it('keeps a constant number of selection overlays as ranges grow, with accurate
).toHaveLength(rendered.length);
});
+it('selects every cell with Cmd+A without scrolling to the last cell', () => {
+ const scroll = vi.fn();
+ Object.defineProperty(HTMLElement.prototype, 'scrollIntoView', {
+ configurable: true,
+ writable: true,
+ value: scroll,
+ });
+ onTestFinished(() => {
+ delete (HTMLElement.prototype as Partial<HTMLElement>).scrollIntoView;
+ });
+ const view = renderGrid({}, { rowCount: 200 });
+ fireEvent.keyDown(view.element, { key: 'a', metaKey: true });
+ expect(view.controller.selection()).toEqual({
+ anchor: { row: 0, column: 0 },
+ focus: { row: 199, column: 25 },
+ });
+ expect(view.container.querySelector('[data-address="Z200"]')).not.toBeNull();
+ expect(scroll).not.toHaveBeenCalled();
+});
+
describe('spreadsheet presentation', () => {
it('renders persistent text, fill, borders and alignment independently of gridlines', () => {
const view = renderGrid(
diff --git a/apps/web/src/features/block-spreadsheet/components/SpreadsheetGrid.tsx b/apps/web/src/features/block-spreadsheet/components/SpreadsheetGrid.tsx
index 19ac57a256..2387f7f79c 100644
--- a/apps/web/src/features/block-spreadsheet/components/SpreadsheetGrid.tsx
+++ b/apps/web/src/features/block-spreadsheet/components/SpreadsheetGrid.tsx
@@ -1139,8 +1139,14 @@ export function SpreadsheetGrid(props: {
return;
}
const previous = props.selection.focus;
+ const selectsAll =
+ (event.metaKey || event.ctrlKey) &&
+ event.key.toLowerCase() === 'a';
props.onKeyDown(event);
+ // Select all ends at the last cell; revealing it would scroll away
+ // from the cells the user is looking at.
if (
+ !selectsAll &&
!props.editing &&
(previous.row !== props.selection.focus.row ||
previous.column !== props.selection.focus.column)