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.

test(mobile): cover refused sheet swipes and keep the snap point private (#9226)

gbirman84e779bc609c
diff --git a/.agents/rules/web/mobile.md b/.agents/rules/web/mobile.md
index 2ecbebad7b..7979a47472 100644
--- a/.agents/rules/web/mobile.md
+++ b/.agents/rules/web/mobile.md
@@ -62,7 +62,8 @@ read their code, and follow that pattern rather than inventing a new one.
that really closed the sheet, so an owner that keeps its sheet open while
another is stacked on it leaves that sheet's controls pressable. Don't add
per-sheet delays or click guards for it. A drag dismissal the owner refuses
- (to confirm a discard) snaps the sheet back open.
+ (to confirm a discard, or while an action is pending) snaps the sheet back
+ open.
- A sheet opened from another sheet stacks on it under its own scrim, which
shares the sheets' layer (as Dialog's does), so the sheet beneath dims with
the page and only the top sheet's handle stands out. Open it under the
diff --git a/apps/web/AGENTS.md b/apps/web/AGENTS.md
index 67bf25dfb9..dcae8092fd 100644
--- a/apps/web/AGENTS.md
+++ b/apps/web/AGENTS.md
@@ -54,8 +54,10 @@ Discussion link scrolling has a backend-free browser regression:
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,
-including mixed pointerdown/pointerup dismissal, and for taps inside the top
-sheet that must still press its own controls:
+including mixed pointerdown/pointerup dismissal, for taps inside the top
+sheet that must still press its own controls, and for swipes whose owner keeps
+the sheet open (a discard prompt, a pending confirmation, event details under a
+stacked sheet), which must bring it back on screen:
`bunx playwright test --config src/components/app/mobile/browser-test/playwright.config.ts`.
Composer typeahead menus choosing the side with room for their full list
diff --git a/apps/web/src/components/app/mobile/MobileDrawer.tsx b/apps/web/src/components/app/mobile/MobileDrawer.tsx
index 09f36dea73..261ea4f59a 100644
--- a/apps/web/src/components/app/mobile/MobileDrawer.tsx
+++ b/apps/web/src/components/app/mobile/MobileDrawer.tsx
@@ -277,7 +277,12 @@ function swallowRestOfTap() {
* Wrapper around Corvu's Drawer for mobile. Handles styling and input/virtual keyboard behaviour.
*/
export const MobileDrawer = Object.assign(
- (props: ComponentProps<typeof Drawer>) => {
+ (
+ props: Omit<
+ ComponentProps<typeof Drawer>,
+ 'activeSnapPoint' | 'onActiveSnapPointChange'
+ >
+ ) => {
const [local, rest] = splitProps(props, [
'onOutsidePointer',
'onOpenChange',
@@ -300,9 +305,9 @@ export const MobileDrawer = Object.assign(
closeOnOutsideFocus={false}
noOutsidePointerEvents={false}
restoreFocus={false}
+ {...rest}
activeSnapPoint={activeSnapPoint()}
onActiveSnapPointChange={setActiveSnapPoint}
- {...rest}
onOpenChange={(open) => {
uncontrolledOpen = open;
local.onOpenChange?.(open);
diff --git a/apps/web/src/components/app/mobile/browser-test/fixture.tsx b/apps/web/src/components/app/mobile/browser-test/fixture.tsx
index 6593ee30e7..da0845d598 100644
--- a/apps/web/src/components/app/mobile/browser-test/fixture.tsx
+++ b/apps/web/src/components/app/mobile/browser-test/fixture.tsx
@@ -5,16 +5,19 @@ 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 { fireAndForget } from '@core/util/fireAndForget';
import {
Button,
ConfirmDialog,
+ confirmDialog,
Dialog,
ImperativeDialogHost,
+ Input,
type ManagedDialogProps,
openDialog,
useImperativeDialog,
} from '@ui';
-import { createSignal, getOwner, Show } from 'solid-js';
+import { createSignal, getOwner, Match, Show, Switch } from 'solid-js';
import { render } from 'solid-js/web';
import { macroLightTheme } from '../../../../features/theme/themes/macro-light';
import { ConfirmDrawer } from '../ConfirmDrawer';
@@ -183,6 +186,88 @@ function EventScenario() {
);
}
+/**
+ * Shaped like the event composer: unmounted on close, and a close request
+ * asks first from a prompt outside the sheet's dismiss stack.
+ */
+function DirtyComposerScenario() {
+ const owner = getOwner();
+ const [open, setOpen] = createSignal(true);
+ let asking = false;
+ const requestClose = async () => {
+ if (asking) return;
+ asking = true;
+ const discard = await confirmDialog(
+ {
+ title: 'You still have remaining changes',
+ confirmLabel: 'Discard',
+ cancelLabel: 'Keep editing',
+ tone: 'danger',
+ },
+ { owner }
+ );
+ asking = false;
+ if (discard) setOpen(false);
+ };
+ return (
+ <Show when={open()}>
+ <MobileDrawer
+ side="bottom"
+ open
+ onOpenChange={(next) => {
+ if (!next) fireAndForget(requestClose(), 'stacked-sheets-fixture');
+ }}
+ >
+ <MobileDrawer.Portal>
+ <MobileDrawer.Overlay />
+ <MobileDrawer.Content aria-label="New event" maxHeight={92}>
+ <MobileDrawer.Handle />
+ <MobileDrawer.ScrollBody class="h-80 gap-3 px-6">
+ <Input aria-label="Title" />
+ <Button onClick={() => press('Create event')}>
+ Create event
+ </Button>
+ </MobileDrawer.ScrollBody>
+ </MobileDrawer.Content>
+ </MobileDrawer.Portal>
+ </MobileDrawer>
+ </Show>
+ );
+}
+
+/** A confirmation mid-request refuses every close until the request settles. */
+function PendingConfirmScenario() {
+ return (
+ <ConfirmDialog
+ open
+ pending
+ onOpenChange={() => press('Close pending')}
+ title="Delete event"
+ confirmLabel="Delete"
+ tone="danger"
+ onConfirm={() => press('Confirm delete')}
+ />
+ );
+}
+
+/** Nothing controls this sheet: its trigger opens it. */
+function UncontrolledScenario() {
+ return (
+ <MobileDrawer side="bottom">
+ <MobileDrawer.Trigger as={Button} class="fixed top-20 left-4">
+ Open filters
+ </MobileDrawer.Trigger>
+ <MobileDrawer.Portal>
+ <MobileDrawer.Overlay />
+ <MobileDrawer.Content aria-label="Filters">
+ <MobileDrawer.Handle />
+ <div class="h-40 px-6">Filters</div>
+ </MobileDrawer.Content>
+ </MobileDrawer.Portal>
+ </MobileDrawer>
+ );
+}
+
/** Shaped like the Android share sheet: closing it asks to discard first. */
function DiscardScenario() {
const [open, setOpen] = createSignal(true);
@@ -233,15 +318,23 @@ function Fixture() {
<output aria-label="Pressed" class="fixed top-2 left-4 text-xs">
{pressed().join(', ')}
</output>
- <Show when={scenario === 'settings'}>
- <SettingsScenario />
- </Show>
- <Show when={scenario === 'discard'}>
- <DiscardScenario />
- </Show>
- <Show when={scenario !== 'settings' && scenario !== 'discard'}>
- <EventScenario />
- </Show>
+ <Switch fallback={<EventScenario />}>
+ <Match when={scenario === 'settings'}>
+ <SettingsScenario />
+ </Match>
+ <Match when={scenario === 'discard'}>
+ <DiscardScenario />
+ </Match>
+ <Match when={scenario === 'composer'}>
+ <DirtyComposerScenario />
+ </Match>
+ <Match when={scenario === 'pending'}>
+ <PendingConfirmScenario />
+ </Match>
+ <Match when={scenario === 'uncontrolled'}>
+ <UncontrolledScenario />
+ </Match>
+ </Switch>
<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.ts
index c2350d474c..d826add873 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
@@ -201,3 +201,99 @@ test('a tap on the backdrop of event details closes it without pressing the page
await tap(page, pageControl);
await expect(pressed(page)).toHaveText('Page control');
});
+
+test('Keep editing after a drag on the composer keeps its edits, and Discard closes it', async ({
+ page,
+}) => {
+ await page.goto('/?scenario=composer');
+ const composer = page.getByRole('dialog', { name: 'New event' });
+ await settled(composer);
+ const title = composer.getByRole('textbox', { name: 'Title' });
+ await title.fill('Design review');
+ const prompt = page.getByRole('dialog', {
+ name: 'You still have remaining changes',
+ });
+
+ await dragDown(page, composer);
+ await settled(prompt);
+ await settled(composer);
+ await tap(page, prompt.getByRole('button', { name: 'Keep editing' }));
+
+ await expect(prompt).toHaveCount(0);
+ await settled(composer);
+ await expect(title).toHaveValue('Design review');
+ await tap(page, composer.getByRole('button', { name: 'Create event' }));
+ await expect(pressed(page)).toHaveText('Create event');
+ await expect(prompt).toHaveCount(0);
+
+ await dragDown(page, composer);
+ await settled(prompt);
+ await tap(page, prompt.getByRole('button', { name: 'Discard' }));
+
+ await expect(prompt).toHaveCount(0);
+ await expect(composer).toHaveCount(0);
+ await expect(page.locator('[data-corvu-drawer-overlay]')).toHaveCount(0);
+});
+
+test('a swipe does not hide a confirmation that is still pending', async ({
+ page,
+}) => {
+ await page.goto('/?scenario=pending');
+ const confirmation = page.getByRole('dialog', { name: 'Delete event' });
+ await settled(confirmation);
+
+ await dragDown(page, confirmation);
+
+ await settled(confirmation);
+ await expect(pressed(page)).toHaveText('');
+});
+
+test('a swipe over event details closes only the sheet on top', 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: 'RSVP' }));
+ const rsvp = page.getByRole('dialog', { name: 'RSVP to recurring event' });
+ await settled(rsvp);
+
+ await dragDown(page, rsvp);
+
+ await expect(rsvp).toHaveCount(0);
+ await settled(details);
+});
+
+test('a swiped-away sheet opens again on screen', 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: 'RSVP' }));
+ const rsvp = page.getByRole('dialog', { name: 'RSVP to recurring event' });
+ await settled(rsvp);
+ await dragDown(page, rsvp);
+ await expect(rsvp).toHaveCount(0);
+
+ await tap(page, details.getByRole('button', { name: 'RSVP' }));
+ await settled(rsvp);
+
+ await dragDown(page, rsvp);
+ await expect(rsvp).toHaveCount(0);
+ await settled(details);
+ await dragDown(page, details);
+ await expect(details).toHaveCount(0);
+});
+
+test('a sheet opened by its trigger slides up, and swipes away', async ({
+ page,
+}) => {
+ await page.goto('/?scenario=uncontrolled');
+ await tap(page, page.getByRole('button', { name: 'Open filters' }));
+ const filters = page.getByRole('dialog', { name: 'Filters' });
+
+ await expect(filters).toHaveAttribute('data-opening');
+ await settled(filters);
+ await dragDown(page, filters);
+
+ await expect(filters).toHaveCount(0);
+});
diff --git a/docs/agent-guide/calendar.md b/docs/agent-guide/calendar.md
index 3e0528ec8d..a4824760af 100644
--- a/docs/agent-guide/calendar.md
+++ b/docs/agent-guide/calendar.md
@@ -234,7 +234,9 @@ with scrollable content above the keyboard. When the form outgrows the sheet, as
it does with the custom repeat builder open, the sheet scrolls down to the
footer: Cancel and `Create event` or `Save`, plus `This event`/`All events` when
editing a recurring event. Desktop retains the centered dialog.
-Dismissing a changed event still asks before discarding the draft.
+Dismissing a changed event by Cancel, swipe, backdrop tap or Escape still asks
+before discarding the draft; Keep editing returns to the sheet with the edits
+intact, and the prompt stays away until the next attempt to close.
On phones, event details use inset round action buttons and a transparent RSVP
footer. Answering a recurring invitation opens a rounded glass sheet: choose