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): update tab titles for routed details (#7195)
dev-rb9b2944ea72e9
diff --git a/apps/web/src/components/app/split-layout/components/SplitLabel.tsx b/apps/web/src/components/app/split-layout/components/SplitLabel.tsxindex 0ccffbf7d5..c742fe8910 100644--- a/apps/web/src/components/app/split-layout/components/SplitLabel.tsx+++ b/apps/web/src/components/app/split-layout/components/SplitLabel.tsx@@ -27,7 +27,6 @@ import { cn, Tooltip } from '@ui';import {type Accessor,type Component,- createEffect,createMemo,createSignal,For,@@ -40,7 +39,7 @@ import {getSplitFileMenuActionSections,type SplitFileMenuAction,} from '../context';-import { useSplitPanelOrThrow } from '../layoutUtils';+import { useSplitDisplayName, useSplitPanelOrThrow } from '../layoutUtils';import { HeaderIsland } from './HeaderIsland';export function StaticSplitLabel(props: {@@ -57,9 +56,7 @@ export function StaticSplitLabel(props: {}) {const panel = useSplitPanelOrThrow();const [renaming, setRenaming] = createSignal(false);- createEffect(() => {- panel.handle.setDisplayName(props.label);- });+ useSplitDisplayName(() => props.label);const startRename = (event: MouseEvent) => {event.preventDefault();event.stopPropagation();@@ -163,9 +160,7 @@ export function SplitLabel(props: {}) {const panel = useSplitPanelOrThrow();- createEffect(() => {- panel.handle.setDisplayName(props.label);- });+ useSplitDisplayName(() => props.label);const truncatedLabel = () => {if (!props.maxDisplayLength) return props.label;@@ -258,9 +253,7 @@ export function BlockItemSplitLabel(props: {return blockName;};- createEffect(() => {- panel.handle.setDisplayName(displayName());- });+ useSplitDisplayName(displayName);const openTitleFileMenu = (e: MouseEvent) => {if (!isTouchDevice()) return;diff --git a/apps/web/src/components/app/split-layout/layoutUtils.ts b/apps/web/src/components/app/split-layout/layoutUtils.tsindex 9a53fc1a4a..b099e0aae5 100644--- a/apps/web/src/components/app/split-layout/layoutUtils.ts+++ b/apps/web/src/components/app/split-layout/layoutUtils.ts@@ -3,9 +3,11 @@ import { globalSplitManager } from '@app/signal/splitLayout';import { createCallback } from '@solid-primitives/rootless';import {type Accessor,+ createEffect,createMemo,createSignal,onCleanup,+ untrack,useContext,} from 'solid-js';import { SplitLayoutContext, SplitPanelContext } from './context';@@ -67,6 +69,46 @@ export function useSplitPanel() {return useContext(SplitPanelContext);}+/**+ * Own the split's display name while `name` is defined, then restore the name+ * that was visible before this owner became active.+ *+ * Routed detail views remain mounted inside their list shell, so writing the+ * name without restoring it leaves the browser tab titled after the departed+ * detail.+ */+export function useSplitDisplayName(name: Accessor<string | undefined>) {+ const handle = useSplitPanelOrThrow().handle;+ let owned = false;+ let previous = '';+ let displayed: string | undefined;++ const release = () => {+ if (!owned) return;+ if (handle.displayName() === displayed) {+ handle.setDisplayName(previous);+ }+ owned = false;+ displayed = undefined;+ };++ createEffect(() => {+ const next = name();+ if (next === undefined) {+ release();+ return;+ }+ if (!owned) {+ previous = untrack(handle.displayName);+ owned = true;+ }+ displayed = next;+ handle.setDisplayName(next);+ });++ onCleanup(release);+}+/** Whether closing this split leaves another split visible. */export function shouldShowSplitCloseButton(manager: SplitManager) {return manager.getVisibleSplitCount() > 1;diff --git a/apps/web/src/components/entity-detail/EntityDetailBreadcrumbItem.tsx b/apps/web/src/components/entity-detail/EntityDetailBreadcrumbItem.tsxindex 30bb08b432..790319a517 100644--- a/apps/web/src/components/entity-detail/EntityDetailBreadcrumbItem.tsx+++ b/apps/web/src/components/entity-detail/EntityDetailBreadcrumbItem.tsx@@ -1,4 +1,5 @@import { ViewBreadcrumbs } from '@app/components/view-shell';+import { useSplitDisplayName } from '@components/app/split-layout/layoutUtils';import {EntityIcon,type EntityIconSelector,@@ -48,7 +49,12 @@ function BreadcrumbItem(props: {entry: EntityDetailNavigationEntry;order: number;name: string;+ setsSplitDisplayName?: boolean;}) {+ useSplitDisplayName(() =>+ props.setsSplitDisplayName ? props.name : undefined+ );+return (<ViewBreadcrumbs.Itemvalue={props.entry.value}@@ -78,6 +84,7 @@ function LiveBreadcrumbItem(props: {entry: EntityDetailNavigationEntry;order: number;previewItem: ItemEntity;+ setsSplitDisplayName?: boolean;}) {const currentName = useItemRawName(() => props.previewItem);const name = () => {@@ -88,13 +95,19 @@ function LiveBreadcrumbItem(props: {};return (- <BreadcrumbItem entry={props.entry} order={props.order} name={name()} />+ <BreadcrumbItem+ entry={props.entry}+ order={props.order}+ name={name()}+ setsSplitDisplayName={props.setsSplitDisplayName ?? false}+ />);}export function EntityDetailBreadcrumbItem(props: {entry: EntityDetailNavigationEntry;order: number;+ setsSplitDisplayName?: boolean;}) {return (<Show@@ -111,6 +124,7 @@ export function EntityDetailBreadcrumbItem(props: {entry={props.entry}order={props.order}name={fallbackBreadcrumbName(props.entry.data)}+ setsSplitDisplayName={props.setsSplitDisplayName ?? false}/>}>@@ -119,6 +133,7 @@ export function EntityDetailBreadcrumbItem(props: {entry={props.entry}order={props.order}previewItem={previewItem()}+ setsSplitDisplayName={props.setsSplitDisplayName ?? false}/>)}</Show>diff --git a/apps/web/src/features/block-md/component/MarkdownDetailBreadcrumbItem.tsx b/apps/web/src/features/block-md/component/MarkdownDetailBreadcrumbItem.tsxindex 1540cf1d9b..c70d139a23 100644--- a/apps/web/src/features/block-md/component/MarkdownDetailBreadcrumbItem.tsx+++ b/apps/web/src/features/block-md/component/MarkdownDetailBreadcrumbItem.tsx@@ -1,7 +1,10 @@import { ViewBreadcrumbs } from '@app/components/view-shell';import { useBlockEntityCommands } from '@app/features/next-soup/actions';import { SplitFileMenu } from '@components/app/split-layout/components/SplitFileMenu';-import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';+import {+ useSplitDisplayName,+ useSplitPanelOrThrow,+} from '@components/app/split-layout/layoutUtils';import type { BlockAlias, BlockName } from '@core/block';import { EntityIcon } from '@core/component/EntityIcon';import { Permissions } from '@core/component/SharePermissions';@@ -38,6 +41,7 @@ export function MarkdownDetailBreadcrumbItem(props: {displayName() ??props.fallbackName ??(props.kind === 'task' ? 'New Task' : 'Untitled');+ useSplitDisplayName(documentName);const focusDocument = () => state.editor.md.editor?.focus();const menuPermissions = () => {diff --git a/apps/web/src/features/calendar-view/components/Workspace.tsx b/apps/web/src/features/calendar-view/components/Workspace.tsxindex 293bbe82d8..5a0d6645a1 100644--- a/apps/web/src/features/calendar-view/components/Workspace.tsx+++ b/apps/web/src/features/calendar-view/components/Workspace.tsx@@ -7,7 +7,10 @@ import {import { useCalendarView } from '@app/features/calendar/components/CalendarViewContext';import { RangeUnavailableBanner } from '@app/features/calendar/components/RangeUnavailableBanner';import { createSizeBreakpoints } from '@app/util/create-size-breakpoints';-import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';+import {+ useSplitDisplayName,+ useSplitPanelOrThrow,+} from '@components/app/split-layout/layoutUtils';import { SplitPanel } from '@components/app/split-panel';import { isMobile } from '@core/mobile/isMobile';import { createElementSize } from '@solid-primitives/resize-observer';@@ -20,7 +23,6 @@ import {Match,on,onCleanup,- onMount,Show,Suspense,Switch,@@ -126,9 +128,7 @@ function WorkspaceContent() {const calendarView = useCalendarView();// An inline preview keeps its host's name.- onMount(() => {- if (!panel.isInlinePreview) panel.handle.setDisplayName('Calendar');- });+ useSplitDisplayName(() => (panel.isInlinePreview ? undefined : 'Calendar'));const eventDetails = () => (<SelectedEventDetailsdiff --git a/apps/web/src/features/channel/Channel/ChannelDetail.tsx b/apps/web/src/features/channel/Channel/ChannelDetail.tsxindex 063994d36e..7f98523e5e 100644--- a/apps/web/src/features/channel/Channel/ChannelDetail.tsx+++ b/apps/web/src/features/channel/Channel/ChannelDetail.tsx@@ -21,6 +21,7 @@ import {} from '@components/app/split-layout/components/PriorityCollapseOverflowSensor';import {useRegisterPriorityCollapseItem,+ useSplitDisplayName,useSplitPanelOrThrow,} from '@components/app/split-layout/layoutUtils';import type { PriorityCollapser } from '@components/app/split-layout/utils/createPriorityCollapser';@@ -249,6 +250,7 @@ function ChannelDetailContent(props: ChannelDetailProps) {const orchestrator = useGlobalBlockOrchestrator();const channelId = props.channelId;const channelName = useChannelName(channelId, props.fallbackName);+ useSplitDisplayName(() => channelName() ?? 'New Channel');const requestFromTarget = (target: ChannelTargetRequest | undefineddiff --git a/apps/web/src/features/channel/Channel/tests/channel-detail-navigation.test.tsx b/apps/web/src/features/channel/Channel/tests/channel-detail-navigation.test.tsxindex f62a762e67..c541a5df5f 100644--- a/apps/web/src/features/channel/Channel/tests/channel-detail-navigation.test.tsx+++ b/apps/web/src/features/channel/Channel/tests/channel-detail-navigation.test.tsx@@ -84,6 +84,7 @@ vi.mock();vi.mock('@components/app/split-layout/layoutUtils', () => ({useRegisterPriorityCollapseItem: () => () => false,+ useSplitDisplayName: () => {},useSplitPanelOrThrow: () => ({ splitHotkeyScope: 'test-scope' }),}));vi.mock('@core/component/TabsInset', () => ({ TabsInset: () => null }));diff --git a/apps/web/src/features/drive-view/components/DriveDetailView.tsx b/apps/web/src/features/drive-view/components/DriveDetailView.tsxindex a534788bba..6f2b7bc196 100644--- a/apps/web/src/features/drive-view/components/DriveDetailView.tsx+++ b/apps/web/src/features/drive-view/components/DriveDetailView.tsx@@ -155,7 +155,11 @@ function StackEntityDetail(props: {</Match><Match when={true}><Show when={props.entry.data.type !== 'document'}>- <EntityDetailBreadcrumbItem entry={props.entry} order={props.order} />+ <EntityDetailBreadcrumbItem+ entry={props.entry}+ order={props.order}+ setsSplitDisplayName+ /></Show><EntityDetailtarget={props.entry.data}diff --git a/apps/web/src/features/drive-view/components/FileDetailBreadcrumbItem.tsx b/apps/web/src/features/drive-view/components/FileDetailBreadcrumbItem.tsxindex b0ccc5489e..f15d02bf0c 100644--- a/apps/web/src/features/drive-view/components/FileDetailBreadcrumbItem.tsx+++ b/apps/web/src/features/drive-view/components/FileDetailBreadcrumbItem.tsx@@ -2,7 +2,10 @@ import { ViewBreadcrumbs } from '@app/components/view-shell';import { useBlockEntityCommands } from '@app/features/next-soup/actions';import type { FileOperation } from '@components/app/split-layout/components/SplitFileMenu';import { SplitFileMenu } from '@components/app/split-layout/components/SplitFileMenu';-import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';+import {+ useSplitDisplayName,+ useSplitPanelOrThrow,+} from '@components/app/split-layout/layoutUtils';import type { BlockAlias, BlockName } from '@core/block';import { EntityIcon } from '@core/component/EntityIcon';import { getPermissions } from '@core/component/SharePermissions';@@ -33,6 +36,7 @@ export function FileDetailBreadcrumbItem(props: {const documentId = () => props.documentMetadata.documentId;const documentName = () =>props.documentMetadata.documentName ?? props.fallbackName ?? 'Untitled';+ useSplitDisplayName(documentName);useBlockEntityCommands({id: documentId(),diff --git a/apps/web/src/features/email-view/components/EmailDetailView.tsx b/apps/web/src/features/email-view/components/EmailDetailView.tsxindex d172cc2d34..f7611de1e4 100644--- a/apps/web/src/features/email-view/components/EmailDetailView.tsx+++ b/apps/web/src/features/email-view/components/EmailDetailView.tsx@@ -20,6 +20,7 @@ import { SplitFileMenu } from '@components/app/split-layout/components/SplitFileimport { ListNavigationButtons } from '@components/app/split-layout/components/SplitHeader';import {useCanAutofocusSplitContent,+ useSplitDisplayName,useSplitPanelOrThrow,} from '@components/app/split-layout/layoutUtils';import { createSplitAutofocus } from '@components/app/split-layout/utils/createSplitAutofocus';@@ -129,6 +130,7 @@ export function EmailDetailView(props: {'Email');};+ useSplitDisplayName(title);const openShare = useShareModal(() => {const thread = threadData()?.thread;if (!thread) return;diff --git a/apps/web/src/features/home/components/HomeEntityDetailRouteView.tsx b/apps/web/src/features/home/components/HomeEntityDetailRouteView.tsxindex 282f8f0e46..225f3928b2 100644--- a/apps/web/src/features/home/components/HomeEntityDetailRouteView.tsx+++ b/apps/web/src/features/home/components/HomeEntityDetailRouteView.tsx@@ -9,7 +9,10 @@ import { useGlobalBlockOrchestrator } from '@components/app/GlobalAppState';import { PreviewPanel } from '@components/app/PreviewPanel';import type { PreviewBlockTarget } from '@components/app/previewTarget';import { SidePanel } from '@components/app/side-panel';-import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';+import {+ useSplitDisplayName,+ useSplitPanelOrThrow,+} from '@components/app/split-layout/layoutUtils';import { type Accessor, createMemo, Match, Show, Switch } from 'solid-js';import { isHomeDocumentType } from '../home-route-schema';import { useHomeView } from '../home-view-context';@@ -21,6 +24,11 @@ type DetailParams = {documentId?: string;};+function HomeEntityDisplayName(props: { name: Accessor<string | undefined> }) {+ useSplitDisplayName(props.name);+ return null;+}+/** The shared details that can render without a legacy block instance. */function entityDetailTarget(params: DetailParams,@@ -105,6 +113,7 @@ function HomeEntityDetailBody(props: {return (<>+ <HomeEntityDisplayName name={name} /><ViewBreadcrumbs.Itemvalue={props.value()}metadata={props.target}diff --git a/apps/web/src/features/projects/project-detail.tsx b/apps/web/src/features/projects/project-detail.tsxindex 807abf50d1..fc36eab8f7 100644--- a/apps/web/src/features/projects/project-detail.tsx+++ b/apps/web/src/features/projects/project-detail.tsx@@ -8,7 +8,10 @@ import {import { useNavigate } from '@app/lib/split-router';import type { ComposeTaskProps } from '@block-md/component/ComposeTask';import { useSplitLayout } from '@components/app/split-layout/layout';-import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';+import {+ useSplitDisplayName,+ useSplitPanelOrThrow,+} from '@components/app/split-layout/layoutUtils';import { getPermissions } from '@core/component/SharePermissions';import { TabsInset } from '@core/component/TabsInset';import { toast } from '@core/component/Toast/Toast';@@ -137,6 +140,7 @@ function ProjectShareTrigger(props: {function ProjectDetailHost(props: ProjectDetailProps) {const context = useProjectsContext();const source = context.createProjectSource(() => props.route.id);+ useSplitDisplayName(() => source.project()?.name ?? 'Project');const commands = context.createCommands();const layout = useSplitLayout();const navigate = useNavigate();