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.

feat(new-layout): add top bars for list views (#6341)

dev-rb88e2a7a6e608
diff --git a/apps/web/src/components/view-shell/ViewShell.tsx b/apps/web/src/components/view-shell/ViewShell.tsx
index 00d2f39184..39801d8034 100644
--- a/apps/web/src/components/view-shell/ViewShell.tsx
+++ b/apps/web/src/components/view-shell/ViewShell.tsx
@@ -342,13 +342,31 @@ function Main(props: JSX.HTMLAttributes<HTMLElement>) {
);
}
+function TopBar(props: JSX.HTMLAttributes<HTMLDivElement>) {
+ const [local, rest] = splitProps(props, ['children', 'class']);
+ return (
+ <div
+ {...rest}
+ class={cn(
+ 'flex h-12 min-w-0 shrink-0 items-center border-b border-edge 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>
+ </div>
+ );
+}
+
function Header(props: JSX.HTMLAttributes<HTMLElement>) {
const [local, rest] = splitProps(props, ['children', 'class']);
return (
<header
{...rest}
class={cn(
- 'shrink-0 px-4 pb-3 pt-2 touch:px-(--mobile-chrome-gutter) touch:pt-[calc(var(--safe-top,0px)+0.5rem)]',
+ 'shrink-0 px-4 py-4 touch:px-(--mobile-chrome-gutter) touch:pt-[calc(var(--safe-top,0px)+0.5rem)]',
local.class
)}
data-view-shell-header=""
@@ -443,6 +461,7 @@ export const ViewShell = Object.assign(Root, {
Root,
Aside,
Main,
+ TopBar,
Header,
Content,
Detail,
diff --git a/apps/web/src/components/view-shell/ViewSidebar.tsx b/apps/web/src/components/view-shell/ViewSidebar.tsx
index e7287743be..c7c29b1309 100644
--- a/apps/web/src/components/view-shell/ViewSidebar.tsx
+++ b/apps/web/src/components/view-shell/ViewSidebar.tsx
@@ -24,7 +24,7 @@ function Header(props: JSX.HTMLAttributes<HTMLDivElement>) {
<div
{...rest}
class={cn(
- 'flex min-w-0 shrink-0 items-center justify-between gap-3 border-b border-edge px-4 py-3',
+ 'flex h-12 min-w-0 shrink-0 items-center justify-between gap-3 border-b border-edge px-4 py-3',
local.class
)}
data-view-sidebar-header=""
diff --git a/apps/web/src/features/email-view/components/EmailHeader.tsx b/apps/web/src/features/email-view/components/EmailHeader.tsx
index 403bfd7faf..e856b0829b 100644
--- a/apps/web/src/features/email-view/components/EmailHeader.tsx
+++ b/apps/web/src/features/email-view/components/EmailHeader.tsx
@@ -1,4 +1,8 @@
-import { SearchBar, useViewControlHotkeys } from '@app/components/view-shell';
+import {
+ SearchBar,
+ useViewControlHotkeys,
+ ViewShell,
+} 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';
@@ -6,6 +10,7 @@ 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';
@@ -16,6 +21,14 @@ export type EmailHeaderProps = {
onSearchEscape?: () => void;
};
+export function EmailTopBar() {
+ const { state } = useEmailView();
+ const title = () =>
+ EMAIL_TABS.find((tab) => tab.id === state.tab)?.label ?? 'Email';
+
+ return <ViewShell.TopBar>{title()}</ViewShell.TopBar>;
+}
+
export function EmailHeader(props: EmailHeaderProps) {
const panel = useSplitPanelOrThrow();
const { state, setState } = useEmailView();
diff --git a/apps/web/src/features/email-view/email-view.tsx b/apps/web/src/features/email-view/email-view.tsx
index 7eb4aa68b6..c05fb7348b 100644
--- a/apps/web/src/features/email-view/email-view.tsx
+++ b/apps/web/src/features/email-view/email-view.tsx
@@ -15,7 +15,7 @@ import {
Suspense,
} from 'solid-js';
import { EmailFilterDrawer } from './components/EmailFilterDrawer';
-import { EmailHeader } from './components/EmailHeader';
+import { EmailHeader, EmailTopBar } from './components/EmailHeader';
import { EmailList } from './components/EmailList';
import { EmailSidebar } from './components/EmailSidebar';
import { EMAIL_TABS } from './constants';
@@ -48,6 +48,7 @@ function EmailDesktopLayout(
<EmailSidebar />
</ViewShell.Aside>
<ViewShell.Main>
+ <EmailTopBar />
<ViewShell.Header>
<EmailHeader onSearchEscape={props.onSearchEscape} />
</ViewShell.Header>
diff --git a/apps/web/src/features/tasks-view/components/TasksHeader.tsx b/apps/web/src/features/tasks-view/components/TasksHeader.tsx
index 1089f994b9..63c8ef4ddb 100644
--- a/apps/web/src/features/tasks-view/components/TasksHeader.tsx
+++ b/apps/web/src/features/tasks-view/components/TasksHeader.tsx
@@ -1,4 +1,8 @@
-import { SearchBar, useViewControlHotkeys } from '@app/components/view-shell';
+import {
+ SearchBar,
+ useViewControlHotkeys,
+ ViewShell,
+} from '@app/components/view-shell';
import { useSplitLayout } from '@components/app/split-layout/layout';
import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
import { SplitPanel } from '@components/app/split-panel';
@@ -18,6 +22,14 @@ export type TasksHeaderProps = {
onSearchEscape?: () => void;
};
+export function TasksTopBar() {
+ const { state } = useTasksView();
+ const title = () =>
+ TASK_TABS.find((tab) => tab.id === state.tab)?.label ?? 'Tasks';
+
+ return <ViewShell.TopBar>{title()}</ViewShell.TopBar>;
+}
+
export function TasksHeader(props: TasksHeaderProps) {
const panel = useSplitPanelOrThrow();
const layout = useSplitLayout();
diff --git a/apps/web/src/features/tasks-view/tasks-view.tsx b/apps/web/src/features/tasks-view/tasks-view.tsx
index 07ce39ee95..0fc58bba0d 100644
--- a/apps/web/src/features/tasks-view/tasks-view.tsx
+++ b/apps/web/src/features/tasks-view/tasks-view.tsx
@@ -4,7 +4,7 @@ import { SplitPanel } from '@components/app/split-panel';
import { ListEntityMetadataQueryProvider } from '@entity';
import SpinnerIcon from '@phosphor/spinner.svg';
import { createSignal, onMount, Suspense } from 'solid-js';
-import { TasksHeader } from './components/TasksHeader';
+import { TasksHeader, TasksTopBar } from './components/TasksHeader';
import { TasksSidebar } from './components/TasksSidebar';
import { TaskList } from './components/task-list/TaskList';
import { TasksViewProvider } from './tasks-view-context';
@@ -42,6 +42,7 @@ function TasksViewRoot() {
<TasksSidebar />
</ViewShell.Aside>
<ViewShell.Main>
+ <TasksTopBar />
<ViewShell.Header>
<TasksHeader onSearchEscape={() => listElement()?.focus()} />
</ViewShell.Header>