@dxos/plugin-markdown 0.8.4-main.fcfe5033a5 → 0.8.4-staging.60fe92afc8

package/src/capabilities/comment-config.ts

@@ -0,0 +1,36 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { Type } from '@dxos/echo';
+import { createDocAccessor, getTextInRange } from '@dxos/echo-client';
+
+import { MarkdownOperation } from '#types';
+import { Markdown } from '#types';
+
+// NOTE: Explicit annotation required: d.ts emit cannot portably name the inferred @dxos/compute types (TS2883).
+const activate: () => Effect.Effect<
+  Capability.Capability<typeof AppCapabilities.CommentConfig>,
+  never,
+  Capability.Service
+> = Effect.fnUntraced(function* () {
+  const config: AppCapabilities.CommentConfig = {
+    id: Type.getTypename(Markdown.Document),
+    comments: 'anchored',
+    selectionMode: 'multi-range',
+    getAnchorLabel: (doc: Markdown.Document, anchor: string): string | undefined => {
+      if (doc.content) {
+        const [start, end] = anchor.split(':');
+        return getTextInRange(createDocAccessor(doc.content.target!, ['content']), start, end);
+      }
+    },
+    scrollToAnchor: MarkdownOperation.ScrollToAnchor,
+  };
+  return Capability.contributes(AppCapabilities.CommentConfig, config);
+});
+
+export default activate;

package/src/capabilities/create-object.ts

@@ -0,0 +1,33 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { Operation } from '@dxos/compute';
+import { Type } from '@dxos/echo';
+import { SpaceOperation } from '@dxos/plugin-space';
+import { SpaceCapabilities } from '@dxos/plugin-space';
+
+import { Markdown } from '#types';
+
+import { getDocumentsPath } from '../paths';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
+      id: Type.getTypename(Markdown.Document),
+      createObject: (props, options) =>
+        Effect.gen(function* () {
+          const object = Markdown.make(props);
+          return yield* Operation.invoke(SpaceOperation.AddObject, {
+            object,
+            target: options.target,
+            hidden: true,
+            targetNodeId: options.targetNodeId ?? getDocumentsPath(options.db.spaceId),
+          });
+        }),
+    });
+  }),
+);

package/src/capabilities/index.ts

@@ -3,11 +3,26 @@
 //
 
 import { Capability } from '@dxos/app-framework';
-import { OperationHandlerSet } from '@dxos/operation';
+import { type AppCapabilities } from '@dxos/app-toolkit';
+import type { OperationHandlerSet } from '@dxos/compute';
 
+export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
+export const NavigationResolver = Capability.lazy('NavigationResolver', () => import('./navigation-resolver'));
 export const AnchorSort = Capability.lazy('AnchorSort', () => import('./anchor-sort'));
 export const AppGraphSerializer = Capability.lazy('AppGraphSerializer', () => import('./app-graph-serializer'));
-export const BlueprintDefinition = Capability.lazy('BlueprintDefinition', () => import('./blueprint-definition'));
+// The contributed capability type references Operation types from @dxos/compute, so the lazy
+// wrapper needs an explicit annotation to keep the inferred type portable (TS2883).
+export const CommentConfig: Capability.LazyCapability<
+  void,
+  Capability.Capability<typeof AppCapabilities.CommentConfig>
+> = Capability.lazy('CommentConfig', () => import('./comment-config'));
+export const CreateObject = Capability.lazy('CreateObject', () => import('./create-object'));
+// The contributed capability type references Blueprint types from @dxos/compute, so the lazy
+// wrapper needs an explicit annotation to keep the inferred type portable (TS2883).
+export const BlueprintDefinition: Capability.LazyCapability<
+  void,
+  Capability.Capability<typeof AppCapabilities.BlueprintDefinition>[]
+> = Capability.lazy('BlueprintDefinition', () => import('./blueprint-definition'));
 export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
   'OperationHandler',
   () => import('./operation-handler'),

package/src/capabilities/navigation-resolver.ts

@@ -0,0 +1,19 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities, createTypeSectionPathResolver } from '@dxos/app-toolkit';
+
+import { Markdown } from '#types';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(
+      AppCapabilities.NavigationPathResolver,
+      createTypeSectionPathResolver(Markdown.Document),
+    );
+  }),
+);

