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): task, drive, and email views ui/ux issues (#6523)
dev-rb116bdf89bce6
diff --git a/apps/web/src/components/app/split-layout/components/SplitHeader.tsx b/apps/web/src/components/app/split-layout/components/SplitHeader.tsxindex 6eb84ddfe0..e8d04ebd50 100644--- a/apps/web/src/components/app/split-layout/components/SplitHeader.tsx+++ b/apps/web/src/components/app/split-layout/components/SplitHeader.tsx@@ -7,7 +7,7 @@ import { openEntityInSplitFromUnifiedList } from '@app/features/next-soup/utils'import { CALENDAR_BLOCK_ID } from '@block-calendar/types';import { useGlobalNotificationSource } from '@components/app/GlobalAppState';import { useSidebarCollapse } from '@components/app/sidebarVisibility';-import type { BlockName } from '@core/block';+import { type BlockName, NonDocumentBlockTypes } from '@core/block';import {ContextMenuContent,MenuItem,@@ -237,6 +237,14 @@ function SplitDriveReturnButton() {);const isDrive = (content: SplitContent) =>content.type === 'component' && content.id === LIST_VIEW_ID.documents;+ const currentIsDriveItem = () => {+ const content = panel.handle.content();+ return (+ content.type !== 'component' &&+ (content.type === 'project' ||+ !NonDocumentBlockTypes.includes(content.type))+ );+ };const sourceLabel = () => {const state = sourceList()?.state;const label = state?.['drive.returnLabel'];@@ -253,7 +261,9 @@ function SplitDriveReturnButton() {};return (- <Show when={sourceList()?.id === LIST_VIEW_ID.documents}>+ <Show+ when={sourceList()?.id === LIST_VIEW_ID.documents && currentIsDriveItem()}+ ><ViewBreadcrumbs.ReturnButtononClick={returnToDrive}tooltip={sourceLabel()}diff --git a/apps/web/src/features/drive-view/components/DriveBreadcrumbs.tsx b/apps/web/src/features/drive-view/components/DriveBreadcrumbs.tsxindex 10fa286daa..20ab41ae34 100644--- a/apps/web/src/features/drive-view/components/DriveBreadcrumbs.tsx+++ b/apps/web/src/features/drive-view/components/DriveBreadcrumbs.tsx@@ -3,32 +3,122 @@ import {type ViewBreadcrumbsOutletProps,type ViewBreadcrumbsSeparatorState,} from '@app/components/view-shell';-import { For } from 'solid-js';+import type { FileOperation } from '@components/app/split-layout/components/SplitFileMenu';+import { SplitFileMenu } from '@components/app/split-layout/components/SplitFileMenu';+import { Permissions } from '@core/component/SharePermissions';+import type { ProjectEntity } from '@entity';+import ArrowSquareOutIcon from '@phosphor/arrow-square-out.svg';+import ShareIcon from '@phosphor/share.svg';+import { For, Show } from 'solid-js';import type { DriveLocationBreadcrumb } from '../core/breadcrumbs';+import type { DriveFolder } from '../core/types';++type DriveBreadcrumbFolder = DriveFolder & { userId: string };++function FolderBreadcrumbMenu(props: {+ folder: DriveBreadcrumbFolder;+ userId?: string;+ onOpenInNewSplit?: (folder: ProjectEntity) => void;+ onShare: (folder: ProjectEntity) => void;+ onDelete: () => void;+}) {+ const entity = (): ProjectEntity => ({+ type: 'project',+ id: props.folder.id,+ name: props.folder.name,+ ownerId: props.folder.userId,+ projectId: props.folder.parentId ?? undefined,+ });+ const operations = (): FileOperation[] => [+ ...(props.onOpenInNewSplit+ ? [+ {+ label: 'Open in new split',+ icon: ArrowSquareOutIcon,+ action: () => props.onOpenInNewSplit?.(entity()),+ },+ ]+ : []),+ {+ label: 'Share',+ icon: ShareIcon,+ action: () => props.onShare(entity()),+ group: 'sharing',+ },+ { op: 'rename' },+ { op: 'moveToProject' },+ { op: 'delete' },+ ];++ return (+ <div class="shrink-0">+ <SplitFileMenu+ id={props.folder.id}+ itemType="project"+ name={props.folder.name}+ ops={operations()}+ entity={entity()}+ entityKind="project"+ permissions={+ props.folder.userId === props.userId+ ? Permissions.OWNER+ : Permissions.CAN_VIEW+ }+ onDelete={props.onDelete}+ />+ </div>+ );+}export function DriveLocationBreadcrumbItems(props: {entries: DriveLocationBreadcrumb[];+ folders: DriveBreadcrumbFolder[];+ userId?: string;+ onOpenFolderInNewSplit?: (folder: ProjectEntity) => void;+ onShareFolder: (folder: ProjectEntity) => void;+ onDeleteFolder: (folder: DriveBreadcrumbFolder) => void;}) {return (<For each={props.entries}>- {(entry, index) => (- <ViewBreadcrumbs.Item- value={entry.value}- metadata={entry}- order={index()}- >- {(item) => (- <ViewBreadcrumbs.Button- class="max-w-48"- isActive={item.isActive()}- onClick={item.onSelect}- tooltip={entry.label}- >- <span class="truncate">{entry.label}</span>- </ViewBreadcrumbs.Button>- )}- </ViewBreadcrumbs.Item>- )}+ {(entry, index) => {+ const folder = () => {+ const location = entry.location;+ if (location.kind !== 'folder' || location.id === null) return;+ return props.folders.find(({ id }) => id === location.id);+ };++ return (+ <ViewBreadcrumbs.Item+ value={entry.value}+ metadata={entry}+ order={index()}+ >+ {(item) => (+ <div class="flex min-w-0 items-center">+ <ViewBreadcrumbs.Button+ class="max-w-48"+ isActive={item.isActive()}+ onClick={item.onSelect}+ tooltip={entry.label}+ >+ <span class="truncate">{entry.label}</span>+ </ViewBreadcrumbs.Button>+ <Show when={item.isActive() ? folder() : undefined}>+ {(activeFolder) => (+ <FolderBreadcrumbMenu+ folder={activeFolder()}+ userId={props.userId}+ onOpenInNewSplit={props.onOpenFolderInNewSplit}+ onShare={props.onShareFolder}+ onDelete={() => props.onDeleteFolder(activeFolder())}+ />+ )}+ </Show>+ </div>+ )}+ </ViewBreadcrumbs.Item>+ );+ }}</For>);}diff --git a/apps/web/src/features/drive-view/drive-view.tsx b/apps/web/src/features/drive-view/drive-view.tsxindex e4f6d3ea1b..ffa5fbe44f 100644--- a/apps/web/src/features/drive-view/drive-view.tsx+++ b/apps/web/src/features/drive-view/drive-view.tsx@@ -18,6 +18,7 @@ import {useCreatableEnabled,} from '@app/features/command/Launcher';import { FavoriteIcon } from '@app/features/favorites/FavoriteIcon';+import { makeShareAction } from '@app/features/next-soup/actions';import type { Query } from '@app/features/next-soup/filters/filter-store';import { queryStateFrom } from '@app/features/next-soup/filters/filter-store';import type { SetPredicatesInput } from '@app/features/next-soup/filters/filter-store/predicates-store';@@ -27,6 +28,7 @@ import { FilterSubmenu } from '@app/features/next-soup/soup-view/filters-bar/filimport { UnifiedFilterDropdown } from '@app/features/next-soup/soup-view/filters-bar/unified-filter-dropdown';import { SoupViewList } from '@app/features/next-soup/soup-view/soup-view';import { useSoupView } from '@app/features/next-soup/soup-view/soup-view-context';+import { globalSplitManager } from '@app/signal/splitLayout';import {favoriteBlockName,favoriteSplitContent,@@ -37,6 +39,7 @@ import { useEntryState } from '@components/app/split-layout/entry-state';import { useSplitLayout } from '@components/app/split-layout/layout';import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';import { useUserId } from '@core/context/user';+import { isTouchDevice } from '@core/mobile/isTouchDevice';import {handleFolderSelect,openFilePicker,@@ -126,6 +129,7 @@ function DriveViewContent(props: DriveViewProps) {const panel = useSplitPanelOrThrow();const layout = useSplitLayout();const navigationStack = useEntityDetailNavigationStack();+ const shareAction = makeShareAction();const userId = useUserId();const view = useSoupView();const projects = useProjectsQuery();@@ -416,7 +420,30 @@ function DriveViewContent(props: DriveViewProps) {navigate(location);}}>- <DriveLocationBreadcrumbItems entries={locationBreadcrumbs()} />+ <DriveLocationBreadcrumbItems+ entries={locationBreadcrumbs()}+ folders={folders()}+ userId={userId()}+ onOpenFolderInNewSplit={+ !isTouchDevice() && globalSplitManager()?.canAppendSplit()+ ? (folder) =>+ layout.openWithSplit(+ { type: 'project', id: folder.id },+ {+ preferNewSplit: true,+ referredFrom: 'entity-actions-menu',+ }+ )+ : undefined+ }+ onShareFolder={(folder) => void shareAction.execute(folder)}+ onDeleteFolder={(folder) => {+ const parentId = folders().some(({ id }) => id === folder.parentId)+ ? folder.parentId+ : null;+ selectFolder(parentId ?? null);+ }}+ /><DriveLayoutstate={state()}folders={folders()}diff --git a/apps/web/src/features/email-view/components/EmailDetailView.tsx b/apps/web/src/features/email-view/components/EmailDetailView.tsxindex 5fb682857d..3eba093aee 100644--- a/apps/web/src/features/email-view/components/EmailDetailView.tsx+++ b/apps/web/src/features/email-view/components/EmailDetailView.tsx@@ -1,6 +1,6 @@import { useEntityDetailNavigationStack } from '@app/components/entity-detail/EntityDetailNavigationStack';import { useListNavigationHotkeys } from '@app/components/entity-detail/use-list-navigation-hotkeys';-import { ViewBreadcrumbs } from '@app/components/view-shell';+import { ViewBreadcrumbs, ViewShell } from '@app/components/view-shell';import { displaySubject } from '@app/features/email-compose/core/subject-text';import type { EmailThreadHost } from '@app/features/email-thread/context/email-thread-context';import { useBlockEntityCommands } from '@app/features/next-soup/actions';@@ -176,7 +176,7 @@ export function EmailDetailView(props: { thread: EmailThreadTarget }) {/><SidePanel.Root defaultOpen={false}><div class="flex size-full min-h-0 min-w-0 flex-col overflow-hidden">- <div class="flex h-12 min-w-0 shrink-0 items-center gap-1 border-edge border-b px-3">+ <ViewShell.TopBar class="touch:flex"><SplitPanel.CloseButton class="hidden shrink-0 @max-[720px]/view-shell:flex" /><ViewBreadcrumbs.Outletclass="flex-1"@@ -192,7 +192,7 @@ export function EmailDetailView(props: { thread: EmailThreadTarget }) {</Show><SidePanel.Toggle /></div>- </div>+ </ViewShell.TopBar><divref={container}class="relative min-h-0 min-w-0 flex-1"diff --git a/apps/web/src/features/email-view/components/EmailHeader.tsx b/apps/web/src/features/email-view/components/EmailHeader.tsxindex 4fba1ff97d..18e1477761 100644--- a/apps/web/src/features/email-view/components/EmailHeader.tsx+++ b/apps/web/src/features/email-view/components/EmailHeader.tsx@@ -38,7 +38,10 @@ export function EmailViewBreadcrumbItem() {isActive={item.isActive()}onClick={item.onSelect}>- <span class="truncate">{tabTitle()}</span>+ <span class="truncate @max-[720px]/view-shell:hidden">+ {tabTitle()}+ </span>+ <span class="hidden @max-[720px]/view-shell:inline">Email</span></ViewBreadcrumbs.Button>)}</ViewBreadcrumbs.Item>@@ -47,7 +50,7 @@ export function EmailViewBreadcrumbItem() {export function EmailTopBar() {return (- <ViewShell.TopBar class="px-3">+ <ViewShell.TopBar><SplitPanel.CloseButton class="hidden shrink-0 @max-[720px]/view-shell:flex" /><ViewBreadcrumbs.Outlet class="flex-1" aria-label="Email location" /></ViewShell.TopBar>diff --git a/apps/web/src/features/tasks-view/components/TasksDetailView.tsx b/apps/web/src/features/tasks-view/components/TasksDetailView.tsxindex de261e008a..92bad6ddd1 100644--- a/apps/web/src/features/tasks-view/components/TasksDetailView.tsx+++ b/apps/web/src/features/tasks-view/components/TasksDetailView.tsx@@ -8,7 +8,7 @@ import {} from '@app/components/entity-detail/EntityDetailNavigationStack';import { useListNavigationHotkeys } from '@app/components/entity-detail/use-list-navigation-hotkeys';import { useListDetailNavigation } from '@app/components/list';-import { ViewBreadcrumbs } from '@app/components/view-shell';+import { ViewBreadcrumbs, ViewShell } from '@app/components/view-shell';import { MarkdownDetailBreadcrumbItem } from '@block-md/component/MarkdownDetailBreadcrumbItem';import { SidePanel } from '@components/app/side-panel';import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';@@ -26,37 +26,12 @@ import {Show,Switch,} from 'solid-js';-import { TASK_TABS } from '../constants';import { useTasksView } from '../tasks-view-context';import type { TaskDetailTarget } from '../types';import { TaskDetail, TaskDetailBodyState } from './TaskDetail';type EntityDetailEntry = EntityDetailNavigationStackEntry;-function TaskViewBreadcrumbItem() {- const { state } = useTasksView();- const tabName = () =>- TASK_TABS.find((tab) => tab.id === state.tab)?.label ?? 'Tasks';-- return (- <ViewBreadcrumbs.Item- value="tasks-view"- metadata={{ type: 'tasks' }}- order={0}- >- {(item) => (- <ViewBreadcrumbs.ReturnButton- isActive={item.isActive()}- onClick={item.onSelect}- tooltip={tabName()}- >- <span class="truncate">{tabName()}</span>- </ViewBreadcrumbs.ReturnButton>- )}- </ViewBreadcrumbs.Item>- );-}-function TaskDetailAncestorBreadcrumbs() {const navigationStack = useEntityDetailNavigationStack();const ancestors = () => navigationStack.entries.slice(0, -1);@@ -77,7 +52,7 @@ function TaskDetailTopBar(props: {const panel = useSplitPanelOrThrow();return (- <div class="flex h-12 min-w-0 shrink-0 items-center gap-1 border-edge border-b px-3">+ <ViewShell.TopBar class="touch:flex"><SplitPanel.CloseButton class="hidden shrink-0 @max-[720px]/view-shell:flex" /><ViewBreadcrumbs.Outletaria-label="Task location"@@ -93,7 +68,7 @@ function TaskDetailTopBar(props: {</Show><SidePanel.Toggle /></div>- </div>+ </ViewShell.TopBar>);}@@ -146,77 +121,65 @@ export function TasksDetailView(props: { task: TaskDetailTarget }) {close: () => setShareOpen(false),}}>- <ViewBreadcrumbs.Root- value={navigationStack.active()?.value ?? 'tasks-view'}- onChange={(value) => {- if (value === 'tasks-view') {- closeTask();- return;- }- navigationStack.popTo(value);- }}- >- <TaskViewBreadcrumbItem />- <TaskDetailAncestorBreadcrumbs />- <SidePanel.Root>- <div class="flex size-full min-h-0 min-w-0 flex-col overflow-hidden">- <TaskDetailTopBar- documentId={props.task.id}- showTaskActions={isTaskActive()}- />- <div class="relative min-h-0 min-w-0 flex-1">- <EntityDetailNavigationStack.Outlet>- {(entry, state) => (- <Switch>- <Match when={entry.value === taskEntry()?.value}>- <TaskDetail- task={props.task}- shareOpen={shareOpen()}- onShareOpenChange={setShareOpen}- >- {(context) => (- <MarkdownDetailBreadcrumbItem- value={entry.value}- metadata={entry.data}- order={state.entries.length}- documentId={props.task.id}- kind="task"- fallbackName={props.task.fallbackName}- ownerId={context.data.metadata.owner}- projectId={- context.data.metadata.projectId ?? undefined- }- onClose={closeTask}- onDuplicate={(id, name) =>- openTask({ id, fallbackName: name })- }- />- )}- </TaskDetail>- </Match>- <Match when={true}>- <ErrorBoundary- fallback={(error, reset) => (- <TaskDetailBodyState- error={error}- actionLabel="Reset"- onAction={reset}- />- )}- >- <StackEntityDetail- entry={entry}+ <TaskDetailAncestorBreadcrumbs />+ <SidePanel.Root>+ <div class="flex size-full min-h-0 min-w-0 flex-col overflow-hidden">+ <TaskDetailTopBar+ documentId={props.task.id}+ showTaskActions={isTaskActive()}+ />+ <div class="relative min-h-0 min-w-0 flex-1">+ <EntityDetailNavigationStack.Outlet>+ {(entry, state) => (+ <Switch>+ <Match when={entry.value === taskEntry()?.value}>+ <TaskDetail+ task={props.task}+ shareOpen={shareOpen()}+ onShareOpenChange={setShareOpen}+ >+ {(context) => (+ <MarkdownDetailBreadcrumbItem+ value={entry.value}+ metadata={entry.data}order={state.entries.length}+ documentId={props.task.id}+ kind="task"+ fallbackName={props.task.fallbackName}+ ownerId={context.data.metadata.owner}+ projectId={+ context.data.metadata.projectId ?? undefined+ }+ onClose={closeTask}+ onDuplicate={(id, name) =>+ openTask({ id, fallbackName: name })+ }+ />+ )}+ </TaskDetail>+ </Match>+ <Match when={true}>+ <ErrorBoundary+ fallback={(error, reset) => (+ <TaskDetailBodyState+ error={error}+ actionLabel="Reset"+ onAction={reset}/>- </ErrorBoundary>- </Match>- </Switch>- )}- </EntityDetailNavigationStack.Outlet>- </div>+ )}+ >+ <StackEntityDetail+ entry={entry}+ order={state.entries.length}+ />+ </ErrorBoundary>+ </Match>+ </Switch>+ )}+ </EntityDetailNavigationStack.Outlet></div>- </SidePanel.Root>- </ViewBreadcrumbs.Root>+ </div>+ </SidePanel.Root></ShareDialogContext.Provider>);}diff --git a/apps/web/src/features/tasks-view/components/TasksHeader.tsx b/apps/web/src/features/tasks-view/components/TasksHeader.tsxindex 3a34060fdc..380179a123 100644--- a/apps/web/src/features/tasks-view/components/TasksHeader.tsx+++ b/apps/web/src/features/tasks-view/components/TasksHeader.tsx@@ -1,6 +1,7 @@import {SearchBar,useViewControlHotkeys,+ ViewBreadcrumbs,ViewShell,} from '@app/components/view-shell';import { useSplitLayout } from '@components/app/split-layout/layout';@@ -22,18 +23,41 @@ export type TasksHeaderProps = {onSearchEscape?: () => void;};-export function TasksTopBar() {+export function TaskViewBreadcrumbItem() {const { state } = useTasksView();const tabTitle = () =>TASK_TABS.find((tab) => tab.id === state.tab)?.label ?? 'Tasks';return (- <ViewShell.TopBar class="px-3">+ <ViewBreadcrumbs.Item+ value="tasks-view"+ metadata={{ type: 'tasks' }}+ order={0}+ >+ {(item) => (+ <ViewBreadcrumbs.ReturnButton+ isActive={item.isActive()}+ onClick={item.onSelect}+ tooltip={tabTitle()}+ >+ <span class="truncate">{tabTitle()}</span>+ </ViewBreadcrumbs.ReturnButton>+ )}+ </ViewBreadcrumbs.Item>+ );+}++export function TasksTopBar() {+ return (+ <ViewShell.TopBar><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 class="hidden min-w-0 truncate text-sm font-semibold tracking-[-0.03em] text-ink @max-[720px]/view-shell:block">+ Tasks</h1>+ <ViewBreadcrumbs.Outlet+ class="@max-[720px]/view-shell:hidden"+ aria-label="Task location"+ /></ViewShell.TopBar>);}diff --git a/apps/web/src/features/tasks-view/tasks-view.tsx b/apps/web/src/features/tasks-view/tasks-view.tsxindex 4a9cc048f6..5159b7176e 100644--- a/apps/web/src/features/tasks-view/tasks-view.tsx+++ b/apps/web/src/features/tasks-view/tasks-view.tsx@@ -1,12 +1,26 @@-import { EntityDetailNavigationStack } from '@app/components/entity-detail/EntityDetailNavigationStack';-import { ViewShell } from '@app/components/view-shell';+import {+ EntityDetailNavigationStack,+ useEntityDetailNavigationStack,+} from '@app/components/entity-detail/EntityDetailNavigationStack';+import { ViewBreadcrumbs, ViewShell } from '@app/components/view-shell';import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';import { SplitPanel } from '@components/app/split-panel';import { ListEntityMetadataQueryProvider } from '@entity';import SpinnerIcon from '@phosphor/spinner.svg';-import { createSignal, Match, onMount, Suspense, Switch } from 'solid-js';+import {+ createSignal,+ Match,+ onMount,+ type ParentProps,+ Suspense,+ Switch,+} from 'solid-js';import { TasksDetailView } from './components/TasksDetailView';-import { TasksHeader, TasksTopBar } from './components/TasksHeader';+import {+ TasksHeader,+ TasksTopBar,+ TaskViewBreadcrumbItem,+} from './components/TasksHeader';import { TasksSidebar } from './components/TasksSidebar';import { TaskList } from './components/task-list/TaskList';import { TasksViewProvider, useTasksView } from './tasks-view-context';@@ -25,6 +39,27 @@ function TasksListFallback() {);}+function TasksViewBreadcrumbs(props: ParentProps) {+ const { closeTask } = useTasksView();+ const navigationStack = useEntityDetailNavigationStack();++ return (+ <ViewBreadcrumbs.Root+ value={navigationStack.active()?.value ?? 'tasks-view'}+ onChange={(value) => {+ if (value === 'tasks-view') {+ closeTask();+ return;+ }+ navigationStack.popTo(value);+ }}+ >+ <TaskViewBreadcrumbItem />+ {props.children}+ </ViewBreadcrumbs.Root>+ );+}+function TasksViewRoot() {const panel = useSplitPanelOrThrow();const { selectedTask } = useTasksView();@@ -75,7 +110,9 @@ export function TasksView(props: TasksViewProps) {><ListEntityMetadataQueryProvider><TasksViewProvider initialState={props.initialState}>- <TasksViewRoot />+ <TasksViewBreadcrumbs>+ <TasksViewRoot />+ </TasksViewBreadcrumbs></TasksViewProvider></ListEntityMetadataQueryProvider></EntityDetailNavigationStack.Root>