@dxos/plugin-markdown 0.6.10 → 0.6.11-staging.9c4dc38

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

@@ -1 +1 @@
-{"version":3,"file":"MarkdownPlugin.d.ts","sourceRoot":"","sources":["../../../src/MarkdownPlugin.tsx"],"names":[],"mappings":"AAOA,OAAO,EAOL,KAAK,gBAAgB,EACtB,MAAM,qBAAqB,CAAC;AAoB7B,OAAO,EACL,KAAK,sBAAsB,EAI5B,MAAM,SAAS,CAAC;AAiBjB,eAAO,MAAM,cAAc,QAAO,gBAAgB,CAAC,sBAAsB,CAwRxE,CAAC"}
+{"version":3,"file":"MarkdownPlugin.d.ts","sourceRoot":"","sources":["../../../src/MarkdownPlugin.tsx"],"names":[],"mappings":"AAOA,OAAO,EAOL,KAAK,gBAAgB,EACtB,MAAM,qBAAqB,CAAC;AA2B7B,OAAO,EACL,KAAK,sBAAsB,EAI5B,MAAM,SAAS,CAAC;AAiBjB,eAAO,MAAM,cAAc,QAAO,gBAAgB,CAAC,sBAAsB,CA+SxE,CAAC"}

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,EACL,KAAK,QAAQ,EAEb,KAAK,gBAAgB,EAKtB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAGL,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,kBAAkB,EAgBxB,MAAM,uBAAuB,CAAC;AAM/B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AASpD,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,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,UAAU,GAAG,WAAW,GAAG,YAAY,CAAC,GACpF,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAC,CAAC;AAE3D,eAAO,MAAM,cAAc,uJAaxB,mBAAmB,sBA6KrB,CAAC;AAaF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"MarkdownEditor.d.ts","sourceRoot":"","sources":["../../../../src/components/MarkdownEditor.tsx"],"names":[],"mappings":"AAMA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAE/D,OAAO,EACL,KAAK,QAAQ,EAEb,KAAK,gBAAgB,EAKtB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAGL,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,kBAAkB,EAgBxB,MAAM,uBAAuB,CAAC;AAM/B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AASpD,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,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,UAAU,GAAG,WAAW,GAAG,YAAY,CAAC,GACpF,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAC,CAAC;AAE3D,eAAO,MAAM,cAAc,uJAaxB,mBAAmB,sBAiLrB,CAAC;AAaF,eAAe,cAAc,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"MarkdownEditor.stories.d.ts","sourceRoot":"","sources":["../../../../src/components/MarkdownEditor.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AACrB,OAAO,KAA2B,MAAM,OAAO,CAAC;;;;;;iBAWrC,MAAM;kBACL,OAAO;;;;;;AAcnB,wBAME;AAMF,eAAO,MAAM,OAAO;;;;CAInB,CAAC;AAEF,eAAO,MAAM,WAAW;;;;;CAKvB,CAAC"}
+{"version":3,"file":"MarkdownEditor.stories.d.ts","sourceRoot":"","sources":["../../../../src/components/MarkdownEditor.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AACrB,OAAO,KAA2B,MAAM,OAAO,CAAC;;;;;;iBAUrC,MAAM;kBACL,OAAO;;;;;;AAYnB,wBAME;AAMF,eAAO,MAAM,OAAO;;;;CAInB,CAAC;AAEF,eAAO,MAAM,WAAW;;;;;CAKvB,CAAC"}

package/dist/types/src/components/Toolbar.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Toolbar.stories.d.ts","sourceRoot":"","sources":["../../../../src/components/Toolbar.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;wBAiGhB,GAAG;AANR,wBAMS;AAYT,eAAO,MAAM,OAAO;;;;CAInB,CAAC"}
+{"version":3,"file":"Toolbar.stories.d.ts","sourceRoot":"","sources":["../../../../src/components/Toolbar.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;wBA+FhB,GAAG;AANR,wBAMS;AAYT,eAAO,MAAM,OAAO;;;;CAInB,CAAC"}

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

@@ -37,6 +37,12 @@ export type MarkdownSettingsProps = {
     numberedHeadings?: boolean;
     folding?: boolean;
 };
-export type MarkdownPluginProvides = SurfaceProvides & IntentResolverProvides & GraphBuilderProvides & GraphSerializerProvides & MetadataRecordsProvides & SettingsProvides<MarkdownSettingsProps> & TranslationsProvides & SchemaProvides & StackProvides;
+type ThreadProvides<T> = {
+    thread: {
+        predicate: (obj: any) => obj is T;
+        createSort: (obj: T) => (anchorA: string, anchorB: string) => number;
+    };
+};
+export type MarkdownPluginProvides = SurfaceProvides & IntentResolverProvides & GraphBuilderProvides & GraphSerializerProvides & MetadataRecordsProvides & SettingsProvides<MarkdownSettingsProps> & TranslationsProvides & SchemaProvides & StackProvides & ThreadProvides<DocumentType>;
 export {};
 //# sourceMappingURL=types.d.ts.map

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,KAAK,EACV,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,EACtB,uBAAuB,EACvB,gBAAgB,EAChB,eAAe,EACf,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAElG,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAK/C,oBAAY,cAAc;IACxB,MAAM,2CAA8B;IACpC,aAAa,kDAAqC;CACnD;AAED,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAErD,MAAM,MAAM,kBAAkB,GAAG,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,YAAY,CAAA;CAAE,KAAK,SAAS,EAAE,CAAC;AAErF,MAAM,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;AAE9C,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,EAAE;QACR,UAAU,EAAE,kBAAkB,CAAC;KAChC,CAAC;CACH,CAAC;AAGF,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE;QACL,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;KAClC,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAEhC,kBAAkB,EAAE,WAAW,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAItD,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAA;KAAE,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,EAAE,cAAc,CAAC;IAChC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,GAClD,sBAAsB,GACtB,oBAAoB,GACpB,uBAAuB,GACvB,uBAAuB,GACvB,gBAAgB,CAAC,qBAAqB,CAAC,GACvC,oBAAoB,GACpB,cAAc,GACd,aAAa,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,EACtB,uBAAuB,EACvB,gBAAgB,EAChB,eAAe,EACf,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAElG,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAK/C,oBAAY,cAAc;IACxB,MAAM,2CAA8B;IACpC,aAAa,kDAAqC;CACnD;AAED,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAErD,MAAM,MAAM,kBAAkB,GAAG,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,YAAY,CAAA;CAAE,KAAK,SAAS,EAAE,CAAC;AAErF,MAAM,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;AAE9C,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,EAAE;QACR,UAAU,EAAE,kBAAkB,CAAC;KAChC,CAAC;CACH,CAAC;AAGF,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE;QACL,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;KAClC,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAEhC,kBAAkB,EAAE,WAAW,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAItD,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAA;KAAE,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,EAAE,cAAc,CAAC;IAChC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAIF,KAAK,cAAc,CAAC,CAAC,IAAI;IACvB,MAAM,EAAE;QACN,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,IAAI,CAAC,CAAC;QAClC,UAAU,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;KACtE,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,GAClD,sBAAsB,GACtB,oBAAoB,GACpB,uBAAuB,GACvB,uBAAuB,GACvB,gBAAgB,CAAC,qBAAqB,CAAC,GACvC,oBAAoB,GACpB,cAAc,GACd,aAAa,GACb,cAAc,CAAC,YAAY,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-markdown",
-  "version": "0.6.10",
+  "version": "0.6.11-staging.9c4dc38",
   "description": "DXOS Surface plugin for interacting with Markdown",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -48,27 +48,27 @@
     "@codemirror/search": "^6.5.6",
     "@codemirror/view": "^6.29.1",
     "@preact/signals-core": "^1.6.0",
-    "@dxos/app-framework": "0.6.10",
-    "@dxos/async": "0.6.10",
-    "@dxos/echo-schema": "0.6.10",
-    "@dxos/keys": "0.6.10",
-    "@dxos/local-storage": "0.6.10",
-    "@dxos/invariant": "0.6.10",
-    "@dxos/log": "0.6.10",
-    "@dxos/plugin-attention": "0.6.10",
-    "@dxos/plugin-graph": "0.6.10",
-    "@dxos/plugin-client": "0.6.10",
-    "@dxos/plugin-settings": "0.6.10",
-    "@dxos/plugin-space": "0.6.10",
-    "@dxos/react-async": "0.6.10",
-    "@dxos/plugin-theme": "0.6.10",
-    "@dxos/react-client": "0.6.10",
-    "@dxos/react-ui-card": "0.6.10",
-    "@dxos/react-ui-deck": "0.6.10",
-    "@dxos/react-ui-editor": "0.6.10",
-    "@dxos/react-ui-mosaic": "0.6.10",
-    "@dxos/react-ui-stack": "0.6.10",
-    "@dxos/util": "0.6.10"
+    "@dxos/app-framework": "0.6.11-staging.9c4dc38",
+    "@dxos/echo-schema": "0.6.11-staging.9c4dc38",
+    "@dxos/async": "0.6.11-staging.9c4dc38",
+    "@dxos/invariant": "0.6.11-staging.9c4dc38",
+    "@dxos/keys": "0.6.11-staging.9c4dc38",
+    "@dxos/log": "0.6.11-staging.9c4dc38",
+    "@dxos/local-storage": "0.6.11-staging.9c4dc38",
+    "@dxos/plugin-attention": "0.6.11-staging.9c4dc38",
+    "@dxos/plugin-client": "0.6.11-staging.9c4dc38",
+    "@dxos/plugin-graph": "0.6.11-staging.9c4dc38",
+    "@dxos/plugin-settings": "0.6.11-staging.9c4dc38",
+    "@dxos/plugin-space": "0.6.11-staging.9c4dc38",
+    "@dxos/plugin-theme": "0.6.11-staging.9c4dc38",
+    "@dxos/react-hooks": "0.6.11-staging.9c4dc38",
+    "@dxos/react-ui-deck": "0.6.11-staging.9c4dc38",
+    "@dxos/react-client": "0.6.11-staging.9c4dc38",
+    "@dxos/react-ui-card": "0.6.11-staging.9c4dc38",
+    "@dxos/react-ui-editor": "0.6.11-staging.9c4dc38",
+    "@dxos/react-ui-mosaic": "0.6.11-staging.9c4dc38",
+    "@dxos/react-ui-stack": "0.6.11-staging.9c4dc38",
+    "@dxos/util": "0.6.11-staging.9c4dc38"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -77,17 +77,17 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "^5.3.4",
-    "@dxos/random": "0.6.10",
-    "@dxos/react-ui": "0.6.10",
-    "@dxos/react-ui-theme": "0.6.10",
-    "@dxos/storybook-utils": "0.6.10"
+    "@dxos/random": "0.6.11-staging.9c4dc38",
+    "@dxos/react-ui-theme": "0.6.11-staging.9c4dc38",
+    "@dxos/storybook-utils": "0.6.11-staging.9c4dc38",
+    "@dxos/react-ui": "0.6.11-staging.9c4dc38"
   },
   "optionalDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
-    "@dxos/react-ui": "0.6.10",
-    "@dxos/react-ui-theme": "0.6.10"
+    "@dxos/react-ui-theme": "0.6.11-staging.9c4dc38",
+    "@dxos/react-ui": "0.6.11-staging.9c4dc38"
   },
   "publishConfig": {
     "access": "public"

package/src/MarkdownPlugin.tsx

@@ -16,11 +16,18 @@ import {
 } from '@dxos/app-framework';
 import { create } from '@dxos/echo-schema';
 import { LocalStorageStore } from '@dxos/local-storage';
+import { log } from '@dxos/log';
 import { parseClientPlugin } from '@dxos/plugin-client';
 import { type ActionGroup, createExtension, isActionGroup } from '@dxos/plugin-graph';
 import { SpaceAction } from '@dxos/plugin-space';
 import { CollectionType } from '@dxos/plugin-space/types';
-import { fullyQualifiedId, isSpace, loadObjectReferences } from '@dxos/react-client/echo';
+import {
+  createDocAccessor,
+  fullyQualifiedId,
+  getRangeFromCursor,
+  isSpace,
+  loadObjectReferences,
+} from '@dxos/react-client/echo';
 import {
   type EditorInputMode,
   type EditorViewMode,
@@ -59,6 +66,7 @@ export const MarkdownPlugin = (): PluginDefinition<MarkdownPluginProvides> => {
   const settings = new LocalStorageStore<MarkdownSettingsProps>(MARKDOWN_PLUGIN, {
     defaultViewMode: 'preview',
     toolbar: true,
+    folding: true,
     experimental: false,
   });
 
@@ -225,10 +233,32 @@ export const MarkdownPlugin = (): PluginDefinition<MarkdownPluginProvides> => {
             type: ['plugin name', { ns: MARKDOWN_PLUGIN }],
             label: ['create stack section label', { ns: MARKDOWN_PLUGIN }],
             icon: (props: any) => <TextAa {...props} />,
-            intent: { plugin: MARKDOWN_PLUGIN, action: MarkdownAction.CREATE },
+            intent: {
+              plugin: MARKDOWN_PLUGIN,
+              action: MarkdownAction.CREATE,
+            },
           },
         ],
       },
+      thread: {
+        // TODO(Zan): How to better handle the type predicate?
+        predicate: (obj) => obj instanceof DocumentType,
+        createSort: (doc: DocumentType) => {
+          const accessor = doc.content ? createDocAccessor(doc.content, ['content']) : undefined;
+
+          if (!accessor) {
+            log.warn('No accessor found for document content.');
+            return (_) => 0;
+          }
+
+          const getStartPosition = (cursor: string | undefined) => {
+            const range = cursor ? getRangeFromCursor(accessor, cursor) : undefined;
+            return range?.start ?? Number.MAX_SAFE_INTEGER;
+          };
+
+          return (anchorA: string, anchorB: string) => getStartPosition(anchorA) - getStartPosition(anchorB);
+        },
+      },
       surface: {
         component: ({ data, role, ...props }, forwardedRef) => {
           const doc =

package/src/components/MarkdownEditor.stories.tsx

@@ -6,9 +6,8 @@ import '@dxos-theme';
 import React, { useMemo, type FC } from 'react';
 
 import { createDocAccessor, createEchoObject } from '@dxos/react-client/echo';
-import { Tooltip } from '@dxos/react-ui';
 import { automerge } from '@dxos/react-ui-editor';
-import { withTheme } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { MainLayout } from './Layout';
 import { MarkdownEditor } from './MarkdownEditor';
@@ -21,18 +20,16 @@ const Story: FC<{
   const extensions = useMemo(() => [automerge(createDocAccessor(doc, ['content']))], [doc]);
 
   return (
-    <Tooltip.Provider>
-      <MainLayout toolbar={toolbar}>
-        <MarkdownEditor id='test' initialValue={doc.content} extensions={extensions} toolbar={toolbar} />
-      </MainLayout>
-    </Tooltip.Provider>
+    <MainLayout toolbar={toolbar}>
+      <MarkdownEditor id='test' initialValue={doc.content} extensions={extensions} toolbar={toolbar} />
+    </MainLayout>
   );
 };
 
 export default {
   title: 'plugin-markdown/EditorMain',
   component: MarkdownEditor,
-  decorators: [withTheme],
+  decorators: [withTheme, withLayout({ tooltips: true })],
   render: Story,
   parameters: { layout: 'fullscreen' },
 };

package/src/components/MarkdownEditor.tsx

@@ -155,7 +155,11 @@ export const MarkdownEditor = ({
           scrollPastEnd: role === 'section' ? false : scrollPastEnd,
         }),
         createMarkdownExtensions({ themeMode }),
-        createThemeExtensions({ themeMode, slots: { content: { className: editorContent } } }),
+        createThemeExtensions({
+          themeMode,
+          syntaxHighlighting: true,
+          slots: { content: { className: editorContent } },
+        }),
         editorGutter,
         role !== 'section' && onFileUpload ? dropFile({ onDrop: handleDrop }) : [],
         providerExtensions,

package/src/components/Toolbar.stories.tsx

@@ -10,7 +10,7 @@ import { create } from '@dxos/echo-schema';
 import { PublicKey } from '@dxos/keys';
 import { faker } from '@dxos/random';
 import { createDocAccessor, createEchoObject } from '@dxos/react-client/echo';
-import { Tooltip, useThemeContext } from '@dxos/react-ui';
+import { useThemeContext } from '@dxos/react-ui';
 import {
   type Action,
   type Comment,
@@ -31,7 +31,7 @@ import {
   useTextEditor,
 } from '@dxos/react-ui-editor';
 import { textBlockWidth } from '@dxos/react-ui-theme';
-import { withTheme } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { TextType } from '../types';
 
@@ -50,7 +50,7 @@ const Story: FC<{ content: string }> = ({ content }) => {
         formattingObserver,
         createBasicExtensions({ readonly: viewMode === 'readonly' }),
         createMarkdownExtensions({ themeMode }),
-        createThemeExtensions({ themeMode, slots: { editor: { className: editorContent } } }),
+        createThemeExtensions({ themeMode, syntaxHighlighting: true, slots: { editor: { className: editorContent } } }),
         createDataExtensions({ id: text.id, text: createDocAccessor(text, ['content']) }),
         comments({
           onCreate: ({ cursor }) => {
@@ -78,25 +78,23 @@ const Story: FC<{ content: string }> = ({ content }) => {
   useComments(view, text.id, _comments);
 
   return (
-    <Tooltip.Provider>
-      <div role='none' className='fixed inset-0 flex flex-col'>
-        <Toolbar.Root onAction={handleAction} state={formattingState} classNames={textBlockWidth}>
-          <Toolbar.View mode={viewMode} />
-          <Toolbar.Markdown />
-          <Toolbar.Custom onUpload={async (file) => ({ url: file.name })} />
-          <Toolbar.Separator />
-          <Toolbar.Actions />
-        </Toolbar.Root>
-        <div ref={parentRef} />
-      </div>
-    </Tooltip.Provider>
+    <div role='none' className='fixed inset-0 flex flex-col'>
+      <Toolbar.Root onAction={handleAction} state={formattingState} classNames={textBlockWidth}>
+        <Toolbar.View mode={viewMode} />
+        <Toolbar.Markdown />
+        <Toolbar.Custom onUpload={async (file) => ({ url: file.name })} />
+        <Toolbar.Separator />
+        <Toolbar.Actions />
+      </Toolbar.Root>
+      <div ref={parentRef} />
+    </div>
   );
 };
 
 export default {
   title: 'react-ui-editor/Toolbar',
   component: Toolbar,
-  decorators: [withTheme],
+  decorators: [withTheme, withLayout({ tooltips: true })],
   parameters: { translations, layout: 'fullscreen' },
   render: (args: any) => <Story {...args} />,
 } as any;

package/src/types/types.ts

@@ -64,6 +64,15 @@ export type MarkdownSettingsProps = {
   folding?: boolean;
 };
 
+// TODO(Zan): Move this to the plugin-space plugin or another common location
+// when we implement comments in sheets.
+type ThreadProvides<T> = {
+  thread: {
+    predicate: (obj: any) => obj is T;
+    createSort: (obj: T) => (anchorA: string, anchorB: string) => number;
+  };
+};
+
 export type MarkdownPluginProvides = SurfaceProvides &
   IntentResolverProvides &
   GraphBuilderProvides &
@@ -72,4 +81,5 @@ export type MarkdownPluginProvides = SurfaceProvides &
   SettingsProvides<MarkdownSettingsProps> &
   TranslationsProvides &
   SchemaProvides &
-  StackProvides;
+  StackProvides &
+  ThreadProvides<DocumentType>;

package/dist/lib/browser/DocumentEditor-ZBSGRJRH.mjs

@@ -1,11 +0,0 @@
-import {
-  DocumentEditor_default
-} from "./chunk-KWE52M7F.mjs";
-import "./chunk-RETREORA.mjs";
-import "./chunk-354DCID5.mjs";
-import "./chunk-CJO5DJVS.mjs";
-import "./chunk-4GGD6YJO.mjs";
-export {
-  DocumentEditor_default as default
-};
-//# sourceMappingURL=DocumentEditor-ZBSGRJRH.mjs.map