package/src/capabilities/node.ts

@@ -3,7 +3,9 @@
 //
 
 import { Capability } from '@dxos/app-framework';
-import { OperationHandlerSet } from '@dxos/operation';
+import { OperationHandlerSet } from '@dxos/compute';
+
+export const CreateObject = Capability.lazy('CreateObject', () => import('./create-object'));
 
 export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
   'OperationHandler',

package/src/capabilities/operation-handler.ts

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import type { OperationHandlerSet } from '@dxos/operation';
+import type { OperationHandlerSet } from '@dxos/compute';
 
 import { MarkdownOperationHandlerSet } from '#operations';
 

package/src/capabilities/react-surface.tsx

@@ -10,17 +10,18 @@ import {
   Surface,
   useAtomCapability,
   useAtomCapabilityState,
+  useCapabilities,
   useCapability,
   useSettingsState,
 } from '@dxos/app-framework/ui';
 import { AppSurface } from '@dxos/app-toolkit/ui';
 import { Obj } from '@dxos/echo';
-import { AttentionCapabilities } from '@dxos/plugin-attention/types';
+import { AttentionCapabilities } from '@dxos/plugin-attention';
 import { Text } from '@dxos/schema';
-import { type EditorViewMode } from '@dxos/ui-editor';
+import { type EditorViewMode } from '@dxos/ui-editor/types';
 
 import { MarkdownSettings } from '#components';
-import { MarkdownCard, MarkdownContainer, type MarkdownContainerProps } from '#containers';
+import { MarkdownCard, EditableMarkdownCard, MarkdownArticle, type MarkdownArticleProps } from '#containers';
 import { meta } from '#meta';
 import { Markdown, MarkdownCapabilities } from '#types';
 
