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(web): simplify narrow view headers (#6606)
dev-rbfd17f7aa8e04
diff --git a/apps/web/src/features/email-view/components/EmailHeader.tsx b/apps/web/src/features/email-view/components/EmailHeader.tsxindex fb74571f6c..6990852f51 100644--- a/apps/web/src/features/email-view/components/EmailHeader.tsx+++ b/apps/web/src/features/email-view/components/EmailHeader.tsx@@ -4,17 +4,14 @@ import {ViewBreadcrumbs,ViewShell,} from '@app/components/view-shell';+import { SidebarCreateButton } from '@app/components/view-shell/SidebarCreateButton';import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';-import CaretDownIcon from '@phosphor/caret-down.svg';-import PlusIcon from '@phosphor/plus.svg';-import { Button, Dropdown, pressHandlers } from '@ui';import { createSignal } from 'solid-js';import { composeEmail } from '../compose-email';import { EMAIL_TABS } from '../constants';import { useEmailView } from '../email-view-context';import { EmailControls } from './EmailControls';import { EmailInboxMenu } from './EmailInboxSelector';-import { EmailNavigation } from './EmailSidebar';export type EmailHeaderProps = {/** Restores list focus when Escape leaves the search field. */@@ -58,7 +55,6 @@ export function EmailTopBar() {export function EmailHeader(props: EmailHeaderProps) {const panel = useSplitPanelOrThrow();const { state, setState } = useEmailView();- const [navigationOpen, setNavigationOpen] = createSignal(false);const [filterOpen, setFilterOpen] = createSignal(false);let searchInput: HTMLInputElement | undefined;const selectedTabLabel = () =>@@ -87,43 +83,15 @@ export function EmailHeader(props: EmailHeaderProps) {return (<div class="flex min-w-0 flex-col">- {/* Sidebar stand-in while the aside is collapsed: the tab menu, the- inbox selector, and compose. */}- <div class="mb-4 hidden min-w-0 items-center gap-2 @max-[720px]/view-shell:flex">- <Dropdown- open={navigationOpen()}- onOpenChange={setNavigationOpen}- placement="bottom-start"- >- <h1 class="min-w-0">- <Dropdown.Trigger- variant="ghost"- size="sm"- class="h-auto min-w-0 max-w-full gap-1 rounded-lg px-2 py-1 text-xl font-semibold tracking-[-0.03em] text-ink"- aria-label={`Select email view: ${selectedTabLabel()}`}- >- <span class="truncate">{selectedTabLabel()}</span>- <CaretDownIcon class="size-3.5 shrink-0 text-ink-muted" />- </Dropdown.Trigger>- </h1>- <Dropdown.Content class="w-72 rounded-2xl p-2">- <div class="rounded-xl bg-menu">- <EmailNavigation onNavigate={() => setNavigationOpen(false)} />- </div>- </Dropdown.Content>- </Dropdown>+ <div class="mb-4 hidden h-8 min-w-0 items-center gap-2 @max-[720px]/view-shell:flex">+ <h1 class="min-w-0 truncate text-xl font-semibold tracking-[-0.03em] text-ink">+ {selectedTabLabel()}+ </h1><div class="ml-auto flex shrink-0 items-center gap-2"><EmailInboxMenu />- <Button- type="button"- variant="cta"- size="md"- class="rounded-lg px-3 transition-none"- {...pressHandlers(() => composeEmail())}- >- <PlusIcon class="size-4 shrink-0" />- New- </Button>+ <div class="shrink-0">+ <SidebarCreateButton label="New" onCreate={() => composeEmail()} />+ </div></div></div>diff --git a/apps/web/src/features/tasks-view/components/TasksHeader.tsx b/apps/web/src/features/tasks-view/components/TasksHeader.tsxindex 48d6e0ecd3..987fd38ccf 100644--- a/apps/web/src/features/tasks-view/components/TasksHeader.tsx+++ b/apps/web/src/features/tasks-view/components/TasksHeader.tsx@@ -4,18 +4,15 @@ import {ViewBreadcrumbs,ViewShell,} from '@app/components/view-shell';+import { SidebarCreateButton } from '@app/components/view-shell/SidebarCreateButton';import { useSplitLayout } from '@components/app/split-layout/layout';import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';import { isTouchDevice } from '@core/mobile/isTouchDevice';-import CaretDownIcon from '@phosphor/caret-down.svg';-import PlusIcon from '@phosphor/plus.svg';-import { Button, Dropdown } from '@ui';-import { createSignal, Show } from 'solid-js';+import { Show } from 'solid-js';import { TASK_TABS } from '../constants';import { useTasksView } from '../tasks-view-context';import { TasksControls } from './TasksControls';import { TasksMobileTabs } from './TasksMobileTabs';-import { TasksNavigation } from './TasksSidebar';export type TasksHeaderProps = {/** Restores list focus when Escape leaves the search field. */@@ -64,8 +61,9 @@ export function TasksHeader(props: TasksHeaderProps) {const panel = useSplitPanelOrThrow();const layout = useSplitLayout();const { state, setState } = useTasksView();- const [navigationOpen, setNavigationOpen] = createSignal(false);let searchInput: HTMLInputElement | undefined;+ const selectedTabLabel = () =>+ TASK_TABS.find((tab) => tab.id === state.tab)?.label ?? 'Tasks';useViewControlHotkeys({scopeId: panel.splitHotkeyScope,@@ -84,50 +82,19 @@ export function TasksHeader(props: TasksHeaderProps) {layout.popoverSplit({ type: 'component', id: 'task-compose' });};- const selectedTabLabel = () =>- TASK_TABS.find((tab) => tab.id === state.tab)?.label;-return (<div class="flex min-w-0 flex-col @max-[720px]/view-shell:gap-3"><Showwhen={isTouchDevice()}fallback={<>- <div class="hidden h-8 min-w-0 items-center gap-2 @max-[720px]/view-shell:flex">- <Dropdown- open={navigationOpen()}- onOpenChange={setNavigationOpen}- placement="bottom-start"- >- <h1 class="min-w-0">- <Dropdown.Trigger- variant="ghost"- size="sm"- class="h-auto min-w-0 max-w-full gap-1 rounded-lg px-2 py-1 text-xl font-semibold tracking-[-0.03em] text-ink"- aria-label={`Select task view: ${selectedTabLabel()}`}- >- <span class="truncate">{selectedTabLabel()}</span>- <CaretDownIcon class="size-3.5 shrink-0 text-ink-muted" />- </Dropdown.Trigger>- </h1>- <Dropdown.Content class="w-72 rounded-2xl p-2">- <div class="rounded-xl bg-menu">- <TasksNavigation- onNavigate={() => setNavigationOpen(false)}- />- </div>- </Dropdown.Content>- </Dropdown>- <Button- type="button"- variant="cta"- size="md"- class="ml-auto"- onClick={createTask}- >- <PlusIcon class="size-4 shrink-0" />- New- </Button>+ <div class="hidden h-8 min-w-0 items-center @max-[720px]/view-shell:flex">+ <h1 class="min-w-0 truncate text-xl font-semibold tracking-[-0.03em] text-ink">+ {selectedTabLabel()}+ </h1>+ <div class="ml-auto shrink-0">+ <SidebarCreateButton label="New" onCreate={createTask} />+ </div></div><div class="flex min-w-0 items-center justify-between gap-3">