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
fix(mobile): keep a sheet's dismissing tap from pressing what it covered (#8709)
gbirmanc12cd7eaa8c8
diff --git a/.agents/rules/web/mobile.md b/.agents/rules/web/mobile.mdindex bc2fd2e1a1..56bbfebcb8 100644--- a/.agents/rules/web/mobile.md+++ b/.agents/rules/web/mobile.md@@ -51,6 +51,10 @@ read their code, and follow that pattern rather than inventing a new one.- Phone drawers have a handle and no X; drag, backdrop, or Escape dismiss,and focus returns to the opener. No submenus at phone width: drill inplace with a back row.+- A backdrop tap only dismisses: `MobileDrawer` swallows the rest of that tap,+ so it never presses what the scrim covered, even when the sheet unmounts as+ it closes (a `<Show>` around it, or `openDialog`). Don't add per-sheet+ delays or click guards for it.- A sheet opened from another sheet stacks on it under its own scrim, whichshares the sheets' layer (as Dialog's does), so the sheet beneath dims withthe page and only the top sheet's handle stands out. Open it under thediff --git a/apps/web/AGENTS.md b/apps/web/AGENTS.mdindex b4a9cf210c..d3b4728dff 100644--- a/apps/web/AGENTS.md+++ b/apps/web/AGENTS.md@@ -25,6 +25,11 @@ It exercises the real resize solver, scroll container, and Lexical layout primitDiscussion link scrolling has a backend-free browser regression:`bunx playwright test --config src/lib/core/messages/browser-test/playwright.config.ts`.+Phone sheets stacked on each other (Connect email over Settings, Add guests,+RSVP scope and the delete confirmation over event details) have a backend-free+browser regression for backdrop taps that must not press what the scrim covers:+`bunx playwright test --config src/components/app/mobile/browser-test/playwright.config.ts`.+Persistent prompts stepping aside for popovers, dialogs, drawers and`data-holds-prompts` surfaces have a backend-free browser regression:`bunx playwright test --config src/lib/core/component/Toast/browser-test/playwright.config.ts`.diff --git a/apps/web/src/components/app/mobile/MobileDrawer.tsx b/apps/web/src/components/app/mobile/MobileDrawer.tsxindex 8234330c74..052086c2f1 100644--- a/apps/web/src/components/app/mobile/MobileDrawer.tsx+++ b/apps/web/src/components/app/mobile/MobileDrawer.tsx@@ -243,6 +243,34 @@ function dismissesDrawer(event: PointerEvent) {return event.target !== document.documentElement;}+/**+ * The rest of a tap that dismisses a drawer must not reach what its scrim+ * covered. Corvu dismisses on the tap's pointerdown or pointerup, and a sheet+ * its owner unmounts on close (a `<Show>` around it, or `openDialog`'s host)+ * takes the scrim with it, so the tap's mouse events and click are hit-tested+ * against the control underneath and press it. Swallow them until the tap's+ * click, the next pointerdown or a key press.+ */+function swallowRestOfTap() {+ const listening = new AbortController();+ const swallow = (event: Event) => {+ if (!event.isTrusted) return;+ event.preventDefault();+ event.stopPropagation();+ if (event.type === 'click') listening.abort();+ };+ for (const type of ['mousedown', 'mouseup', 'click'])+ window.addEventListener(type, swallow, {+ capture: true,+ signal: listening.signal,+ });+ for (const type of ['pointerdown', 'keydown'])+ window.addEventListener(type, () => listening.abort(), {+ capture: true,+ signal: listening.signal,+ });+}+/*** Wrapper around Corvu's Drawer for mobile. Handles styling and input/virtual keyboard behaviour.*/@@ -259,6 +287,7 @@ export const MobileDrawer = Object.assign(onOutsidePointer={(event) => {if (!dismissesDrawer(event)) event.preventDefault();local.onOutsidePointer?.(event);+ if (!event.defaultPrevented) swallowRestOfTap();}}/>);diff --git a/apps/web/src/components/app/mobile/browser-test/fixture.tsx b/apps/web/src/components/app/mobile/browser-test/fixture.tsxnew file mode 100644index 0000000000..c2f8335774--- /dev/null+++ b/apps/web/src/components/app/mobile/browser-test/fixture.tsx@@ -0,0 +1,170 @@+import '@fontsource-variable/inter';+import '../../../../index.css';+import { MobileSettingsSheet } from '@app/features/settings/MobileSettingsSheet';+import { SettingsPage, SettingsRow } from '@app/features/settings/primitives';+import type { SettingsTab } from '@core/constant/SettingsState';+import { SETTINGS_TAB_GROUPS } from '@core/constant/settingsTabsConfig';+import { EmailProviderDialog } from '@core/email-link/ProviderDialog';+import {+ Button,+ ConfirmDialog,+ Dialog,+ ImperativeDialogHost,+ type ManagedDialogProps,+ openDialog,+ useImperativeDialog,+} from '@ui';+import { createSignal, getOwner, Show } from 'solid-js';+import { render } from 'solid-js/web';+import { macroLightTheme } from '../../../../features/theme/themes/macro-light';+import { MobileDrawer } from '../MobileDrawer';++for (const [token, value] of Object.entries(macroLightTheme.colorTokens)) {+ document.documentElement.style.setProperty(`--color-${token}`, value);+}+document.documentElement.dataset.themeLight = 'true';++const [pressed, setPressed] = createSignal<string[]>([]);+const press = (control: string) => setPressed((list) => [...list, control]);++/** Connect email opens as `selectEmailProvider` opens it, under the sheet's owner. */+function EmailSettingsPage() {+ const owner = getOwner();+ const connectEmail = () => {+ const handle = openDialog(+ EmailProviderDialog,+ { outlookAvailable: true, onSelect: () => handle.close() },+ { owner }+ );+ };+ return (+ <SettingsPage title="Email">+ <SettingsRow label="[email protected]" description="Up to date">+ <Button variant="ghost" onClick={() => press('Remove inbox')}>+ Remove+ </Button>+ </SettingsRow>+ <SettingsRow label="Add another inbox">+ <Button variant="outline" onClick={connectEmail}>+ Add account+ </Button>+ </SettingsRow>+ </SettingsPage>+ );+}++function SettingsScenario() {+ const [page, setPage] = createSignal<SettingsTab | undefined>('Email');+ return (+ <MobileSettingsSheet+ open+ page={page()}+ groups={SETTINGS_TAB_GROUPS}+ name="Alex Morgan"+ email="[email protected]"+ avatar="AM"+ onClose={() => press('Close settings')}+ onNavigate={(next) => {+ if (!next) press('Back to settings');+ setPage(next);+ }}+ onLogout={() => press('Log out')}+ renderPage={() => <EmailSettingsPage />}+ />+ );+}++function DeleteEventDialog(props: ManagedDialogProps) {+ return (+ <ConfirmDialog+ open={props.open}+ onOpenChange={props.onOpenChange}+ title="Delete event"+ confirmLabel="Delete"+ tone="danger"+ onConfirm={() => press('Confirm delete')}+ />+ );+}++/** Shaped like event details: unmounted on close, sheets stacked on it. */+function EventDetailsDrawer(props: { onClose: () => void }) {+ const [guests, setGuests] = createSignal(false);+ const [rsvpScope, setRsvpScope] = createSignal(false);+ const deleteDialog = useImperativeDialog(DeleteEventDialog);+ return (+ <MobileDrawer+ side="bottom"+ open+ onOpenChange={(open) => {+ if (!open && (guests() || rsvpScope() || deleteDialog.isOpen())) return;+ props.onClose();+ }}+ >+ <MobileDrawer.Portal>+ <MobileDrawer.Overlay />+ <MobileDrawer.Content+ aria-label="Weekly product sync"+ targetHeight={70}+ >+ <MobileDrawer.Handle />+ <MobileDrawer.ScrollBody class="gap-3 px-6">+ <Button onClick={() => press('Edit')}>Edit</Button>+ <Button onClick={() => setGuests(true)}>Add guests</Button>+ <Button onClick={() => setRsvpScope(true)}>RSVP</Button>+ <Button onClick={() => deleteDialog.open({})}>Delete</Button>+ </MobileDrawer.ScrollBody>+ <Dialog open={guests()} onOpenChange={setGuests}>+ <Dialog.Title class="px-4 pb-2 text-base font-semibold">+ Add guests+ </Dialog.Title>+ <div class="h-40 px-4">Guest picker</div>+ </Dialog>+ <MobileDrawer+ side="bottom"+ open={rsvpScope()}+ onOpenChange={setRsvpScope}+ >+ <MobileDrawer.Portal>+ <MobileDrawer.Overlay />+ <MobileDrawer.Content aria-label="RSVP to recurring event">+ <MobileDrawer.Handle />+ <div class="h-40 px-6">This event or all events</div>+ </MobileDrawer.Content>+ </MobileDrawer.Portal>+ </MobileDrawer>+ </MobileDrawer.Content>+ </MobileDrawer.Portal>+ </MobileDrawer>+ );+}++function EventScenario() {+ const [open, setOpen] = createSignal(true);+ return (+ <Show when={open()}>+ <EventDetailsDrawer onClose={() => setOpen(false)} />+ </Show>+ );+}++function Fixture() {+ const scenario = new URLSearchParams(location.search).get('scenario');+ return (+ <>+ <Button class="fixed top-8 left-4" onClick={() => press('Page control')}>+ Page control+ </Button>+ <output aria-label="Pressed" class="fixed top-2 left-4 text-xs">+ {pressed().join(', ')}+ </output>+ <Show when={scenario === 'settings'} fallback={<EventScenario />}>+ <SettingsScenario />+ </Show>+ <ImperativeDialogHost />+ </>+ );+}++const root = document.getElementById('root');+if (root) render(() => <Fixture />, root);diff --git a/apps/web/src/components/app/mobile/browser-test/index.html b/apps/web/src/components/app/mobile/browser-test/index.htmlnew file mode 100644index 0000000000..076314f581--- /dev/null+++ b/apps/web/src/components/app/mobile/browser-test/index.html@@ -0,0 +1,5 @@+<!doctype html>+<html lang="en" data-modality="keyboard">+ <head><meta charset="UTF-8" /><meta name="viewport" content="width=device-width, initial-scale=1.0" /><title>Stacked sheets</title></head>+ <body><div id="root"></div><script type="module" src="/fixture.tsx"></script></body>+</html>diff --git a/apps/web/src/components/app/mobile/browser-test/playwright.config.ts b/apps/web/src/components/app/mobile/browser-test/playwright.config.tsnew file mode 100644index 0000000000..c3ff1cf55a--- /dev/null+++ b/apps/web/src/components/app/mobile/browser-test/playwright.config.ts@@ -0,0 +1,34 @@+import { fileURLToPath } from 'node:url';+import { defineConfig, devices } from '@playwright/test';++const directory = fileURLToPath(new URL('.', import.meta.url));+const webDirectory = fileURLToPath(new URL('../../../../../', import.meta.url));+const port = Number(process.env.STACKED_SHEETS_BROWSER_PORT ?? 3098);+export default defineConfig({+ testDir: directory,+ testMatch: '*.browser.e2e.ts',+ outputDir: `${directory}/test-results`,+ timeout: 45_000,+ fullyParallel: true,+ use: {+ baseURL: `http://127.0.0.1:${port}`,+ trace: 'retain-on-failure',+ screenshot: 'only-on-failure',+ launchOptions: {+ executablePath: process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH,+ },+ },+ webServer: {+ command: `bunx vite --config src/components/app/mobile/browser-test/vite.config.ts --port ${port}`,+ cwd: webDirectory,+ url: `http://127.0.0.1:${port}`,+ reuseExistingServer: false,+ timeout: 120_000,+ },+ projects: [+ {+ name: 'phone',+ use: { ...devices['iPhone 13'], defaultBrowserType: 'chromium' },+ },+ ],+});diff --git a/apps/web/src/components/app/mobile/browser-test/stacked-sheets.browser.e2e.ts b/apps/web/src/components/app/mobile/browser-test/stacked-sheets.browser.e2e.tsnew file mode 100644index 0000000000..22a9de8859--- /dev/null+++ b/apps/web/src/components/app/mobile/browser-test/stacked-sheets.browser.e2e.ts@@ -0,0 +1,91 @@+import { expect, type Locator, type Page, test } from '@playwright/test';++async function tap(page: Page, target: Locator) {+ const box = await target.boundingBox();+ if (!box) throw new Error('The tap target is not rendered');+ await page.touchscreen.tap(box.x + box.width / 2, box.y + box.height / 2);+}++/** Corvu starts the opening slide a frame after mount, so wait for it to end. */+async function settled(sheet: Locator) {+ await expect(sheet).toBeInViewport({ ratio: 1 });+ await expect(sheet).not.toHaveAttribute('data-transitioning');+}++const pressed = (page: Page) => page.getByRole('status', { name: 'Pressed' });++for (const control of ['Remove', 'Back to settings']) {+ test(`a tap on the dimmed Settings sheet over ${control} closes only Connect email`, async ({+ page,+ }) => {+ await page.goto('/?scenario=settings');+ const settings = page.getByRole('dialog', { name: 'Settings' });+ await settled(settings);+ await tap(page, page.getByRole('button', { name: 'Add account' }));+ const connectEmail = page.getByRole('dialog', { name: 'Connect email' });+ await settled(connectEmail);++ const covered = settings.getByRole('button', {+ name: control,+ exact: true,+ });+ await tap(page, covered);++ await expect(connectEmail).toHaveCount(0);+ await expect(settings).toBeVisible();+ await expect(+ settings.getByRole('heading', { name: 'Email' })+ ).toBeVisible();+ await expect(pressed(page)).toHaveText('');++ await tap(page, covered);+ await expect(pressed(page)).not.toHaveText('');+ });+}++for (const [opener, sheetName] of [+ ['Add guests', 'Add guests'],+ ['RSVP', 'RSVP to recurring event'],+ ['Delete', 'Delete event'],+]) {+ test(`a tap on the dimmed event details closes only ${sheetName}`, async ({+ page,+ }) => {+ await page.goto('/?scenario=event');+ const details = page.getByRole('dialog', { name: 'Weekly product sync' });+ await settled(details);+ await tap(page, details.getByRole('button', { name: opener }));+ const sheet = page.getByRole('dialog', { name: sheetName });+ await settled(sheet);++ const edit = details.getByRole('button', { name: 'Edit' });+ await tap(page, edit);++ await expect(sheet).toHaveCount(0);+ await expect(details).toBeVisible();+ await expect(pressed(page)).toHaveText('');++ await tap(page, edit);+ await expect(pressed(page)).toHaveText('Edit');+ });+}++test('a tap on the backdrop of event details closes it without pressing the page', async ({+ page,+}) => {+ await page.goto('/?scenario=event');+ const details = page.getByRole('dialog', { name: 'Weekly product sync' });+ await settled(details);+ const pageControl = page.getByRole('button', {+ name: 'Page control',+ includeHidden: true,+ });++ await tap(page, pageControl);++ await expect(details).toHaveCount(0);+ await expect(pressed(page)).toHaveText('');++ await tap(page, pageControl);+ await expect(pressed(page)).toHaveText('Page control');+});diff --git a/apps/web/src/components/app/mobile/browser-test/vite.config.ts b/apps/web/src/components/app/mobile/browser-test/vite.config.tsnew file mode 100644index 0000000000..19bfa358f3--- /dev/null+++ b/apps/web/src/components/app/mobile/browser-test/vite.config.ts@@ -0,0 +1,34 @@+import { fileURLToPath } from 'node:url';+import tailwind from '@tailwindcss/vite';+import { defineConfig } from 'vite';+import solidPlugin from 'vite-plugin-solid';+import solidSvg from 'vite-plugin-solid-svg';+import tsconfigPaths from 'vite-tsconfig-paths';++const directory = fileURLToPath(new URL('.', import.meta.url));+const webDirectory = fileURLToPath(new URL('../../../../../', import.meta.url));+const workspaceDirectory = fileURLToPath(+ new URL('../../../../../../../', import.meta.url)+);++/** Real phone sheets stacked over each other, with no services behind them. */+export default defineConfig({+ root: directory,+ cacheDir: `${directory}/.vite`,+ plugins: [+ solidPlugin(),+ solidSvg({ defaultAsComponent: true }),+ tsconfigPaths({ projects: [`${webDirectory}/tsconfig.json`] }),+ tailwind(),+ ],+ resolve: {+ dedupe: ['solid-js'],+ alias: { 'loro-crdt': 'loro-crdt/base64' },+ },+ optimizeDeps: { esbuildOptions: { target: 'esnext' } },+ server: {+ host: '127.0.0.1',+ strictPort: true,+ fs: { allow: [workspaceDirectory] },+ },+});diff --git a/docs/agent-guide/calendar.md b/docs/agent-guide/calendar.mdindex 6b9dc1dc23..e529277840 100644--- a/docs/agent-guide/calendar.md+++ b/docs/agent-guide/calendar.md@@ -554,7 +554,7 @@ notified only when someone besides you is on it.With the `enable-calendar-guest-invites` flag on, a third icon button, `Add guests`, showswhenever the event's `viewerCan.inviteGuests` allows it, including for a guest whoseorganizer lets guests invite. It opens an editor anchored to the button (on phones, a bottom-sheet stacked over the dimmed event details, showing one bright handle): the current guests are listed under `Invited` without a remove control, the picker+sheet stacked over the dimmed event details, showing one bright handle; a tap on the dimmed details closes only this sheet and presses nothing under it): the current guests are listed under `Invited` without a remove control, the pickeradds people, each new guest has an `Optional` checkbox, a recurring event offers `Thisevent` / `All events` (`All events` by default, like the editor's recurring edits), and`Send invitations` (or Cmd/Ctrl+Enter) sends them; Escape closes. The new guests appear at