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(spreadsheet): add separate import button next to download menu (#8180)
Jacob Beckermand57b6a635696
diff --git a/apps/web/src/features/block-spreadsheet/components/SpreadsheetActionMenus.tsx b/apps/web/src/features/block-spreadsheet/components/SpreadsheetActionMenus.tsxindex 15599ff005..8d274772a8 100644--- a/apps/web/src/features/block-spreadsheet/components/SpreadsheetActionMenus.tsx+++ b/apps/web/src/features/block-spreadsheet/components/SpreadsheetActionMenus.tsx@@ -19,6 +19,7 @@ import SortDescending from '@phosphor/sort-descending.svg';import Table from '@phosphor/table.svg';import TextAlignLeft from '@phosphor/text-align-left.svg';import Upload from '@phosphor/upload-simple.svg';+import { Button } from '@ui/components/Button';import { Dropdown } from '@ui/components/Dropdown';import { For, type JSX, type ParentProps, Show } from 'solid-js';import { CHART_TYPES } from '../core/chart-builder';@@ -302,6 +303,24 @@ export function DataFormatMenu(props: SpreadsheetToolbarProps) {);}+export function SpreadsheetImportButton(props: {+ disabled?: boolean;+ onCommand: (command: SpreadsheetCommand) => void;+}) {+ return (+ <Button+ size="icon-sm"+ variant="ghost"+ label="Import"+ disabled={props.disabled}+ class="h-7 w-7 min-h-7 min-w-7 shrink-0 p-1 text-ink-muted touch:h-[44px] touch:w-[44px] touch:min-h-[44px] touch:min-w-[44px]"+ onClick={() => props.onCommand('import')}+ >+ <Upload class="size-[18px]" />+ </Button>+ );+}+export function SpreadsheetFileMenu(props: {readonly: boolean;canExport: boolean;@@ -310,21 +329,11 @@ export function SpreadsheetFileMenu(props: {}) {return (<ActionMenu- label="Import and export"+ label="Download"icon={<Download class="size-[18px]" />}placement="top-end"onRestoreFocus={props.onRestoreFocus}>- <Dropdown.Group>- <Dropdown.Item- closeOnSelect- disabled={props.readonly}- onSelect={() => props.onCommand('import')}- >- <Upload class="size-4" />- Import…- </Dropdown.Item>- </Dropdown.Group><Dropdown.Group><Dropdown.ItemcloseOnSelectdiff --git a/apps/web/src/features/block-spreadsheet/components/SpreadsheetToolbar.test.tsx b/apps/web/src/features/block-spreadsheet/components/SpreadsheetToolbar.test.tsxindex 4b9ceac47d..050c7b512b 100644--- a/apps/web/src/features/block-spreadsheet/components/SpreadsheetToolbar.test.tsx+++ b/apps/web/src/features/block-spreadsheet/components/SpreadsheetToolbar.test.tsx@@ -8,7 +8,10 @@ import {import { createSignal, type ParentProps } from 'solid-js';import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';import type { SpreadsheetToolbarProps } from '../core/toolbar-types';-import { SpreadsheetFileMenu } from './SpreadsheetActionMenus';+import {+ SpreadsheetFileMenu,+ SpreadsheetImportButton,+} from './SpreadsheetActionMenus';import { SpreadsheetToolbar } from './SpreadsheetToolbar';// App hotkey registries are outside this presentational menu fixture.@@ -53,6 +56,10 @@ function toolbar(onZoom={onZoom}{...overrides}/>+ <SpreadsheetImportButton+ disabled={overrides.readonly ?? false}+ onCommand={onCommand}+ /><SpreadsheetFileMenureadonly={overrides.readonly ?? false}canExport={overrides.canExport ?? true}@@ -153,7 +160,7 @@ describe('spreadsheet toolbar', () => {it('opens menus with the keyboard and invokes the selected command', async () => {const view = toolbar();- const file = view.getByRole('button', { name: 'Import and export' });+ const file = view.getByRole('button', { name: 'Download' });fireEvent.keyDown(file, { key: 'ArrowDown' });const download = await screen.findByRole('menuitem', {name: 'Download as CSV',@@ -162,18 +169,24 @@ describe('spreadsheet toolbar', () => {expect(view.onCommand).toHaveBeenCalledWith('export-csv');});- it.each([- ['Import…', 'import'],- ['Download as Excel (.xlsx)', 'export-xlsx'],- ])('invokes the %s workbook command', async (label, command) => {+ it('invokes the import command from the standalone button', () => {const view = toolbar();- fireEvent.keyDown(view.getByRole('button', { name: 'Import and export' }), {+ fireEvent.click(view.getByRole('button', { name: 'Import' }));+ expect(view.onCommand).toHaveBeenCalledWith('import');+ });++ it('invokes the Download as Excel (.xlsx) workbook command', async () => {+ const view = toolbar();+ fireEvent.keyDown(view.getByRole('button', { name: 'Download' }), {key: 'ArrowDown',});- fireEvent.keyDown(await screen.findByRole('menuitem', { name: label }), {- key: 'Enter',- });- expect(view.onCommand).toHaveBeenCalledWith(command);+ fireEvent.keyDown(+ await screen.findByRole('menuitem', {+ name: 'Download as Excel (.xlsx)',+ }),+ { key: 'Enter' }+ );+ expect(view.onCommand).toHaveBeenCalledWith('export-xlsx');});it('exposes checked view settings directly with the keyboard', async () => {@@ -211,17 +224,14 @@ describe('spreadsheet toolbar', () => {document.body.append(editor);try {const view = toolbar({ onRestoreFocus: () => editor.focus() });- fireEvent.keyDown(- view.getByRole('button', { name: 'Import and export' }),- {- key: 'ArrowDown',- }- );- const importItem = await screen.findByRole('menuitem', {- name: 'Import…',+ fireEvent.keyDown(view.getByRole('button', { name: 'Download' }), {+ key: 'ArrowDown',+ });+ const excelItem = await screen.findByRole('menuitem', {+ name: 'Download as Excel (.xlsx)',});- await waitFor(() => expect(document.activeElement).toBe(importItem));- fireEvent.keyDown(importItem, { key: 'Escape' });+ await waitFor(() => expect(document.activeElement).toBe(excelItem));+ fireEvent.keyDown(excelItem, { key: 'Escape' });await waitFor(() => expect(document.activeElement).toBe(editor));expect(view.onCommand).not.toHaveBeenCalled();} finally {@@ -284,7 +294,7 @@ describe('spreadsheet toolbar', () => {},{role: 'button',- trigger: 'Import and export',+ trigger: 'Download',item: 'Download as CSV',command: 'export-csv',},@@ -327,6 +337,7 @@ describe('spreadsheet toolbar', () => {'Undo','Paste special','Format and data',+ 'Import',]) {expect(view.getByRole('button', { name }).hasAttribute('disabled')).toBe(true@@ -336,7 +347,7 @@ describe('spreadsheet toolbar', () => {'Zoom','View options','Find and replace',- 'Import and export',+ 'Download',]) {expect(view.getByRole('button', { name }).hasAttribute('disabled')).toBe(false@@ -346,14 +357,13 @@ describe('spreadsheet toolbar', () => {it('disables imports for viewers and both download formats when exports are unavailable', async () => {const view = toolbar({ readonly: true, canExport: false });- fireEvent.keyDown(view.getByRole('button', { name: 'Import and export' }), {+ expect(+ view.getByRole('button', { name: 'Import' }).hasAttribute('disabled')+ ).toBe(true);+ fireEvent.keyDown(view.getByRole('button', { name: 'Download' }), {key: 'ArrowDown',});- for (const name of [- 'Import…',- 'Download as Excel (.xlsx)',- 'Download as CSV',- ]) {+ for (const name of ['Download as Excel (.xlsx)', 'Download as CSV']) {const item = await screen.findByRole('menuitem', { name });expect(item.getAttribute('aria-disabled')).toBe('true');fireEvent.keyDown(item, { key: 'Enter' });diff --git a/apps/web/src/features/block-spreadsheet/views/SpreadsheetEditor.tsx b/apps/web/src/features/block-spreadsheet/views/SpreadsheetEditor.tsxindex 3fb514966e..048280feeb 100644--- a/apps/web/src/features/block-spreadsheet/views/SpreadsheetEditor.tsx+++ b/apps/web/src/features/block-spreadsheet/views/SpreadsheetEditor.tsx@@ -29,7 +29,10 @@ import {DropdownDialog,type DropdownDialogState,} from '../components/DropdownDialog';-import { SpreadsheetFileMenu } from '../components/SpreadsheetActionMenus';+import {+ SpreadsheetFileMenu,+ SpreadsheetImportButton,+} from '../components/SpreadsheetActionMenus';import { SpreadsheetDialog } from '../components/SpreadsheetDialog';import {SpreadsheetFindDialog,@@ -1413,7 +1416,13 @@ export function SpreadsheetEditor(props: {</span></Show></div>- <div class="shrink-0 border-l border-edge-muted pl-1 max-sm:order-1">+ <div class="flex shrink-0 items-center gap-0.5 border-l border-edge-muted pl-1 max-sm:order-1">+ <SpreadsheetImportButton+ disabled={+ !editable() || actions.pending() || !!workbookActions.busy()+ }+ onCommand={menuCommand}+ /><SpreadsheetFileMenureadonly={!editable() || actions.pending() || !!workbookActions.busy()