@dxos/plugin-markdown 0.8.1-staging.391c573 → 0.8.1-staging.9eaf14f

package/dist/types/src/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,mBAAmB,CAAC;AAEtC,OAAO,EACL,KAAK,SAAS,EAEd,KAAK,oBAAoB,EACzB,cAAc,EACd,KAAK,SAAS,EACf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAKxC,yBAAiB,cAAc,CAAC;;;;;;;;;;;;IAC9B,MAAM,OAAO,MAAO,SAAQ,WAQ1B;KAAG;;;;;;;;;;IAEL,MAAM,OAAO,WAAY,SAAQ,gBAM/B;KAAG;;CACN;AAED,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAGrD,MAAM,MAAM,yBAAyB,GAAG,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,YAAY,CAAA;CAAE,KAAK,SAAS,GAAG,SAAS,CAAC;AAEtG,MAAM,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;AAE9C,MAAM,MAAM,mBAAmB,GAAG;IAEhC,kBAAkB,CAAC,EAAE,yBAAyB,EAAE,CAAC;IAIjD,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAGzC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IAGrD,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;GAYlC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,sBAAsB,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-markdown",
-  "version": "0.8.1-staging.391c573",
+  "version": "0.8.1-staging.9eaf14f",
   "description": "DXOS Surface plugin for interacting with Markdown",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -38,29 +38,30 @@
     "@preact/signals-core": "^1.6.0",
     "effect": "3.13.3",
     "react-dropzone": "^14.2.3",
-    "@dxos/app-framework": "0.8.1-staging.391c573",
-    "@dxos/async": "0.8.1-staging.391c573",
-    "@dxos/artifact": "0.8.1-staging.391c573",
-    "@dxos/echo-schema": "0.8.1-staging.391c573",
-    "@dxos/invariant": "0.8.1-staging.391c573",
-    "@dxos/keys": "0.8.1-staging.391c573",
-    "@dxos/live-object": "0.8.1-staging.391c573",
-    "@dxos/local-storage": "0.8.1-staging.391c573",
-    "@dxos/log": "0.8.1-staging.391c573",
-    "@dxos/plugin-attention": "0.8.1-staging.391c573",
-    "@dxos/plugin-client": "0.8.1-staging.391c573",
-    "@dxos/plugin-graph": "0.8.1-staging.391c573",
-    "@dxos/plugin-space": "0.8.1-staging.391c573",
-    "@dxos/plugin-theme": "0.8.1-staging.391c573",
-    "@dxos/react-ui-attention": "0.8.1-staging.391c573",
-    "@dxos/react-hooks": "0.8.1-staging.391c573",
-    "@dxos/react-client": "0.8.1-staging.391c573",
-    "@dxos/react-ui-editor": "0.8.1-staging.391c573",
-    "@dxos/react-ui-card": "0.8.1-staging.391c573",
-    "@dxos/react-ui-form": "0.8.1-staging.391c573",
-    "@dxos/schema": "0.8.1-staging.391c573",
-    "@dxos/util": "0.8.1-staging.391c573",
-    "@dxos/react-ui-stack": "0.8.1-staging.391c573"
+    "@dxos/app-framework": "0.8.1-staging.9eaf14f",
+    "@dxos/artifact": "0.8.1-staging.9eaf14f",
+    "@dxos/echo-schema": "0.8.1-staging.9eaf14f",
+    "@dxos/async": "0.8.1-staging.9eaf14f",
+    "@dxos/invariant": "0.8.1-staging.9eaf14f",
+    "@dxos/keys": "0.8.1-staging.9eaf14f",
+    "@dxos/live-object": "0.8.1-staging.9eaf14f",
+    "@dxos/local-storage": "0.8.1-staging.9eaf14f",
+    "@dxos/log": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-attention": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-client": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-deck": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-graph": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-theme": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-space": "0.8.1-staging.9eaf14f",
+    "@dxos/react-client": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui-attention": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui-card": "0.8.1-staging.9eaf14f",
+    "@dxos/react-hooks": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui-editor": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui-stack": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui-form": "0.8.1-staging.9eaf14f",
+    "@dxos/schema": "0.8.1-staging.9eaf14f",
+    "@dxos/util": "0.8.1-staging.9eaf14f"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -69,18 +70,18 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/debug": "0.8.1-staging.391c573",
-    "@dxos/react-ui-theme": "0.8.1-staging.391c573",
-    "@dxos/storybook-utils": "0.8.1-staging.391c573",
-    "@dxos/react-ui": "0.8.1-staging.391c573",
-    "@dxos/random": "0.8.1-staging.391c573"
+    "@dxos/debug": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui": "0.8.1-staging.9eaf14f",
+    "@dxos/random": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui-theme": "0.8.1-staging.9eaf14f",
+    "@dxos/storybook-utils": "0.8.1-staging.9eaf14f"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.1-staging.391c573",
-    "@dxos/react-ui-theme": "0.8.1-staging.391c573"
+    "@dxos/react-ui": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui-theme": "0.8.1-staging.9eaf14f"
   },
   "publishConfig": {
     "access": "public"

package/src/MarkdownPlugin.tsx

@@ -3,7 +3,7 @@
 //
 
 import { Capabilities, contributes, createIntent, defineModule, definePlugin, Events } from '@dxos/app-framework';
-import { type BaseObject } from '@dxos/echo-schema';
+import { isInstanceOf, type BaseObject } from '@dxos/echo-schema';
 import { RefArray } from '@dxos/live-object';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
 import { SpaceCapabilities, ThreadEvents } from '@dxos/plugin-space';
@@ -21,7 +21,7 @@ import {
   ArtifactDefinition,
 } from './capabilities';
 import { MarkdownEvents } from './events';
-import { MARKDOWN_PLUGIN, meta } from './meta';
+import { meta } from './meta';
 import translations from './translations';
 import { DocumentType, MarkdownAction } from './types';
 import { serializer } from './util';
@@ -53,8 +53,8 @@ export const MarkdownPlugin = () =>
         contributes(Capabilities.Metadata, {
           id: DocumentType.typename,
           metadata: {
-            label: (object: any) => (object instanceof DocumentType ? object.name || object.fallbackName : undefined),
-            placeholder: ['document title placeholder', { ns: MARKDOWN_PLUGIN }],
+            label: (object: any) =>
+              isInstanceOf(DocumentType, object) ? object.name || object.fallbackName : undefined,
             icon: 'ph--text-aa--regular',
             graphProps: {
               managesAutofocus: true,
@@ -74,7 +74,7 @@ export const MarkdownPlugin = () =>
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
             objectSchema: DocumentType,
-            getIntent: () => createIntent(MarkdownAction.Create),
+            getIntent: (_, { space }) => createIntent(MarkdownAction.Create, { spaceId: space.id }),
           }),
         ),
     }),

