@dxos/plugin-markdown 0.9.0 → 0.9.1-staging.ee54ba693a

package/src/components/MarkdownEditor/MarkdownEditor.stories.tsx

@@ -2,15 +2,19 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { type Decorator, type Meta, type StoryObj } from '@storybook/react-vite';
 import * as Effect from 'effect/Effect';
 import React from 'react';
 
 import { withPluginManager } from '@dxos/app-framework/testing';
+import { AppActivationEvents } from '@dxos/app-toolkit';
 import { Filter, Obj } from '@dxos/echo';
-import { ClientPlugin } from '@dxos/plugin-client/testing';
-import { initializeIdentity } from '@dxos/plugin-client/testing';
+import { ClientPlugin, initializeIdentity } from '@dxos/plugin-client/testing';
+import { Sketch } from '@dxos/plugin-sketch';
+import { SketchPlugin } from '@dxos/plugin-sketch/plugin';
+import { SketchBuilder } from '@dxos/plugin-sketch/testing';
 import { corePlugins } from '@dxos/plugin-testing';
+import { type Client } from '@dxos/react-client';
 import { useQuery, useSpaces } from '@dxos/react-client/echo';
 import { Panel } from '@dxos/react-ui';
 import { AttendableContainer } from '@dxos/react-ui-attention';
@@ -19,16 +23,23 @@ import { translations as editorTranslations } from '@dxos/react-ui-editor/transl
 import { Loading, withLayout } from '@dxos/react-ui/testing';
 import { Text } from '@dxos/schema';
 
+import { useLinkQuery } from '#hooks';
 import { translations } from '#translations';
 import { Markdown } from '#types';
 
 import { MarkdownEditor, MarkdownEditorProvider, type MarkdownEditorProviderProps } from './MarkdownEditor';
 
-type DefaultStoryProps = Omit<MarkdownEditorProviderProps, 'id' | 'extensions' | 'children'>;
+// A minimal sketch (tldraw `tldraw.com/2`) snapshot, used as a test sketch.
+const SKETCH_CONTENT = new SketchBuilder()
+  .rectangle({ id: 'rect', x: 0, y: 0, text: 'DXOS', color: 'blue', fill: 'solid', size: 'l' })
+  .build();
 
