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(email): open the clicked email when clicking a sender (#9555)
gbirmanf4b9d9968fe5
diff --git a/apps/web/AGENTS.md b/apps/web/AGENTS.mdindex c203d76add..0d7a971120 100644--- a/apps/web/AGENTS.md+++ b/apps/web/AGENTS.md@@ -1090,6 +1090,20 @@ Use the shared scoped drag helpers and overlayIcon for the tag chip.The backend-free browser regression is`bunx playwright test --config src/features/property/tags/browser-test/playwright.config.ts`.+### Senders in email rows++Sender names in Mail rows and collapsed thread messages keep their person card+on hover; clicking the name or anywhere else on the row opens the email.+`HoverCard` keeps the portal's placeholder inside its own `display: contents`+wrapper: opening or closing the card otherwise changes the trigger's siblings,+Solid can then detach and reinsert the trigger, and a press that closes the+card loses its click. Cards opened from a row use `isolateClicks`, because+Solid delivers portaled events through the component tree and a click on the+card would also open the row. On touch, a collapsed message's picture lets the+tap through to the row. The backend-free desktop/phone regression, over rows+with two senders, is+`bunx playwright test --config src/features/entity/browser-test/playwright.config.ts`.+### Enter on a property pillA document control owns Enter unless a press focused it, including one givendiff --git a/apps/web/src/features/email-message/components/collapsed-message.tsx b/apps/web/src/features/email-message/components/collapsed-message.tsxindex 178a61450e..c641a98584 100644--- a/apps/web/src/features/email-message/components/collapsed-message.tsx+++ b/apps/web/src/features/email-message/components/collapsed-message.tsx@@ -1,5 +1,5 @@import type { EmailMessage } from '@app/features/email-message/core/email-message';-import { Tooltip } from '@ui';+import { cn, Tooltip } from '@ui';import { createMemo, type JSX, Show } from 'solid-js';import { getSenderDisplayName } from '../core/email-user';import { formatFullDate, formatShortDate } from '../core/format-email-date';@@ -9,6 +9,7 @@ interface CollapsedMessageProps {message: EmailMessage;avatar?: JSX.Element;currentUserEmail?: string;+ isTouch?: boolean;}/** Collapsed thread row: sender, snippet, date. The chrome is MessageCard's. */@@ -36,7 +37,14 @@ export function CollapsedMessage(props: CollapsedMessageProps) {return (<div class="min-w-0 grid grid-cols-[7rem_minmax(0,1fr)_4.5rem] items-center gap-x-2 @max-[480px]/message:grid-cols-[minmax(0,1fr)_auto] @max-[480px]/message:gap-y-2"><div class="flex items-center min-h-6 gap-2 min-w-0 text-sm @max-[480px]/message:col-start-1 @max-[480px]/message:row-start-1">- <div class="shrink-0 flex justify-center items-center size-6">+ {/* On touch the picture's tap would open the sender's card; in a+ collapsed row it belongs to the row, which opens the message. */}+ <div+ class={cn(+ 'shrink-0 flex justify-center items-center size-6',+ props.isTouch && 'pointer-events-none'+ )}+ >{props.avatar}</div><div class="min-w-0">diff --git a/apps/web/src/features/email-message/components/email-user-tooltip.tsx b/apps/web/src/features/email-message/components/email-user-tooltip.tsxindex 23b2470358..645277ce9c 100644--- a/apps/web/src/features/email-message/components/email-user-tooltip.tsx+++ b/apps/web/src/features/email-message/components/email-user-tooltip.tsx@@ -26,6 +26,7 @@ export function EmailUserTooltip(props: EmailUserTooltipProps) {placement="bottom"open={open()}onOpenChange={setOpen}+ isolateClickstriggerAs="span"triggerClass={props.triggerClass}trigger={props.children}diff --git a/apps/web/src/features/email-message/views/email-message.tsx b/apps/web/src/features/email-message/views/email-message.tsxindex 54807a1343..3bffe6ea83 100644--- a/apps/web/src/features/email-message/views/email-message.tsx+++ b/apps/web/src/features/email-message/views/email-message.tsx@@ -165,6 +165,7 @@ export function EmailMessageView(props: EmailMessageViewProps) {message={props.message}currentUserEmail={props.viewerEmail}avatar={props.renderAvatar?.(props.message)}+ isTouch={props.isTouch}/>}>diff --git a/apps/web/src/features/entity/browser-test/participants.browser.e2e.ts b/apps/web/src/features/entity/browser-test/participants.browser.e2e.tsnew file mode 100644index 0000000000..7009c5f3e6--- /dev/null+++ b/apps/web/src/features/entity/browser-test/participants.browser.e2e.ts@@ -0,0 +1,108 @@+import { expect, type Locator, type Page, test } from '@playwright/test';++test.beforeEach(async ({ page }) => {+ await page.route('**/*', async (route) => {+ if (new URL(route.request().url()).hostname === 'localhost')+ await route.continue();+ else await route.fulfill({ status: 401, body: '{}' });+ });+ await page.routeWebSocket('**/*', (socket) => socket.close());+ await page.goto('/src/features/entity/browser-test/participants.html');+ await expect(+ page.getByTestId('list-narrow').getByText('Ada', { exact: true })+ ).toBeVisible({ timeout: 60_000 });+});++/** Rest on a target long enough for any hover card to open. */+async function dwell(page: Page, target: Locator) {+ const box = await target.boundingBox();+ if (!box) throw new Error('Target is not laid out');+ await page.mouse.move(box.x - 20, box.y - 20);+ await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2, {+ steps: 10,+ });+ await page.waitForTimeout(600);+}++/** Hover a sender until its card shows; the first card on a cold page loads late. */+async function openCard(page: Page, sender: Locator, card: Locator) {+ await expect(async () => {+ await dwell(page, sender);+ await expect(card).toBeVisible({ timeout: 2_000 });+ }).toPass({ timeout: 30_000 });+}++async function click(page: Page, target: Locator) {+ const box = await target.boundingBox();+ if (!box) throw new Error('Target is not laid out');+ await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2, {+ steps: 5,+ });+ await page.mouse.down();+ await page.mouse.up();+}++for (const list of ['list-narrow', 'list-wide']) {+ test(`${list}: hovering a sender shows the card; the row, not the card, opens the email`, async ({+ page,+ }) => {+ const sender = page+ .getByTestId(list)+ .getByText('macro-application[bot]')+ .first();+ const card = page.getByText('[email protected]');+ await openCard(page, sender, card);++ await click(page, card);+ await expect(page.getByLabel('Opened threads')).toHaveText('');++ // Pressing the sender closes its card; the click must still land.+ await click(page, sender);+ await expect(page.getByLabel('Opened threads')).toHaveText('thread-1');+ });+}++test('thread: hovering a collapsed sender shows the card; the message, not the card, opens', async ({+ page,+}) => {+ const thread = page.getByTestId('thread');+ const sender = thread.getByText('Ada', { exact: true });+ const card = page.getByText('[email protected]');+ await openCard(page, sender, card);++ await click(page, card);+ await expect(page.getByLabel('Expanded messages')).toHaveText('');++ await click(page, sender);+ await expect(page.getByLabel('Expanded messages')).toHaveText('message-1');+});++test.describe('touch', () => {+ test.use({+ hasTouch: true,+ isMobile: true,+ viewport: { width: 390, height: 900 },+ });++ test('tapping a sender opens the email', async ({ page }) => {+ await page+ .getByTestId('list-narrow')+ .getByText('Alan', { exact: true })+ .tap();+ await expect(page.getByLabel('Opened threads')).toHaveText('thread-2');+ });++ test("tapping a collapsed message's sender picture opens the message", async ({+ page,+ }) => {+ const avatar = page+ .getByTestId('thread')+ .locator('[data-slot="avatar"]')+ .nth(1);+ const box = await avatar.boundingBox();+ if (!box) throw new Error('Avatar is not laid out');+ // A finger lands on the picture whether or not the picture takes the tap.+ await page.touchscreen.tap(box.x + box.width / 2, box.y + box.height / 2);+ await expect(page.getByLabel('Expanded messages')).toHaveText('message-2');+ });+});diff --git a/apps/web/src/features/entity/browser-test/participants.html b/apps/web/src/features/entity/browser-test/participants.htmlnew file mode 100644index 0000000000..506b624f18--- /dev/null+++ b/apps/web/src/features/entity/browser-test/participants.html@@ -0,0 +1 @@+<!doctype html><html><head><meta charset="UTF-8"><title>Email sender fixture</title></head><body><div id="root"></div><script type="module" src="./participants.tsx"></script></body></html>diff --git a/apps/web/src/features/entity/browser-test/participants.tsx b/apps/web/src/features/entity/browser-test/participants.tsxnew file mode 100644index 0000000000..4664f41f31--- /dev/null+++ b/apps/web/src/features/entity/browser-test/participants.tsx@@ -0,0 +1,158 @@+import '@app/index.css';+import type { EmailMessage } from '@app/features/email-message/core/email-message';+import { EmailSenderIcon } from '@app/features/email-message/sender-icon-adapter';+import { EmailMessageView } from '@app/features/email-message/views/email-message';+import { TagSetsProvider } from '@app/features/property/tags/tag-sets-context';+import { MobileSettingsProvider } from '@app/features/settings/context/mobile-settings';+import { AnalyticsContextProvider } from '@app/lib/analytics/analytics-context';+import { PosthogProvider } from '@app/lib/analytics/posthog';+import { ChannelsContextProvider } from '@core/context/channels';+import { EmailLinksContextProvider } from '@core/context/emailLinks';+import { QuickAccessProvider } from '@core/context/quickAccess/QuickAccessProvider';+import { UserContextProvider } from '@core/context/user';+import { isTouchDevice } from '@core/mobile/isTouchDevice';+import { EntityProvider } from '@entity';+import { MemoryRouter, Route } from '@solidjs/router';+import { QueryClient, QueryClientProvider } from '@tanstack/solid-query';+import { createSignal, For } from 'solid-js';+import { render } from 'solid-js/web';+import { ListEntity, ListLayoutProvider } from '../composed/ListEntity';+import type { EmailEntity } from '../types/entity';++const SENDERS = ['Ada Lovelace', 'Alan Turing', 'Barbara Liskov'];++const threads = SENDERS.map(+ (name, i) =>+ ({+ id: `thread-${i + 1}`,+ type: 'email',+ name: `Subject ${i + 1}`,+ // Two senders, the second a shared notification address, as on a+ // GitHub thread: hovering the second name is where clicks were lost.+ participants: [+ { email: `sender${i + 1}@example.com`, name },+ { email: '[email protected]', name: 'macro-application[bot]' },+ ],+ }) as unknown as EmailEntity+);++const messages = SENDERS.map(+ (name, i) =>+ ({+ db_id: `message-${i + 1}`,+ thread_db_id: 'thread-1',+ link_id: 'link-1',+ from: { email: `sender${i + 1}@example.com`, name },+ to: [{ email: '[email protected]', name: 'Viewer' }],+ cc: [],+ bcc: [],+ labels: [],+ attachments: [],+ attachments_draft: [],+ attachments_forwarded: [],+ body_text: `Message ${i + 1}`,+ internal_date_ts: '2026-11-01T10:00:00Z',+ created_at: '2026-11-01T10:00:00Z',+ updated_at: '2026-11-01T10:00:00Z',+ is_draft: false,+ is_read: true,+ }) as unknown as EmailMessage+);++/**+ * Mail rows (the reading-pane list and the wide list) and a thread's collapsed+ * messages, each recording what a click opened.+ */+function Fixture() {+ const [openedThreads, setOpenedThreads] = createSignal<string[]>([]);+ const [expandedMessages, setExpandedMessages] = createSignal<string[]>([]);+ const lists = [+ { name: 'narrow', width: 'w-80' },+ { name: 'wide', width: 'w-[900px]' },+ ];++ return (+ <main class="flex flex-col gap-6 bg-page p-8 text-ink">+ <For each={lists}>+ {(list) => {+ const [ref, setRef] = createSignal<HTMLElement>();+ return (+ <section+ data-testid={`list-${list.name}`}+ ref={setRef}+ class={list.width}+ >+ <ListLayoutProvider ref={ref} narrowLayout="inbox">+ <For each={threads}>+ {(thread) => (+ <ListEntity+ entity={thread}+ onClick={() =>+ setOpenedThreads((ids) => [...ids, thread.id])+ }+ />+ )}+ </For>+ </ListLayoutProvider>+ </section>+ );+ }}+ </For>+ <section data-testid="thread" class="flex w-[600px] flex-col gap-2">+ <For each={messages}>+ {(message) => (+ <EmailMessageView+ message={message}+ renderAvatar={(m) => <EmailSenderIcon message={m} />}+ isTouch={isTouchDevice()}+ isPersonal+ isSelected={false}+ allowHover+ isExpanded={false}+ onExpand={() =>+ setExpandedMessages((ids) => [...ids, message.db_id])+ }+ />+ )}+ </For>+ </section>+ <output aria-label="Opened threads">{openedThreads().join(',')}</output>+ <output aria-label="Expanded messages">+ {expandedMessages().join(',')}+ </output>+ </main>+ );+}++const queryClient = new QueryClient({+ defaultOptions: { queries: { retry: false } },+});++render(+ () => (+ <QueryClientProvider client={queryClient}>+ <AnalyticsContextProvider>+ <PosthogProvider>+ <EntityProvider>+ <UserContextProvider>+ <ChannelsContextProvider>+ <QuickAccessProvider>+ <EmailLinksContextProvider>+ <MobileSettingsProvider>+ <TagSetsProvider tagSets={() => []}>+ <MemoryRouter>+ <Route path="*" component={Fixture} />+ </MemoryRouter>+ </TagSetsProvider>+ </MobileSettingsProvider>+ </EmailLinksContextProvider>+ </QuickAccessProvider>+ </ChannelsContextProvider>+ </UserContextProvider>+ </EntityProvider>+ </PosthogProvider>+ </AnalyticsContextProvider>+ </QueryClientProvider>+ ),+ document.getElementById('root')!+);diff --git a/apps/web/src/features/entity/browser-test/playwright.config.ts b/apps/web/src/features/entity/browser-test/playwright.config.tsnew file mode 100644index 0000000000..d4a9d9aec1--- /dev/null+++ b/apps/web/src/features/entity/browser-test/playwright.config.ts@@ -0,0 +1,23 @@+import { fileURLToPath } from 'node:url';+import { defineConfig } from '@playwright/test';++const port = process.env.EMAIL_SENDER_TEST_PORT ?? '3510';+export default defineConfig({+ testDir: fileURLToPath(new URL('.', import.meta.url)),+ testMatch: '*.browser.e2e.ts',+ workers: 1,+ timeout: 120_000,+ use: {+ baseURL: `http://localhost:${port}`,+ launchOptions: {+ executablePath: process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH,+ },+ },+ webServer: {+ command: `MACRO_DEV_HTTPS=false bunx vite --port ${port} --strictPort`,+ cwd: fileURLToPath(new URL('../../../../', import.meta.url)),+ url: `http://localhost:${port}/app/`,+ reuseExistingServer: false,+ timeout: 60_000,+ },+});diff --git a/apps/web/src/features/entity/extractors/entity-email-participants.tsx b/apps/web/src/features/entity/extractors/entity-email-participants.tsxindex 607b1c542d..dd423ffd93 100644--- a/apps/web/src/features/entity/extractors/entity-email-participants.tsx+++ b/apps/web/src/features/entity/extractors/entity-email-participants.tsx@@ -70,6 +70,7 @@ function ParticipantWithTooltip(props: {<HoverCardopen={open()}onOpenChange={setOpen}+ isolateClickstriggerAs="span"trigger={<Show@@ -167,6 +168,7 @@ function copyEmail(email: string, e: MouseEvent) {function HiddenParticipantsTooltip(props: { hidden: ResolvedParticipant[] }) {return (<HoverCard+ isolateClickstriggerAs="span"trigger={<span class="opacity-60">+{props.hidden.length}</span>}content={diff --git a/apps/web/src/lib/core/component/HoverCard.tsx b/apps/web/src/lib/core/component/HoverCard.tsxindex b5f80561e5..0cce7a0c6f 100644--- a/apps/web/src/lib/core/component/HoverCard.tsx+++ b/apps/web/src/lib/core/component/HoverCard.tsx@@ -10,9 +10,12 @@ import {createEffect,createSignal,onCleanup,+ Show,useContext,} from 'solid-js';+const stopPropagation = (event: Event) => event.stopPropagation();+type NestedHoverCardContext = {count: () => number;setCount: Setter<number>;@@ -131,6 +134,12 @@ export type HoverCardComponentProps = {* surface below.*/passThroughPointerEvents?: boolean;+ /**+ * Keep presses inside the card from reaching the trigger's ancestors. Solid+ * delivers portaled events through the component tree, so without this a+ * click anywhere on a card opened from a list row also activates that row.+ */+ isolateClicks?: boolean;/** Callback when open state changes */onOpenChange?: (open: boolean) => void;/**@@ -397,32 +406,47 @@ export function HoverCard(props: HoverCardComponentProps) {{props.trigger}</KobalteHoverCard.Trigger>- <KobalteHoverCard.Portal mount={props.portalMount}>- <KobalteHoverCard.Content- ref={(el) => {- setContentEl(el);- props.contentRef?.(el);- }}- {...dismissableLayerProps}- class={cn(- props.contentZIndexClass ?? 'z-tool-tip',- // `!` because the dismissable layer writes `pointer-events: auto`- // onto this element.- props.passThroughPointerEvents && 'pointer-events-none!',- props.contentClass- )}- >- <HoverCardPortalNestedPreviewOpenContext.Provider- value={{- count: nestedOpenCount,- setCount: setNestedOpenCount,- entry,+ {/* Opening the card leaves the portal's placeholder text node here, and+ closing it removes the node. Outside a wrapper that change reaches the+ trigger's parent, which can detach and reinsert the trigger; a press+ that closes the card then loses its click. */}+ <span class="contents">+ <KobalteHoverCard.Portal mount={props.portalMount}>+ <KobalteHoverCard.Content+ ref={(el) => {+ setContentEl(el);+ props.contentRef?.(el);}}+ {...dismissableLayerProps}+ class={cn(+ props.contentZIndexClass ?? 'z-tool-tip',+ // `!` because the dismissable layer writes `pointer-events: auto`+ // onto this element.+ props.passThroughPointerEvents && 'pointer-events-none!',+ props.contentClass+ )}>- {props.content}- </HoverCardPortalNestedPreviewOpenContext.Provider>- </KobalteHoverCard.Content>- </KobalteHoverCard.Portal>+ <HoverCardPortalNestedPreviewOpenContext.Provider+ value={{+ count: nestedOpenCount,+ setCount: setNestedOpenCount,+ entry,+ }}+ >+ <Show when={props.isolateClicks} fallback={props.content}>+ <div+ class="contents"+ onClick={stopPropagation}+ onMouseDown={stopPropagation}+ onPointerDown={stopPropagation}+ >+ {props.content}+ </div>+ </Show>+ </HoverCardPortalNestedPreviewOpenContext.Provider>+ </KobalteHoverCard.Content>+ </KobalteHoverCard.Portal>+ </span></KobalteHoverCard>);}diff --git a/apps/web/src/lib/core/component/UserCardTrigger.tsx b/apps/web/src/lib/core/component/UserCardTrigger.tsxindex b1bb8c2471..5c944ca0d6 100644--- a/apps/web/src/lib/core/component/UserCardTrigger.tsx+++ b/apps/web/src/lib/core/component/UserCardTrigger.tsx@@ -61,6 +61,7 @@ export function UserCardTrigger(props: UserCardTriggerProps) {placement={props.placement}open={open()}onOpenChange={setOpen}+ isolateClickstriggerAs={props.triggerAs ?? 'span'}triggerClass={props.triggerClass}triggerTabIndex={props.triggerTabIndex}diff --git a/docs/agent-guide/email.md b/docs/agent-guide/email.mdindex 08e81bb12d..0ba898e51a 100644--- a/docs/agent-guide/email.md+++ b/docs/agent-guide/email.md@@ -151,6 +151,14 @@ query: load more threads from the same address, then check that existing rownames and their hover cards do not change. Repeat with a text query to exercisethe search-service results.+Hovering a sender's name in a Mail row or a collapsed thread message shows the+sender's card. Clicking the name, or anywhere else on the row, opens that email+or message; clicking inside the card (its actions, padding, or name) never+opens the row underneath. On touch, tapping a collapsed message's sender+picture opens the message. The backend-free desktop/phone regression is+`bunx playwright test --config src/features/entity/browser-test/playwright.config.ts`+from `apps/web`.+`Favorites`, directly below Inbox on desktop, lists starred Macro emails acrossSignal, Noise, and archived mail. It respects the selected inboxes and filters; searchwithin the tab is also restricted to favorites. Removing a star removes the row