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): snap a drawer back open when its owner refuses a drag close (#9158)
Peter Chinman096fd09fbd1f
diff --git a/.agents/rules/web/mobile.md b/.agents/rules/web/mobile.mdindex 6295e00e0d..2ecbebad7b 100644--- a/.agents/rules/web/mobile.md+++ b/.agents/rules/web/mobile.md@@ -61,7 +61,8 @@ read their code, and follow that pattern rather than inventing a new one.it closes (a `<Show>` around it, or `openDialog`). It swallows only a tapthat really closed the sheet, so an owner that keeps its sheet open whileanother is stacked on it leaves that sheet's controls pressable. Don't add- per-sheet delays or click guards for it.+ per-sheet delays or click guards for it. A drag dismissal the owner refuses+ (to confirm a discard) snaps the sheet back open.- 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/src/components/app/mobile/MobileDrawer.tsx b/apps/web/src/components/app/mobile/MobileDrawer.tsxindex 68bf9fdf7d..09f36dea73 100644--- a/apps/web/src/components/app/mobile/MobileDrawer.tsx+++ b/apps/web/src/components/app/mobile/MobileDrawer.tsx@@ -1,10 +1,11 @@import { virtualKeyboardVisible } from '@core/mobile/virtualKeyboard';import { isEditableInput } from '@core/util/isEditableInput';-import Drawer from '@corvu/drawer';+import Drawer, { type Size } from '@corvu/drawer';import { Layer } from '@ui/components/Layer';import { cn } from '@ui/utils/classname';import {type ComponentProps,+ createSignal,onCleanup,splitProps,type ValidComponent,@@ -287,16 +288,25 @@ export const MobileDrawer = Object.assign(disposed = true;});const closed = () => disposed || !(props.open ?? uncontrolledOpen);+ // A drag past the break point moves Corvu to its closed snap point before+ // it asks to close. An owner that keeps the drawer open (to confirm a+ // discard) would leave it parked off-screen behind its scrim, so return+ // it to the open snap point. It starts closed, as Corvu's own state does,+ // so opening slides it in.+ const [activeSnapPoint, setActiveSnapPoint] = createSignal<Size>(0);return (<DrawerbreakPoints={[0.8]}closeOnOutsideFocus={false}noOutsidePointerEvents={false}restoreFocus={false}+ activeSnapPoint={activeSnapPoint()}+ onActiveSnapPointChange={setActiveSnapPoint}{...rest}onOpenChange={(open) => {uncontrolledOpen = open;local.onOpenChange?.(open);+ if (!open && !closed()) setActiveSnapPoint(1);}}onOutsidePointer={(event) => {if (!dismissesDrawer(event)) event.preventDefault();diff --git a/apps/web/src/components/app/mobile/browser-test/fixture.tsx b/apps/web/src/components/app/mobile/browser-test/fixture.tsxindex 28a4b71bb9..6593ee30e7 100644--- a/apps/web/src/components/app/mobile/browser-test/fixture.tsx+++ b/apps/web/src/components/app/mobile/browser-test/fixture.tsx@@ -17,6 +17,7 @@ import {import { createSignal, getOwner, Show } from 'solid-js';import { render } from 'solid-js/web';import { macroLightTheme } from '../../../../features/theme/themes/macro-light';+import { ConfirmDrawer } from '../ConfirmDrawer';import { MobileDrawer } from '../MobileDrawer';for (const [token, value] of Object.entries(macroLightTheme.colorTokens)) {@@ -182,6 +183,46 @@ function EventScenario() {);}+/** Shaped like the Android share sheet: closing it asks to discard first. */+function DiscardScenario() {+ const [open, setOpen] = createSignal(true);+ const [confirmDiscard, setConfirmDiscard] = createSignal(false);+ return (+ <>+ <MobileDrawer+ side="bottom"+ open={open()}+ onOpenChange={(next) => {+ if (!next) setConfirmDiscard(true);+ }}+ >+ <MobileDrawer.Portal>+ <MobileDrawer.Overlay />+ <MobileDrawer.Content aria-label="Share to Macro" targetHeight={80}>+ <MobileDrawer.Handle />+ <div class="h-40 px-6">+ <Button onClick={() => press('Send')}>Send</Button>+ </div>+ </MobileDrawer.Content>+ </MobileDrawer.Portal>+ </MobileDrawer>+ <ConfirmDrawer+ open={confirmDiscard()}+ onOpenChange={setConfirmDiscard}+ title="Discard this share?"+ body="Your message and shared attachments will be removed."+ cancelLabel="Keep editing"+ confirmLabel="Discard"+ tone="danger"+ onConfirm={() => {+ setConfirmDiscard(false);+ setOpen(false);+ }}+ />+ </>+ );+}+function Fixture() {const scenario = new URLSearchParams(location.search).get('scenario');return (@@ -192,9 +233,15 @@ function Fixture() {<output aria-label="Pressed" class="fixed top-2 left-4 text-xs">{pressed().join(', ')}</output>- <Show when={scenario === 'settings'} fallback={<EventScenario />}>+ <Show when={scenario === 'settings'}><SettingsScenario /></Show>+ <Show when={scenario === 'discard'}>+ <DiscardScenario />+ </Show>+ <Show when={scenario !== 'settings' && scenario !== 'discard'}>+ <EventScenario />+ </Show><ImperativeDialogHost /></>);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.tsindex 88c5d81cf9..c2350d474c 100644--- 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.ts@@ -14,6 +14,51 @@ async function settled(sheet: Locator) {const pressed = (page: Page) => page.getByRole('status', { name: 'Pressed' });+/** A finger dragging the sheet down by its top edge, past the break point. */+async function dragDown(page: Page, sheet: Locator) {+ const box = await sheet.boundingBox();+ if (!box) throw new Error('The sheet is not rendered');+ const x = box.x + box.width / 2;+ const y = box.y + 12;+ const cdp = await page.context().newCDPSession(page);+ await cdp.send('Input.dispatchTouchEvent', {+ type: 'touchStart',+ touchPoints: [{ x, y }],+ });+ for (let step = 1; step <= 10; step += 1)+ await cdp.send('Input.dispatchTouchEvent', {+ type: 'touchMove',+ touchPoints: [{ x, y: y + (box.height * step) / 10 }],+ });+ await cdp.send('Input.dispatchTouchEvent', {+ type: 'touchEnd',+ touchPoints: [],+ });+}++test('a sheet its owner keeps open returns into view after a drag down', async ({+ page,+}) => {+ await page.goto('/?scenario=discard');+ const share = page.getByRole('dialog', { name: 'Share to Macro' });+ await settled(share);++ await dragDown(page, share);++ const confirm = page.getByRole('dialog', { name: 'Discard this share?' });+ await settled(confirm);+ await settled(share);+ await tap(page, confirm.getByRole('button', { name: 'Keep editing' }));+ await expect(confirm).toHaveCount(0);+ await tap(page, share.getByRole('button', { name: 'Send' }));+ await expect(pressed(page)).toHaveText('Send');++ await dragDown(page, share);+ await settled(confirm);+ await tap(page, confirm.getByRole('button', { name: 'Discard' }));+ await expect(share).toHaveCount(0);+});+test('a pointerdown dismissal does not dismiss the parent on pointerup', async ({page,}) => {