Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(canvas): open references in read-only canvases (#8493)

Eric Hayesc2ca67835a74
diff --git a/apps/web/src/features/block-canvas/browser-test/document-preview.tsx b/apps/web/src/features/block-canvas/browser-test/document-preview.tsx
new file mode 100644
index 0000000000..8148d7d825
--- /dev/null
+++ b/apps/web/src/features/block-canvas/browser-test/document-preview.tsx
@@ -0,0 +1,17 @@
+export function DocumentPreviewContent() {
+ return (
+ <button
+ type="button"
+ data-testid="canvas-reference"
+ onClick={() => {
+ window.referenceFixture.opens++;
+ }}
+ >
+ Referenced document
+ </button>
+ );
+}
+
+export const PopupPreview = DocumentPreviewContent;
+export const getMentionsIcon = () => undefined;
+export const mentionsAccessories = () => undefined;
diff --git a/apps/web/src/features/block-canvas/browser-test/reference.e2e.ts b/apps/web/src/features/block-canvas/browser-test/reference.e2e.ts
new file mode 100644
index 0000000000..01cd18dce5
--- /dev/null
+++ b/apps/web/src/features/block-canvas/browser-test/reference.e2e.ts
@@ -0,0 +1,17 @@
+import { expect, test } from '@playwright/test';
+
+test('loads a saved canvas and opens its reference', async ({ page }) => {
+ await page.goto('/reference.html');
+ const reference = page.getByTestId('canvas-reference');
+ await expect(reference).toBeVisible();
+ await reference.click();
+ expect(await page.evaluate(() => window.referenceFixture.opens)).toBe(1);
+});
+
+test('editable canvas mounts and opens its reference', async ({ page }) => {
+ await page.goto('/reference.html?edit');
+ const reference = page.getByTestId('canvas-reference');
+ await expect(reference).toBeVisible();
+ await reference.click();
+ expect(await page.evaluate(() => window.referenceFixture.opens)).toBe(1);
+});
diff --git a/apps/web/src/features/block-canvas/browser-test/reference.fixture.tsx b/apps/web/src/features/block-canvas/browser-test/reference.fixture.tsx
new file mode 100644
index 0000000000..b9e166add2
--- /dev/null
+++ b/apps/web/src/features/block-canvas/browser-test/reference.fixture.tsx
@@ -0,0 +1,53 @@
+import '../../../index.css';
+import { createScene, type ShapeItem, translation } from '@macro-inc/graphics';
+import { queryClient } from '@queries/client';
+import { QueryClientProvider } from '@tanstack/solid-query';
+import { DragDropProvider } from '@thisbeyond/solid-dnd';
+import { render } from 'solid-js/web';
+import { CanvasDocument } from '../component/CanvasDocument';
+
+declare global {
+ interface Window {
+ referenceFixture: { opens: number };
+ }
+}
+
+window.referenceFixture = { opens: 0 };
+const reference: ShapeItem<'document'> = {
+ id: 'reference',
+ type: 'document',
+ placement: { parentId: 'scene-root', sortKey: 'a0' },
+ transform: translation(100, 100),
+ appearance: { fill: 'transparent', stroke: 'transparent' },
+ geometry: {
+ width: 320,
+ height: 240,
+ documentId: 'referenced-doc',
+ fileType: 'md',
+ name: 'Referenced document',
+ },
+};
+const file = new Blob(
+ [JSON.stringify({ version: 2, document: createScene([reference]) })],
+ { type: 'application/x-macro-canvas' }
+);
+const editable = new URLSearchParams(location.search).has('edit');
+
+render(
+ () => (
+ <div style={{ width: '100vw', height: '100vh' }}>
+ <QueryClientProvider client={queryClient}>
+ <DragDropProvider>
+ <CanvasDocument
+ documentId="canvas"
+ file={file}
+ canEdit={editable}
+ isNested={!editable}
+ view={editable ? { x: 0, y: 0, scale: 100 } : undefined}
+ />
+ </DragDropProvider>
+ </QueryClientProvider>
+ </div>
+ ),
+ document.getElementById('app')!
+);
diff --git a/apps/web/src/features/block-canvas/browser-test/reference.html b/apps/web/src/features/block-canvas/browser-test/reference.html
new file mode 100644
index 0000000000..4aaefeeafe
--- /dev/null
+++ b/apps/web/src/features/block-canvas/browser-test/reference.html
@@ -0,0 +1,5 @@
+<!doctype html>
+<html lang="en">
+ <head><meta charset="UTF-8" /><meta name="viewport" content="width=device-width, initial-scale=1" /></head>
+ <body><div id="app"></div><script type="module" src="./reference.fixture.tsx"></script></body>
+</html>
diff --git a/apps/web/src/features/block-canvas/browser-test/reference.playwright.config.ts b/apps/web/src/features/block-canvas/browser-test/reference.playwright.config.ts
new file mode 100644
index 0000000000..ca75569281
--- /dev/null
+++ b/apps/web/src/features/block-canvas/browser-test/reference.playwright.config.ts
@@ -0,0 +1,33 @@
+import { fileURLToPath } from 'node:url';
+import { defineConfig, devices } from '@playwright/test';
+
+const directory = fileURLToPath(new URL('.', import.meta.url));
+const webDirectory = fileURLToPath(new URL('../../../../', import.meta.url));
+const localURL = `http://127.0.0.1:${process.env.CANVAS_REFERENCE_PORT ?? 3029}`;
+
+export default defineConfig({
+ testDir: directory,
+ testMatch: 'reference.e2e.ts',
+ outputDir: `${directory}/test-results`,
+ reporter: 'line',
+ use: { baseURL: localURL },
+ webServer: {
+ command:
+ 'bunx vite --config src/features/block-canvas/browser-test/reference.vite.config.ts',
+ cwd: webDirectory,
+ url: `${localURL}/reference.html`,
+ reuseExistingServer: true,
+ timeout: 90_000,
+ },
+ projects: [
+ {
+ name: 'chromium',
+ use: {
+ ...devices['Desktop Chrome'],
+ launchOptions: {
+ executablePath: process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH,
+ },
+ },
+ },
+ ],
+});
diff --git a/apps/web/src/features/block-canvas/browser-test/reference.vite.config.ts b/apps/web/src/features/block-canvas/browser-test/reference.vite.config.ts
new file mode 100644
index 0000000000..1bc56471dd
--- /dev/null
+++ b/apps/web/src/features/block-canvas/browser-test/reference.vite.config.ts
@@ -0,0 +1,41 @@
+import { fileURLToPath } from 'node:url';
+import tailwind from '@tailwindcss/vite';
+import { defineConfig } from 'vite';
+import solidPlugin from 'vite-plugin-solid';
+import solidSvg from 'vite-plugin-solid-svg';
+import wasm from 'vite-plugin-wasm';
+import tsconfigPaths from 'vite-tsconfig-paths';
+
+const directory = fileURLToPath(new URL('.', import.meta.url));
+const webDirectory = fileURLToPath(new URL('../../../../', import.meta.url));
+const workspaceDirectory = fileURLToPath(
+ new URL('../../../../../../', import.meta.url)
+);
+
+export default defineConfig({
+ root: directory,
+ cacheDir: `${directory}/.vite`,
+ plugins: [
+ solidPlugin(),
+ solidSvg({ defaultAsComponent: true }),
+ tsconfigPaths({ projects: [`${webDirectory}/tsconfig.json`] }),
+ tailwind(),
+ wasm(),
+ ],
+ resolve: {
+ alias: {
+ '@core/component/DocumentPreview': `${directory}/document-preview.tsx`,
+ },
+ dedupe: ['solid-js', 'loro-crdt'],
+ },
+ optimizeDeps: {
+ exclude: ['loro-crdt'],
+ esbuildOptions: { target: 'esnext' },
+ },
+ server: {
+ host: '127.0.0.1',
+ port: Number(process.env.CANVAS_REFERENCE_PORT ?? 3029),
+ strictPort: true,
+ fs: { allow: [workspaceDirectory] },
+ },
+});
diff --git a/apps/web/src/features/block-canvas/views/canvas-read-only-view.tsx b/apps/web/src/features/block-canvas/views/canvas-read-only-view.tsx
index 2b077acdae..ee0290f7db 100644
--- a/apps/web/src/features/block-canvas/views/canvas-read-only-view.tsx
+++ b/apps/web/src/features/block-canvas/views/canvas-read-only-view.tsx
@@ -97,7 +97,14 @@ export function CanvasReadOnlyView(props: {
>
<GraphicsSurface
editor={props.editor}
- input={{ editing: false, tool }}
+ input={{
+ editing: false,
+ tool,
+ ignoreTarget: (target) =>
+ target instanceof Element &&
+ !!target.closest('[data-graphics-item]') &&
+ !!target.closest('button,a,input,select,textarea,[role="button"]'),
+ }}
gridColor="transparent"
renderers={{
connector: (p) => (
diff --git a/docs/agent-guide/canvas.md b/docs/agent-guide/canvas.md
index 33c9e68ee7..22a7a4e1ef 100644
--- a/docs/agent-guide/canvas.md
+++ b/docs/agent-guide/canvas.md
@@ -10,10 +10,9 @@ as gray rather than transparent.
## Canvas link paste
-Pasting a supported routed Macro app link onto the canvas creates a text
-node with an entity mention, as legacy links do. Routed links retain compatible
-block targets, but not workspace paths or pane-local search state; unsupported
-links remain text.
+Pasting a supported routed Macro app link onto the canvas creates a document
+reference card. Routed links retain compatible block targets, but not workspace
+paths or pane-local search state; unsupported links remain text.
## Copying and saving images
diff --git a/docs/agent-guide/documents.md b/docs/agent-guide/documents.md
index 5494de8e11..8d1b5d83d8 100644
--- a/docs/agent-guide/documents.md
+++ b/docs/agent-guide/documents.md
@@ -234,6 +234,8 @@ folder option. Insertion uses the position captured when I is pressed. Verify
keyboard selection, closing/reopening, upload cancellation, and placement after
pan/zoom. The shortcut is inactive during text/embed editing and in read-only canvases.
Reference cards register with the shared reference system when the canvas saves.
+In both editable and read-only canvases, click a reference card's title to open
+its document; selecting the rest of the card leaves the canvas in place.
Verify the backlink on the target, duplicate cards retaining one reference, and
removing the final card followed by undo/redo. Reload must preserve tracking.
Existing untracked cards register on their next content save.