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): restore md embed card behavior and improve menu options (#7835)
Seamus08e34c2608f1
diff --git a/apps/web/src/features/block-canvas/canvas-next/README.md b/apps/web/src/features/block-canvas/canvas-next/README.mdindex 017952d933..412b2ed19e 100644--- a/apps/web/src/features/block-canvas/canvas-next/README.md+++ b/apps/web/src/features/block-canvas/canvas-next/README.md@@ -21,7 +21,11 @@ legacy entity references. Pencil samples are retained and use the new brush.Unsupported links, connector labels, invalid records, and interleaved group layersoffer **Open in legacy editor** without writing data.There is no version 2-to-legacy downgrade. Document-level read-only mode mounts a-navigation-only surface without editing, paste/drop, or embedded editing handlers.+selection/navigation surface without editing, paste/drop, or embedded editing handlers.+Markdown embeds explicitly pass `isEmbedded` to the editor and use this same+read-only surface, with Select and Hand tools and no property inspector. Selection+does not expose transform handles or mutate the scene; embedded views cannot save+canvas edits even when the viewer has edit permission on the original document.Saves are debounced and serialized; failures keep edits dirty. Save state is notshown in the canvas UI.diff --git a/apps/web/src/features/block-canvas/canvas-next/canvas-next-document.tsx b/apps/web/src/features/block-canvas/canvas-next/canvas-next-document.tsxindex e17125069c..8e9d226abc 100644--- a/apps/web/src/features/block-canvas/canvas-next/canvas-next-document.tsx+++ b/apps/web/src/features/block-canvas/canvas-next/canvas-next-document.tsx@@ -1,4 +1,5 @@import type { GraphicsEditor } from '@macro-inc/graphics';+import { debounce } from '@solid-primitives/scheduled';import {createEffect,createResource,@@ -35,6 +36,8 @@ export default function CanvasNextDocument(const ancestors = useContext(CanvasAncestry);const documentId = props.documentId;const initial = props.initial;+ const canEdit = () => props.canEdit && !props.isNested;+ const activePointers = new Set<number>();const [persistence, setPersistence] =createSignal<ReturnType<typeof createDocumentPersistence>>();const [editor, setEditor] = createSignal<GraphicsEditor>();@@ -70,36 +73,61 @@ export default function CanvasNextDocument(};};const content = (- <div class="relative flex size-full min-h-0 flex-col">+ <div+ class="relative flex size-full min-h-0 flex-col"+ on:pointerdown={(event) => activePointers.add(event.pointerId)}+ ><Show when={!savedLocation.loading}><CanvasAncestry.Provider value={[...ancestors, documentId]}><CanvasNextEditorinitial={initial}canEdit={props.canEdit}+ isEmbedded={props.isNested}fitOnLoad={!location()}onReady={(current, finishText) => {setEditor(current);const saving = createDocumentPersistence(current,initial,- canvasDocumentSource(documentId, () => props.canEdit)+ canvasDocumentSource(documentId, canEdit));setPersistence(saving);props.registerMethods?.({exportCanvas: async () => {- if (props.canEdit) finishText();+ if (canEdit()) finishText();return { ...initial, document: current.document };},goToLocationFromParams: (params) =>applyLocation(parseLocation(params)),});let viewTimer: ReturnType<typeof setTimeout> | undefined;- const unsubscribe = current.subscribeCamera((camera) => {+ let notifiedCamera = current.getCamera();+ // Updating the host's saved view can replace its decorator DOM.+ // Wait until navigation settles, and never interrupt a pointer gesture.+ const notifyLocation = debounce(() => {+ if (activePointers.size) return;+ const camera = current.getCamera();+ if (+ camera.x === notifiedCamera.x &&+ camera.y === notifiedCamera.y &&+ camera.scale === notifiedCamera.scale+ )+ return;+ notifiedCamera = camera;props.onLocationChange?.({x: camera.x,y: camera.y,scale: camera.scale * 100,});+ }, 100);+ const pointerEnd = (event: PointerEvent) => {+ if (!activePointers.delete(event.pointerId)) return;+ notifyLocation();+ };+ window.addEventListener('pointerup', pointerEnd, true);+ window.addEventListener('pointercancel', pointerEnd, true);+ const unsubscribe = current.subscribeCamera((camera) => {+ notifyLocation();if (props.isNested) return;clearTimeout(viewTimer);viewTimer = setTimeout(() => {@@ -107,7 +135,7 @@ export default function CanvasNextDocument(}, 500);});const flush = () => {- if (props.canEdit) finishText();+ if (canEdit()) finishText();void saving.flush();};const beforeUnload = (event: BeforeUnloadEvent) => {@@ -123,6 +151,9 @@ export default function CanvasNextDocument(flush();saving.dispose();unsubscribe();+ notifyLocation.clear();+ window.removeEventListener('pointerup', pointerEnd, true);+ window.removeEventListener('pointercancel', pointerEnd, true);clearTimeout(viewTimer);window.removeEventListener('pagehide', flush);window.removeEventListener('beforeunload', beforeUnload);diff --git a/apps/web/src/features/block-canvas/canvas-next/canvas-next.tsx b/apps/web/src/features/block-canvas/canvas-next/canvas-next.tsxindex 66fa8e8102..8404ad9de0 100644--- a/apps/web/src/features/block-canvas/canvas-next/canvas-next.tsx+++ b/apps/web/src/features/block-canvas/canvas-next/canvas-next.tsx@@ -25,6 +25,7 @@ import { createCanvasTextMeasurer } from './views/text-content';export function CanvasNextEditor(props: {initial: CanvasFile;canEdit: boolean;+ isEmbedded?: boolean;fitOnLoad?: boolean;onReady?: (editor: GraphicsEditor, finishText: () => void) => void;}) {@@ -39,7 +40,7 @@ export function CanvasNextEditor(props: {return (<StaticMarkdownContext><Show- when={props.canEdit}+ when={props.canEdit && !props.isEmbedded}fallback={<CanvasReadOnlyView editor={editor} fitOnLoad={props.fitOnLoad} />}diff --git a/apps/web/src/features/block-canvas/canvas-next/views/canvas-read-only-view.tsx b/apps/web/src/features/block-canvas/canvas-next/views/canvas-read-only-view.tsxindex 346768cb88..f96c38543a 100644--- a/apps/web/src/features/block-canvas/canvas-next/views/canvas-read-only-view.tsx+++ b/apps/web/src/features/block-canvas/canvas-next/views/canvas-read-only-view.tsx@@ -8,7 +8,8 @@ import {RectangleView,TextView,} from '@macro-inc/graphics/solid';-import { onCleanup, onMount } from 'solid-js';+import { createSignal, onCleanup, onMount } from 'solid-js';+import { CanvasDrawingToolbar, CanvasZoomToolbar } from './canvas-toolbars';import { CanvasMediaView } from './embedded-items';import { CanvasTextContent } from './text-content';@@ -17,7 +18,19 @@ export function CanvasReadOnlyView(props: {editor: GraphicsEditor;fitOnLoad?: boolean;}) {+ const [tool, setTool] = createSignal<'select' | 'pan'>('select');+ const [scale, setScale] = createSignal(props.editor.getCamera().scale);+ onCleanup(props.editor.subscribeCamera((camera) => setScale(camera.scale)));let host!: HTMLDivElement;+ const zoom = (factor: number) =>+ props.editor.zoomAt(+ { x: host.clientWidth / 2, y: host.clientHeight / 2 },+ props.editor.getCamera().scale * factor+ );+ const focus = () =>+ host+ .querySelector<HTMLElement>('[aria-label="Graphics canvas"]')+ ?.focus({ preventScroll: true });const fit = () =>props.editor.fitScene({width: host.clientWidth,@@ -33,11 +46,36 @@ export function CanvasReadOnlyView(props: {onCleanup(() => observer.disconnect());});return (- <div ref={host} class="relative size-full min-h-0">+ <div+ ref={host}+ class="relative size-full min-h-0"+ on:keydown={(event) => {+ if (+ !(event.target instanceof HTMLElement) ||+ event.target.getAttribute('aria-label') !== 'Graphics canvas'+ )+ return;+ event.stopPropagation();+ if (event.altKey) return;+ if (event.ctrlKey || event.metaKey) {+ if (event.key === '=' || event.key === '+') zoom(1.2);+ else if (event.key === '-') zoom(1 / 1.2);+ else return;+ event.preventDefault();+ return;+ }+ if (event.shiftKey) return;+ if (event.key === '.') fit();+ else if (event.key.toLowerCase() === 'v') setTool('select');+ else if (event.key.toLowerCase() === 'h') setTool('pan');+ else return;+ event.preventDefault();+ }}+ ><GraphicsSurfaceeditor={props.editor}- input={{ editing: false, tool: () => 'pan' }}- hideSelection+ input={{ editing: false, tool }}+ gridColor="transparent"renderers={{connector: (p) => (<ConnectorView {...p} contentView={CanvasTextContent} />@@ -67,13 +105,16 @@ export function CanvasReadOnlyView(props: {),}}/>- <button- type="button"- class="absolute bottom-4 left-4 rounded border border-edge-muted bg-panel px-3 py-2 text-sm"- onClick={fit}- >- Fit canvas- </button>+ <CanvasDrawingToolbar+ readOnly+ tool={tool()}+ onTool={(next) => {+ if (next !== 'select' && next !== 'pan') return;+ setTool(next);+ focus();+ }}+ />+ <CanvasZoomToolbar scale={scale()} onZoom={zoom} onFit={fit} /></div>);}diff --git a/apps/web/src/features/block-canvas/canvas-next/views/canvas-toolbars.tsx b/apps/web/src/features/block-canvas/canvas-next/views/canvas-toolbars.tsxindex 67d45ef6b7..c9a66c0737 100644--- a/apps/web/src/features/block-canvas/canvas-next/views/canvas-toolbars.tsx+++ b/apps/web/src/features/block-canvas/canvas-next/views/canvas-toolbars.tsx@@ -8,11 +8,13 @@ import Circle from '@phosphor/circle.svg';import Cursor from '@phosphor/cursor.svg';import Eraser from '@phosphor/eraser.svg';import Hand from '@phosphor/hand.svg';+import Minus from '@phosphor/minus.svg';import Pencil from '@phosphor/pencil-simple.svg';+import Plus from '@phosphor/plus.svg';import Rectangle from '@phosphor/rectangle.svg';import Text from '@phosphor/text-t.svg';import { Button, Dropdown, Hotkey, Toolbar } from '@ui';-import { type ComponentProps, For, Show } from 'solid-js';+import { type ComponentProps, For, type ParentProps, Show } from 'solid-js';import { Dynamic } from 'solid-js/web';import type { CanvasSnapMode } from '../core/snapping';import type {@@ -34,6 +36,7 @@ const tools = [export function CanvasDrawingToolbar(props: {tool: CanvasTool;onTool: (tool: CanvasTool) => void;+ readOnly?: boolean;}) {return (<div class="pointer-events-none absolute bottom-4 left-1/2 z-40 max-w-[calc(100%-2rem)] -translate-x-1/2">@@ -43,7 +46,15 @@ export function CanvasDrawingToolbar(props: {class="pointer-events-auto relative max-w-full overflow-x-auto"><Toolbar.Group>- <For each={tools}>+ <For+ each={+ props.readOnly+ ? tools.filter(+ (tool) => tool.id === 'select' || tool.id === 'pan'+ )+ : tools+ }+ >{(tool) => (<Toolbar.Buttonlabel={`${tool.label} tool`}@@ -117,15 +128,13 @@ function CanvasViewCheckboxItem();}-export function CanvasViewControls(props: {+type CanvasZoomProps = {scale: number;- grid: boolean;- onGrid: (visible: boolean) => void;onZoom: (factor: number) => void;onFit: () => void;- snapMode: CanvasSnapMode;- onSnapMode: (mode: CanvasSnapMode) => void;-}) {+};++function CanvasZoomMenu(props: ParentProps<CanvasZoomProps>) {return (<Dropdown placement="bottom-end"><Dropdown.Trigger@@ -167,33 +176,73 @@ export function CanvasViewControls(props: {)}</For></Dropdown.Group>- <Dropdown.Group>- <CanvasViewCheckboxItem checked={props.grid} onChange={props.onGrid}>- Toggle dot grid- </CanvasViewCheckboxItem>- </Dropdown.Group>- <Dropdown.Group>- <For- each={- [- { mode: 'none', label: 'No snapping' },- { mode: 'pixel', label: 'Snap to px' },- { mode: 'auto', label: 'Auto snapping' },- ] as const- }- >- {(option) => (- <CanvasViewCheckboxItem- closeOnSelect- checked={props.snapMode === option.mode}- onChange={() => props.onSnapMode(option.mode)}- >- {option.label}- </CanvasViewCheckboxItem>- )}- </For>- </Dropdown.Group>+ {props.children}</Dropdown.Content></Dropdown>);}++export function CanvasZoomToolbar(props: CanvasZoomProps) {+ return (+ <div class="absolute bottom-4 left-4 z-40">+ <Toolbar size="icon-sm" aria-label="Canvas zoom">+ <Toolbar.Group>+ <Toolbar.Button+ label="Zoom out"+ onClick={() => props.onZoom(1 / 1.2)}+ >+ <Minus />+ </Toolbar.Button>+ <CanvasZoomMenu {...props} />+ <Toolbar.Button label="Zoom in" onClick={() => props.onZoom(1.2)}>+ <Plus />+ </Toolbar.Button>+ </Toolbar.Group>+ </Toolbar>+ </div>+ );+}++export function CanvasViewControls(+ props: CanvasZoomProps & {+ grid: boolean;+ onGrid: (visible: boolean) => void;+ snapMode: CanvasSnapMode;+ onSnapMode: (mode: CanvasSnapMode) => void;+ }+) {+ return (+ <CanvasZoomMenu+ scale={props.scale}+ onZoom={props.onZoom}+ onFit={props.onFit}+ >+ <Dropdown.Group>+ <CanvasViewCheckboxItem checked={props.grid} onChange={props.onGrid}>+ Toggle dot grid+ </CanvasViewCheckboxItem>+ </Dropdown.Group>+ <Dropdown.Group>+ <For+ each={+ [+ { mode: 'none', label: 'No snapping' },+ { mode: 'pixel', label: 'Snap to px' },+ { mode: 'auto', label: 'Auto snapping' },+ ] as const+ }+ >+ {(option) => (+ <CanvasViewCheckboxItem+ closeOnSelect+ checked={props.snapMode === option.mode}+ onChange={() => props.onSnapMode(option.mode)}+ >+ {option.label}+ </CanvasViewCheckboxItem>+ )}+ </For>+ </Dropdown.Group>+ </CanvasZoomMenu>+ );+}diff --git a/apps/web/src/features/block-canvas/component/Block.tsx b/apps/web/src/features/block-canvas/component/Block.tsxindex bc3035d30a..eaba9fe35a 100644--- a/apps/web/src/features/block-canvas/component/Block.tsx+++ b/apps/web/src/features/block-canvas/component/Block.tsx@@ -56,7 +56,7 @@ export default function BlockCanvas(props: BlockCanvasProps) {return (<divclass="size-full select-none flex flex-col"- on:click={(event) => {+ onClick={(event) => {if (isNested) event.stopPropagation();}}>diff --git a/apps/web/src/features/block-md/context/markdown-document-context.tsx b/apps/web/src/features/block-md/context/markdown-document-context.tsxindex f313a116e0..6c4efb7cfb 100644--- a/apps/web/src/features/block-md/context/markdown-document-context.tsx+++ b/apps/web/src/features/block-md/context/markdown-document-context.tsx@@ -1,3 +1,4 @@+import { MarkdownHostContext } from '@core/component/LexicalMarkdown/context/MarkdownHostContext';import type { Accessor, ParentComponent } from 'solid-js';import { createContext, useContext } from 'solid-js';import type { MarkdownDocumentKind, MarkdownDocumentSource } from '../types';@@ -24,7 +25,9 @@ export const MarkdownDocumentProvider: ParentComponent<{context: MarkdownDocumentContextValue;}> = (props) => (<MarkdownDocumentContext.Provider value={props.context}>- {props.children}+ <MarkdownHostContext.Provider value="md">+ {props.children}+ </MarkdownHostContext.Provider></MarkdownDocumentContext.Provider>);diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentCard.test.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentCard.test.tsxindex b857b1d80a..0f577c6a21 100644--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentCard.test.tsx+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentCard.test.tsx@@ -1,7 +1,30 @@-import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library';+import {+ type MarkdownDocumentContextValue,+ MarkdownDocumentProvider,+} from '@block-md/context/markdown-document-context';+import { createMarkdownDocumentState } from '@block-md/context/markdown-document-state';+import {+ $createDocumentCardNode,+ $isDocumentCardNode,+ $isDocumentMentionNode,+} from '@macro-inc/lexical-core';+import {+ cleanup,+ fireEvent,+ render,+ screen,+ waitFor,+} from '@solidjs/testing-library';+import { $getNodeByKey, $getRoot } from 'lexical';import { createResource, type JSX, onCleanup } from 'solid-js';+import { createStore } from 'solid-js/store';import { afterEach, expect, it, vi } from 'vitest';+import {+ createLexicalWrapper,+ LexicalWrapperContext,+} from '../../context/LexicalWrapperContext';import { MarkdownHostContext } from '../../context/MarkdownHostContext';+import { defaultSelectionData } from '../../plugins/selection-data';import { DocumentCard } from './DocumentCard';// The card's imports reach the realtime connection, which opens a socket on load.@@ -113,7 +136,7 @@ it('mounts a form card’s body in a channel message, with no block and no editoexpect(mocks.disposed).toBe(1);});-it('offers a sent card only what works without an editor: collapsing it here, never deleting it from the message', async () => {+it('offers navigation on sent cards without collapse or editing actions', async () => {render(() => (<MarkdownHostContext.Provider value="channel"><DocumentCard@@ -127,13 +150,16 @@ it('offers a sent card only what works without an editor: collapsing it here, ne</MarkdownHostContext.Provider>));await screen.findByText('form-1');- expect(screen.getByRole('menuitem', { name: 'Collapse' })).toBeTruthy();+ expect(screen.queryByRole('menuitem', { name: /Collapse/ })).toBeNull();+ expect(screen.getByRole('menuitem', { name: 'Copy Link' })).toBeTruthy();+ expect(+ screen.getByRole('menuitem', { name: 'Open in New Split' })+ ).toBeTruthy();expect(screen.queryByRole('menuitem', { name: /Delete/ })).toBeNull();expect(screen.queryByRole('menuitem', { name: /Convert to Inline Mention/ })).toBeNull();- fireEvent.click(screen.getByRole('menuitem', { name: 'Collapse' }));- expect(screen.queryByText('form-1')).toBeNull();+ expect(screen.getByText('form-1')).toBeTruthy();});it('reserves a poll’s height across suspended metadata loading', async () => {@@ -171,3 +197,167 @@ it('reserves a poll’s height across suspended metadata loading', async () => {);expect(screen.queryByRole('status')).toBeNull();});++it.each(['code', 'canvas', 'pdf'] as const)(+ 'mounts a %s preview inside a standalone markdown document',+ async (blockName) => {+ const { unmount } = render(() => {+ const context: MarkdownDocumentContextValue = {+ documentId: () => 'document-1',+ kind: () => 'document',+ documentSource: () => ({ type: 'loading' }),+ permissions: {+ canComment: () => true,+ canEdit: () => true,+ isOwner: () => true,+ },+ persistedName: () => 'Embeds',+ fallbackName: () => 'Embeds',+ state: createMarkdownDocumentState(),+ element: () => undefined,+ };+ return (+ <MarkdownDocumentProvider context={context}>+ <DocumentCard+ key="embedded-node"+ documentId="form-1"+ documentName="Embedded document"+ blockName={blockName}+ blockParams={{}}+ theme={{}}+ />+ </MarkdownDocumentProvider>+ );+ });++ const content = await screen.findByText('form-1');+ expect(content.dataset.nestedBlock).toBe(blockName);+ expect(+ content+ .closest<HTMLElement>('.rounded-xl')+ ?.classList.contains('resize-y')+ ).toBe(true);+ const disposedBeforeUnmount = mocks.disposed;+ unmount();+ expect(mocks.disposed).toBe(disposedBeforeUnmount + 1);+ }+);++it.each(['code', 'canvas'] as const)(+ 'keeps a native %s resize when selection changes and saves the new size',+ async (blockName) => {+ const wrapper = createLexicalWrapper({+ type: 'markdown',+ namespace: 'card-resize',+ isInteractable: () => true,+ });+ const [selection, setSelection] = createStore(+ structuredClone(defaultSelectionData)+ );+ const cardData = {+ documentId: 'form-1',+ documentName: 'Embedded document',+ blockName,+ blockParams: {},+ previewBox: ['100%', '400px'] as [string, string],+ };+ let key = '';+ wrapper.editor.update(+ () => {+ const node = $createDocumentCardNode(cardData);+ key = node.getKey();+ $getRoot().append(node);+ },+ { discrete: true }+ );+ render(() => {+ onCleanup(wrapper.cleanup);+ return (+ <MarkdownHostContext.Provider value="md">+ <LexicalWrapperContext.Provider value={{ ...wrapper, selection }}>+ <DocumentCard+ {...cardData}+ key={key}+ theme={{}}+ previewComponent={() => <div data-testid="resizable-preview" />}+ />+ </LexicalWrapperContext.Provider>+ </MarkdownHostContext.Provider>+ );+ });+ const card = screen+ .getByTestId('resizable-preview')+ .closest<HTMLElement>('.rounded-xl')!;+ vi.spyOn(card, 'getBoundingClientRect').mockImplementation(+ () => new DOMRect(0, 0, 768, Number.parseFloat(card.style.height))+ );++ // The native resize grip writes an inline height before mouseup selects+ // the card. That selection rerenders the card's class and style props.+ card.style.height = '560px';+ await Promise.resolve();+ setSelection({ type: 'node', nodeKeys: new Set([key]) });+ expect(card.style.height).toBe('560px');++ await waitFor(+ () => {+ const size = wrapper.editor.read(() => {+ const node = $getNodeByKey(key);+ return $isDocumentCardNode(node) ? node.getPreviewBox() : undefined;+ });+ expect(size).toEqual([768, 560]);+ },+ { timeout: 2000 }+ );+ expect(card.style.height).toBe('560px');+ }+);++it('shows convert back to mention when the editor becomes editable and preserves the reference', async () => {+ const wrapper = createLexicalWrapper({+ type: 'markdown',+ namespace: 'card-conversion',+ isInteractable: () => true,+ });+ const cardData = {+ documentId: 'form-1',+ documentName: 'Lunch?',+ blockName: 'form',+ blockParams: { question: 'lunch' },+ };+ let key = '';+ wrapper.editor.update(+ () => {+ const node = $createDocumentCardNode(cardData);+ key = node.getKey();+ $getRoot().append(node);+ },+ { discrete: true }+ );+ wrapper.editor.setEditable(false);+ render(() => {+ onCleanup(wrapper.cleanup);+ return (+ <LexicalWrapperContext.Provider value={wrapper}>+ <DocumentCard {...cardData} key={key} theme={{}} />+ </LexicalWrapperContext.Provider>+ );+ });+ expect(+ screen.queryByRole('menuitem', { name: 'Convert to Inline Mention' })+ ).toBeNull();+ wrapper.editor.setEditable(true);+ fireEvent.click(+ await screen.findByRole('menuitem', { name: 'Convert to Inline Mention' })+ );+ await waitFor(() => {+ wrapper.editor.read(() => {+ const mention = $getRoot().getFirstDescendant();+ expect($isDocumentMentionNode(mention)).toBe(true);+ if (!$isDocumentMentionNode(mention)) return;+ expect(mention?.getDocumentId()).toBe(cardData.documentId);+ expect(mention?.getBlockParams()).toEqual(cardData.blockParams);+ expect($getNodeByKey(key)).toBeNull();+ });+ });+});diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentCard.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentCard.tsxindex a344ae345b..10cc664242 100644--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentCard.tsx+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentCard.tsx@@ -1,4 +1,6 @@import { pollCardHeight } from '@app/features/block-form/core/poll-card-layout';+import { openChatWithAgent } from '@app/features/chat/ChatWithAgentButton';+import { globalSplitManager } from '@app/signal/splitLayout';import { URL_PARAMS as CHANNEL_PARAMS } from '@block-channel/constants';import { isInBlock, type PreviewState, useMaybeBlockName } from '@core/block';import { useItemPreviewData } from '@core/component/ItemPreview';@@ -8,6 +10,7 @@ import { ENABLE_BLOCK_IN_BLOCK } from '@core/constant/featureFlags';import { canNestBlock, createBlockInstance } from '@core/orchestrator';import { blockElementSignal } from '@core/signal/blockElement';import { getDisplayName, tryMacroId } from '@core/user';+import { copyBranchNameToClipboard } from '@core/util/branchName';import { lazyNamed } from '@core/util/lazyNamed';import { matches } from '@core/util/match';import {@@ -22,8 +25,11 @@ import {unsetDocumentCardPreviewCache,} from '@macro-inc/lexical-core';import Minimize from '@phosphor/arrows-in.svg';-import Clipboard from '@phosphor/clipboard.svg';+import ColumnsPlusRight from '@phosphor/columns-plus-right.svg';import DotsThree from '@phosphor/dots-three.svg';+import GitBranch from '@phosphor/git-branch.svg';+import Link from '@phosphor/link.svg';+import Sparkle from '@phosphor/sparkle.svg';import LoadingSpinner from '@phosphor/spinner.svg';import TrashSimple from '@phosphor/trash-simple.svg';import {@@ -31,6 +37,7 @@ import {isAccessiblePreviewItem,} from '@queries/preview';import { blockNameToItemType } from '@service-storage/client';+import { createCallback } from '@solid-primitives/rootless';import { debounce } from '@solid-primitives/scheduled';import { Card, cn, Dropdown, Item } from '@ui';import {@@ -66,7 +73,7 @@ import { floatWithElement } from '../../directive/floatWithElement';import { UPDATE_DOCUMENT_NAME_COMMAND } from '../../plugins';import { removeNodeAndRestoreSelection } from '../../plugins/shared/removeNodeAndRestoreSelection';import { dispatchInternalLayoutShift } from '../../plugins/shared/utils';-import { BlockLink } from '../core/BlockLink';+import { BlockLink, openDocument } from '../core/BlockLink';false && floatWithElement;@@ -114,11 +121,19 @@ export function DocumentCard(props: DocumentCardDecoratorProps) {function DocumentCardInner(props: DocumentCardDecoratorProps) {const wrapper = useContext(LexicalWrapperContext);const editor = () => wrapper?.editor;+ const [editable, setEditable] = createSignal(editor()?.isEditable() ?? false);+ if (wrapper) {+ onCleanup(+ wrapper.editor.registerEditableListener((value) => {+ setEditable(value);+ })+ );+ }const selection = () => wrapper?.selection;const portalMount = isInBlock() ? blockElementSignal.get : () => undefined;// Outside the legacy block system the markdown's host names the parent.- const currentBlockName = useMaybeBlockName() ?? useMarkdownHost();+ const currentBlockName = useMarkdownHost() ?? useMaybeBlockName();const previewType = () =>blockNameToItemType(verifyBlockName(props.blockName));@@ -158,9 +173,6 @@ function DocumentCardInner(props: DocumentCardDecoratorProps) {};const [dropdownOpen, setDropdownOpen] = createSignal(false);- // Without an editor (a sent message) the card can't change the message;- // it collapses here instead, for this viewer only.- const [collapsed, setCollapsed] = createSignal(false);const [, setContainerRef] = createSignal<HTMLDivElement>();const resizePreview = (height: string) => {@@ -182,15 +194,32 @@ function DocumentCardInner(props: DocumentCardDecoratorProps) {showDraftSelectorButton: true,canvas: {onLocationChange: (location) => {- if (!editor()) return;- editor()?.update(() => {- $addUpdateTag(HISTORY_MERGE_TAG);- const node = $getNodeByKey(props.key);- if (!$isDocumentCardNode(node)) return;- node.setPreviewData({- view: location,- });- });+ const currentEditor = editor();+ if (!currentEditor) return;+ const focused = document.activeElement;+ const restoreFocus =+ focused instanceof HTMLElement &&+ currentEditor.getElementByKey(props.key)?.contains(focused);+ currentEditor.update(+ () => {+ $addUpdateTag(HISTORY_MERGE_TAG);+ const node = $getNodeByKey(props.key);+ if (!$isDocumentCardNode(node)) return;+ node.setPreviewData({+ view: location,+ });+ },+ {+ onUpdate: () => {+ if (+ restoreFocus &&+ focused instanceof HTMLElement &&+ focused.isConnected+ )+ focused.focus({ preventScroll: true });+ },+ }+ );},},};@@ -329,6 +358,32 @@ function DocumentCardInner(props: DocumentCardDecoratorProps) {});};+ const canOpenInChat = () =>+ currentBlockName !== 'chat' &&+ ['write', 'pdf', 'md', 'code', 'image', 'canvas'].includes(props.blockName);++ const handleOpenInChat = () => {+ const preview = item();+ void openChatWithAgent({+ type: 'document',+ id: props.documentId,+ name: isAccessiblePreviewItem(preview)+ ? preview.name+ : props.documentName,+ fileType: verifyBlockName(props.blockName),+ });+ };++ const isSplitAlreadyOpen = () =>+ !!globalSplitManager()?.getSplitByContent(+ verifyBlockName(props.blockName),+ props.documentId+ );++ const openInNewSplit = createCallback(() => {+ openDocument(props.blockName, props.documentId, props.blockParams, true);+ });+const handleCopy = () => {try {let hostname = window.location.hostname.replace('www.', '').toLowerCase();@@ -370,13 +425,11 @@ function DocumentCardInner(props: DocumentCardDecoratorProps) {// resizable box.const resizable = () => isPreviewable() && props.blockName !== 'form';const pollHeight = () =>- props.blockName === 'form' && !collapsed()- ? pollCardHeight(props.previewData)- : undefined;+ props.blockName === 'form' ? pollCardHeight(props.previewData) : undefined;const boundedPreview = () => resizable() || Boolean(pollHeight());- const [_, previewBoxHeight] = stringifyPreviewBox(- props.previewBox || DEFAULT_PREVIEW_BOX+ const [previewBoxHeight, setPreviewBoxHeight] = createSignal(+ stringifyPreviewBox(props.previewBox || DEFAULT_PREVIEW_BOX)[1]);const [previewBoxRef, setPreviewBoxRef] = createSignal<HTMLDivElement | null>(@@ -392,18 +445,21 @@ function DocumentCardInner(props: DocumentCardDecoratorProps) {});}, 1000);- // create mutation observer to update preview box+ // Native resizing changes the inline style. Keep that height in Solid before+ // selection updates can reapply the old style, then persist it to Lexical.createEffect(() => {const el = previewBoxRef();if (!el) return;- const observer = new MutationObserver((_mutations) => {+ const observer = new MutationObserver(() => {+ if (!resizable() || el.style.height === previewBoxHeight()) return;const { width, height } = el.getBoundingClientRect();+ setPreviewBoxHeight(el.style.height);if (editor()) {dispatchInternalLayoutShift(editor()!);}debouncedUpdatePreviewBox([width, height]);});- observer.observe(el, { attributes: true });+ observer.observe(el, { attributes: true, attributeFilter: ['style'] });onCleanup(() => {observer.disconnect();});@@ -486,19 +542,7 @@ function DocumentCardInner(props: DocumentCardDecoratorProps) {</Dropdown.Trigger><Dropdown.Content mount={portalMount()}><Dropdown.Group>- <Show- when={editor()}- fallback={- <Dropdown.Item- onSelect={() => setCollapsed(!collapsed())}- >- <Minimize class="size-4 shrink-0" />- <span class="flex-1 truncate">- {collapsed() ? 'Expand' : 'Collapse'}- </span>- </Dropdown.Item>- }- >+ <Show when={editable()}><Dropdown.Item onSelect={convertToMention}><Minimize class="size-4 shrink-0" /><span class="flex-1 truncate">@@ -506,12 +550,34 @@ function DocumentCardInner(props: DocumentCardDecoratorProps) {</span></Dropdown.Item></Show>+ <Show when={canOpenInChat()}>+ <Dropdown.Item onSelect={handleOpenInChat}>+ <Sparkle class="size-4 shrink-0" />+ <span class="flex-1 truncate">Ask Macro</span>+ </Dropdown.Item>+ </Show><Dropdown.Item onSelect={handleCopy}>- <Clipboard class="size-4 shrink-0" />+ <Link class="size-4 shrink-0" /><span class="flex-1 truncate">Copy Link</span></Dropdown.Item>+ <Show when={props.blockName === 'task'}>+ <Dropdown.Item+ onSelect={() =>+ void copyBranchNameToClipboard(props.item.id)+ }+ >+ <GitBranch class="size-4 shrink-0" />+ <span class="flex-1 truncate">Copy Branch Name</span>+ </Dropdown.Item>+ </Show>+ <Show when={!isSplitAlreadyOpen()}>+ <Dropdown.Item onSelect={openInNewSplit}>+ <ColumnsPlusRight class="size-4 shrink-0" />+ <span class="flex-1 truncate">Open in New Split</span>+ </Dropdown.Item>+ </Show></Dropdown.Group>- <Show when={editor()}>+ <Show when={editable()}><Dropdown.Group><Dropdown.Item onSelect={deleteCard}><TrashSimple class="size-4 shrink-0" />@@ -544,7 +610,7 @@ function DocumentCardInner(props: DocumentCardDecoratorProps) {resizable() && 'resize-y shrink-0 min-h-80')}style={{- height: pollHeight() ?? (resizable() ? previewBoxHeight : 'auto'),+ height: pollHeight() ?? (resizable() ? previewBoxHeight() : 'auto'),}}onClick={(e) => {if (channelMessageId()) return;@@ -591,8 +657,9 @@ function DocumentCardInner(props: DocumentCardDecoratorProps) {</Suspense></Card.Body></Show>- <Show when={!collapsed() && previewComponent()}>+ <Show when={previewComponent()}><Card.Body+ data-lexical-interactiveclass={cn('mx-3 mt-2 mb-3 p-0',boundedPreview() && 'flex min-h-0 flex-1'diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentMention.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentMention.tsxindex 45b27f4e84..0b809db3c6 100644--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentMention.tsx+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentMention.tsx@@ -70,6 +70,7 @@ import {useContext,} from 'solid-js';import { LexicalWrapperContext } from '../../context/LexicalWrapperContext';+import { useMarkdownHost } from '../../context/MarkdownHostContext';import { autoRegister, UPDATE_DOCUMENT_NAME_COMMAND } from '../../plugins';import { openDocument } from '../core/BlockLink';import { MentionTooltip } from './MentionTooltip';@@ -578,7 +579,7 @@ export function DocumentMentionStatic(props: DocumentMentionDecoratorProps) {function DocumentMentionInner(props: DocumentMentionDecoratorProps) {const currentBlockId = useMaybeBlockId();- const currentBlockName = useMaybeBlockName();+ const currentBlockName = useMarkdownHost() ?? useMaybeBlockName();const lexicalWrapper = useContext(LexicalWrapperContext);const editor = lexicalWrapper?.editor;diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/plugins/restore-focus/restoreFocusPlugin.test.ts b/apps/web/src/lib/core/component/LexicalMarkdown/plugins/restore-focus/restoreFocusPlugin.test.tsnew file mode 100644index 0000000000..5a296b9aa0--- /dev/null+++ b/apps/web/src/lib/core/component/LexicalMarkdown/plugins/restore-focus/restoreFocusPlugin.test.ts@@ -0,0 +1,28 @@+import { createEditor } from 'lexical';+import { expect, it, vi } from 'vitest';+import { restoreFocusPlugin } from './restoreFocusPlugin';++it('restores the root selection without stealing focus from embedded controls', () => {+ const editor = createEditor();+ const root = document.createElement('div');+ const embed = document.createElement('div');+ const control = document.createElement('button');+ embed.contentEditable = 'false';+ embed.append(control);+ document.body.append(root);+ editor.setRootElement(root);+ root.append(embed);+ const dispose = restoreFocusPlugin()(editor);+ const focus = vi.spyOn(editor, 'focus').mockImplementation(() => {});+ try {+ control.dispatchEvent(new FocusEvent('focusin', { bubbles: true }));+ expect(focus).not.toHaveBeenCalled();+ root.dispatchEvent(new FocusEvent('focusin', { bubbles: true }));+ expect(focus).toHaveBeenCalledOnce();+ } finally {+ focus.mockRestore();+ dispose();+ editor.setRootElement(null);+ root.remove();+ }+});diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/plugins/restore-focus/restoreFocusPlugin.ts b/apps/web/src/lib/core/component/LexicalMarkdown/plugins/restore-focus/restoreFocusPlugin.tsindex 6e827ff292..de6f026568 100644--- a/apps/web/src/lib/core/component/LexicalMarkdown/plugins/restore-focus/restoreFocusPlugin.ts+++ b/apps/web/src/lib/core/component/LexicalMarkdown/plugins/restore-focus/restoreFocusPlugin.ts@@ -27,6 +27,9 @@ export function restoreFocusPlugin() {);}),registerRootEventListener(editor, 'focusin', (e) => {+ // Embedded controls and editors own their focus, even though their+ // focusin event bubbles through the outer editor root.+ if (e.target !== editor.getRootElement()) return;if (clickFlag) return;e.preventDefault();editor.focus(undefined, { defaultSelection: 'rootStart' });diff --git a/docs/AGENT_GUIDE/documents.md b/docs/AGENT_GUIDE/documents.mdindex 1c218edbc6..2a966432d7 100644--- a/docs/AGENT_GUIDE/documents.md+++ b/docs/AGENT_GUIDE/documents.md@@ -34,6 +34,23 @@ deleting the shared property definition). Pins are saved with the document.Markdown code blocks have a **Copy Code** button in both editable and read-onlyviews. Successful copies briefly animate the icon to a solid green check-circle;they do not show a success toast.++Embedded code files, canvases, and PDFs in Markdown documents show their content+below the card header, including when the document opens in a drive detail view.+Project cards remain header-only. To verify, reopen a document with existing+embeds and check that their preview bodies load; also check that a code or canvas+mention offers **Convert to Embed** in its preview menu.+Drag an embed's bottom-right resize grip, then release and select the card. Its+height should stay at the dragged size and persist after reopening the document.+Canvas Next embeds are read-only: **Select** selects shapes without moving them,+and **Hand** pans the canvas. The toolbar contains only those two tools; property+inspector details and drawing/editing controls are absent. Check toolbar clicks,+drag-to-pan, and the V/H shortcuts with focus inside the canvas. These interactions+must keep focus in the embed and must not type into or modify the outer document.+Embeds hide the dot grid. The bottom-left zoom toolbar has minus and plus buttons+around the current zoom percentage. Click the percentage for the shared canvas+zoom menu: Zoom In/Out, Zoom to fit, and 25%, 50%, 100%, or 200% presets.+## Create a document from an editorType `/document` in a Markdown slash menu and choose **Document**. The popover@@ -2144,7 +2161,13 @@ Status and detail slots share one TaskPropertiesPreviewProvider per card:GraphQL preview data is reused, and REST fallback property/access queries areowned once, not separately by each slot. Non-task cards do not load task properties.Use the title to open the referenced document and the-actions menu to copy its link, convert it to an inline mention, or delete the card.+actions menu for the same applicable actions as a mention: Copy Link, Ask Macro+for supported document types outside chat, Copy Branch Name for tasks, and+Open in New Split when the reference is not already open. Editable cards also+offer Convert to Inline Mention and Delete; these actions update when the editor+becomes editable after loading. Converting back preserves the referenced document+and its location parameters. Collapse/Expand Reference is only+available on mentions; cards (including sent-message cards) never offer collapse.Title navigation preserves the reference's block parameters, including message,thread, annotation, and document locations.Click the card frame to select its editor node; controls and embedded contentdiff --git a/packages/graphics/src/browser/index.ts b/packages/graphics/src/browser/index.tsindex 437bacca2b..bdca56d568 100644--- a/packages/graphics/src/browser/index.ts+++ b/packages/graphics/src/browser/index.ts@@ -39,6 +39,7 @@ export type GraphicsHover = Readonly<{}>;export type GraphicsInputOptions = {tool?: () => 'pan' | DrawingKind | 'select';+ /** False permits navigation and selection, but never document changes. */editing?: boolean;suspended?: () => boolean;/** Host-owned controls may keep their pointer events without starting a gesture. */@@ -189,7 +190,9 @@ export function attachCameraControls(options.suspended?.() ||options.ignoreTarget?.(event.target) ||(event.target instanceof Element &&- event.target.closest('[contenteditable="true"]'))+ event.target+ .closest('[contenteditable]')+ ?.getAttribute('contenteditable') === 'true'))return;if (@@ -210,7 +213,11 @@ export function attachCameraControls((event.button === 1 ||(event.button === 0 && (space || options.tool?.() === 'pan')));const tool = options.tool?.();- const drawing = event.button === 0 && !pan && isShapeKind(tool);+ const drawing =+ options.editing !== false &&+ event.button === 0 &&+ !pan &&+ isShapeKind(tool);const selecting =event.button === 0 && !pan && options.tool?.() === 'select';let transforming = false;@@ -255,7 +262,15 @@ export function attachCameraControls((!deep && frame && selectionContainsPoint(frame, point)? editor.getSession().selectedIds[0]: undefined);- if (shiftTarget && event.shiftKey && !transformHandle) {+ if (options.editing === false) {+ if (id) {+ if (event.shiftKey) editor.toggleSelection(id);+ else editor.select(id);+ event.preventDefault();+ return;+ }+ boxing = editor.beginBoxSelection(point, event.shiftKey);+ } else if (shiftTarget && event.shiftKey && !transformHandle) {// Defer Shift-click toggling until release so Shift-drag can move instead.pendingSelection = {id: shiftTarget,diff --git a/packages/graphics/src/solid/index.tsx b/packages/graphics/src/solid/index.tsxindex ee27e5d05d..f19c1aa330 100644--- a/packages/graphics/src/solid/index.tsx+++ b/packages/graphics/src/solid/index.tsx@@ -491,7 +491,13 @@ export function GraphicsSurface(props: {}}</For></g>- <Show when={!projection.session().transform && singleConnector()}>+ <Show+ when={+ props.input?.editing !== false &&+ !projection.session().transform &&+ singleConnector()+ }+ >{(item) => (<For each={['start', 'end'] as const}>{(end) => {@@ -565,12 +571,12 @@ export function GraphicsSurface(props: {style={{'pointer-events':props.selectionHitArea === 'shapes' ? 'none' : 'all',- cursor: 'move',+ cursor: props.input?.editing === false ? 'default' : 'move',}}/>)}</Show>- <Show when={!singleConnector()}>+ <Show when={props.input?.editing !== false && !singleConnector()}>{/* Screen-space hit strips; corners are painted afterward and win overlaps. */}<For each={resizeHandles.filter(isResizeEdge)}>{(handle, index) => (@@ -635,7 +641,7 @@ export function GraphicsSurface(props: {)}</Show></Show>- <Show when={radiusRectangle()}>+ <Show when={props.input?.editing !== false && radiusRectangle()}>{(item) => (<RadiusHandlesitem={item()}diff --git a/packages/graphics/tests/read-only-input.test.ts b/packages/graphics/tests/read-only-input.test.tsnew file mode 100644index 0000000000..a37c339153--- /dev/null+++ b/packages/graphics/tests/read-only-input.test.ts@@ -0,0 +1,111 @@+import { afterEach, expect, it, vi } from 'vitest';+import {+ attachCameraControls,+ type GraphicsInputOptions,+} from '../src/browser';+import { createGraphicsEditor, translation } from '../src/core';++const cleanups: (() => void)[] = [];+afterEach(() => cleanups.splice(0).forEach((cleanup) => cleanup()));++function setup(options: GraphicsInputOptions, embedded = false) {+ const editor = createGraphicsEditor([+ {+ id: 'shape',+ type: 'rectangle',+ placement: { parentId: 'scene-root', sortKey: 'a0' },+ transform: translation(0, 0),+ geometry: { width: 100, height: 80 },+ appearance: { fill: 'white', stroke: 'black' },+ },+ ]);+ const markdown = document.createElement('div');+ markdown.setAttribute('contenteditable', 'true');+ const card = document.createElement('div');+ if (embedded) card.setAttribute('contenteditable', 'false');+ const viewport = document.createElement('div');+ viewport.tabIndex = 0;+ viewport.setPointerCapture = vi.fn();+ viewport.hasPointerCapture = () => false;+ card.append(viewport);+ markdown.append(card);+ document.body.append(markdown);+ const detach = attachCameraControls(viewport, editor, options);+ cleanups.push(() => {+ detach();+ editor.dispose();+ markdown.remove();+ });+ const pointer = (type: string, x: number, y: number, shiftKey = false) => {+ const event = new MouseEvent(type, {+ bubbles: true,+ clientX: x,+ clientY: y,+ shiftKey,+ });+ Object.defineProperty(event, 'pointerId', { value: 1 });+ viewport.dispatchEvent(event);+ };+ return { editor, viewport, pointer };+}++it('pans a non-editable canvas island inside an editable markdown document', () => {+ const { editor, pointer } = setup(+ { editing: false, tool: () => 'pan' },+ true+ );+ const before = editor.getCamera();+ pointer('pointerdown', 10, 10);+ pointer('pointermove', 50, 30);+ pointer('pointerup', 50, 30);+ expect(editor.getCamera()).toEqual({+ ...before,+ x: before.x + 40,+ y: before.y + 20,+ });+});++it('still leaves pointers inside editable text to the text editor', () => {+ const { editor, pointer } = setup({ tool: () => 'pan' });+ const before = editor.getCamera();+ pointer('pointerdown', 10, 10);+ pointer('pointermove', 50, 30);+ pointer('pointerup', 50, 30);+ expect(editor.getCamera()).toEqual(before);+});++it('selects and box-selects without moving or deleting shapes in read-only mode', () => {+ const { editor, viewport, pointer } = setup(+ { editing: false, tool: () => 'select' },+ true+ );+ const before = editor.document;+ pointer('pointerdown', 20, 20);+ pointer('pointermove', 60, 40);+ pointer('pointerup', 60, 40);+ expect(editor.getSession().selectedIds).toEqual(['shape']);+ viewport.dispatchEvent(+ new KeyboardEvent('keydown', { key: 'Delete', bubbles: true })+ );+ expect(editor.document).toBe(before);+ pointer('pointerdown', 20, 20, true);+ expect(editor.getSession().selectedIds).toEqual([]);+ pointer('pointerdown', -10, -10);+ pointer('pointermove', 110, 90);+ pointer('pointerup', 110, 90);+ expect(editor.getSession().selectedIds).toEqual(['shape']);+ expect(editor.document).toBe(before);+ expect(editor.getSession().canUndo).toBe(false);+});++it('does not draw even if a drawing tool is supplied in read-only mode', () => {+ const { editor, pointer } = setup(+ { editing: false, tool: () => 'rectangle' },+ true+ );+ const before = editor.document;+ pointer('pointerdown', 150, 150);+ pointer('pointermove', 200, 200);+ pointer('pointerup', 200, 200);+ expect(editor.document).toBe(before);+});