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(md): use 'New Document' as placeholder, make home use reactive title (#7599)
Seamuse8def6a763a4
diff --git a/apps/web/src/features/block-md/component/MarkdownDetailBreadcrumbItem.tsx b/apps/web/src/features/block-md/component/MarkdownDetailBreadcrumbItem.tsxindex fa07d59761..58be9708a5 100644--- a/apps/web/src/features/block-md/component/MarkdownDetailBreadcrumbItem.tsx+++ b/apps/web/src/features/block-md/component/MarkdownDetailBreadcrumbItem.tsx@@ -9,6 +9,7 @@ import {import type { BlockAlias, BlockName } from '@core/block';import { EntityIcon } from '@core/component/EntityIcon';import { Permissions } from '@core/component/SharePermissions';+import { blockNameToDefaultFile } from '@core/constant/allBlocks';import { buildEntityData } from '@entity';import { useMarkdownDocument } from '../context/markdown-document-context';import type { MarkdownDocumentKind } from '../types';@@ -39,9 +40,7 @@ export function MarkdownDetailBreadcrumbItem(props: {const { fileOperations, menuTools } = useMarkdownDocumentTools();const blockName = () => markdownDocumentBlockName(props.kind);const documentName = () =>- displayName() ??- props.fallbackName ??- (props.kind === 'task' ? 'New Task' : 'Untitled');+ displayName() || props.fallbackName || blockNameToDefaultFile(blockName());useSplitDisplayName(documentName);const focusDocument = () => state.editor.md.editor?.focus();diff --git a/apps/web/src/features/block-md/component/MarkdownNameProvider.tsx b/apps/web/src/features/block-md/component/MarkdownNameProvider.tsxindex 7269eefcbb..f11beaead1 100644--- a/apps/web/src/features/block-md/component/MarkdownNameProvider.tsx+++ b/apps/web/src/features/block-md/component/MarkdownNameProvider.tsx@@ -21,7 +21,7 @@ export const MarkdownNameProvider: FlowComponent = (props) => {// Keep the editable title and the label separate. An empty persisted// title is a real editor value so TitleEditor can stay empty and show its// placeholder, but surrounding UI should still display the block fallback- // such as "New Note" or "New Task".+ // such as "New Document" or "New Task".const { persistedName, fallbackName } = useMarkdownDocument();const [optimisticName, setOptimisticName] = createSignal<string | undefineddiff --git a/apps/web/src/features/block-md/component/sidepanel/MarkdownSidePanelSections.tsx b/apps/web/src/features/block-md/component/sidepanel/MarkdownSidePanelSections.tsxindex f87d7792b9..9d3dd8f8f9 100644--- a/apps/web/src/features/block-md/component/sidepanel/MarkdownSidePanelSections.tsx+++ b/apps/web/src/features/block-md/component/sidepanel/MarkdownSidePanelSections.tsx@@ -55,7 +55,6 @@ export function MarkdownSidePanelSections() {const canEdit = permissions.canEdit;const { displayName } = useMarkdownName();const isTask = () => kind() === 'task';- const canDispatchToAgent = () => isTask() || kind() === 'document';const entity = (): Entity => ({id: documentId(),type: 'document',@@ -67,7 +66,7 @@ export function MarkdownSidePanelSections() {<><SidePanel.HeaderActions><div class="flex shrink-0 items-center gap-1">- <Show when={canDispatchToAgent() && !isMobile()}>+ <Show when={isTask() && !isMobile()}><DispatchAgentButton showPrimaryLabel /></Show><AskMacroButtondiff --git a/apps/web/src/features/block-md/component/useMarkdownDocumentDownload.ts b/apps/web/src/features/block-md/component/useMarkdownDocumentDownload.tsindex 11e82f1c40..0f244716ed 100644--- a/apps/web/src/features/block-md/component/useMarkdownDocumentDownload.ts+++ b/apps/web/src/features/block-md/component/useMarkdownDocumentDownload.ts@@ -2,6 +2,7 @@ import {editorStateAsMarkdown,getSaveState,} from '@core/component/LexicalMarkdown/utils';+import { toast } from '@core/component/Toast/Toast';import { downloadFile } from '@filesystem/download';import { createCallback } from '@solid-primitives/rootless';import { useMarkdownDocument } from '../context/markdown-document-context';@@ -22,6 +23,25 @@ export function useDownloadDocumentAsMarkdownText() {});}+export function useCopyDocumentAsMarkdown() {+ const { state } = useMarkdownDocument();++ return createCallback(async () => {+ const editor = state.editor.md.editor;+ if (!editor) return;++ try {+ await navigator.clipboard.writeText(+ editorStateAsMarkdown(editor, 'external')+ );+ toast.success('Markdown copied to clipboard');+ } catch (error) {+ console.error('Failed to copy markdown', error);+ toast.failure('Failed to copy markdown');+ }+ });+}+export function useDownloadDocumentAsJson() {const { persistedName, fallbackName, state } = useMarkdownDocument();const fileName = () => persistedName() || fallbackName();diff --git a/apps/web/src/features/block-md/component/useMarkdownDocumentTools.tsx b/apps/web/src/features/block-md/component/useMarkdownDocumentTools.tsxindex 84f0e5a434..901528dcd9 100644--- a/apps/web/src/features/block-md/component/useMarkdownDocumentTools.tsx+++ b/apps/web/src/features/block-md/component/useMarkdownDocumentTools.tsx@@ -18,6 +18,7 @@ import {import { isMobile } from '@core/mobile/isMobile';import { copyBranchNameToClipboard } from '@core/util/branchName';import ClockCounterClockwise from '@phosphor/clock-counter-clockwise.svg';+import Copy from '@phosphor/copy.svg';import Download from '@phosphor/download.svg';import GitBranch from '@phosphor/git-branch.svg';import IconLink from '@phosphor/link.svg';@@ -31,7 +32,10 @@ import {useDispatchAgentSplitFileActions,} from './DispatchAgentMenu';import { useMarkdownName } from './MarkdownNameProvider';-import { useDownloadDocumentAsMarkdownText } from './useMarkdownDocumentDownload';+import {+ useCopyDocumentAsMarkdown,+ useDownloadDocumentAsMarkdownText,+} from './useMarkdownDocumentDownload';function useMarkdownShareModal() {const { documentId, kind, permissions } = useMarkdownDocument();@@ -64,6 +68,7 @@ export function useMarkdownDocumentTools() {const { documentId, kind, element } = useMarkdownDocument();const history = useHistory();const { displayName } = useMarkdownName();+ const copyAsMarkdown = useCopyDocumentAsMarkdown();const downloadAsMarkdownText = useDownloadDocumentAsMarkdownText();const openShare = useMarkdownShareModal();const dispatchAgentActions = useDispatchAgentSplitFileActions();@@ -94,7 +99,12 @@ export function useMarkdownDocumentTools() {: []),...(isDocument? ([- { ...dispatchAgentActions.copyAsPrompt, group: 'file' as const },+ {+ group: 'sharing' as const,+ label: 'Copy as markdown',+ icon: Copy,+ action: copyAsMarkdown,+ },] satisfies FileOperation[]): []),{diff --git a/apps/web/src/features/block-md/definition.ts b/apps/web/src/features/block-md/definition.tsindex cf1d930fcd..76772f9952 100644--- a/apps/web/src/features/block-md/definition.ts+++ b/apps/web/src/features/block-md/definition.ts@@ -15,7 +15,7 @@ import {export const definition = defineBlock({name: 'md',description: 'write markdown notes',- defaultFilename: 'New Note',+ defaultFilename: 'New Document',aliases: [{ name: 'task', defaultFileName: 'New Task' },{ name: 'snippet', defaultFileName: 'New Snippet' },diff --git a/apps/web/src/features/block-md/views/compose-document.tsx b/apps/web/src/features/block-md/views/compose-document.tsxindex f9c5cf7f19..e33e37a112 100644--- a/apps/web/src/features/block-md/views/compose-document.tsx+++ b/apps/web/src/features/block-md/views/compose-document.tsx@@ -4,6 +4,7 @@ import { useMacroMentionLinkResolver } from '@components/app/split-layout/split-import { buildConfig } from '@core/component/LexicalMarkdown/builder/MarkdownConfigBuilder';import { MarkdownShell } from '@core/component/LexicalMarkdown/builder/MarkdownShell';import { toast } from '@core/component/Toast/Toast';+import { blockNameToDefaultFile } from '@core/constant/allBlocks';import { registerHotkey, useHotkeyDOMScope } from '@core/hotkey/hotkeys';import ArrowsOutIcon from '@phosphor/arrows-out.svg';import XIcon from '@phosphor/x.svg';@@ -40,7 +41,8 @@ export function ComposeDocument(props: ComposeDocumentProps) {const portalScope = () => (panel.handle.isPopover() ? 'local' : 'block');const submit = async (expand = false) => {- const documentTitle = title().trim() || (expand ? 'New Note' : '');+ const documentTitle =+ title().trim() || (expand ? blockNameToDefaultFile('md') : '');if (isCreating() || !documentTitle) return;const documentContent = content().trim();const entries = tags.tagEntries();diff --git a/apps/web/src/features/drive-view/views/MarkdownDetail.tsx b/apps/web/src/features/drive-view/views/MarkdownDetail.tsxindex 77fd0d5263..6d6dca60fe 100644--- a/apps/web/src/features/drive-view/views/MarkdownDetail.tsx+++ b/apps/web/src/features/drive-view/views/MarkdownDetail.tsx@@ -19,6 +19,7 @@ import {} from '@components/app/GlobalAppState';import { SidePanel } from '@components/app/side-panel';import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';+import { blockNameToDefaultFile } from '@core/constant/allBlocks';import { ENABLE_MARKDOWN_SIDE_PANEL } from '@core/constant/featureFlags';import { createMethodRegistration } from '@core/orchestrator';import { DocumentDebouncedNotificationReadMarker } from '@notifications';@@ -181,7 +182,12 @@ export function MarkdownDetail(props: MarkdownDetailProps) {<MarkdownDetailContentdocumentId={props.documentId}kind={props.kind ?? 'document'}- fallbackName={props.fallbackName ?? 'Untitled'}+ fallbackName={+ props.fallbackName ||+ blockNameToDefaultFile(+ props.kind && props.kind !== 'document' ? props.kind : 'md'+ )+ }data={data()}children={props.children}/>diff --git a/apps/web/src/features/home/components/HomeEntityDetailRouteView.tsx b/apps/web/src/features/home/components/HomeEntityDetailRouteView.tsxindex 7f014641a8..0e7ab7638d 100644--- a/apps/web/src/features/home/components/HomeEntityDetailRouteView.tsx+++ b/apps/web/src/features/home/components/HomeEntityDetailRouteView.tsx@@ -1,5 +1,6 @@import {EntityDetail,+ type EntityDetailContext,entityDetailBlockType,} from '@app/components/entity-detail/EntityDetail';import type { EntityDetailTarget } from '@app/components/entity-detail/entity-detail-target';@@ -7,18 +8,35 @@ import { ViewBreadcrumbs, ViewShell } from '@app/components/view-shell';import { channelsSearch } from '@app/features/channels-view/channels-route';import { createSearchParams, useParams } from '@app/lib/split-router';import { URL_PARAMS as CHANNEL_URL_PARAMS } from '@block-channel/constants';+import { useMarkdownName } from '@block-md/component/MarkdownNameProvider';+import { useMarkdownDocumentTools } from '@block-md/component/useMarkdownDocumentTools';+import { useMarkdownDocument } from '@block-md/context/markdown-document-context';import { ChannelDetailTopBar } from '@channel/Channel/ChannelDetail';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 {+ type FileOperation,+ SplitFileMenu,+} from '@components/app/split-layout/components/SplitFileMenu';import {useSplitDisplayName,useSplitPanelOrThrow,} from '@components/app/split-layout/layoutUtils';+import { EntityIcon } from '@core/component/EntityIcon';+import { getPermissions, Permissions } from '@core/component/SharePermissions';import { ShareTrigger } from '@core/component/TopBar/ShareButton';import { useDocumentShareModal } from '@core/component/TopBar/shareModal';-import { type Accessor, createMemo, Match, Show, Switch } from 'solid-js';+import { blockNameToDefaultFile } from '@core/constant/allBlocks';+import {+ type Accessor,+ createMemo,+ type JSX,+ Match,+ Show,+ Switch,+} from 'solid-js';import { isHomeDocumentType } from '../home-route-schema';import { useHomeView } from '../home-view-context';import { HomeReturnBreadcrumb } from './HomeReturnBreadcrumb';@@ -29,9 +47,119 @@ type DetailParams = {documentId?: string;};-function HomeEntityDisplayName(props: { name: Accessor<string | undefined> }) {+function HomeEntityBreadcrumb(props: {+ name: Accessor<string | undefined>;+ target: EntityDetailTarget;+ value: Accessor<string>;+ fileMenu?: JSX.Element;+}) {useSplitDisplayName(props.name);- return null;++ return (+ <ViewBreadcrumbs.Item+ value={props.value()}+ metadata={props.target}+ order={1}+ >+ {(item) => (+ <div class="flex min-w-0 items-center">+ <ViewBreadcrumbs.Button+ class="gap-1.5"+ isActive={item.isActive()}+ onClick={item.onSelect}+ tooltip={props.name()}+ >+ <EntityIcon+ targetType={entityDetailBlockType(props.target) ?? 'channel'}+ size="xs"+ class="shrink-0"+ />+ <span class="truncate">{props.name()}</span>+ </ViewBreadcrumbs.Button>+ <Show when={props.fileMenu}>+ <div class="shrink-0">{props.fileMenu}</div>+ </Show>+ </div>+ )}+ </ViewBreadcrumbs.Item>+ );+}++function HomeMarkdownBreadcrumb(props: {+ target: EntityDetailTarget;+ value: Accessor<string>;+}) {+ const { displayName } = useMarkdownName();+ const { documentId, kind, permissions } = useMarkdownDocument();+ const { fileOperations, menuTools } = useMarkdownDocumentTools();+ const blockType = () => {+ const documentKind = kind();+ return documentKind === 'document' ? 'md' : documentKind;+ };+ const name = () => displayName() || blockNameToDefaultFile(blockType());+ const menuPermissions = () => {+ if (permissions.isOwner()) return Permissions.OWNER;+ if (permissions.canEdit()) return Permissions.CAN_EDIT;+ if (permissions.canComment()) return Permissions.CAN_COMMENT;+ return Permissions.CAN_VIEW;+ };++ return (+ <HomeEntityBreadcrumb+ name={name}+ target={props.target}+ value={props.value}+ fileMenu={+ <SplitFileMenu+ id={documentId()}+ itemType="document"+ name={name()}+ ops={fileOperations}+ tools={menuTools}+ entityKind={blockType()}+ permissions={menuPermissions()}+ />+ }+ />+ );+}++type HomeDocumentContext = Extract<EntityDetailContext, { type: 'document' }>;++function HomeDocumentBreadcrumb(props: {+ context: HomeDocumentContext;+ target: EntityDetailTarget;+ value: Accessor<string>;+}) {+ const blockType = () => entityDetailBlockType(props.target) ?? 'unknown';+ const name = () =>+ props.context.documentMetadata.documentName ||+ blockNameToDefaultFile(blockType());+ const fileOperations = (): FileOperation[] => [+ { op: 'copy' },+ { op: 'rename' },+ { op: 'moveToProject' },+ ...(props.context.operations ?? []),+ { op: 'delete' },+ ];++ return (+ <HomeEntityBreadcrumb+ name={name}+ target={props.target}+ value={props.value}+ fileMenu={+ <SplitFileMenu+ id={props.context.documentMetadata.documentId}+ itemType="document"+ name={name()}+ ops={fileOperations()}+ entityKind={blockType()}+ permissions={getPermissions(props.context.userAccessLevel)}+ />+ }+ />+ );}/** The shared details that can render without a legacy block instance. */@@ -130,30 +258,54 @@ function HomeEntityDetailBody(props: {case 'channel':return context.name();case 'document':- return context.documentMetadata.documentName;+ return (+ context.documentMetadata.documentName ||+ blockNameToDefaultFile(entityDetailBlockType(props.target))+ );}};const channel = () =>context.type === 'channel' ? context : undefined;+ const document = () =>+ context.type === 'document' ? context : undefined;+ const blockType = entityDetailBlockType(props.target);+ const isMarkdown =+ context.type === 'document' &&+ (blockType === 'md' ||+ blockType === 'task' ||+ blockType === 'snippet' ||+ blockType === 'skill');return (<>- <HomeEntityDisplayName name={name} />- <ViewBreadcrumbs.Item- value={props.value()}- metadata={props.target}- order={1}- >- {(item) => (- <ViewBreadcrumbs.Button- isActive={item.isActive()}- onClick={item.onSelect}- tooltip={name()}+ <Show+ when={isMarkdown}+ fallback={+ <Show+ when={document()}+ fallback={+ <HomeEntityBreadcrumb+ name={name}+ target={props.target}+ value={props.value}+ />+ }>- <span class="truncate">{name()}</span>- </ViewBreadcrumbs.Button>- )}- </ViewBreadcrumbs.Item>+ {(current) => (+ <HomeDocumentBreadcrumb+ context={current()}+ target={props.target}+ value={props.value}+ />+ )}+ </Show>+ }+ >+ <HomeMarkdownBreadcrumb+ target={props.target}+ value={props.value}+ />+ </Show><Show when={channel()}>{(current) => (<ChannelDetailTopBar