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: new app views responsive ui issues (#6482)

dev-rb21f980424bb2
diff --git a/apps/web/src/components/view-shell/ViewShell.tsx b/apps/web/src/components/view-shell/ViewShell.tsx
index a671cf96fb..6441aa8a8e 100644
--- a/apps/web/src/components/view-shell/ViewShell.tsx
+++ b/apps/web/src/components/view-shell/ViewShell.tsx
@@ -361,14 +361,12 @@ function TopBar(props: JSX.HTMLAttributes<HTMLDivElement>) {
<div
{...rest}
class={cn(
- 'flex h-12 min-w-0 shrink-0 items-center border-b border-edge-muted px-4 py-3 touch:hidden',
+ 'flex h-12 min-w-0 shrink-0 items-center gap-1 border-b border-edge-muted px-4 py-3 touch:hidden',
local.class
)}
data-view-shell-top-bar=""
>
- <h1 class="min-w-0 truncate text-sm font-semibold tracking-[-0.03em] text-ink">
- {local.children}
- </h1>
+ {local.children}
</div>
);
}
diff --git a/apps/web/src/features/agents-view/views/AgentsView.tsx b/apps/web/src/features/agents-view/views/AgentsView.tsx
index 85a8bbe525..b1854a1d6e 100644
--- a/apps/web/src/features/agents-view/views/AgentsView.tsx
+++ b/apps/web/src/features/agents-view/views/AgentsView.tsx
@@ -177,7 +177,11 @@ function AgentsWorkspace() {
keyed
fallback={
<>
- <ViewShell.TopBar>{PAGE_TITLES[page()]}</ViewShell.TopBar>
+ <ViewShell.TopBar>
+ <h1 class="min-w-0 truncate text-sm font-semibold tracking-[-0.03em] text-ink">
+ {PAGE_TITLES[page()]}
+ </h1>
+ </ViewShell.TopBar>
<div class="min-h-0 flex-1">
<Suspense fallback={<LoadingComposer />}>
<Switch>
diff --git a/apps/web/src/features/channels-view/components/rail/SlimChannelsRail.tsx b/apps/web/src/features/channels-view/components/rail/SlimChannelsRail.tsx
index d449d42d2d..467ff62258 100644
--- a/apps/web/src/features/channels-view/components/rail/SlimChannelsRail.tsx
+++ b/apps/web/src/features/channels-view/components/rail/SlimChannelsRail.tsx
@@ -382,8 +382,12 @@ function SlimHeader() {
return (
<div class="flex shrink-0 flex-col items-center gap-3 pt-2">
- <div class="flex h-8 w-full items-center justify-center px-1">
- <SplitPanel.CloseButton size="icon-sm" />
+ <div class="flex w-full items-center justify-center px-2">
+ <SplitPanel.ControlGroup>
+ <SplitPanel.CloseButton size="icon-sm" />
+ </SplitPanel.ControlGroup>
+ </div>
+ <div class="flex h-8 w-full items-center justify-center px-2">
<RailModeButton
expanded={false}
onToggle={() => rail.setMode('full')}
diff --git a/apps/web/src/features/drive-view/views/drive-layout.tsx b/apps/web/src/features/drive-view/views/drive-layout.tsx
index 98d3da2fd4..379af66c9f 100644
--- a/apps/web/src/features/drive-view/views/drive-layout.tsx
+++ b/apps/web/src/features/drive-view/views/drive-layout.tsx
@@ -8,10 +8,9 @@ import {
} from '@app/components/view-shell';
import { SplitPanel } from '@components/app/split-panel';
import CaretDownIcon from '@phosphor/caret-down.svg';
-import CaretRightIcon from '@phosphor/caret-right.svg';
import FolderIcon from '@phosphor/folder.svg';
import SearchIcon from '@phosphor/magnifying-glass.svg';
-import { Button, cn, Dropdown } from '@ui';
+import { Button, Dropdown } from '@ui';
import { createMemo, createSignal, For, type JSX, Show } from 'solid-js';
import { DriveNavigation } from '../components/drive-navigation';
import { FolderTree } from '../components/folder-tree';
@@ -87,122 +86,107 @@ export function DriveLayout(props: {
onOpenChange={props.onFavoritesOpen}
>
<CollapsibleSection.Trigger class="text-xs">
- <CollapsibleSection.Indicator class="order-first ml-0" />
- Favorites
+ <span class="min-w-0 truncate">Favorites</span>
+ <CollapsibleSection.Indicator />
</CollapsibleSection.Trigger>
<CollapsibleSection.Content>
<props.favorites />
</CollapsibleSection.Content>
</CollapsibleSection.Root>
- <section aria-label="Folders" class="min-w-0">
- <div class="mb-3 flex h-7 items-center justify-between px-3 text-xs text-ink-muted">
- <span>Folders</span>
+ <CollapsibleSection.Root
+ open={props.state.rootOpen}
+ onOpenChange={props.onRootOpen}
+ >
+ <div class="flex items-center gap-1">
+ <CollapsibleSection.Trigger class="min-w-0 flex-1 text-xs">
+ <span class="min-w-0 truncate">Folders</span>
+ <CollapsibleSection.Indicator />
+ </CollapsibleSection.Trigger>
<Button
variant="ghost"
- size="sm"
- square
- class="size-7 rounded-lg"
- aria-label="Search folders"
+ size="icon-sm"
+ label="Search folders"
+ class="ml-auto mr-2 shrink-0 rounded-lg"
onClick={() => {
- setSearchingFolders((value) => !value);
+ const open = !searchingFolders();
+ setSearchingFolders(open);
setFolderSearch('');
+ if (open) props.onRootOpen(true);
}}
>
- <SearchIcon class="size-4" />
+ <SearchIcon class="size-3.5" />
</Button>
</div>
- <Show when={searchingFolders()}>
- <SearchBar
- label="Search folders"
- placeholder="Search folders"
- value={folderSearch()}
- onValueChange={setFolderSearch}
- class="mb-2"
- />
- </Show>
- <div
- class={cn(
- 'flex min-w-0 items-center rounded-xl',
- selectedFolder() === null ? 'bg-active' : 'hover:bg-hover'
- )}
- >
- <Button
- variant="ghost"
- size="sm"
- square
- class="size-6 shrink-0 rounded-lg not-disabled:hover:bg-transparent not-touch:not-disabled:hover:bg-none not-touch:not-disabled:active:bg-none"
- aria-label={
- props.state.rootOpen
- ? 'Collapse Drive folders'
- : 'Expand Drive folders'
- }
- aria-expanded={props.state.rootOpen}
- onClick={() => props.onRootOpen(!props.state.rootOpen)}
- >
- <CaretRightIcon
- class={cn(
- 'size-3 transition-transform',
- props.state.rootOpen && 'rotate-90'
- )}
+ <CollapsibleSection.Content>
+ <Show when={searchingFolders()}>
+ <SearchBar
+ label="Search folders"
+ placeholder="Search folders"
+ value={folderSearch()}
+ onValueChange={setFolderSearch}
+ class="mb-2"
/>
- </Button>
- <ViewSidebar.Item
- class={cn(
- 'min-w-0 flex-1 px-2 font-normal bg-transparent not-disabled:hover:bg-transparent not-touch:not-disabled:hover:bg-none not-touch:not-disabled:active:bg-none',
- selectedFolder() === null && 'text-ink'
- )}
- aria-current={selectedFolder() === null ? 'page' : undefined}
- onClick={() => {
- props.onFolder(null);
- setNavigationOpen(false);
- }}
- >
- <FolderIcon class="size-4 shrink-0" />
- <span>Drive</span>
- </ViewSidebar.Item>
- </div>
- <Show when={props.state.rootOpen || folderSearch().trim()}>
- <div class="ml-3 border-l border-edge pl-3">
- <Show
- when={!props.foldersLoading}
- fallback={
- <p role="status" class="px-3 py-2 text-sm text-ink-extra-muted">
- Loading folders…
- </p>
- }
+ </Show>
+ <ViewSidebar.Nav aria-label="Folders">
+ <ViewSidebar.Item
+ active={selectedFolder() === null}
+ onClick={() => {
+ props.onFolder(null);
+ setNavigationOpen(false);
+ }}
>
+ <ViewSidebar.Icon>
+ <FolderIcon class="size-4" />
+ </ViewSidebar.Icon>
+ <span>Drive</span>
+ </ViewSidebar.Item>
+ <div class="ml-3 border-l border-edge pl-3">
<Show
- when={!props.foldersError}
+ when={!props.foldersLoading}
fallback={
- <div class="p-3 text-sm text-ink-muted">
- Folders couldn’t be loaded.
- <Button variant="ghost" onClick={props.onRetryFolders}>
- Try again
- </Button>
- </div>
+ <p
+ role="status"
+ class="px-3 py-2 text-sm text-ink-extra-muted"
+ >
+ Loading folders…
+ </p>
}
>
- <FolderTree
- nodes={filteredTree()}
- selectedId={selectedFolder()}
- expandedIds={props.state.expandedFolderIds}
- searching={!!folderSearch().trim()}
- onToggle={props.onToggleFolder}
- onSelect={(id) => {
- props.onFolder(id);
- setNavigationOpen(false);
- }}
- />
- <Show when={filteredTree().length === 0}>
- <p class="px-3 py-2 text-sm text-ink-extra-muted">
- {folderSearch() ? 'No matching folders' : 'No folders yet'}
- </p>
+ <Show
+ when={!props.foldersError}
+ fallback={
+ <div class="p-3 text-sm text-ink-muted">
+ Folders couldn’t be loaded.
+ <Button variant="ghost" onClick={props.onRetryFolders}>
+ Try again
+ </Button>
+ </div>
+ }
+ >
+ <FolderTree
+ nodes={filteredTree()}
+ selectedId={selectedFolder()}
+ expandedIds={props.state.expandedFolderIds}
+ searching={!!folderSearch().trim()}
+ onToggle={props.onToggleFolder}
+ onSelect={(id) => {
+ props.onFolder(id);
+ setNavigationOpen(false);
+ }}
+ />
+ <Show when={filteredTree().length === 0}>
+ <p class="px-3 py-2 text-sm text-ink-extra-muted">
+ {folderSearch()
+ ? 'No matching folders'
+ : 'No folders yet'}
+ </p>
+ </Show>
</Show>
</Show>
- </Show>
- </div>
- </Show>
- </section>
+ </div>
+ </ViewSidebar.Nav>
+ </CollapsibleSection.Content>
+ </CollapsibleSection.Root>
</>
);
@@ -224,10 +208,6 @@ export function DriveLayout(props: {
<SplitPanel.CloseButton />
<ViewSidebar.Title>Drive</ViewSidebar.Title>
</div>
- <SplitPanel.ControlGroup>
- <SplitPanel.BackButton />
- <SplitPanel.ForwardButton />
- </SplitPanel.ControlGroup>
</ViewSidebar.Header>
<ViewSidebar.Content class="flex flex-col gap-6">
<props.createMenu />
@@ -237,14 +217,22 @@ export function DriveLayout(props: {
</ViewShell.Aside>
<ViewShell.Main>
<ViewShell.TopBar class="touch:flex">
+ <SplitPanel.CloseButton class="hidden shrink-0 @max-[720px]/view-shell:flex" />
+ <h1 class="hidden min-w-0 truncate text-sm font-semibold tracking-[-0.03em] text-ink @max-[720px]/view-shell:block">
+ Drive
+ </h1>
<Show
when={props.state.location.kind === 'folder'}
- fallback={title()}
+ fallback={
+ <h1 class="min-w-0 truncate text-sm font-semibold tracking-[-0.03em] text-ink @max-[720px]/view-shell:hidden">
+ {title()}
+ </h1>
+ }
>
<span
role="navigation"
aria-label="Folder breadcrumbs"
- class="inline-flex max-w-full items-center gap-1 overflow-x-auto align-middle"
+ class="inline-flex max-w-full items-center gap-1 overflow-x-auto align-middle @max-[720px]/view-shell:hidden"
>
<Button
variant="ghost"
@@ -281,28 +269,26 @@ export function DriveLayout(props: {
<ViewShell.Header>
<div class="flex min-w-0 flex-col gap-3">
<div class="hidden min-w-0 items-center gap-2 @max-[720px]/view-shell:flex">
- <SplitPanel.ControlGroup>
- <SplitPanel.CloseButton />
- <SplitPanel.BackButton />
- <SplitPanel.ForwardButton />
- </SplitPanel.ControlGroup>
<Dropdown
open={navigationOpen()}
onOpenChange={setNavigationOpen}
placement="bottom-start"
>
- <Dropdown.Trigger
- variant="ghost"
- class="min-w-0 gap-1 rounded-lg text-lg font-semibold"
- aria-label="Select Drive view"
- >
- <span class="truncate">{title()}</span>
- <CaretDownIcon class="size-3 shrink-0" />
- </Dropdown.Trigger>
- <Dropdown.Content class="max-h-[70vh] w-72 overflow-auto rounded-2xl p-3">
- <div class="flex flex-col gap-5">
+ <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 Drive view: ${title()}`}
+ >
+ <span class="truncate">{title()}</span>
+ <CaretDownIcon class="size-3.5 shrink-0 text-ink-muted" />
+ </Dropdown.Trigger>
+ </h1>
+ <Dropdown.Content class="max-h-[70vh] w-72 overflow-auto rounded-2xl">
+ <Dropdown.Group class="gap-5 p-3">
<SidebarContent />
- </div>
+ </Dropdown.Group>
</Dropdown.Content>
</Dropdown>
<div class="ml-auto shrink-0">
diff --git a/apps/web/src/features/email-view/components/EmailHeader.tsx b/apps/web/src/features/email-view/components/EmailHeader.tsx
index 4a02f13b06..ed780fea7e 100644
--- a/apps/web/src/features/email-view/components/EmailHeader.tsx
+++ b/apps/web/src/features/email-view/components/EmailHeader.tsx
@@ -5,7 +5,7 @@ import {
} from '@app/components/view-shell';
import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
import { SplitPanel } from '@components/app/split-panel';
-import MenuIcon from '@phosphor/list.svg';
+import CaretDownIcon from '@phosphor/caret-down.svg';
import PlusIcon from '@phosphor/plus.svg';
import { Button, Dropdown, pressHandlers } from '@ui';
import { createSignal } from 'solid-js';
@@ -23,10 +23,18 @@ export type EmailHeaderProps = {
export function EmailTopBar() {
const { state } = useEmailView();
- const title = () =>
+ const tabTitle = () =>
EMAIL_TABS.find((tab) => tab.id === state.tab)?.label ?? 'Email';
- return <ViewShell.TopBar>{title()}</ViewShell.TopBar>;
+ return (
+ <ViewShell.TopBar class="px-3">
+ <SplitPanel.CloseButton class="hidden shrink-0 @max-[720px]/view-shell:flex" />
+ <h1 class="min-w-0 truncate text-sm font-semibold tracking-[-0.03em] text-ink">
+ <span class="@max-[720px]/view-shell:hidden">{tabTitle()}</span>
+ <span class="hidden @max-[720px]/view-shell:inline">Email</span>
+ </h1>
+ </ViewShell.TopBar>
+ );
}
export function EmailHeader(props: EmailHeaderProps) {
@@ -35,6 +43,8 @@ export function EmailHeader(props: EmailHeaderProps) {
const [navigationOpen, setNavigationOpen] = createSignal(false);
const [filterOpen, setFilterOpen] = createSignal(false);
let searchInput: HTMLInputElement | undefined;
+ const selectedTabLabel = () =>
+ EMAIL_TABS.find((tab) => tab.id === state.tab)?.label ?? 'Email';
// The view's control hotkeys are registered once, here, for the split scope.
useViewControlHotkeys({
@@ -59,10 +69,6 @@ export function EmailHeader(props: EmailHeaderProps) {
return (
<div class="flex min-w-0 flex-col">
- <SplitPanel.ControlGroup class="hidden px-2 pb-2 @max-[720px]/view-shell:flex">
- <SplitPanel.CloseButton />
- </SplitPanel.ControlGroup>
-
{/* 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">
@@ -71,24 +77,23 @@ export function EmailHeader(props: EmailHeaderProps) {
onOpenChange={setNavigationOpen}
placement="bottom-start"
>
- <Dropdown.Trigger
- variant="ghost"
- size="sm"
- square
- class="size-8 shrink-0 rounded-full"
- aria-label="Open Email navigation"
- >
- <MenuIcon class="size-4" />
- </Dropdown.Trigger>
+ <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>
- <h1 class="min-w-0 truncate text-xl font-semibold tracking-[-0.03em] text-ink">
- Email
- </h1>
<div class="ml-auto flex shrink-0 items-center gap-2">
<EmailInboxMenu />
<Button
diff --git a/apps/web/src/features/email-view/components/EmailSidebar.tsx b/apps/web/src/features/email-view/components/EmailSidebar.tsx
index 9874b0d902..7ec1e3cce2 100644
--- a/apps/web/src/features/email-view/components/EmailSidebar.tsx
+++ b/apps/web/src/features/email-view/components/EmailSidebar.tsx
@@ -48,31 +48,24 @@ function Tab(props: { item: EmailTabItem; onNavigate?: () => void }) {
}
export function EmailNavigation(props: { onNavigate?: () => void }) {
- const { state, showTags, isSidebarSectionOpen, setSidebarSectionOpen } =
- useEmailView();
-
return (
- <div class="flex flex-col gap-6">
- <ViewSidebar.Nav aria-label="Email tabs">
- <For each={EMAIL_TABS}>
- {(item) => <Tab item={item} onNavigate={props.onNavigate} />}
- </For>
- </ViewSidebar.Nav>
-
- <SidebarTagsSection
- activeIds={state.facets.tags ?? []}
- onActiveIdsChange={showTags}
- open={isSidebarSectionOpen('tags')}
- onOpenChange={(open) => setSidebarSectionOpen('tags', open)}
- onNavigate={props.onNavigate}
- />
- </div>
+ <ViewSidebar.Nav aria-label="Email tabs">
+ <For each={EMAIL_TABS}>
+ {(item) => <Tab item={item} onNavigate={props.onNavigate} />}
+ </For>
+ </ViewSidebar.Nav>
);
}
export function EmailSidebar() {
const panel = useSplitPanelOrThrow();
- const { state, setTab } = useEmailView();
+ const {
+ state,
+ setTab,
+ showTags,
+ isSidebarSectionOpen,
+ setSidebarSectionOpen,
+ } = useEmailView();
useViewTabHotkeys({
scopeId: panel.splitHotkeyScope,
@@ -94,6 +87,13 @@ export function EmailSidebar() {
<EmailInboxList />
<EmailNavigation />
+
+ <SidebarTagsSection
+ activeIds={state.facets.tags ?? []}
+ onActiveIdsChange={showTags}
+ open={isSidebarSectionOpen('tags')}
+ onOpenChange={(open) => setSidebarSectionOpen('tags', open)}
+ />
</ViewSidebar.Content>
</ViewSidebar.Root>
);
diff --git a/apps/web/src/features/tasks-view/components/TasksHeader.tsx b/apps/web/src/features/tasks-view/components/TasksHeader.tsx
index e6544f5648..3a34060fdc 100644
--- a/apps/web/src/features/tasks-view/components/TasksHeader.tsx
+++ b/apps/web/src/features/tasks-view/components/TasksHeader.tsx
@@ -24,12 +24,16 @@ export type TasksHeaderProps = {
export function TasksTopBar() {
const { state } = useTasksView();
- const title = () =>
+ const tabTitle = () =>
TASK_TABS.find((tab) => tab.id === state.tab)?.label ?? 'Tasks';
return (
<ViewShell.TopBar class="px-3">
- <span class="px-1">{title()}</span>
+ <SplitPanel.CloseButton class="hidden shrink-0 @max-[720px]/view-shell:flex" />
+ <h1 class="min-w-0 truncate text-sm font-semibold tracking-[-0.03em] text-ink">
+ <span class="@max-[720px]/view-shell:hidden">{tabTitle()}</span>
+ <span class="hidden @max-[720px]/view-shell:inline">Tasks</span>
+ </h1>
</ViewShell.TopBar>
);
}
@@ -67,12 +71,6 @@ export function TasksHeader(props: TasksHeaderProps) {
when={isTouchDevice()}
fallback={
<>
- <div class="hidden items-center @max-[720px]/view-shell:flex">
- <SplitPanel.ControlGroup>
- <SplitPanel.CloseButton />
- </SplitPanel.ControlGroup>
- </div>
-
<div class="hidden h-8 min-w-0 items-center gap-2 @max-[720px]/view-shell:flex">
<Dropdown
open={navigationOpen()}