-const DefaultStory = (props: DefaultStoryProps) => {
+type StoryArgs = Omit<MarkdownEditorProviderProps, 'id' | 'extensions' | 'children'>;
+
+const DefaultStory = (props: StoryArgs) => {
   const [space] = useSpaces();
   const [doc] = useQuery(space?.db, Filter.type(Markdown.Document));
+  const handleLinkQuery = useLinkQuery(space?.db, doc);
   const id = doc && Obj.getURI(doc);
   if (!id) {
     return <Loading data={{ id }} />;
@@ -36,15 +47,19 @@ const DefaultStory = (props: DefaultStoryProps) => {
 
   return (
     <AttendableContainer id={id} tabIndex={0} classNames='dx-container'>
-      <MarkdownEditorProvider id={id} object={doc} {...props}>
+      <MarkdownEditorProvider id={id} attendableId={id} object={doc} onLinkQuery={handleLinkQuery} {...props}>
         {(editorRootProps) => (
           <Editor.Root {...editorRootProps}>
-            <Panel.Root>
-              <Panel.Toolbar asChild>
-                <MarkdownEditor.Toolbar />
+            {/* Mirror MarkdownArticle: Panel.Toolbar/Content are NOT `asChild` (MarkdownEditor.Toolbar is not
+                composable, so asChild wraps it in a dx-slot-warning div that breaks the grid-area layout). */}
+            <Panel.Root role='article'>
+              <Panel.Toolbar>
+                <MarkdownEditor.Toolbar classNames='dx-document' />
               </Panel.Toolbar>
-              <Panel.Content asChild>
+              <Panel.Content>
                 <MarkdownEditor.Content />
+                {/* Embedded objects (transclusions) portal into block-container elements created by the editor. */}
+                <MarkdownEditor.Blocks />
               </Panel.Content>
             </Panel.Root>
           </Editor.Root>
@@ -54,28 +69,49 @@ const DefaultStory = (props: DefaultStoryProps) => {
   );
 };
 
+const withClient = (seed: (client: Client) => Effect.Effect<void>): Decorator =>
+  withPluginManager({
+    // SketchPlugin's section surface reads its Settings atom, contributed on SetupSettings.
+    setupEvents: [AppActivationEvents.SetupSettings],
+    plugins: [
+      ...corePlugins(),
+      SketchPlugin(),
+      ClientPlugin({
+        types: [Markdown.Document, Text.Text, Sketch.Sketch, Sketch.Canvas],
+        onClientInitialized: ({ client }) => seed(client),
+      }),
+    ],
+  });
+
+const seedPlainDocument = (client: Client) =>
+  Effect.gen(function* () {
+    const { personalSpace } = yield* initializeIdentity(client);
+    personalSpace.db.add(Markdown.make({ content: Array.from({ length: 100 }, (_, i) => `Line ${i + 1}`).join('\n') }));
+  });
+
+const seedEmbeddedSketch = (client: Client) =>
+  Effect.gen(function* () {
+    const { personalSpace } = yield* initializeIdentity(client);
+    const sketch = personalSpace.db.add(Sketch.make({ name: 'Test Sketch', canvas: { content: SKETCH_CONTENT } }));
+    const uri = Obj.getURI(sketch);
+    personalSpace.db.add(
+      Markdown.make({
+        content: [
+          '# Test Document',
+          '',
+          'The sketch below renders inline as a block surface:',
+          '',
+          `![${sketch.name}](${uri})`,
+          '',
+        ].join('\n'),
+      }),
+    );
+  });
+
 const meta: Meta<typeof DefaultStory> = {
   title: 'plugins/plugin-markdown/components/MarkdownEditor',
   render: DefaultStory,
-  decorators: [
-    withLayout({ layout: 'column' }),
-    withPluginManager({
-      plugins: [
-        ...corePlugins(),
-        // TODO(burdon): Try to write story without ClientPlugin.
-        ClientPlugin({
-          types: [Markdown.Document, Text.Text],
-          onClientInitialized: ({ client }) =>
-            Effect.gen(function* () {
-              const { personalSpace } = yield* initializeIdentity(client);
-              personalSpace.db.add(
-                Markdown.make({ content: Array.from({ length: 100 }, (_, i) => `Line ${i + 1}`).join('\n') }),
-              );
-            }),
-        }),
-      ],
-    }),
-  ],
+  decorators: [withLayout({ layout: 'column' })],
   parameters: {
     translations: [...translations, ...editorTranslations],
   },
@@ -85,4 +121,10 @@ export default meta;
 
 type Story = StoryObj<typeof meta>;
 
-export const Default: Story = {};
+export const Default: Story = {
+  decorators: [withClient(seedPlainDocument)],
+};
+
+export const WithEmbeddedSketch: Story = {
+  decorators: [withClient(seedEmbeddedSketch)],
+};

package/src/components/MarkdownEditor/MarkdownEditor.tsx

@@ -9,11 +9,6 @@ import { createContext } from '@radix-ui/react-context';
 import React, { type ReactNode, useCallback, useMemo, useState } from 'react';
 import { createPortal } from 'react-dom';
 
-import { Surface } from '@dxos/app-framework/ui';
-import { AppSurface } from '@dxos/app-toolkit/ui';
-import { Obj } from '@dxos/echo';
-import { URI } from '@dxos/keys';
-import { useClient } from '@dxos/react-client';
 import { type ThemedClassName } from '@dxos/react-ui';
 import { composable, composableProps } from '@dxos/react-ui';
 import {
@@ -22,7 +17,7 @@ import {
   createEditorController,
   useEditorContext,
 } from '@dxos/react-ui-editor';
-import { type PreviewBlock, type PreviewOptions } from '@dxos/ui-editor';
+import { type XmlWidgetState } from '@dxos/ui-editor';
 import { isNonNullable } from '@dxos/util';
 
 import {
@@ -49,7 +44,7 @@ import {
 type MarkdownEditorContextValue = {
   id: string;
   attendableId?: string;
-  previewBlocks: PreviewBlock[];
+  widgets: XmlWidgetState[];
 } & Pick<ExtensionsOptions, 'compact' | 'viewMode'> &
   Pick<NaturalMarkdownToolbarProps, 'onAction' | 'onFileUpload' | 'onViewModeChange'>;
 
@@ -74,7 +69,7 @@ export type MarkdownEditorProviderProps = {
   'id' | 'attendableId' | 'viewMode' | 'compact' | 'onAction' | 'onFileUpload' | 'onViewModeChange'
 > &
   Pick<UseEditorMenuOptionsProps, 'slashCommandGroups' | 'onLinkQuery'> &
-  Pick<ExtensionsOptions, 'editorStateStore' | 'selectionManager' | 'settings' | 'onSelectObject'>;
+  Pick<ExtensionsOptions, 'editorStateStore' | 'viewState' | 'settings' | 'onSelectObject'>;
 
 export const MarkdownEditorProvider = ({
   children,
@@ -84,7 +79,7 @@ export const MarkdownEditorProvider = ({
   settings,
   compact,
   viewMode,
-  selectionManager,
+  viewState,
   editorStateStore,
   extensions: extensionsProp,
   slashCommandGroups,
@@ -94,20 +89,8 @@ export const MarkdownEditorProvider = ({
   onFileUpload,
   onViewModeChange,
 }: MarkdownEditorProviderProps) => {
-  // Preview blocks.
-  const [previewBlocks, setPreviewBlocks] = useState<PreviewBlock[]>([]);
-  const previewOptions = useMemo<PreviewOptions>(
-    () => ({
-      db: Obj.isObject(object) ? Obj.getDatabase(object) : undefined,
-      addBlockContainer: (block) => {
-        setPreviewBlocks((prev) => [...prev, block]);
-      },
-      removeBlockContainer: ({ link }) => {
-        setPreviewBlocks((prev) => prev.filter(({ link: prevLink }) => prevLink.dxn !== link.dxn));
-      },
-    }),
-    [object],
-  );
+  // Widget portals driven by xmlTags.
+  const [widgets, setWidgets] = useState<XmlWidgetState[]>([]);
 
   // Context menu options (Editor.Root calls useEditorMenu with these props).
   const menuOptions = useEditorMenuOptions({ slashCommandGroups, onLinkQuery });
@@ -118,9 +101,9 @@ export const MarkdownEditorProvider = ({
     object,
     compact,
     viewMode,
-    selectionManager,
+    viewState,
     editorStateStore,
-    previewOptions,
+    setWidgets,
     settings,
     onSelectObject,
   });
@@ -149,12 +132,12 @@ export const MarkdownEditorProvider = ({
       attendableId,
       compact,
       viewMode,
-      previewBlocks,
+      widgets,
       onAction,
       onFileUpload,
       onViewModeChange,
     }),
-    [id, attendableId, compact, viewMode, previewBlocks, onAction, onFileUpload, onViewModeChange],
+    [id, attendableId, compact, viewMode, widgets, onAction, onFileUpload, onViewModeChange],
   );
 
   return (
@@ -251,12 +234,12 @@ const MARKDOWN_EDITOR_BLOCKS_NAME = 'MarkdownEditor.Blocks';
 type MarkdownEditorBlocksProps = {};
 
 const MarkdownEditorBlocks = (_props: MarkdownEditorBlocksProps) => {
-  const { previewBlocks } = useMarkdownEditorContext(MARKDOWN_EDITOR_BLOCKS_NAME);
+  const { widgets } = useMarkdownEditorContext(MARKDOWN_EDITOR_BLOCKS_NAME);
 
   return (
     <>
-      {previewBlocks.map(({ link, el }) => (
-        <PreviewBlock key={link.dxn} link={link} el={el} />
+      {widgets.map(({ id, root, Component, props }) => (
+        <div key={id}>{createPortal(<Component {...props} />, root)}</div>
       ))}
     </>
   );
@@ -264,15 +247,6 @@ const MarkdownEditorBlocks = (_props: MarkdownEditorBlocksProps) => {
 
 MarkdownEditorBlocks.displayName = MARKDOWN_EDITOR_BLOCKS_NAME;
 
-const PreviewBlock = ({ el, link }: PreviewBlock) => {
-  const client = useClient();
-  const dxn = URI.make(link.dxn);
-  const subject = client.graph.makeRef(dxn).target;
-  const data = useMemo(() => ({ subject }), [subject]);
-
-  return createPortal(<Surface.Surface type={AppSurface.Card} data={data} limit={1} />, el);
-};
-
 //
 // MarkdownEditor
 //
@@ -284,7 +258,7 @@ export const MarkdownEditor = {
   Blocks: MarkdownEditorBlocks,
 };
 
-export type { MarkdownEditorContentProps, MarkdownEditorToolbarProps, MarkdownEditorBlocksProps };
+export type { MarkdownEditorBlocksProps, MarkdownEditorContentProps, MarkdownEditorToolbarProps };
 
 /** @deprecated Use `MarkdownEditorProviderProps`. */
 export type MarkdownEditorRootProps = MarkdownEditorProviderProps;

package/src/components/MarkdownEditor/MarkdownEditorContent.tsx

@@ -7,6 +7,7 @@ import { type Atom, RegistryContext } from '@effect-atom/atom-react';
 import React, { forwardRef, useCallback, useContext, useEffect, useImperativeHandle, useMemo } from 'react';
 
 import { useCapabilities } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
 import { type ThemedClassName, useThemeContext, useTranslation } from '@dxos/react-ui';
 import {
   type EditorMenuGroup,
@@ -18,15 +19,15 @@ import {
   type EditorSelectionState,
   type EditorStateStore,
   type ThemeExtensionsOptions,
-  mobileSlots,
   createBasicExtensions,
   createMarkdownExtensions,
   createThemeExtensions,
-  dropFile,
   documentSlots,
+  dropFile,
+  editorClassNames,
   formattingListener,
+  mobileSlots,
   processEditorPayload,
-  editorClassNames,
   scrollbarAutohide,
 } from '@dxos/ui-editor';
 import { type EditorViewMode } from '@dxos/ui-editor/types';
@@ -72,7 +73,7 @@ export const MarkdownEditorContent = forwardRef<EditorView | null, MarkdownEdito
     },
     forwardedRef,
   ) => {
-    const { t } = useTranslation(meta.id);
+    const { t } = useTranslation(meta.profile.key);
     const { themeMode } = useThemeContext();
     const registry = useContext(RegistryContext);
 
@@ -95,7 +96,7 @@ export const MarkdownEditorContent = forwardRef<EditorView | null, MarkdownEdito
       focusAttributes,
     } = useTextEditor(
       () => ({
-        ...(role !== 'section' && {
+        ...(role !== AppSurface.Section.role && {
           id,
           scrollTo,
           selection,
@@ -117,7 +118,7 @@ export const MarkdownEditorContent = forwardRef<EditorView | null, MarkdownEdito
           createMarkdownExtensions(),
           scrollbarAutohide(),
           toolbarState && formattingListener(updateToolbarState),
-          role !== 'section' &&
+          role !== AppSurface.Section.role &&
             onFileUpload &&
             dropFile({
               // TODO(wittjosiah): Factor out to file uploader plugin.

package/src/components/MarkdownEditor/MarkdownEditorToolbar.tsx

@@ -5,7 +5,7 @@
 import { type EditorView } from '@codemirror/view';
 import React, { useCallback, useState } from 'react';
 
-import { type FileInfo } from '@dxos/app-toolkit';
+import { AppCapabilities } from '@dxos/app-toolkit';
 import { composable, composableProps } from '@dxos/react-ui';
 import { Editor, type EditorToolbarProps } from '@dxos/react-ui-editor';
 
@@ -17,7 +17,7 @@ export type MarkdownEditorToolbarProps = {
   // that React 19.2's dev render-logger would walk into a cross-origin frame. See
   // `react-ui-editor/.../controller.ts` for the full rationale.
   getView?: () => EditorView | null;
-  onFileUpload?: (file: File) => Promise<FileInfo | undefined>;
+  onFileUpload?: (file: File) => Promise<AppCapabilities.FileInfo | undefined>;
 } & Pick<EditorToolbarProps, 'role' | 'customActions' | 'onAction' | 'onViewModeChange'>;
 
 export const MarkdownEditorToolbar = composable<HTMLDivElement, MarkdownEditorToolbarProps>(

package/src/components/PreviewComponent/PreviewComponent.tsx

@@ -0,0 +1,195 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+
+import { Surface, useOperationInvoker } from '@dxos/app-framework/ui';
+import { LayoutOperation, Paths } from '@dxos/app-toolkit';
+import { AppSurface } from '@dxos/app-toolkit/ui';
+import { Obj } from '@dxos/echo';
+import { URI } from '@dxos/keys';
+import { useClient } from '@dxos/react-client';
+import { Icon, IconButton } from '@dxos/react-ui';
+import { ResizeHandle, type Size, resizeAttributes, sizeStyle } from '@dxos/react-ui-dnd';
+import { type XmlWidgetProps } from '@dxos/ui-editor';
+
+export type PreviewComponentProps = XmlWidgetProps<{
+  label: string;
+  dxn: string;
+  block?: boolean;
+  suggest?: boolean;
+  onOpen?: (dxn: URI.URI) => void;
+}>;
+
+// Persisted height (px) lives in the image alt text after the label, Obsidian-style: `![label|320](dxn)`.
+const HEIGHT_PATTERN = /^(.*)\|(\d+)$/;
+
+const parseEmbedLabel = (alt: string): { baseLabel: string; height?: number } => {
+  const match = HEIGHT_PATTERN.exec(alt ?? '');
+  if (match) {
+    const height = Number.parseInt(match[2], 10);
+    if (Number.isFinite(height) && height > 0) {
+      return { baseLabel: match[1], height };
+    }
+  }
+  return { baseLabel: alt ?? '' };
+};
+
+const formatEmbedLabel = (baseLabel: string, height?: number): string =>
+  height != null ? `${baseLabel}|${height}` : baseLabel;
+
+const MIN_SIZE = 6;
+const FALLBACK_SIZE = 320;
+
+/** Scroll the element's top into view (honoring its `scroll-margin`) only if that top is not already visible. */
+const scrollTopIntoViewIfNeeded = (element: HTMLElement): void => {
+  let parent = element.parentElement;
+  while (parent) {
+    const { overflowY } = getComputedStyle(parent);
+    if (
+      (overflowY === 'auto' || overflowY === 'scroll' || overflowY === 'overlay') &&
+      parent.scrollHeight > parent.clientHeight
+    ) {
+      break;
+    }
+    parent = parent.parentElement;
+  }
+  const elementTop = element.getBoundingClientRect().top;
+  const viewTop = parent ? parent.getBoundingClientRect().top : 0;
+  const viewBottom = parent ? parent.getBoundingClientRect().bottom : window.innerHeight;
+  if (elementTop < viewTop || elementTop > viewBottom) {
+    element.scrollIntoView({ block: 'start', inline: 'nearest' });
+  }
+};
+
+/**
+ * Registry-backed block widget for URL-scheme preview slots.
+ * Replaces the addBlockContainer callback pattern.
+ * Used as the Component entry in a urlSchemes XmlWidgetDef.
+ */
+export const PreviewComponent = ({ dxn, label: alt, onOpen, view, range }: PreviewComponentProps) => {
+  const client = useClient();
+  const { invokePromise } = useOperationInvoker();
+  const containerRef = useRef<HTMLDivElement>(null);
+  const uri = dxn ? URI.make(dxn) : undefined;
+  const subject = uri ? client.graph.makeRef<Obj.Unknown>(uri).target : undefined;
+
+  // px per rem; ResizeHandle works in rem while the persisted height is in px.
+  const remSize = useMemo(() => parseFloat(getComputedStyle(document.documentElement).fontSize) || 16, []);
+  const { height } = parseEmbedLabel(alt);
+
+  // `min-content` keeps the embed at its intrinsic height until the user resizes it; the handle then
+  // measures the rendered box and switches to an explicit height.
+  const [size, setSize] = useState<Size>(height != null ? height / remSize : 'min-content');
+
+  // Tell the surface it is sized by its container (vs. intrinsic) so content (e.g. an image) can fit.
+  const extrinsic = size !== 'min-content';
+  const data = useMemo(
+    () => (subject ? { subject, attendableId: dxn, extrinsic } : undefined),
+    [subject, dxn, extrinsic],
+  );
+  useEffect(() => {
+    setSize(height != null ? height / remSize : 'min-content');
+  }, [height, remSize]);
+
+  // Persist the height (px) into the alt text on drop by rewriting the image node in the source. The
+  // node bounds and base label are re-derived from the live document (the captured `range`/`label`
+  // can lag a prior edit before React re-renders the widget). When the same object is transcluded
+  // more than once, the node whose start is NEAREST the widget's range is chosen so a duplicate
+  // embed isn't rewritten by mistake.
+  const handleResize = useCallback(
+    (next: Size, commit?: boolean) => {
+      setSize(next);
+      if (!commit || typeof next !== 'number' || !view) {
+        return;
+      }
+      const doc = view.state.doc.toString();
+      const marker = `](${dxn})`;
+      let open = -1;
+      let close = -1;
+      for (let at = doc.indexOf(marker); at >= 0; at = doc.indexOf(marker, at + marker.length)) {
+        const start = doc.lastIndexOf('![', at);
+        if (start >= 0 && (open < 0 || Math.abs(start - range.from) < Math.abs(open - range.from))) {
+          open = start;
+          close = at;
+        }
+      }
+      if (open < 0) {
+        return;
+      }
+      const { baseLabel: currentBaseLabel } = parseEmbedLabel(doc.slice(open + 2, close));
+      const insert = `![${formatEmbedLabel(currentBaseLabel, Math.round(next * remSize))}](${dxn})`;
+      view.dispatch({ changes: { from: open, to: close + marker.length, insert } });
+      // After the resized box has laid out, bring its top into frame — but only if that top scrolled
+      // out of view. Scroll the element itself (not the CM view) so it works whichever ancestor
+      // actually scrolls (cm-scroller or an outer panel); defer a frame so the new height applies first.
+      requestAnimationFrame(() => {
+        if (containerRef.current) {
+          scrollTopIntoViewIfNeeded(containerRef.current);
+        }
+      });
+    },
+    [view, range, dxn, remSize],
+  );
+
+  // Open the referenced object: defer to the caller's handler when provided, else navigate to it.
+  const handleOpen = useCallback(() => {
+    if (!uri || !subject) {
+      return;
+    }
+    if (onOpen) {
+      onOpen(uri);
+    } else {
+      void invokePromise?.(LayoutOperation.Open, {
+        subject: [Paths.getObjectPathFromObject(subject)],
+        navigation: 'immediate',
+      });
+    }
+  }, [uri, subject, onOpen, invokePromise]);
+
+  if (!uri || !subject || !data) {
+    return null;
+  }
+
+  const objectLabel = Obj.getLabel(subject);
+  const objectIcon = Obj.getIcon(subject);
+
+  // Frame transcluded block embeds so they read as a self-contained card within the document flow.
+  // The clip/border live on an inner element so they don't clip the resize handle (which straddles the
+  // bottom edge); the inner grid stretches the surface to fill the resizable box, overriding any
+  // intrinsic aspect.
+  return (
+    <div
+      className='relative grid scroll-mt-16'
+      style={sizeStyle(size, 'vertical')}
+      {...resizeAttributes}
+      ref={containerRef}
+    >
+      <div className='grid overflow-hidden border border-subdued-separator rounded-md'>
+        <Surface.Surface type={AppSurface.Section} data={data} limit={1} />
+      </div>
+      <div className='absolute top-1 right-1 flex items-center justify-end gap-1'>
+        <span className='dx-tag dx-tag--neutral flex items-center gap-1'>
+          {objectIcon && <Icon icon={objectIcon.icon} size={4} />}
+          {objectLabel}
+        </span>
+        <IconButton
+          density='sm'
+          icon='ph--arrow-square-out--regular'
+          iconOnly
+          label='Open'
+          variant='ghost'
+          onClick={handleOpen}
+        />
+      </div>
+      <ResizeHandle
+        side='block-end'
+        fallbackSize={FALLBACK_SIZE}
+        minSize={MIN_SIZE}
+        size={size}
+        onSizeChange={handleResize}
+      />
+    </div>
+  );
+};

package/src/components/PreviewComponent/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export * from './PreviewComponent';

package/src/components/index.ts

@@ -2,8 +2,5 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type ComponentType, lazy } from 'react';
-
 export * from './MarkdownEditor';
-
-export const MarkdownSettings: ComponentType<any> = lazy(() => import('./MarkdownSettings'));
+export * from './PreviewComponent';

package/src/containers/MarkdownArticle/MarkdownArticle.stories.tsx

@@ -91,10 +91,9 @@ const meta = {
               const createObjects = createObjectFactory(personalSpace.db, generator);
               yield* Effect.promise(() => createObjects([{ type: Organization.Organization, count: 10 }]));
 
-              const queue = personalSpace.queues.create();
-              const kai = Obj.make(Person.Person, { fullName: 'Kai' });
-              const dxos = Obj.make(Organization.Organization, { name: 'DXOS' });
-              yield* Effect.promise(() => queue.append([kai, dxos]));
+              const kai = personalSpace.db.add(Obj.make(Person.Person, { fullName: 'Kai' }));
+              const dxos = personalSpace.db.add(Obj.make(Organization.Organization, { name: 'DXOS' }));
+              yield* Effect.promise(() => personalSpace.db.flush());
 
               personalSpace.db.add(
                 Markdown.make({

package/src/containers/MarkdownArticle/MarkdownArticle.tsx

@@ -13,14 +13,14 @@ import { Obj } from '@dxos/echo';
 import { useActionRunner } from '@dxos/plugin-graph';
 import { useObject } from '@dxos/react-client/echo';
 import { Panel } from '@dxos/react-ui';
-import { type SelectionManager } from '@dxos/react-ui-attention';
+import { type ViewStateManager } from '@dxos/react-ui-attention';
 import { Editor } from '@dxos/react-ui-editor';
 import { Text } from '@dxos/schema';
 
 import {
   MarkdownEditor,
-  MarkdownEditorProvider,
   type MarkdownEditorContentProps,
+  MarkdownEditorProvider,
   type MarkdownEditorProviderProps,
 } from '#components';
 import { useLinkQuery } from '#hooks';
@@ -31,7 +31,7 @@ export type MarkdownArticleProps = AppSurface.ObjectArticleProps<
   {
     id: string;
     settings: Markdown.Settings;
-    selectionManager?: SelectionManager;
+    viewState?: ViewStateManager;
   } & Pick<MarkdownPluginState, 'extensionProviders'> &
     Pick<MarkdownEditorProviderProps, 'viewMode' | 'onSelectObject' | 'onViewModeChange'> &
     Pick<MarkdownEditorContentProps, 'editorStateStore'>
@@ -90,7 +90,7 @@ export const MarkdownArticle = forwardRef<HTMLDivElement, MarkdownArticleProps>(
     }, [db, upload]);
 
     // Query for @ refs.
-    const handleLinkQuery = useLinkQuery(db);
+    const handleLinkQuery = useLinkQuery(db, Obj.isObject(object) ? object : undefined);
 
     // Open linked objects.
     const { invokePromise } = useOperationInvoker();
@@ -115,7 +115,7 @@ export const MarkdownArticle = forwardRef<HTMLDivElement, MarkdownArticleProps>(
         id={id}
         attendableId={attendableId}
         object={object}
-        compact={role !== 'article'}
+        compact={role !== AppSurface.Article.role}
         extensions={extensions}
         settings={settings}
         viewMode={viewMode}
@@ -129,7 +129,7 @@ export const MarkdownArticle = forwardRef<HTMLDivElement, MarkdownArticleProps>(
           <Editor.Root {...editorRootProps}>
             <Panel.Root role={role} ref={forwardedRef}>
               {settings.toolbar && (
-                <Panel.Toolbar classNames='bg-toolbar-surface'>
+                <Panel.Toolbar>
                   <MarkdownEditor.Toolbar classNames='dx-document' customActions={customActions} />
                 </Panel.Toolbar>
               )}

package/src/containers/MarkdownCard/MarkdownCard.tsx

@@ -20,7 +20,7 @@ import { snippet as snippetExtension } from './snippet';
 export type MarkdownCardProps = { subject: Markdown.Document | Text.Text };
 
 export const MarkdownCard = ({ subject }: MarkdownCardProps) => {
-  const { t } = useTranslation(meta.id);
+  const { t } = useTranslation(meta.profile.key);
   // NOTE: Newline is added so that Fade does not obscure the last line.
   const snippet = useMemo(() => getSnippet(subject) + '\n', [subject]);
   const extensions = useMemo(() => [snippetExtension({ height: 300, scale: 0.8 })], []);
@@ -29,7 +29,7 @@ export const MarkdownCard = ({ subject }: MarkdownCardProps) => {
   return (
     <Card.Body>
       {snippet && (
-        <Card.Section className='relative'>
+        <Card.Section className='aspect-square relative'>
           <Card.Row fullWidth>
             <MarkdownEditorProvider id={subject.id} viewMode='readonly' extensions={extensions}>
               {(editorRootProps) => (

package/src/{components → containers}/MarkdownSettings/MarkdownSettings.stories.tsx

@@ -11,7 +11,7 @@ import { translations } from '#translations';
 import { MarkdownSettings } from './MarkdownSettings';
 
 const meta = {
-  title: 'plugins/plugin-markdown/components/MarkdownSettings',
+  title: 'plugins/plugin-markdown/containers/MarkdownSettings',
   tags: ['settings'],
   component: MarkdownSettings,
   decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],