@dxos/plugin-markdown 0.6.14-staging.934c9de → 0.6.14-staging.9b873ce

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

@@ -1 +1 @@
-{"version":3,"file":"MarkdownContainer.d.ts","sourceRoot":"","sources":["../../../../src/components/MarkdownContainer.tsx"],"names":[],"mappings":"AAIA,OAAO,KAA6B,MAAM,OAAO,CAAC;AAKlD,OAAO,EAAkB,KAAK,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAE5E,OAAO,EAAE,YAAY,EAAE,KAAK,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAGpE,MAAM,MAAM,sBAAsB,GAAG,IAAI,CACvC,mBAAmB,EACnB,MAAM,GAAG,YAAY,GAAG,oBAAoB,GAAG,UAAU,GAAG,kBAAkB,GAAG,kBAAkB,CACpG,GAAG;IACF,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,YAAY,GAAG,GAAG,CAAC;IAC3B,QAAQ,EAAE,qBAAqB,CAAC;CACjC,CAAC;AAIF,QAAA,MAAM,iBAAiB,6CAA8C,sBAAsB,sBAyB1F,CAAC;AAEF,KAAK,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,EAAE,QAAQ,CAAC,GAAG;IAAE,QAAQ,EAAE,YAAY,CAAA;CAAE,GAAG,IAAI,CACjG,mBAAmB,EACnB,IAAI,GAAG,eAAe,CACvB,CAAC;AAEJ,eAAO,MAAM,cAAc,8FAQxB,mBAAmB,sBAmCrB,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"MarkdownContainer.d.ts","sourceRoot":"","sources":["../../../../src/components/MarkdownContainer.tsx"],"names":[],"mappings":"AAIA,OAAO,KAA6B,MAAM,OAAO,CAAC;AAKlD,OAAO,EAAkB,KAAK,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAE5E,OAAO,EAAE,YAAY,EAAE,KAAK,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAGpE,MAAM,MAAM,sBAAsB,GAAG,IAAI,CACvC,mBAAmB,EACnB,MAAM,GAAG,oBAAoB,GAAG,UAAU,GAAG,kBAAkB,GAAG,kBAAkB,CACrF,GAAG;IACF,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,YAAY,GAAG,GAAG,CAAC;IAC3B,QAAQ,EAAE,qBAAqB,CAAC;CACjC,CAAC;AAIF,QAAA,MAAM,iBAAiB,sGASpB,sBAAsB,sBAgCxB,CAAC;AAEF,KAAK,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,EAAE,QAAQ,GAAG,oBAAoB,GAAG,kBAAkB,CAAC,GAC3G,IAAI,CAAC,mBAAmB,EAAE,IAAI,GAAG,eAAe,GAAG,YAAY,CAAC,GAAG;IACjE,QAAQ,EAAE,YAAY,CAAC;CACxB,CAAC;AAEJ,eAAO,MAAM,cAAc,wDAAyD,mBAAmB,sBAgCtG,CAAC;AAEF,eAAe,iBAAiB,CAAC"}

package/dist/types/src/components/MarkdownEditor.d.ts

@@ -1,11 +1,10 @@
 import React from 'react';
-import { type FileInfo, type LayoutCoordinate } from '@dxos/app-framework';
+import { type FileInfo } from '@dxos/app-framework';
 import { type EditorViewMode, type EditorInputMode, type EditorStateStore, type UseTextEditorProps } from '@dxos/react-ui-editor';
 import { type MarkdownPluginState } from '../types';
 export type MarkdownEditorProps = {
     id: string;
     role?: string;
-    coordinate?: LayoutCoordinate;
     inputMode?: EditorInputMode;
     scrollPastEnd?: boolean;
     toolbar?: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"MarkdownEditor.d.ts","sourceRoot":"","sources":["../../../../src/components/MarkdownEditor.tsx"],"names":[],"mappings":"AAMA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAE/D,OAAO,EAAE,KAAK,QAAQ,EAAgB,KAAK,gBAAgB,EAAuB,MAAM,qBAAqB,CAAC;AAG9G,OAAO,EAGL,KAAK,cAAc,EACnB,KAAK,eAAe,EAEpB,KAAK,gBAAgB,EAErB,KAAK,kBAAkB,EAaxB,MAAM,uBAAuB,CAAC;AAO/B,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAIpD,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,gBAAgB,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IAC9D,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC;CAC9D,GAAG,IAAI,CAAC,kBAAkB,EAAE,cAAc,GAAG,YAAY,CAAC,GACzD,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAC,CAAC;AAE3D;;;;;GAKG;AACH,eAAO,MAAM,cAAc,oJAYxB,mBAAmB,sBA0JrB,CAAC"}
+{"version":3,"file":"MarkdownEditor.d.ts","sourceRoot":"","sources":["../../../../src/components/MarkdownEditor.tsx"],"names":[],"mappings":"AAMA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAE/D,OAAO,EAAE,KAAK,QAAQ,EAAqC,MAAM,qBAAqB,CAAC;AAGvF,OAAO,EAGL,KAAK,cAAc,EACnB,KAAK,eAAe,EAEpB,KAAK,gBAAgB,EAErB,KAAK,kBAAkB,EAaxB,MAAM,uBAAuB,CAAC;AAO/B,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAIpD,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,gBAAgB,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IAC9D,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC;CAC9D,GAAG,IAAI,CAAC,kBAAkB,EAAE,cAAc,GAAG,YAAY,CAAC,GACzD,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAC,CAAC;AAE3D;;;;;GAKG;AACH,eAAO,MAAM,cAAc,oJAYxB,mBAAmB,sBAqIrB,CAAC"}

package/dist/types/src/components/index.d.ts

@@ -1,3 +1,3 @@
 export * from './MarkdownSettings';
-export declare const MarkdownContainer: import("react").LazyExoticComponent<({ id, role, object, settings, ...props }: import("./MarkdownContainer").MarkdownContainerProps) => import("react").JSX.Element>;
+export declare const MarkdownContainer: import("react").LazyExoticComponent<({ id, role, object, extensionProviders, settings, viewMode, editorStateStore, onViewModeChange, }: import("./MarkdownContainer").MarkdownContainerProps) => import("react").JSX.Element>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/index.ts"],"names":[],"mappings":"AAMA,cAAc,oBAAoB,CAAC;AAEnC,eAAO,MAAM,iBAAiB,sKAA4C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/index.ts"],"names":[],"mappings":"AAMA,cAAc,oBAAoB,CAAC;AAEnC,eAAO,MAAM,iBAAiB,+NAA4C,CAAC"}

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

@@ -4,7 +4,7 @@ import { type Query } from '@dxos/react-client/echo';
 import { type EditorStateStore, type EditorViewMode, type Extension } from '@dxos/react-ui-editor';
 import { type DocumentType, type MarkdownPluginState, type MarkdownSettingsProps } from './types';
 type ExtensionsOptions = {
-    document: DocumentType;
+    document?: DocumentType;
     dispatch?: IntentDispatcher;
     query?: Query<DocumentType>;
     settings: MarkdownSettingsProps;

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

@@ -1 +1 @@
-{"version":3,"file":"extensions.d.ts","sourceRoot":"","sources":["../../../src/extensions.tsx"],"names":[],"mappings":"AAIA,OAAc,EAA6B,KAAK,SAAS,EAAW,MAAM,OAAO,CAAC;AAGlF,OAAO,EAAE,KAAK,gBAAgB,EAAyC,MAAM,qBAAqB,CAAC;AAEnG,OAAO,EAAiD,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAGpG,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,SAAS,EAWf,MAAM,uBAAuB,CAAC;AAI/B,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,mBAAmB,EAAE,KAAK,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAGlG,KAAK,iBAAiB,GAAG;IACvB,QAAQ,EAAE,YAAY,CAAC;IACvB,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,KAAK,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC5B,QAAQ,EAAE,qBAAqB,CAAC;IAChC,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC;AAGF,eAAO,MAAM,aAAa,4EAMvB,iBAAiB,GAAG,IAAI,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,KAAG,SAAS,EA2DjF,CAAC;AA+HF,eAAO,MAAM,UAAU,GAAI,CAAC,SAAS,OAAO,QAAQ,CAAC,QAAQ,SAAS,KAAG,CAGxE,CAAC"}
+{"version":3,"file":"extensions.d.ts","sourceRoot":"","sources":["../../../src/extensions.tsx"],"names":[],"mappings":"AAIA,OAAc,EAA6B,KAAK,SAAS,EAAW,MAAM,OAAO,CAAC;AAGlF,OAAO,EAAE,KAAK,gBAAgB,EAAyC,MAAM,qBAAqB,CAAC;AAEnG,OAAO,EAAiD,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAGpG,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,SAAS,EAWf,MAAM,uBAAuB,CAAC;AAI/B,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,mBAAmB,EAAE,KAAK,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAGlG,KAAK,iBAAiB,GAAG;IACvB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,KAAK,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC5B,QAAQ,EAAE,qBAAqB,CAAC;IAChC,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC;AAGF,eAAO,MAAM,aAAa,4EAMvB,iBAAiB,GAAG,IAAI,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,KAAG,SAAS,EAuEjF,CAAC;AA+HF,eAAO,MAAM,UAAU,GAAI,CAAC,SAAS,OAAO,QAAQ,CAAC,QAAQ,SAAS,KAAG,CAGxE,CAAC"}

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

@@ -3,7 +3,7 @@ declare const _default: {
     id: string;
     name: string;
     description: string;
-    homePage: string;
+    source: string;
     icon: string;
 };
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-markdown",
-  "version": "0.6.14-staging.934c9de",
+  "version": "0.6.14-staging.9b873ce",
   "description": "DXOS Surface plugin for interacting with Markdown",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -44,28 +44,27 @@
     "@codemirror/view": "^6.34.1",
     "@effect/schema": "^0.75.1",
     "@preact/signals-core": "^1.6.0",
-    "@dxos/app-framework": "0.6.14-staging.934c9de",
-    "@dxos/async": "0.6.14-staging.934c9de",
-    "@dxos/echo-schema": "0.6.14-staging.934c9de",
-    "@dxos/invariant": "0.6.14-staging.934c9de",
-    "@dxos/keys": "0.6.14-staging.934c9de",
-    "@dxos/local-storage": "0.6.14-staging.934c9de",
-    "@dxos/log": "0.6.14-staging.934c9de",
-    "@dxos/plugin-attention": "0.6.14-staging.934c9de",
-    "@dxos/plugin-client": "0.6.14-staging.934c9de",
-    "@dxos/plugin-graph": "0.6.14-staging.934c9de",
-    "@dxos/plugin-theme": "0.6.14-staging.934c9de",
-    "@dxos/plugin-space": "0.6.14-staging.934c9de",
-    "@dxos/react-hooks": "0.6.14-staging.934c9de",
-    "@dxos/react-client": "0.6.14-staging.934c9de",
-    "@dxos/react-ui-attention": "0.6.14-staging.934c9de",
-    "@dxos/react-ui-deck": "0.6.14-staging.934c9de",
-    "@dxos/react-ui-card": "0.6.14-staging.934c9de",
-    "@dxos/react-ui-data": "0.6.14-staging.934c9de",
-    "@dxos/react-ui-editor": "0.6.14-staging.934c9de",
-    "@dxos/react-ui-stack": "0.6.14-staging.934c9de",
-    "@dxos/react-ui-mosaic": "0.6.14-staging.934c9de",
-    "@dxos/util": "0.6.14-staging.934c9de"
+    "@dxos/echo-schema": "0.6.14-staging.9b873ce",
+    "@dxos/invariant": "0.6.14-staging.9b873ce",
+    "@dxos/local-storage": "0.6.14-staging.9b873ce",
+    "@dxos/keys": "0.6.14-staging.9b873ce",
+    "@dxos/app-framework": "0.6.14-staging.9b873ce",
+    "@dxos/async": "0.6.14-staging.9b873ce",
+    "@dxos/log": "0.6.14-staging.9b873ce",
+    "@dxos/plugin-attention": "0.6.14-staging.9b873ce",
+    "@dxos/plugin-space": "0.6.14-staging.9b873ce",
+    "@dxos/plugin-graph": "0.6.14-staging.9b873ce",
+    "@dxos/plugin-client": "0.6.14-staging.9b873ce",
+    "@dxos/react-client": "0.6.14-staging.9b873ce",
+    "@dxos/plugin-theme": "0.6.14-staging.9b873ce",
+    "@dxos/react-hooks": "0.6.14-staging.9b873ce",
+    "@dxos/react-ui-attention": "0.6.14-staging.9b873ce",
+    "@dxos/react-ui-data": "0.6.14-staging.9b873ce",
+    "@dxos/react-ui-editor": "0.6.14-staging.9b873ce",
+    "@dxos/react-ui-card": "0.6.14-staging.9b873ce",
+    "@dxos/react-ui-mosaic": "0.6.14-staging.9b873ce",
+    "@dxos/react-ui-stack": "0.6.14-staging.9b873ce",
+    "@dxos/util": "0.6.14-staging.9b873ce"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -74,17 +73,17 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/random": "0.6.14-staging.934c9de",
-    "@dxos/react-ui-theme": "0.6.14-staging.934c9de",
-    "@dxos/react-ui": "0.6.14-staging.934c9de",
-    "@dxos/storybook-utils": "0.6.14-staging.934c9de"
+    "@dxos/random": "0.6.14-staging.9b873ce",
+    "@dxos/react-ui": "0.6.14-staging.9b873ce",
+    "@dxos/react-ui-theme": "0.6.14-staging.9b873ce",
+    "@dxos/storybook-utils": "0.6.14-staging.9b873ce"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui-theme": "0.6.14-staging.934c9de",
-    "@dxos/react-ui": "0.6.14-staging.934c9de"
+    "@dxos/react-ui-theme": "0.6.14-staging.9b873ce",
+    "@dxos/react-ui": "0.6.14-staging.9b873ce"
   },
   "publishConfig": {
     "access": "public"

package/src/MarkdownPlugin.tsx

@@ -9,7 +9,6 @@ import {
   parseIntentPlugin,
   resolvePlugin,
   LayoutAction,
-  type LayoutCoordinate,
   NavigationAction,
   type PluginDefinition,
 } from '@dxos/app-framework';
@@ -245,8 +244,7 @@ export const MarkdownPlugin = (): PluginDefinition<MarkdownPluginProvides> => {
           switch (role) {
             case 'section':
             case 'article': {
-              // TODO(burdon): Normalize types (from FilesPlugin).
-              const doc = getDoc(data.active) ?? getDoc(data.object);
+              const doc = getDoc(data.object);
               const { id, object } = isEditorModel(data.object)
                 ? { id: data.object.id, object: data.object }
                 : doc
@@ -262,7 +260,6 @@ export const MarkdownPlugin = (): PluginDefinition<MarkdownPluginProvides> => {
                   id={id}
                   object={object}
                   role={role}
-                  coordinate={data.coordinate as LayoutCoordinate}
                   settings={settings.values}
                   extensionProviders={state.values.extensionProviders}
                   viewMode={getViewMode(id)}

package/src/components/MarkdownContainer.tsx

@@ -14,7 +14,7 @@ import { getFallbackName } from '../util';
 
 export type MarkdownContainerProps = Pick<
   MarkdownEditorProps,
-  'role' | 'coordinate' | 'extensionProviders' | 'viewMode' | 'editorStateStore' | 'onViewModeChange'
+  'role' | 'extensionProviders' | 'viewMode' | 'editorStateStore' | 'onViewModeChange'
 > & {
   id: string;
   object: DocumentType | any;
@@ -23,17 +23,30 @@ export type MarkdownContainerProps = Pick<
 
 // TODO(burdon): Move toolbar here.
 // TODO(burdon): Factor out difference for ECHO and non-ECHO objects; i.e., single component.
-const MarkdownContainer = ({ id, role, object, settings, ...props }: MarkdownContainerProps) => {
+const MarkdownContainer = ({
+  id,
+  role,
+  object,
+  extensionProviders,
+  settings,
+  viewMode,
+  editorStateStore,
+  onViewModeChange,
+}: MarkdownContainerProps) => {
   const scrollPastEnd = role === 'article';
-  if (object instanceof DocumentType) {
+  const doc = object instanceof DocumentType ? object : undefined;
+  const extensions = useExtensions({ extensionProviders, document: doc, settings, viewMode, editorStateStore });
+
+  if (doc) {
     return (
       <DocumentEditor
         id={fullyQualifiedId(object)}
         role={role}
-        document={object}
+        document={doc}
+        extensions={extensions}
         settings={settings}
         scrollPastEnd={scrollPastEnd}
-        {...props}
+        onViewModeChange={onViewModeChange}
       />
     );
   } else {
@@ -42,31 +55,24 @@ const MarkdownContainer = ({ id, role, object, settings, ...props }: MarkdownCon
         id={id}
         role={role}
         initialValue={object.text}
+        extensions={extensions}
+        viewMode={viewMode}
         toolbar={settings.toolbar}
+        inputMode={settings.editorInputMode}
         scrollPastEnd={scrollPastEnd}
-        {...props}
+        onViewModeChange={onViewModeChange}
       />
     );
   }
 };
 
-type DocumentEditorProps = Omit<MarkdownContainerProps, 'object'> & { document: DocumentType } & Pick<
-    MarkdownEditorProps,
-    'id' | 'scrollPastEnd'
-  >;
+type DocumentEditorProps = Omit<MarkdownContainerProps, 'object' | 'extensionProviders' | 'editorStateStore'> &
+  Pick<MarkdownEditorProps, 'id' | 'scrollPastEnd' | 'extensions'> & {
+    document: DocumentType;
+  };
 
-export const DocumentEditor = ({
-  id,
-  document: doc,
-  extensionProviders,
-  settings,
-  viewMode,
-  editorStateStore,
-  ...props
-}: DocumentEditorProps) => {
+export const DocumentEditor = ({ id, document: doc, settings, viewMode, ...props }: DocumentEditorProps) => {
   const space = getSpace(doc);
-  const initialValue = useMemo(() => doc.content?.content, [doc.content]);
-  const extensions = useExtensions({ extensionProviders, document: doc, settings, viewMode, editorStateStore });
 
   // Migrate gradually to `fallbackName`.
   useEffect(() => {
@@ -89,11 +95,10 @@ export const DocumentEditor = ({
   return (
     <MarkdownEditor
       id={id}
-      initialValue={initialValue}
-      extensions={extensions}
+      initialValue={doc.content?.content}
+      viewMode={viewMode}
       toolbar={settings.toolbar}
       inputMode={settings.editorInputMode}
-      viewMode={viewMode}
       onFileUpload={handleFileUpload}
       {...props}
     />

package/src/components/MarkdownEditor.tsx

@@ -6,9 +6,9 @@ import { openSearchPanel } from '@codemirror/search';
 import { type EditorView } from '@codemirror/view';
 import React, { useMemo, useEffect, useCallback } from 'react';
 
-import { type FileInfo, LayoutAction, type LayoutCoordinate, useIntentDispatcher } from '@dxos/app-framework';
+import { type FileInfo, LayoutAction, useIntentDispatcher } from '@dxos/app-framework';
 import { useThemeContext, useTranslation } from '@dxos/react-ui';
-import { useAttendableAttributes, useAttention } from '@dxos/react-ui-attention';
+import { useAttention } from '@dxos/react-ui-attention';
 import {
   type Action,
   type DNDOptions,
@@ -31,8 +31,8 @@ import {
   useFormattingState,
   useTextEditor,
 } from '@dxos/react-ui-editor';
-import { sectionToolbarLayout } from '@dxos/react-ui-stack';
-import { textBlockWidth, focusRing, mx } from '@dxos/react-ui-theme';
+import { StackItem } from '@dxos/react-ui-stack';
+import { mx, textBlockWidth } from '@dxos/react-ui-theme';
 import { isNotFalsy, nonNullable } from '@dxos/util';
 
 import { useSelectCurrentThread } from '../hooks';
@@ -44,7 +44,6 @@ const DEFAULT_VIEW_MODE: EditorViewMode = 'preview';
 export type MarkdownEditorProps = {
   id: string;
   role?: string;
-  coordinate?: LayoutCoordinate;
   inputMode?: EditorInputMode;
   scrollPastEnd?: boolean;
   toolbar?: boolean;
@@ -78,7 +77,6 @@ export const MarkdownEditor = ({
   const { themeMode } = useThemeContext();
   const dispatch = useIntentDispatcher();
   const [formattingState, formattingObserver] = useFormattingState();
-  const attendableAttributes = useAttendableAttributes(id);
   const { hasAttention } = useAttention(id);
 
   // Restore last selection and scroll point.
@@ -146,7 +144,7 @@ export const MarkdownEditor = ({
         moveToEndOfLine: true,
       }),
     }),
-    [id, initialValue, formattingObserver, viewMode, themeMode, extensions, providerExtensions],
+    [id, formattingObserver, viewMode, themeMode, extensions, providerExtensions],
   );
 
   useTest(editorView);
@@ -172,30 +170,17 @@ export const MarkdownEditor = ({
   };
 
   return (
-    <div
-      role='none'
-      {...(role === 'section'
-        ? { className: 'flex flex-col' }
-        : {
-            className: 'contents',
-            // TODO(wittjosiah): Factor out to `useAttendableAttributes`?
-            ...(hasAttention && { 'aria-current': 'location' }),
-            ...attendableAttributes,
-          })}
-    >
+    <StackItem.Content toolbar={toolbar} contentSize={role === 'article' ? 'cover' : 'intrinsic'}>
       {toolbar && (
-        <div role='none' className='flex shrink-0 justify-center overflow-x-auto attention-surface'>
+        <div
+          role='none'
+          className={mx(
+            'attention-surface is-full',
+            role === 'section' && 'sticky block-start-0 z-[1] border-be !border-separator -mbe-px min-is-0',
+          )}
+        >
           <Toolbar.Root
-            classNames={
-              role === 'section'
-                ? [
-                    textBlockWidth,
-                    'z-[2] group-focus-within/section:visible',
-                    !hasAttention && 'invisible',
-                    sectionToolbarLayout,
-                  ]
-                : [textBlockWidth]
-            }
+            classNames={[textBlockWidth, !hasAttention && 'opacity-20']}
             state={formattingState && { ...formattingState, ...commentsState }}
             onAction={handleAction}
           >
@@ -212,20 +197,13 @@ export const MarkdownEditor = ({
         ref={parentRef}
         data-testid='composer.markdownRoot'
         data-toolbar={toolbar ? 'enabled' : 'disabled'}
-        className={
-          role === 'section'
-            ? mx('flex flex-col flex-1 min-bs-[12rem]', focusRing)
-            : mx(
-                'flex is-full bs-full overflow-hidden',
-                focusRing,
-                'focus-visible:ring-inset attention-surface',
-                'p-0.5', // TODO(burdon): Handle padding for focusRing consistently.
-                'data-[toolbar=disabled]:pbs-2 data-[toolbar=disabled]:row-span-2',
-              )
-        }
+        className={mx(
+          'ch-focus-ring-inset data-[toolbar=disabled]:pbs-2 attention-surface',
+          role === 'article' ? 'min-bs-0' : '[&_.cm-scroller]:overflow-hidden [&_.cm-scroller]:min-bs-24',
+        )}
         {...focusAttributes}
       />
-    </div>
+    </StackItem.Content>
   );
 };
 

package/src/components/MarkdownSettings.tsx

@@ -5,7 +5,7 @@
 import React from 'react';
 
 import { Input, Select, useTranslation } from '@dxos/react-ui';
-import { FormInput } from '@dxos/react-ui-data';
+import { DeprecatedFormInput } from '@dxos/react-ui-data';
 import { type EditorInputMode, EditorInputModes, type EditorViewMode, EditorViewModes } from '@dxos/react-ui-editor';
 
 import { MARKDOWN_PLUGIN } from '../meta';
@@ -17,7 +17,7 @@ export const MarkdownSettings = ({ settings }: { settings: MarkdownSettingsProps
   // TODO(wittjosiah): Add skill test confirmation for entering vim mode.
   return (
     <>
-      <FormInput label={t('default view mode label')}>
+      <DeprecatedFormInput label={t('default view mode label')}>
         <Select.Root
           value={settings.defaultViewMode}
           onValueChange={(value) => {
@@ -37,9 +37,9 @@ export const MarkdownSettings = ({ settings }: { settings: MarkdownSettingsProps
             </Select.Content>
           </Select.Portal>
         </Select.Root>
-      </FormInput>
+      </DeprecatedFormInput>
 
-      <FormInput label={t('editor input mode label')}>
+      <DeprecatedFormInput label={t('editor input mode label')}>
         <Select.Root
           value={settings.editorInputMode ?? 'default'}
           onValueChange={(value) => {
@@ -59,31 +59,31 @@ export const MarkdownSettings = ({ settings }: { settings: MarkdownSettingsProps
             </Select.Content>
           </Select.Portal>
         </Select.Root>
-      </FormInput>
+      </DeprecatedFormInput>
 
-      <FormInput label={t('settings toolbar label')}>
+      <DeprecatedFormInput label={t('settings toolbar label')}>
         <Input.Switch checked={settings.toolbar} onCheckedChange={(checked) => (settings.toolbar = !!checked)} />
-      </FormInput>
+      </DeprecatedFormInput>
 
-      <FormInput label={t('settings numbered headings label')}>
+      <DeprecatedFormInput label={t('settings numbered headings label')}>
         <Input.Switch
           checked={settings.numberedHeadings}
           onCheckedChange={(checked) => (settings.numberedHeadings = !!checked)}
         />
-      </FormInput>
+      </DeprecatedFormInput>
 
-      <FormInput label={t('settings folding label')}>
+      <DeprecatedFormInput label={t('settings folding label')}>
         <Input.Switch checked={settings.folding} onCheckedChange={(checked) => (settings.folding = !!checked)} />
-      </FormInput>
+      </DeprecatedFormInput>
 
-      <FormInput label={t('settings experimental label')}>
+      <DeprecatedFormInput label={t('settings experimental label')}>
         <Input.Switch
           checked={settings.experimental}
           onCheckedChange={(checked) => (settings.experimental = !!checked)}
         />
-      </FormInput>
+      </DeprecatedFormInput>
 
-      <FormInput
+      <DeprecatedFormInput
         label={t('settings debug label')}
         secondary={
           settings.debug ? (
@@ -99,7 +99,7 @@ export const MarkdownSettings = ({ settings }: { settings: MarkdownSettingsProps
         }
       >
         <Input.Switch checked={settings.debug} onCheckedChange={(checked) => (settings.debug = !!checked)} />
-      </FormInput>
+      </DeprecatedFormInput>
     </>
   );
 };

package/src/extensions.tsx

@@ -33,7 +33,7 @@ import { type DocumentType, type MarkdownPluginState, type MarkdownSettingsProps
 import { setFallbackName } from './util';
 
 type ExtensionsOptions = {
-  document: DocumentType;
+  document?: DocumentType;
   dispatch?: IntentDispatcher;
   query?: Query<DocumentType>;
   settings: MarkdownSettingsProps;
@@ -66,7 +66,17 @@ export const useExtensions = ({
         dispatch,
         // query,
       }),
-    [document, viewMode, dispatch, settings, settings.folding, settings.numberedHeadings],
+    [
+      document,
+      viewMode,
+      dispatch,
+      settings,
+      settings.editorInputMode,
+      settings.folding,
+      settings.numberedHeadings,
+      settings.debug,
+      settings.typewriter,
+    ],
   );
 
   //
@@ -82,7 +92,7 @@ export const useExtensions = ({
 
         return acc;
       }, []),
-    [extensionProviders],
+    [extensionProviders, document],
   );
 
   //
@@ -92,20 +102,22 @@ export const useExtensions = ({
     () =>
       [
         // NOTE: Data extensions must be first so that automerge is updated before other extensions compute their state.
-        createDataExtensions({
-          id: document.id,
-          text: document.content && createDocAccessor(document.content, ['content']),
-          space,
-          identity,
-        }),
+        document &&
+          createDataExtensions({
+            id: document.id,
+            text: document.content && createDocAccessor(document.content, ['content']),
+            space,
+            identity,
+          }),
         selectionState(editorStateStore),
-        listener({
-          onChange: (text) => setFallbackName(document, text),
-        }),
+        document &&
+          listener({
+            onChange: (text) => setFallbackName(document, text),
+          }),
         baseExtensions,
         pluginExtensions,
       ].filter(isNotFalsy),
-    [baseExtensions, pluginExtensions, document, document.content, space, identity],
+    [baseExtensions, pluginExtensions, document, document?.content, space, identity],
   );
 };
 

package/src/meta.ts

@@ -8,8 +8,8 @@ export const MARKDOWN_PLUGIN = 'dxos.org/plugin/markdown';
 
 export default {
   id: MARKDOWN_PLUGIN,
-  name: 'Markdown Editor',
+  name: 'Markdown',
   description: 'Text editor supporting extended Markdown.',
-  homePage: 'https://github.com/dxos/dxos/tree/main/packages/apps/plugins/plugin-markdown',
+  source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-markdown',
   icon: 'ph--text-aa--regular',
 } satisfies PluginMeta;