package/src/capabilities/app-graph-serializer.ts

@@ -5,24 +5,25 @@
 import { pipe } from 'effect';
 
 import { contributes, Capabilities, type PluginsContext, chain, createIntent } from '@dxos/app-framework';
+import { getSchemaTypename } from '@dxos/echo-schema';
 import { SpaceAction, CollectionType } from '@dxos/plugin-space/types';
 import { isSpace } from '@dxos/react-client/echo';
 
-import { MARKDOWN_PLUGIN } from '../meta';
 import translations from '../translations';
 import { MarkdownAction, DocumentType } from '../types';
 
 export default (context: PluginsContext) =>
   contributes(Capabilities.AppGraphSerializer, [
     {
-      inputType: DocumentType.typename,
+      inputType: getSchemaTypename(DocumentType)!,
       outputType: 'text/markdown',
       // Reconcile with metadata serializers.
       serialize: async (node) => {
         const doc = node.data;
         const content = await doc.content.load();
         return {
-          name: doc.name || doc.fallbackName || translations[0]['en-US'][MARKDOWN_PLUGIN]['document title placeholder'],
+          name:
+            doc.name || doc.fallbackName || translations[0]['en-US'][DocumentType.typename]['object name placeholder'],
           data: content.content,
           type: 'text/markdown',
         };
@@ -39,7 +40,7 @@ export default (context: PluginsContext) =>
         const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
         const result = await dispatch(
           pipe(
-            createIntent(MarkdownAction.Create, { name: data.name, content: data.data }),
+            createIntent(MarkdownAction.Create, { spaceId: space.id, name: data.name, content: data.data }),
             chain(SpaceAction.AddObject, { target }),
           ),
         );

package/src/capabilities/artifact-definition.ts

@@ -3,10 +3,10 @@
 //
 
 import { Capabilities, contributes, type PromiseIntentDispatcher } from '@dxos/app-framework';
-import { defineArtifact, defineTool, ToolResult } from '@dxos/artifact';
+import { ArtifactId, defineArtifact, defineTool, ToolResult } from '@dxos/artifact';
 import { isInstanceOf, S } from '@dxos/echo-schema';
-import { invariant } from '@dxos/invariant';
-import { fullyQualifiedId, Filter, type Space } from '@dxos/react-client/echo';
+import { invariant, assertArgument } from '@dxos/invariant';
+import { Filter, fullyQualifiedId, type Space } from '@dxos/react-client/echo';
 
 import { meta } from '../meta';
 import { DocumentType } from '../types';
@@ -21,7 +21,7 @@ declare global {
 
 export default () => {
   const definition = defineArtifact({
-    id: meta.id,
+    id: `artifact:${meta.id}`,
     name: meta.name,
     instructions: `
       - The markdown plugin allows you to work with text documents in the current space.
@@ -56,20 +56,13 @@ export default () => {
         description: 'Read the content of a markdown document.',
         caption: 'Inspecting markdown document...',
         schema: S.Struct({
-          id: S.String.annotations({
-            description: 'The fully qualified ID of the document `spaceID:objectID`',
-          }),
+          id: ArtifactId,
         }),
         execute: async ({ id }, { extensions }) => {
           invariant(extensions?.space, 'No space');
-          const space = extensions.space;
-          const { objects: documents } = await space.db.query(Filter.schema(DocumentType)).run();
-          const document = documents.find((doc) => fullyQualifiedId(doc) === id);
-          if (!document) {
-            return ToolResult.Error(`Document not found: ${id}`);
-          }
+          const document = await extensions.space.db.query({ id: ArtifactId.toDXN(id).toString() }).first();
+          assertArgument(isInstanceOf(DocumentType, document), 'Invalid type');
 
-          invariant(isInstanceOf(DocumentType, document));
           const { content } = await document.content?.load();
           return ToolResult.Success({
             id: fullyQualifiedId(document),

package/src/capabilities/capabilities.ts

@@ -3,7 +3,7 @@
 //
 
 import { defineCapability } from '@dxos/app-framework';
-import { type EditorViewMode } from '@dxos/react-ui-editor';
+import { type EditorViewMode, type EditorStateStore } from '@dxos/react-ui-editor';
 
 import { MARKDOWN_PLUGIN } from '../meta';
 import { type MarkdownExtensionProvider, type MarkdownPluginState } from '../types';
@@ -11,6 +11,7 @@ import { type MarkdownExtensionProvider, type MarkdownPluginState } from '../typ
 export namespace MarkdownCapabilities {
   export const State = defineCapability<{
     state: MarkdownPluginState;
+    editorState: EditorStateStore;
     getViewMode: (id: string) => EditorViewMode;
     setViewMode: (id: string, viewMode: EditorViewMode) => void;
   }>(`${MARKDOWN_PLUGIN}/capability/state`);

package/src/capabilities/intent-resolver.ts

@@ -3,7 +3,9 @@
 //
 
 import { Capabilities, contributes, createResolver, type PluginsContext } from '@dxos/app-framework';
-import { makeRef, create } from '@dxos/live-object';
+import { ObjectId } from '@dxos/echo-schema';
+import { DXN, QueueSubspaceTags } from '@dxos/keys';
+import { makeRef, create, refFromDXN } from '@dxos/live-object';
 import { TextType } from '@dxos/schema';
 
 import { MarkdownCapabilities } from './capabilities';
@@ -13,10 +15,11 @@ export default (context: PluginsContext) =>
   contributes(Capabilities.IntentResolver, [
     createResolver({
       intent: MarkdownAction.Create,
-      resolve: ({ name, content }) => {
+      resolve: ({ name, spaceId, content }) => {
         const doc = create(DocumentType, {
           name,
           content: makeRef(create(TextType, { content: content ?? '' })),
+          assistantChatQueue: refFromDXN(new DXN(DXN.kind.QUEUE, [QueueSubspaceTags.DATA, spaceId, ObjectId.random()])),
           threads: [],
         });
 

package/src/capabilities/react-surface.tsx

@@ -5,8 +5,10 @@
 import React from 'react';
 
 import { createSurface, contributes, Capabilities, useCapability } from '@dxos/app-framework';
+import { isInstanceOf } from '@dxos/echo-schema';
 import { SettingsStore } from '@dxos/local-storage';
 import { fullyQualifiedId } from '@dxos/react-client/echo';
+import { TextType } from '@dxos/schema';
 
 import { MarkdownCapabilities } from './capabilities';
 import { MarkdownContainer, MarkdownSettings } from '../components';
@@ -17,12 +19,13 @@ export default () =>
   contributes(Capabilities.ReactSurface, [
     createSurface({
       id: `${MARKDOWN_PLUGIN}/document`,
-      role: ['article', 'section'],
-      filter: (data): data is { subject: DocumentType } => data.subject instanceof DocumentType,
+      role: ['article', 'section', 'tabpanel'],
+      filter: (data): data is { subject: DocumentType; variant: undefined } =>
+        isInstanceOf(DocumentType, data.subject) && !data.variant,
       component: ({ data, role }) => {
         const settingsStore = useCapability(Capabilities.SettingsStore);
         const settings = settingsStore.getStore<MarkdownSettingsProps>(MARKDOWN_PLUGIN)!.value;
-        const { state, getViewMode, setViewMode } = useCapability(MarkdownCapabilities.State);
+        const { state, editorState, getViewMode, setViewMode } = useCapability(MarkdownCapabilities.State);
 
         return (
           <MarkdownContainer
@@ -32,8 +35,31 @@ export default () =>
             settings={settings}
             extensionProviders={state.extensionProviders}
             viewMode={getViewMode(fullyQualifiedId(data.subject))}
-            selection={state.selectionState}
-            folding={state.foldState}
+            editorStateStore={editorState}
+            onViewModeChange={setViewMode}
+          />
+        );
+      },
+    }),
+    createSurface({
+      id: `${MARKDOWN_PLUGIN}/text`,
+      role: ['article', 'section', 'tabpanel'],
+      filter: (data): data is { id: string; subject: TextType } =>
+        typeof data.id === 'string' && isInstanceOf(TextType, data.subject),
+      component: ({ data, role }) => {
+        const settingsStore = useCapability(Capabilities.SettingsStore);
+        const settings = settingsStore.getStore<MarkdownSettingsProps>(MARKDOWN_PLUGIN)!.value;
+        const { state, editorState, getViewMode, setViewMode } = useCapability(MarkdownCapabilities.State);
+
+        return (
+          <MarkdownContainer
+            id={data.id}
+            object={data.subject}
+            role={role}
+            settings={settings}
+            extensionProviders={state.extensionProviders}
+            viewMode={getViewMode(data.id)}
+            editorStateStore={editorState}
             onViewModeChange={setViewMode}
           />
         );
@@ -46,7 +72,7 @@ export default () =>
       component: ({ data, role }) => {
         const settingsStore = useCapability(Capabilities.SettingsStore);
         const settings = settingsStore.getStore<MarkdownSettingsProps>(MARKDOWN_PLUGIN)!.value;
-        const { state, getViewMode, setViewMode } = useCapability(MarkdownCapabilities.State);
+        const { state, editorState, getViewMode, setViewMode } = useCapability(MarkdownCapabilities.State);
 
         return (
           <MarkdownContainer
@@ -56,15 +82,14 @@ export default () =>
             settings={settings}
             extensionProviders={state.extensionProviders}
             viewMode={getViewMode(data.subject.id)}
-            selection={state.selectionState}
-            folding={state.foldState}
+            editorStateStore={editorState}
             onViewModeChange={setViewMode}
           />
         );
       },
     }),
     createSurface({
-      id: `${MARKDOWN_PLUGIN}/settings`,
+      id: `${MARKDOWN_PLUGIN}/plugin-settings`,
       role: 'article',
       filter: (data): data is { subject: SettingsStore<MarkdownSettingsProps> } =>
         data.subject instanceof SettingsStore && data.subject.prefix === MARKDOWN_PLUGIN,

package/src/capabilities/state.ts

@@ -4,24 +4,19 @@
 
 import { Capabilities, contributes, type PluginsContext } from '@dxos/app-framework';
 import { LocalStorageStore } from '@dxos/local-storage';
-import { type EditorSelectionState, type FoldState, type EditorViewMode } from '@dxos/react-ui-editor';
+import { type EditorViewMode, createEditorStateStore } from '@dxos/react-ui-editor';
 
 import { MarkdownCapabilities } from './capabilities';
 import { MARKDOWN_PLUGIN } from '../meta';
 import { type MarkdownPluginState, type MarkdownSettingsProps } from '../types';
 
 export default (context: PluginsContext) => {
-  const state = new LocalStorageStore<MarkdownPluginState>(MARKDOWN_PLUGIN, {
-    extensionProviders: [],
-    viewMode: {},
-    selectionState: {},
-    foldState: {},
-  });
-
-  state
-    .prop({ key: 'viewMode', type: LocalStorageStore.json<{ [key: string]: EditorViewMode }>() })
-    .prop({ key: 'selectionState', type: LocalStorageStore.json<{ [key: string]: EditorSelectionState }>() })
-    .prop({ key: 'foldState', type: LocalStorageStore.json<{ [key: string]: FoldState }>() });
+  const state = new LocalStorageStore<MarkdownPluginState>(MARKDOWN_PLUGIN, { extensionProviders: [], viewMode: {} });
+
+  state.prop({ key: 'viewMode', type: LocalStorageStore.json<{ [key: string]: EditorViewMode }>() });
+
+  // TODO(wittjosiah): Fold into state.
+  const editorState = createEditorStateStore(`${MARKDOWN_PLUGIN}/editor`);
 
   const getViewMode = (id: string) => {
     const defaultViewMode = context
@@ -32,9 +27,5 @@ export default (context: PluginsContext) => {
 
   const setViewMode = (id: string, viewMode: EditorViewMode) => (state.values.viewMode[id] = viewMode);
 
-  return contributes(MarkdownCapabilities.State, {
-    state: state.values,
-    getViewMode,
-    setViewMode,
-  });
+  return contributes(MarkdownCapabilities.State, { state: state.values, editorState, getViewMode, setViewMode });
 };

package/src/capabilities/thread.ts

@@ -3,6 +3,7 @@
 //
 
 import { contributes } from '@dxos/app-framework';
+import { isInstanceOf } from '@dxos/echo-schema';
 import { ThreadCapabilities } from '@dxos/plugin-space';
 import { createDocAccessor, getRangeFromCursor } from '@dxos/react-client/echo';
 
@@ -10,7 +11,7 @@ import { DocumentType } from '../types';
 
 export default () =>
   contributes(ThreadCapabilities.Thread, {
-    predicate: (obj) => obj instanceof DocumentType,
+    predicate: (obj) => isInstanceOf(DocumentType, obj),
     createSort: (doc: DocumentType) => {
       const accessor = doc.content.target ? createDocAccessor(doc.content.target, ['content']) : undefined;
       if (!accessor) {

package/src/components/MarkdownContainer.tsx

@@ -5,8 +5,9 @@
 import React, { useEffect, useMemo } from 'react';
 
 import { Capabilities, useCapabilities } from '@dxos/app-framework';
+import { isInstanceOf } from '@dxos/echo-schema';
 import { fullyQualifiedId, getSpace } from '@dxos/react-client/echo';
-import { type EditorSelectionState, type FoldState } from '@dxos/react-ui-editor';
+import { TextType } from '@dxos/schema';
 
 import { MarkdownEditor, type MarkdownEditorProps } from './MarkdownEditor';
 import { useExtensions } from '../extensions';
@@ -15,13 +16,11 @@ import { getFallbackName } from '../util';
 
 export type MarkdownContainerProps = Pick<
   MarkdownEditorProps,
-  'role' | 'extensionProviders' | 'viewMode' | 'onViewModeChange'
+  'role' | 'extensionProviders' | 'viewMode' | 'editorStateStore' | 'onViewModeChange'
 > & {
   id: string;
-  object: DocumentType | any;
+  object: DocumentType | TextType | any;
   settings: MarkdownSettingsProps;
-  selection?: Record<string, EditorSelectionState>;
-  folding?: Record<string, FoldState>;
 };
 
 // TODO(burdon): Move toolbar here.
@@ -32,14 +31,13 @@ const MarkdownContainer = ({
   object,
   settings,
   viewMode,
-  selection,
-  folding,
+  editorStateStore,
   onViewModeChange,
 }: MarkdownContainerProps) => {
   const scrollPastEnd = role === 'article';
-  const doc = object instanceof DocumentType ? object : undefined;
-  const extensions = useExtensions({ document: doc, settings, viewMode, selection, folding });
-  const selectionState = selection?.[fullyQualifiedId(object)];
+  const doc = isInstanceOf(DocumentType, object) ? object : undefined;
+  const text = isInstanceOf(TextType, object) ? object : undefined;
+  const extensions = useExtensions({ document: doc, text, id, settings, viewMode, editorStateStore });
 
   if (doc) {
     return (
@@ -51,8 +49,21 @@ const MarkdownContainer = ({
         viewMode={viewMode}
         settings={settings}
         scrollPastEnd={scrollPastEnd}
-        selection={selectionState?.selection}
-        scrollTo={selectionState?.scrollTo}
+        onViewModeChange={onViewModeChange}
+      />
+    );
+  } else if (text) {
+    return (
+      <MarkdownEditor
+        id={id}
+        role={role}
+        initialValue={text.content}
+        extensions={extensions}
+        viewMode={viewMode}
+        toolbar={settings.toolbar}
+        comment={false}
+        inputMode={settings.editorInputMode}
+        scrollPastEnd={scrollPastEnd}
         onViewModeChange={onViewModeChange}
       />
     );
@@ -67,16 +78,14 @@ const MarkdownContainer = ({
         toolbar={settings.toolbar}
         inputMode={settings.editorInputMode}
         scrollPastEnd={scrollPastEnd}
-        selection={selectionState?.selection}
-        scrollTo={selectionState?.scrollTo}
         onViewModeChange={onViewModeChange}
       />
     );
   }
 };
 
-type DocumentEditorProps = Omit<MarkdownContainerProps, 'object' | 'extensionProviders' | 'selection' | 'folding'> &
-  Pick<MarkdownEditorProps, 'id' | 'scrollPastEnd' | 'extensions' | 'scrollTo' | 'selection'> & {
+type DocumentEditorProps = Omit<MarkdownContainerProps, 'object' | 'extensionProviders' | 'editorStateStore'> &
+  Pick<MarkdownEditorProps, 'id' | 'scrollPastEnd' | 'extensions'> & {
     document: DocumentType;
   };
 

package/src/components/MarkdownEditor.tsx

@@ -7,31 +7,33 @@ import { type EditorView } from '@codemirror/view';
 import React, { useMemo, useEffect, useCallback } from 'react';
 import { useDropzone } from 'react-dropzone';
 
-import { createIntent, type FileInfo, LayoutAction, useIntentDispatcher } from '@dxos/app-framework';
+import { createIntent, type FileInfo, useIntentDispatcher } from '@dxos/app-framework';
+import { ATTENDABLE_PATH_SEPARATOR, DeckAction } from '@dxos/plugin-deck/types';
 import { useThemeContext, useTranslation } from '@dxos/react-ui';
 import {
-  type EditorAction,
   type DNDOptions,
+  type EditorAction,
   type EditorViewMode,
   type EditorInputMode,
   type EditorSelectionState,
+  type EditorStateStore,
   EditorToolbar,
   type UseTextEditorProps,
   createBasicExtensions,
+  createEditorAction,
   createMarkdownExtensions,
   createThemeExtensions,
   dropFile,
   editorContent,
   editorGutter,
   processEditorPayload,
+  stackItemContentEditorClassNames,
   useActionHandler,
   useCommentState,
   useCommentClickListener,
   useFormattingState,
   useTextEditor,
-  stackItemContentEditorClassNames,
   useEditorToolbarState,
-  createEditorAction,
 } from '@dxos/react-ui-editor';
 import { StackItem } from '@dxos/react-ui-stack';
 import { isNotFalsy, isNonNullable } from '@dxos/util';
@@ -46,11 +48,13 @@ export type MarkdownEditorProps = {
   inputMode?: EditorInputMode;
   scrollPastEnd?: boolean;
   toolbar?: boolean;
+  // TODO(wittjosiah): Generalize custom toolbar actions (e.g. comment, upload, etc.)
+  comment?: boolean;
   viewMode?: EditorViewMode;
+  editorStateStore?: EditorStateStore;
   onViewModeChange?: (id: string, mode: EditorViewMode) => void;
   onFileUpload?: (file: File) => Promise<FileInfo | undefined>;
 } & Pick<UseTextEditorProps, 'initialValue' | 'extensions'> &
-  Partial<EditorSelectionState> &
   Partial<Pick<MarkdownPluginState, 'extensionProviders'>>;
 
 /**
@@ -67,9 +71,9 @@ export const MarkdownEditor = ({
   extensionProviders,
   scrollPastEnd,
   toolbar,
+  comment = true,
   viewMode,
-  scrollTo,
-  selection,
+  editorStateStore,
   onFileUpload,
   onViewModeChange,
 }: MarkdownEditorProps) => {
@@ -79,6 +83,9 @@ export const MarkdownEditor = ({
   const toolbarState = useEditorToolbarState({ viewMode });
   const formattingObserver = useFormattingState(toolbarState);
 
+  // Restore last selection and scroll point.
+  const { scrollTo, selection } = useMemo<EditorSelectionState>(() => editorStateStore?.getState(id) ?? {}, [id]);
+
   // Extensions from other plugins.
   // TODO(burdon): Reconcile with DocumentEditor.useExtensions.
   const providerExtensions = useMemo(
@@ -90,10 +97,9 @@ export const MarkdownEditor = ({
   const commentObserver = useCommentState(toolbarState);
   const onCommentClick = useCallback(async () => {
     await dispatch(
-      createIntent(LayoutAction.UpdateComplementary, {
-        part: 'complementary',
-        subject: 'comments',
-        options: { state: 'expanded' },
+      createIntent(DeckAction.ChangeCompanion, {
+        primary: id,
+        companion: `${id}${ATTENDABLE_PATH_SEPARATOR}comments`,
       }),
     );
   }, [dispatch]);
@@ -118,10 +124,10 @@ export const MarkdownEditor = ({
       initialValue,
       extensions: [
         formattingObserver,
-        commentObserver,
-        commentClickObserver,
+        comment && commentObserver,
+        comment && commentClickObserver,
         createBasicExtensions({
-          readonly: viewMode === 'readonly',
+          readOnly: viewMode === 'readonly',
           placeholder: t('editor placeholder'),
           scrollPastEnd: role === 'section' ? false : scrollPastEnd,
         }),
@@ -145,7 +151,7 @@ export const MarkdownEditor = ({
         moveToEndOfLine: true,
       }),
     }),
-    [id, formattingObserver, viewMode, themeMode, extensions, providerExtensions],
+    [id, formattingObserver, comment, viewMode, themeMode, extensions, providerExtensions],
   );
 
   useTest(editorView);
@@ -212,6 +218,7 @@ export const MarkdownEditor = ({
             attendableId={id}
             role={role}
             state={toolbarState}
+            comment={comment}
             customActions={onFileUpload ? createUploadAction : undefined}
             onAction={handleAction}
           />

package/src/components/Toolbar.stories.tsx

@@ -49,7 +49,7 @@ const DefaultStory: FC<{ content?: string }> = ({ content = '' }) => {
       initialValue: text.content,
       extensions: [
         formattingObserver,
-        createBasicExtensions({ readonly: toolbarState.viewMode === 'readonly' }),
+        createBasicExtensions({ readOnly: toolbarState.viewMode === 'readonly' }),
         createMarkdownExtensions({ themeMode }),
         createThemeExtensions({ themeMode, syntaxHighlighting: true, slots: { editor: { className: editorContent } } }),
         createDataExtensions({ id: text.id, text: createDocAccessor(text, ['content']) }),