@@ -36,7 +37,7 @@ export default Capability.makeModule(() =>
         component: ({ data, role, ref }) => {
           return (
             <Container
-              id={Obj.getDXN(data.subject).toString()}
+              id={Obj.getURI(data.subject)}
               attendableId={data.attendableId}
               subject={data.subject}
               role={role}
@@ -57,7 +58,7 @@ export default Capability.makeModule(() =>
         component: ({ data, role, ref }) => {
           return (
             <Container
-              id={Obj.getDXN(data.subject).toString()}
+              id={Obj.getURI(data.subject)}
               attendableId={data.attendableId}
               subject={data.subject}
               role={role}
@@ -67,16 +68,22 @@ export default Capability.makeModule(() =>
         },
       }),
       Surface.create({
-        id: 'surface.plugin-settings',
+        id: 'surface.pluginSettings',
         filter: AppSurface.settings(AppSurface.Article, meta.id),
         component: ({ data: { subject } }) => {
           const { settings, updateSettings } = useSettingsState<Markdown.Settings>(subject.atom);
           return <MarkdownSettings settings={settings} onSettingsChange={updateSettings} />;
         },
       }),
+      Surface.create({
+        id: 'surface.editable',
+        position: 'first',
+        filter: AppSurface.object(AppSurface.Card, [Markdown.Document, Text.Text], (data) => data.editable === true),
+        component: ({ data }) => <EditableMarkdownCard subject={data.subject} />,
+      }),
       Surface.create({
         id: 'surface.preview',
-        filter: AppSurface.object(AppSurface.Card, [Markdown.Document, Text.Text]),
+        filter: AppSurface.object(AppSurface.Card, [Markdown.Document, Text.Text], (data) => data.editable !== true),
         component: ({ data }) => <MarkdownCard {...data} />,
       }),
     ]),
@@ -94,17 +101,17 @@ const Container = forwardRef<
   const settings = useAtomCapability(MarkdownCapabilities.Settings);
   const [state, setState] = useAtomCapabilityState(MarkdownCapabilities.State);
   const editorState = useCapability(MarkdownCapabilities.EditorState);
-  const extensions = useCapability(MarkdownCapabilities.Extensions);
+  const extensions = useCapabilities(MarkdownCapabilities.ExtensionProvider);
   const extensionProviders = useMemo(() => extensions.flat(), [extensions]);
 
   const viewMode: EditorViewMode = (id && state.viewMode[id]) || settings?.defaultViewMode || 'source';
-  const handleViewModeChange = useCallback<NonNullable<MarkdownContainerProps['onViewModeChange']>>(
+  const handleViewModeChange = useCallback<NonNullable<MarkdownArticleProps['onViewModeChange']>>(
     (mode) => setState((current) => ({ ...current, viewMode: { ...current.viewMode, [id]: mode } })),
     [id, setState],
   );
 
   return (
-    <MarkdownContainer
+    <MarkdownArticle
       role={role}
       subject={subject}
       id={id}

package/src/capabilities/state.ts

@@ -9,10 +9,10 @@ import { createKvsStore } from '@dxos/effect';
 import { createEditorStateStore } from '@dxos/ui-editor';
 
 import { meta } from '#meta';
-import { type EditorViewEntry, type EditorViewRegistry, MarkdownCapabilities, MarkdownStateSchema } from '#types';
+import { MarkdownCapabilities } from '#types';
 
-const createEditorViewRegistry = (): EditorViewRegistry => {
-  const views = new Map<string, EditorViewEntry>();
+const createEditorViewRegistry = (): MarkdownCapabilities.EditorViewRegistry => {
+  const views = new Map<string, MarkdownCapabilities.EditorViewEntry>();
   return {
     register: (attendableId, view, documentId) => {
       views.set(attendableId, { view, documentId });
@@ -29,7 +29,7 @@ export default Capability.makeModule(
     // Persisted state using KVS store.
     const stateAtom = createKvsStore({
       key: `${meta.id}.state`,
-      schema: MarkdownStateSchema,
+      schema: MarkdownCapabilities.StateSchema,
       defaultValue: () => ({ viewMode: {} }),
     });
 

package/src/components/MarkdownEditor/FileUpload.tsx

@@ -15,49 +15,54 @@ export const IMAGE_FILES = ['.jpg', '.jpeg', '.png', '.gif'];
 export type FileUploadAction = () => void;
 
 export type FileUploadProps = {
-  editorView?: EditorView;
+  // Provided as a getter (not a value prop) so the live `EditorView` is never carried in a React prop
+  // 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>;
 };
 
 // TODO(burdon): Factor out.
 // TODO(burdon): Move to root? (support drag into document via dropzone).
-export const FileUpload = forwardRef<FileUploadAction, FileUploadProps>(
-  ({ editorView, onFileUpload }, forwardedRef) => {
-    // https://react-dropzone.js.org
-    const { acceptedFiles, open, inputRef } = useDropzone({
-      disabled: !onFileUpload,
-      multiple: false,
-      noDrag: true,
-      accept: {
-        'image/*': IMAGE_FILES,
-      },
-    });
-
-    useImperativeHandle(forwardedRef, () => open, []);
-
-    useEffect(() => {
-      if (editorView && acceptedFiles.length && onFileUpload) {
-        requestAnimationFrame(async () => {
-          // NOTE: Clone file since react-dropzone patches in a non-standard `path` property, which confuses IPFS.
-          const f = acceptedFiles[0];
-          const file = new File([f], f.name, {
-            type: f.type,
-            lastModified: f.lastModified,
-          });
-
-          // TODO(burdon): Factor out.
-          const info = await onFileUpload(file);
-          if (info) {
-            addLink({ url: info.url, image: true })(editorView);
-          }
+export const FileUpload = forwardRef<FileUploadAction, FileUploadProps>(({ getView, onFileUpload }, forwardedRef) => {
+  // https://react-dropzone.js.org
+  const { acceptedFiles, open, inputRef } = useDropzone({
+    disabled: !onFileUpload,
+    multiple: false,
+    noDrag: true,
+    accept: {
+      'image/*': IMAGE_FILES,
+    },
+  });
+
+  useImperativeHandle(forwardedRef, () => open, []);
+
+  useEffect(() => {
+    if (acceptedFiles.length && onFileUpload) {
+      requestAnimationFrame(async () => {
+        const editorView = getView?.();
+        if (!editorView) {
+          return;
+        }
+        // NOTE: Clone file since react-dropzone patches in a non-standard `path` property, which confuses IPFS.
+        const f = acceptedFiles[0];
+        const file = new File([f], f.name, {
+          type: f.type,
+          lastModified: f.lastModified,
         });
-      }
-    }, [editorView, acceptedFiles, onFileUpload]);
 
-    if (!onFileUpload) {
-      return null;
+        // TODO(burdon): Factor out.
+        const info = await onFileUpload(file);
+        if (info) {
+          addLink({ url: info.url, image: true })(editorView);
+        }
+      });
     }
+  }, [getView, acceptedFiles, onFileUpload]);
+
+  if (!onFileUpload) {
+    return null;
+  }
 
-    return <>{createPortal(<input ref={inputRef} />, document.body)} </>;
-  },
-);
+  return <>{createPortal(<input ref={inputRef} />, document.body)} </>;
+});

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

@@ -8,19 +8,20 @@ import React from 'react';
 
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Filter, Obj } from '@dxos/echo';
-import { ClientPlugin } from '@dxos/plugin-client';
+import { ClientPlugin } from '@dxos/plugin-client/testing';
 import { initializeIdentity } from '@dxos/plugin-client/testing';
 import { corePlugins } from '@dxos/plugin-testing';
 import { useQuery, useSpaces } from '@dxos/react-client/echo';
 import { Panel } from '@dxos/react-ui';
 import { AttendableContainer } from '@dxos/react-ui-attention';
-import { Editor, translations as editorTranslations } from '@dxos/react-ui-editor';
+import { Editor } from '@dxos/react-ui-editor';
+import { translations as editorTranslations } from '@dxos/react-ui-editor/translations';
 import { Loading, withLayout } from '@dxos/react-ui/testing';
 import { Text } from '@dxos/schema';
 
+import { translations } from '#translations';
 import { Markdown } from '#types';
 
-import { translations } from '../../translations';
 import { MarkdownEditor, MarkdownEditorProvider, type MarkdownEditorProviderProps } from './MarkdownEditor';
 
 type DefaultStoryProps = Omit<MarkdownEditorProviderProps, 'id' | 'extensions' | 'children'>;
@@ -28,7 +29,7 @@ type DefaultStoryProps = Omit<MarkdownEditorProviderProps, 'id' | 'extensions' |
 const DefaultStory = (props: DefaultStoryProps) => {
   const [space] = useSpaces();
   const [doc] = useQuery(space?.db, Filter.type(Markdown.Document));
-  const id = doc && Obj.getDXN(doc).toString();
+  const id = doc && Obj.getURI(doc);
   if (!id) {
     return <Loading data={{ id }} />;
   }

package/src/components/MarkdownEditor/MarkdownEditor.tsx

@@ -12,9 +12,10 @@ 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 { DXN } from '@dxos/keys';
+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 {
   type EditorRootProps,
   type EditorToolbarState,
@@ -22,7 +23,6 @@ import {
   useEditorContext,
 } from '@dxos/react-ui-editor';
 import { type PreviewBlock, type PreviewOptions } from '@dxos/ui-editor';
-import { composable, composableProps } from '@dxos/ui-theme';
 import { isNonNullable } from '@dxos/util';
 
 import {
@@ -172,32 +172,39 @@ const MARKDOWN_EDITOR_CONTENT_NAME = 'MarkdownEditor.Content';
 
 type MarkdownEditorContentProps = Omit<NaturalMarkdownEditorContentProps, 'id' | 'extensions' | 'toolbarState'>;
 
-const MarkdownEditorContent = composable<HTMLDivElement, MarkdownEditorContentProps>(({ ...props }, _forwardedRef) => {
-  const { id, attendableId, compact, viewMode, onFileUpload } = useMarkdownEditorContext(MARKDOWN_EDITOR_CONTENT_NAME);
-
-  const { extensions, setController, state } = useEditorContext(MARKDOWN_EDITOR_CONTENT_NAME);
-
-  const handleRef = useCallback(
-    (view: EditorView | null) => {
-      setController(createEditorController(view));
-    },
-    [setController],
-  );
+const MarkdownEditorContent = composable<HTMLDivElement, MarkdownEditorContentProps>(
+  ({ compact: compactProp, ...props }, _forwardedRef) => {
+    const {
+      id,
+      attendableId,
+      compact = compactProp,
+      viewMode,
+      onFileUpload,
+    } = useMarkdownEditorContext(MARKDOWN_EDITOR_CONTENT_NAME);
+    const { extensions, setController, state } = useEditorContext(MARKDOWN_EDITOR_CONTENT_NAME);
 
-  return (
-    <NaturalMarkdownEditorContent
-      {...composableProps(props)}
-      id={id}
-      attendableId={attendableId}
-      compact={compact}
-      viewMode={viewMode}
-      toolbarState={state as Atom.Writable<EditorToolbarState>}
-      extensions={extensions}
-      onFileUpload={onFileUpload}
-      ref={handleRef}
-    />
-  );
-});
+    const handleRef = useCallback(
+      (view: EditorView | null) => {
+        setController(createEditorController(view));
+      },
+      [setController],
+    );
+
+    return (
+      <NaturalMarkdownEditorContent
+        {...composableProps(props)}
+        id={id}
+        attendableId={attendableId}
+        compact={compact}
+        viewMode={viewMode}
+        toolbarState={state as Atom.Writable<EditorToolbarState>}
+        extensions={extensions}
+        onFileUpload={onFileUpload}
+        ref={handleRef}
+      />
+    );
+  },
+);
 
 MarkdownEditorContent.displayName = MARKDOWN_EDITOR_CONTENT_NAME;
 
@@ -208,7 +215,7 @@ MarkdownEditorContent.displayName = MARKDOWN_EDITOR_CONTENT_NAME;
 const MARKDOWN_EDITOR_TOOLBAR_NAME = 'MarkdownEditor.Toolbar';
 
 type MarkdownEditorToolbarProps = ThemedClassName<
-  Omit<NaturalMarkdownToolbarProps, 'editorView' | 'onAction' | 'onFileUpload' | 'onViewModeChange' | 'id'>
+  Omit<NaturalMarkdownToolbarProps, 'getView' | 'onAction' | 'onFileUpload' | 'onViewModeChange' | 'id'>
 >;
 
 const MarkdownEditorToolbar = (props: MarkdownEditorToolbarProps) => {
@@ -217,11 +224,15 @@ const MarkdownEditorToolbar = (props: MarkdownEditorToolbarProps) => {
 
   const { controller } = useEditorContext(MARKDOWN_EDITOR_TOOLBAR_NAME);
 
+  // Stable getter identity (changes only when the controller does) so the FileUpload effect, whose
+  // deps include `getView`, does not re-run every render and re-upload the same file.
+  const getView = useCallback(() => controller?.view ?? null, [controller]);
+
   return (
     <NaturalMarkdownToolbar
       {...props}
       id={attendableId ?? id}
-      editorView={controller?.view ?? undefined}
+      getView={getView}
       onAction={onAction}
       onFileUpload={onFileUpload}
       onViewModeChange={onViewModeChange}
@@ -255,7 +266,7 @@ MarkdownEditorBlocks.displayName = MARKDOWN_EDITOR_BLOCKS_NAME;
 
 const PreviewBlock = ({ el, link }: PreviewBlock) => {
   const client = useClient();
-  const dxn = DXN.parse(link.dxn);
+  const dxn = URI.make(link.dxn);
   const subject = client.graph.makeRef(dxn).target;
   const data = useMemo(() => ({ subject }), [subject]);
 

package/src/components/MarkdownEditor/MarkdownEditorContent.tsx

@@ -17,7 +17,6 @@ import {
 import {
   type EditorSelectionState,
   type EditorStateStore,
-  type EditorViewMode,
   type ThemeExtensionsOptions,
   mobileSlots,
   createBasicExtensions,
@@ -28,7 +27,9 @@ import {
   formattingListener,
   processEditorPayload,
   editorClassNames,
+  scrollbarAutohide,
 } from '@dxos/ui-editor';
+import { type EditorViewMode } from '@dxos/ui-editor/types';
 import { mx } from '@dxos/ui-theme';
 import { isTruthy } from '@dxos/util';
 
@@ -114,6 +115,7 @@ export const MarkdownEditorContent = forwardRef<EditorView | null, MarkdownEdito
             syntaxHighlighting: true,
           }),
           createMarkdownExtensions(),
+          scrollbarAutohide(),
           toolbarState && formattingListener(updateToolbarState),
           role !== 'section' &&
             onFileUpload &&
@@ -130,7 +132,7 @@ export const MarkdownEditorContent = forwardRef<EditorView | null, MarkdownEdito
           extensions,
         ].filter(isTruthy),
       }),
-      [id, viewMode, themeMode, extensions],
+      [id, viewMode, themeMode, extensions, compact],
     );
 
     useImperativeHandle<EditorView | null, EditorView | null>(forwardedRef, () => editorView, [editorView]);
@@ -149,7 +151,6 @@ export const MarkdownEditorContent = forwardRef<EditorView | null, MarkdownEdito
       <div
         {...focusAttributes}
         className={mx(editorClassNames(role), classNames)}
-        role='none'
         data-testid='composer.markdownRoot'
         data-popover-collision-boundary={true}
         ref={parentRef}

package/src/components/MarkdownEditor/MarkdownEditorToolbar.tsx

@@ -6,29 +6,32 @@ import { type EditorView } from '@codemirror/view';
 import React, { useCallback, useState } from 'react';
 
 import { type FileInfo } from '@dxos/app-toolkit';
+import { composable, composableProps } from '@dxos/react-ui';
 import { Editor, type EditorToolbarProps } from '@dxos/react-ui-editor';
-import { composable, composableProps } from '@dxos/ui-theme';
 
 import { FileUpload, type FileUploadAction } from './FileUpload';
 
 export type MarkdownEditorToolbarProps = {
   id: string;
-  editorView?: EditorView;
+  // Provided as a getter (not a value prop) so the live `EditorView` is never carried in a React prop
+  // 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>;
 } & Pick<EditorToolbarProps, 'role' | 'customActions' | 'onAction' | 'onViewModeChange'>;
 
 export const MarkdownEditorToolbar = composable<HTMLDivElement, MarkdownEditorToolbarProps>(
-  ({ id, role, editorView, customActions, onAction, onFileUpload, onViewModeChange, ...props }, forwardedRef) => {
+  ({ id, role, getView, customActions, onAction, onFileUpload, onViewModeChange, ...props }, forwardedRef) => {
     const { className, ...rest } = composableProps(props);
     const [upload, setUpload] = useState<FileUploadAction | null>(null);
     const uploadRef = useCallback((next: FileUploadAction) => setUpload(() => next), []);
 
-    if (!editorView) {
+    if (!getView?.()) {
       return <div className={className} {...rest} ref={forwardedRef} />;
     }
 
     return (
-      <div role='none' className='contents' ref={forwardedRef}>
+      <div className='contents' ref={forwardedRef}>
         <Editor.Toolbar
           {...rest}
           classNames={className}
@@ -40,7 +43,7 @@ export const MarkdownEditorToolbar = composable<HTMLDivElement, MarkdownEditorTo
           onViewModeChange={onViewModeChange}
         />
 
-        {onFileUpload && <FileUpload ref={uploadRef} editorView={editorView} onFileUpload={onFileUpload} />}
+        {onFileUpload && <FileUpload ref={uploadRef} getView={getView} onFileUpload={onFileUpload} />}
       </div>
     );
   },

package/src/components/MarkdownSettings/MarkdownSettings.stories.tsx

@@ -6,7 +6,8 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { translations } from '../../translations';
+import { translations } from '#translations';
+
 import { MarkdownSettings } from './MarkdownSettings';
 
 const meta = {

package/src/components/MarkdownSettings/MarkdownSettings.tsx

@@ -13,7 +13,7 @@ import { Markdown } from '#types';
 
 export type MarkdownSettingsProps = AppSurface.SettingsArticleProps<Markdown.Settings>;
 
-const TypewriterField = ({ value, onChange, readonly }: SettingsFieldProps<string>) => (
+const SnippetsField = ({ value, onChange, readonly }: SettingsFieldProps<string | undefined>) => (
   <Input.TextArea disabled={readonly} rows={5} value={value ?? ''} onChange={(event) => onChange(event.target.value)} />
 );
 
@@ -24,8 +24,8 @@ export const MarkdownSettings = ({ settings, onSettingsChange }: MarkdownSetting
         <SettingsForm.FieldSet
           readonly={!onSettingsChange}
           schema={Markdown.Settings}
-          visible={(path, values) => path !== 'typewriter' || !!values.debug}
-          fieldMap={{ typewriter: TypewriterField }}
+          visible={(path, values) => path !== 'snippets' || !!values.debug}
+          fieldMap={{ snippets: SnippetsField }}
           values={settings}
           onValuesChanged={(values) => onSettingsChange?.(() => values)}
         />