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(notifications): keep persistent prompts off popovers and the touch composer (#8707)

gbirman68d23bf63df7
diff --git a/.agents/rules/web/mobile.md b/.agents/rules/web/mobile.md
index 6c73ba87c3..e95d901b37 100644
--- a/.agents/rules/web/mobile.md
+++ b/.agents/rules/web/mobile.md
@@ -60,8 +60,10 @@ read their code, and follow that pattern rather than inventing a new one.
- Overlays are Kobalte or corvu layers or handle Escape: Android Back sends
Escape to the top layer. Own back stacks use `useAndroidBackNavigation`.
- Persistent prompts (`toast.custom` with `persistent`) go to the prompt
- region (`useKeyedPersistentToasts` does it), which hides while a modal layer
- is open; a prompt in the transient region would cover a sheet's controls.
+ region (`useKeyedPersistentToasts` does it), which hides while a popover,
+ dialog, or drawer is open, or while a presented pane carries
+ `data-holds-prompts` (the touch email composer does); a prompt in the
+ transient region would cover a sheet's controls.
## Keyboard and focus
diff --git a/apps/web/AGENTS.md b/apps/web/AGENTS.md
index 6971aac6b4..b4a9cf210c 100644
--- a/apps/web/AGENTS.md
+++ b/apps/web/AGENTS.md
@@ -25,6 +25,10 @@ It exercises the real resize solver, scroll container, and Lexical layout primit
Discussion link scrolling has a backend-free browser regression:
`bunx playwright test --config src/lib/core/messages/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`.
+
Meeting-note creation, linking, optional team access, retry, and unlinking have desktop and
phone browser coverage in `features/calendar-notes`:
`bunx playwright test --config src/features/calendar-notes/browser-test/playwright.config.ts`.
diff --git a/apps/web/src/features/email-compose/views/email-compose.tsx b/apps/web/src/features/email-compose/views/email-compose.tsx
index 96e2d7d03c..2a6715440f 100644
--- a/apps/web/src/features/email-compose/views/email-compose.tsx
+++ b/apps/web/src/features/email-compose/views/email-compose.tsx
@@ -243,7 +243,8 @@ function LoadedEmailComposeView(
<ComposeProvider value={ctxValue}>
{/* On touch devices the composer fills the screen and keeps its send
actions in the header, so it holds the bottom accessory slot empty
- and the page's New button cannot float over the message. */}
+ and the page's New button cannot float over the message. Persistent
+ prompts wait too, as they do over the full-screen reply composer. */}
<FloatRegion region="accessory" />
<Show when={!composeContext.presentation.isMobile()}>
<SplitHeaderLeft>
@@ -260,7 +261,12 @@ function LoadedEmailComposeView(
/>
</SplitHeaderLeft>
</Show>
- <div class="relative flex flex-col size-full min-h-0 overflow-hidden text-sm">
+ <div
+ class="relative flex flex-col size-full min-h-0 overflow-hidden text-sm"
+ data-holds-prompts={
+ composeContext.presentation.isTouch() ? '' : undefined
+ }
+ >
<Show when={state.operationSource}>
{(source) => (
<MessageOperationRecovery
diff --git a/apps/web/src/lib/core/component/Toast/ToastRegion.tsx b/apps/web/src/lib/core/component/Toast/ToastRegion.tsx
index a5fc190933..405a57c5ba 100644
--- a/apps/web/src/lib/core/component/Toast/ToastRegion.tsx
+++ b/apps/web/src/lib/core/component/Toast/ToastRegion.tsx
@@ -10,6 +10,9 @@ export function ToastRegion() {
{/*
Desktop stack, bottom-right. Persistent prompts get their own region
capped at one visible card. Upload progress sits nearest the corner.
+ Prompts step aside while a popover, dialog, drawer, or a surface
+ marked data-holds-prompts is open, so they never cover its controls;
+ a holder in an inert (background) pane does not count.
*/}
<div class="fixed bottom-2 right-2 m-0 p-2 sm:p-4 list-none outline-none pointer-events-none z-toast-region flex flex-col items-end gap-2">
<Toast.Region
@@ -27,6 +30,7 @@ export function ToastRegion() {
limit={1}
pauseOnInteraction={false}
swipeDirection="right"
+ class="in-[body:has([role=dialog],[role=alertdialog],[data-holds-prompts]:not([inert],[inert]_*))]:hidden"
>
<Toast.List class="flex flex-col gap-2" />
</Toast.Region>
@@ -48,8 +52,8 @@ export function ToastRegion() {
transient toast is visible — Toast.tsx dismisses the previous one as
soon as a new one is shown. Persistent prompts live in their own
region above that slot, capped at one visible card with the rest
- queued until it is answered. Prompts step aside while a drawer, sheet,
- or dialog is open, so they never cover its controls.
+ queued until it is answered. Prompts step aside as on desktop: while a
+ drawer, sheet, dialog, or full-screen composer is open.
*/}
<div
class="fixed left-1/2 -translate-x-1/2 w-full max-w-[420px] px-(--mobile-chrome-gutter) pointer-events-none z-toast-region flex flex-col gap-2"
@@ -72,7 +76,7 @@ export function ToastRegion() {
limit={1}
pauseOnInteraction={false}
swipeDirection="left"
- class="in-[body:has([aria-modal=true])]:hidden"
+ class="in-[body:has([role=dialog],[role=alertdialog],[data-holds-prompts]:not([inert],[inert]_*))]:hidden"
>
<Toast.List class="flex flex-col gap-2" />
</Toast.Region>
diff --git a/apps/web/src/lib/core/component/Toast/browser-test/index.html b/apps/web/src/lib/core/component/Toast/browser-test/index.html
new file mode 100644
index 0000000000..3cea310857
--- /dev/null
+++ b/apps/web/src/lib/core/component/Toast/browser-test/index.html
@@ -0,0 +1 @@
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Prompt region regression</title></head><body><div id="root"></div><script type="module" src="/main.tsx"></script></body></html>
diff --git a/apps/web/src/lib/core/component/Toast/browser-test/main.tsx b/apps/web/src/lib/core/component/Toast/browser-test/main.tsx
new file mode 100644
index 0000000000..260c55fd19
--- /dev/null
+++ b/apps/web/src/lib/core/component/Toast/browser-test/main.tsx
@@ -0,0 +1,105 @@
+import { toast } from '@core/component/Toast/Toast';
+import { ToastRegion } from '@core/component/Toast/ToastRegion';
+import { isMobile } from '@core/mobile/isMobile';
+import { isTouchDevice } from '@core/mobile/isTouchDevice';
+import { Popover } from '@kobalte/core/popover';
+import { Button, Dialog } from '@ui';
+import { createSignal, onMount, Show } from 'solid-js';
+import { render } from 'solid-js/web';
+import '../../../../../index.css';
+
+document.documentElement.dataset.touchDevice = String(isTouchDevice());
+
+function Fixture() {
+ const [dialogOpen, setDialogOpen] = createSignal(false);
+ const [fullscreenOpen, setFullscreenOpen] = createSignal(false);
+ const [composerOpen, setComposerOpen] = createSignal(false);
+ const [composerInBackground, setComposerInBackground] = createSignal(false);
+ const [composerInert, setComposerInert] = createSignal(false);
+
+ onMount(() => {
+ toast.custom(
+ {
+ title: 'Enable Browser Notifications',
+ content: () => <div>Get notified about new messages.</div>,
+ actions: [{ label: 'Hide', onClick: () => {} }],
+ },
+ {
+ persistent: true,
+ region: isMobile() ? 'mobile-prompt-region' : 'prompt-region',
+ }
+ );
+ });
+
+ return (
+ <main class="flex min-h-screen flex-col items-start gap-2 bg-page p-4 text-ink">
+ <Popover>
+ <Popover.Trigger as={Button} variant="outline">
+ Open popover
+ </Popover.Trigger>
+ <Popover.Portal>
+ <Popover.Content class="menu-surface p-3">
+ <Popover.Title>Event details</Popover.Title>
+ <Popover.CloseButton
+ as={Button}
+ aria-label="Close popover"
+ variant="outline"
+ >
+ Close popover
+ </Popover.CloseButton>
+ </Popover.Content>
+ </Popover.Portal>
+ </Popover>
+ <Button variant="outline" onClick={() => setDialogOpen(true)}>
+ Open dialog
+ </Button>
+ <Button variant="outline" onClick={() => setFullscreenOpen(true)}>
+ Open full-screen dialog
+ </Button>
+ <Button variant="outline" onClick={() => setComposerOpen((v) => !v)}>
+ Toggle composer
+ </Button>
+ <Button
+ variant="outline"
+ onClick={() => setComposerInBackground((v) => !v)}
+ >
+ Toggle composer background
+ </Button>
+ <Button variant="outline" onClick={() => setComposerInert((v) => !v)}>
+ Toggle composer inert
+ </Button>
+ <Dialog open={dialogOpen()} onOpenChange={setDialogOpen}>
+ <Dialog.Title>Delete event</Dialog.Title>
+ <Button variant="outline" onClick={() => setDialogOpen(false)}>
+ Close dialog
+ </Button>
+ </Dialog>
+ <Dialog
+ fullscreen
+ open={fullscreenOpen()}
+ onOpenChange={setFullscreenOpen}
+ >
+ <Dialog.Title>Reply composer</Dialog.Title>
+ <Button variant="outline" onClick={() => setFullscreenOpen(false)}>
+ Close full-screen dialog
+ </Button>
+ </Dialog>
+ <Show when={composerOpen()}>
+ <div inert={composerInBackground()}>
+ <section
+ data-holds-prompts
+ inert={composerInert()}
+ aria-label="Composer"
+ >
+ Draft
+ </section>
+ </div>
+ </Show>
+ <ToastRegion />
+ </main>
+ );
+}
+
+const root = document.getElementById('root');
+if (!root) throw new Error('Missing fixture root');
+render(() => <Fixture />, root);
diff --git a/apps/web/src/lib/core/component/Toast/browser-test/playwright.config.ts b/apps/web/src/lib/core/component/Toast/browser-test/playwright.config.ts
new file mode 100644
index 0000000000..af8c9cb57d
--- /dev/null
+++ b/apps/web/src/lib/core/component/Toast/browser-test/playwright.config.ts
@@ -0,0 +1,37 @@
+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.PROMPT_REGION_BROWSER_PORT ?? 3017);
+export default defineConfig({
+ testDir: directory,
+ testMatch: '*.browser.e2e.ts',
+ outputDir: `${directory}/test-results`,
+ timeout: 30_000,
+ workers: 1,
+ reporter: 'line',
+ use: {
+ launchOptions: {
+ executablePath: process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH,
+ },
+ baseURL: `http://127.0.0.1:${port}`,
+ trace: 'retain-on-failure',
+ screenshot: 'only-on-failure',
+ },
+ webServer: {
+ command: `bunx vite --config src/lib/core/component/Toast/browser-test/vite.config.ts --port ${port}`,
+ cwd: webDirectory,
+ url: `http://127.0.0.1:${port}`,
+ reuseExistingServer: false,
+ },
+ projects: [
+ { name: 'desktop', use: { ...devices['Desktop Chrome'] } },
+ {
+ name: 'mobile',
+ use: { ...devices['iPhone 13'], browserName: 'chromium' },
+ },
+ ],
+});
diff --git a/apps/web/src/lib/core/component/Toast/browser-test/prompt.browser.e2e.ts b/apps/web/src/lib/core/component/Toast/browser-test/prompt.browser.e2e.ts
new file mode 100644
index 0000000000..83d446faf7
--- /dev/null
+++ b/apps/web/src/lib/core/component/Toast/browser-test/prompt.browser.e2e.ts
@@ -0,0 +1,59 @@
+import { expect, type Page, test } from '@playwright/test';
+
+const prompt = (page: Page) =>
+ page.getByText('Enable Browser Notifications', { exact: true });
+
+const press = (page: Page, name: string) =>
+ page.getByRole('button', { name, exact: true }).click();
+
+test.beforeEach(async ({ page }) => {
+ await page.goto('/');
+ await expect(prompt(page)).toBeVisible();
+});
+
+test('steps aside while a popover is open', async ({ page }) => {
+ await press(page, 'Open popover');
+ await expect(page.getByText('Event details')).toBeVisible();
+ await expect(prompt(page)).toBeHidden();
+
+ await press(page, 'Close popover');
+ await expect(prompt(page)).toBeVisible();
+});
+
+test('steps aside while a dialog or drawer is open', async ({ page }) => {
+ await press(page, 'Open dialog');
+ await expect(page.getByText('Delete event')).toBeVisible();
+ await expect(prompt(page)).toBeHidden();
+
+ await press(page, 'Close dialog');
+ await expect(prompt(page)).toBeVisible();
+});
+
+test('steps aside while a full-screen dialog is open', async ({ page }) => {
+ await press(page, 'Open full-screen dialog');
+ await expect(page.getByText('Reply composer')).toBeVisible();
+ await expect(prompt(page)).toBeHidden();
+
+ await press(page, 'Close full-screen dialog');
+ await expect(prompt(page)).toBeVisible();
+});
+
+test('waits for a presented surface that holds prompts', async ({ page }) => {
+ await press(page, 'Toggle composer');
+ await expect(prompt(page)).toBeHidden();
+
+ await press(page, 'Toggle composer background');
+ await expect(prompt(page)).toBeVisible();
+
+ await press(page, 'Toggle composer background');
+ await expect(prompt(page)).toBeHidden();
+
+ await press(page, 'Toggle composer inert');
+ await expect(prompt(page)).toBeVisible();
+
+ await press(page, 'Toggle composer inert');
+ await expect(prompt(page)).toBeHidden();
+
+ await press(page, 'Toggle composer');
+ await expect(prompt(page)).toBeVisible();
+});
diff --git a/apps/web/src/lib/core/component/Toast/browser-test/vite.config.ts b/apps/web/src/lib/core/component/Toast/browser-test/vite.config.ts
new file mode 100644
index 0000000000..f8ef8672cf
--- /dev/null
+++ b/apps/web/src/lib/core/component/Toast/browser-test/vite.config.ts
@@ -0,0 +1,27 @@
+import { fileURLToPath } from 'node:url';
+import tailwindcss from '@tailwindcss/vite';
+import { defineConfig } from 'vite';
+import solid 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)
+);
+export default defineConfig({
+ root: directory,
+ cacheDir: `${directory}/.vite`,
+ plugins: [
+ tailwindcss(),
+ solid(),
+ solidSvg({ defaultAsComponent: true }),
+ tsconfigPaths({ projects: [`${webDirectory}/tsconfig.json`] }),
+ ],
+ resolve: {
+ dedupe: ['solid-js'],
+ alias: { 'loro-crdt': 'loro-crdt/base64' },
+ },
+ optimizeDeps: { esbuildOptions: { target: 'esnext' } },
+ server: { host: '127.0.0.1', strictPort: true },
+});
diff --git a/docs/agent-guide/settings.md b/docs/agent-guide/settings.md
index b1ed8b8699..277e68a315 100644
--- a/docs/agent-guide/settings.md
+++ b/docs/agent-guide/settings.md
@@ -83,8 +83,9 @@ Notifications**. Select **Enable** to request permission through the native
notification provider; macOS uses its system permission dialog. The web prompt
continues to say **Enable Browser Notifications** and uses browser permissions.
Select **Hide** to dismiss the prompt. It waits in the same region as other
-prompts, one card at a time, and on a phone it steps aside while a drawer,
-sheet, or dialog is open and comes back when it closes.
+prompts, one card at a time. It steps aside while a popover, dialog, drawer, or
+sheet is open (the calendar event details, for example) and, on touch devices,
+while the full-screen email composer is open, and it comes back when they close.
### Notification snoozes