@dxos/react-ui-editor 0.3.11-main.c95bc86 → 0.3.11-main.cb5abf5

package/dist/lib/browser/index.mjs

@@ -1,6 +1,7 @@
 // packages/ui/react-ui-editor/src/index.ts
 import { TextKind } from "@dxos/protocols/proto/dxos/echo/model/text";
 import { Doc, YText, YXmlFragment } from "@dxos/text-model";
+import { keymap as keymap7 } from "@codemirror/view";
 
 // packages/ui/react-ui-editor/src/components/TextEditor/index.ts
 import { tags as tags2 } from "@lezer/highlight";
@@ -8,13 +9,13 @@ import { tags as tags2 } from "@lezer/highlight";
 // packages/ui/react-ui-editor/src/components/TextEditor/TextEditor.tsx
 import { EditorState as EditorState2 } from "@codemirror/state";
 import { EditorView as EditorView13 } from "@codemirror/view";
-import { useFocusableGroup } from "@fluentui/react-tabster";
 import { vim } from "@replit/codemirror-vim";
 import defaultsDeep2 from "lodash.defaultsdeep";
 import React, { forwardRef, useCallback, useEffect as useEffect2, useImperativeHandle, useRef, useState } from "react";
 import { log as log2 } from "@dxos/log";
 import { useThemeContext } from "@dxos/react-ui";
-import { attentionSurface, mx as mx3 } from "@dxos/react-ui-theme";
+import { focusRing, mx as mx3 } from "@dxos/react-ui-theme";
+import { isNotFalsy as isNotFalsy3 } from "@dxos/util";
 
 // packages/ui/react-ui-editor/src/extensions/autocomplete.ts
 import { autocompletion, completionKeymap } from "@codemirror/autocomplete";
@@ -53,14 +54,14 @@ var autocomplete = ({ onSearch }) => {
 };
 
 // packages/ui/react-ui-editor/src/extensions/automerge/automerge.ts
+import { invertedEffects } from "@codemirror/commands";
 import { StateField } from "@codemirror/state";
 import { EditorView, ViewPlugin } from "@codemirror/view";
-import { next as A } from "@dxos/automerge/automerge";
-import { invariant } from "@dxos/invariant";
+import { next as A4 } from "@dxos/automerge/automerge";
 
 // packages/ui/react-ui-editor/src/extensions/automerge/cursor.ts
 import get from "lodash.get";
-import { next as automerge } from "@dxos/automerge/automerge";
+import { next as A } from "@dxos/automerge/automerge";
 var cursorConverter = (handle, path) => ({
   // TODO(burdon): Handle assoc to associate with a previous character.
   toCursor: (pos) => {
@@ -72,7 +73,7 @@ var cursorConverter = (handle, path) => ({
     if (typeof value === "string" && value.length <= pos) {
       return "end";
     }
-    return automerge.getCursor(doc, path.slice(), pos);
+    return A.getCursor(doc, path.slice(), pos);
   },
   fromCursor: (cursor) => {
     if (cursor === "") {
@@ -90,26 +91,28 @@ var cursorConverter = (handle, path) => ({
         return 0;
       }
     }
-    return automerge.getCursorPosition(doc, path.slice(), cursor);
+    return A.getCursorPosition(doc, path.slice(), cursor);
   }
 });
 
 // packages/ui/react-ui-editor/src/extensions/automerge/defs.ts
 import { Annotation, StateEffect } from "@codemirror/state";
-var effectType = StateEffect.define({});
-var reconcileAnnotationType = Annotation.define();
 var getPath = (state, field) => state.field(field).path;
 var getLastHeads = (state, field) => state.field(field).lastHeads;
-var updateHeads = (newHeads) => effectType.of({
+var updateHeadsEffect = StateEffect.define({});
+var updateHeads = (newHeads) => updateHeadsEffect.of({
   newHeads
 });
-var isReconcileTx = (tr) => !!tr.annotation(reconcileAnnotationType);
+var reconcileAnnotation = Annotation.define();
+var isReconcile = (tr) => {
+  return !!tr.annotation(reconcileAnnotation);
+};
 
 // packages/ui/react-ui-editor/src/extensions/automerge/semaphore.ts
-import { next as automerge2 } from "@dxos/automerge/automerge";
+import { next as A3 } from "@dxos/automerge/automerge";
 
 // packages/ui/react-ui-editor/src/extensions/automerge/update-automerge.ts
-import { next as am } from "@dxos/automerge/automerge";
+import { next as A2 } from "@dxos/automerge/automerge";
 var updateAutomerge = (field, handle, transactions, state) => {
   const { lastHeads, path } = state.field(field);
   let hasChanges = false;
@@ -122,11 +125,19 @@ var updateAutomerge = (field, handle, transactions, state) => {
     return void 0;
   }
   const newHeads = handle.changeAt(lastHeads, (doc) => {
+    const invertedTransactions = [];
     for (const tr of transactions) {
-      tr.changes.iterChanges((fromA, toA, _fromB, _toB, inserted) => {
-        am.splice(doc, path, fromA, toA - fromA, inserted.toString());
+      tr.changes.iterChanges((fromA, toA, _fromB, _toB, insert) => {
+        invertedTransactions.push({
+          from: fromA,
+          del: toA - fromA,
+          insert
+        });
       });
     }
+    invertedTransactions.reverse().forEach(({ from, del, insert }) => {
+      A2.splice(doc, path.slice(), from, del, insert.toString());
+    });
   });
   return newHeads ?? void 0;
 };
@@ -141,13 +152,13 @@ var updateCodeMirror = (view, selection, target, patches) => {
       selection = selection.map(changeSet, 1);
       view.dispatch({
         changes: changeSet,
-        annotations: reconcileAnnotationType.of({})
+        annotations: reconcileAnnotation.of(false)
       });
     }
   }
   view.dispatch({
     selection,
-    annotations: reconcileAnnotationType.of({})
+    annotations: reconcileAnnotation.of(false)
   });
 };
 var handlePatch = (patch, target, state) => {
@@ -168,7 +179,7 @@ var handleInsert = (target, patch) => {
   if (index == null) {
     return [];
   }
-  const text = patch.values.map((v) => v ? v.toString() : "").join("");
+  const text = patch.values.map((value) => value ? value.toString() : "").join("");
   return [
     {
       from: index,
@@ -246,36 +257,37 @@ var PatchSemaphore = class {
     this._state = _state;
     this._inReconcile = false;
   }
-  // NOTE: Cannot destruct view.state.
   reconcile(view) {
-    if (this._inReconcile) {
-      return;
+    if (!this._inReconcile) {
+      this._inReconcile = true;
+      this.doReconcile(view);
+      this._inReconcile = false;
     }
-    this._inReconcile = true;
+  }
+  doReconcile(view) {
     const path = getPath(view.state, this._state);
     const oldHeads = getLastHeads(view.state, this._state);
     let selection = view.state.selection;
-    const transactions = view.state.field(this._state).unreconciledTransactions.filter((tx) => !isReconcileTx(tx));
+    const transactions = view.state.field(this._state).unreconciledTransactions.filter((tx) => !isReconcile(tx));
     const toInvert = transactions.slice().reverse();
-    for (const tx of toInvert) {
-      const inverted = tx.changes.invert(tx.startState.doc);
+    for (const tr of toInvert) {
+      const inverted = tr.changes.invert(tr.startState.doc);
       selection = selection.map(inverted);
       view.dispatch({
         changes: inverted,
-        annotations: reconcileAnnotationType.of(true)
+        annotations: reconcileAnnotation.of(true)
       });
     }
     let newHeads = updateAutomerge(this._state, this._handle, transactions, view.state);
     if (newHeads === null || newHeads === void 0) {
-      newHeads = automerge2.getHeads(this._handle.docSync());
+      newHeads = A3.getHeads(this._handle.docSync());
     }
-    const diff = automerge2.equals(oldHeads, newHeads) ? [] : automerge2.diff(this._handle.docSync(), oldHeads, newHeads);
+    const diff = A3.equals(oldHeads, newHeads) ? [] : A3.diff(this._handle.docSync(), oldHeads, newHeads);
     updateCodeMirror(view, selection, path, diff);
     view.dispatch({
       effects: updateHeads(newHeads),
-      annotations: reconcileAnnotationType.of({})
+      annotations: reconcileAnnotation.of(false)
     });
-    this._inReconcile = false;
   }
 };
 
@@ -317,12 +329,11 @@ var Cursor = class _Cursor {
 };
 
 // packages/ui/react-ui-editor/src/extensions/automerge/automerge.ts
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/automerge/automerge.ts";
-var automerge3 = ({ handle, path }) => {
-  const state = StateField.define({
+var automerge = ({ handle, path }) => {
+  const syncState = StateField.define({
     create: () => ({
       path: path.slice(),
-      lastHeads: A.getHeads(handle.docSync()),
+      lastHeads: A4.getHeads(handle.docSync()),
       unreconciledTransactions: []
     }),
     update: (value, tr) => {
@@ -333,7 +344,7 @@ var automerge3 = ({ handle, path }) => {
       };
       let clearUnreconciled = false;
       for (const effect of tr.effects) {
-        if (effect.is(effectType)) {
+        if (effect.is(updateHeadsEffect)) {
           result.lastHeads = effect.value.newHeads;
           clearUnreconciled = true;
         }
@@ -341,29 +352,21 @@ var automerge3 = ({ handle, path }) => {
       if (clearUnreconciled) {
         result.unreconciledTransactions = [];
       } else {
-        if (!isReconcileTx(tr)) {
+        if (!isReconcile(tr)) {
           result.unreconciledTransactions.push(tr);
         }
       }
       return result;
     }
   });
-  const semaphore = new PatchSemaphore(handle, state);
+  const semaphore = new PatchSemaphore(handle, syncState);
   return [
     Cursor.converter.of(cursorConverter(handle, path)),
+    syncState,
     // Reconcile external updates.
     ViewPlugin.fromClass(class {
       constructor(_view) {
         this._view = _view;
-        invariant(this._view, void 0, {
-          F: __dxlog_file,
-          L: 66,
-          S: this,
-          A: [
-            "this._view",
-            ""
-          ]
-        });
         handle.addListener("change", this._handleChange.bind(this));
       }
       destroy() {
@@ -379,7 +382,17 @@ var automerge3 = ({ handle, path }) => {
         semaphore.reconcile(view);
       }
     }),
-    state
+    // TODO(burdon): Record undo transactions.
+    //  See https://github.com/yjs/y-codemirror.next/tree/main
+    // https://codemirror.net/examples/inverted-effect
+    invertedEffects.of((tr) => {
+      const effects = [];
+      if (!tr.changes.empty) {
+        tr.changes.iterChanges((fromA, toA, fromB, toB, inserted) => {
+        });
+      }
+      return effects;
+    })
   ];
 };
 
@@ -398,13 +411,13 @@ var dummyProvider = {
   update: () => {
   }
 };
-var AwarenessProvider = Facet2.define({
+var awarenessProvider = Facet2.define({
   combine: (providers) => providers[0] ?? dummyProvider
 });
 var RemoteSelectionChangedAnnotation = Annotation2.define();
 var awareness = (provider = dummyProvider) => {
   return [
-    AwarenessProvider.of(provider),
+    awarenessProvider.of(provider),
     ViewPlugin2.fromClass(RemoteSelectionsDecorator, {
       decorations: (value) => value.decorations
     }),
@@ -418,7 +431,7 @@ var RemoteSelectionsDecorator = class {
     this._lastAnchor = void 0;
     this._lastHead = void 0;
     this._cursorConverter = view.state.facet(Cursor.converter);
-    this._provider = view.state.facet(AwarenessProvider);
+    this._provider = view.state.facet(awarenessProvider);
     this._provider.open();
     this._provider.remoteStateChange.on(this._ctx, () => {
       view.dispatch({
@@ -624,24 +637,25 @@ import { history } from "@codemirror/commands";
 import { bracketMatching, defaultHighlightStyle, syntaxHighlighting } from "@codemirror/language";
 import { oneDarkHighlightStyle } from "@codemirror/theme-one-dark";
 import { drawSelection, EditorView as EditorView3, highlightActiveLine, placeholder } from "@codemirror/view";
-var basicBundle = ({ themeMode, placeholder: _placeholder, lineWrapping = true }) => [
-  lineWrapping ? EditorView3.lineWrapping : [],
+import { isNotFalsy } from "@dxos/util";
+var createBasicBundle = ({ themeMode, placeholder: _placeholder, lineWrapping = true } = {}) => [
+  lineWrapping && EditorView3.lineWrapping,
   // https://codemirror.net/docs/ref/#codemirror.minimalSetup
   bracketMatching(),
   closeBrackets(),
   drawSelection(),
   highlightActiveLine(),
   history(),
-  _placeholder ? placeholder(_placeholder) : [],
+  _placeholder && placeholder(_placeholder),
   // https://github.com/codemirror/theme-one-dark
   themeMode === "dark" ? syntaxHighlighting(oneDarkHighlightStyle) : syntaxHighlighting(defaultHighlightStyle)
-];
+].filter(isNotFalsy);
 
 // packages/ui/react-ui-editor/src/extensions/blast.ts
 import { EditorView as EditorView4, keymap as keymap2 } from "@codemirror/view";
 import defaultsDeep from "lodash.defaultsdeep";
-import { invariant as invariant2 } from "@dxos/invariant";
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/blast.ts";
+import { invariant } from "@dxos/invariant";
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/blast.ts";
 var defaultOptions = {
   effect: 2,
   maxParticles: 200,
@@ -767,9 +781,9 @@ var Blaster = class {
     return this._node;
   }
   initialize() {
-    invariant2(!this._canvas && !this._ctx, void 0, {
-      F: __dxlog_file2,
-      L: 138,
+    invariant(!this._canvas && !this._ctx, void 0, {
+      F: __dxlog_file,
+      L: 141,
       S: this,
       A: [
         "!this._canvas && !this._ctx",
@@ -804,9 +818,9 @@ var Blaster = class {
     }
   }
   start() {
-    invariant2(this._canvas && this._ctx, void 0, {
-      F: __dxlog_file2,
-      L: 177,
+    invariant(this._canvas && this._ctx, void 0, {
+      F: __dxlog_file,
+      L: 180,
       S: this,
       A: [
         "this._canvas && this._ctx",
@@ -948,12 +962,12 @@ var random = (min, max) => {
 };
 
 // packages/ui/react-ui-editor/src/extensions/comments.ts
-import { StateEffect as StateEffect2, StateField as StateField2 } from "@codemirror/state";
+import { invertedEffects as invertedEffects2 } from "@codemirror/commands";
+import { Facet as Facet3, StateEffect as StateEffect2, StateField as StateField2 } from "@codemirror/state";
 import { hoverTooltip, keymap as keymap3, Decoration as Decoration2, EditorView as EditorView5 } from "@codemirror/view";
 import sortBy from "lodash.sortby";
 import { useEffect } from "react";
 import { debounce } from "@dxos/async";
-import { invariant as invariant3 } from "@dxos/invariant";
 import { nonNullable } from "@dxos/util";
 
 // packages/ui/react-ui-editor/src/styles/cursors.ts
@@ -1025,13 +1039,13 @@ var getToken = (path, defaultValue = void 0) => get2(tokens, path, defaultValue)
 
 // packages/ui/react-ui-editor/src/util.ts
 import { log } from "@dxos/log";
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/util.ts";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/util.ts";
 var callbackWrapper = (fn) => (...args) => {
   try {
     return fn(...args);
   } catch (err) {
     log.catch(err, void 0, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 18,
       S: void 0,
       C: (f, a) => f(...a)
@@ -1059,7 +1073,6 @@ var logChanges = (trs) => {
 };
 
 // packages/ui/react-ui-editor/src/extensions/comments.ts
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/comments.ts";
 var styles2 = EditorView5.baseTheme({
   "& .cm-comment": {
     backgroundColor: getToken("extend.colors.yellow.50")
@@ -1068,15 +1081,13 @@ var styles2 = EditorView5.baseTheme({
     backgroundColor: getToken("extend.colors.yellow.100")
   }
 });
-var marks = {
-  highlight: Decoration2.mark({
-    class: "cm-comment"
-  }),
-  highlightActive: Decoration2.mark({
-    class: "cm-comment-current"
-  })
-};
-var setFocus = (view, id, center = true) => {
+var commentMark = Decoration2.mark({
+  class: "cm-comment"
+});
+var commentCurrentMark = Decoration2.mark({
+  class: "cm-comment-current"
+});
+var focusComment = (view, id, center = true) => {
   const comment = view.state.field(commentsState).comments.find((range2) => range2.comment.id === id);
   if (!comment?.comment.cursor) {
     return;
@@ -1138,7 +1149,7 @@ var commentsState = StateField2.define({
     return value;
   }
 });
-var highlightDecorations = EditorView5.decorations.compute([
+var commentsDecorations = EditorView5.decorations.compute([
   commentsState
 ], (state) => {
   const { selection: { current }, comments: comments2 } = state.field(commentsState);
@@ -1149,9 +1160,9 @@ var highlightDecorations = EditorView5.decorations.compute([
       return void 0;
     }
     if (comment.comment.id === current) {
-      return marks.highlightActive.range(range.from, range.to);
+      return commentCurrentMark.range(range.from, range.to);
     } else {
-      return marks.highlight.range(range.from, range.to);
+      return commentMark.range(range.from, range.to);
     }
   }).filter(nonNullable);
   return Decoration2.set(decorations);
@@ -1180,84 +1191,124 @@ var trackPastedComments = (onUpdate) => {
       cut: handleTrack,
       copy: handleTrack
     }),
-    // Handle paste.
-    EditorView5.updateListener.of(({ view, state, transactions }) => {
+    // Track deleted comments.
+    invertedEffects2.of((tr) => {
+      const { comments: comments2 } = tr.startState.field(commentsState);
+      const effects = [];
+      tr.changes.iterChangedRanges((fromA, toA) => {
+        for (const { comment: { id }, range: { from, to } } of comments2) {
+          if (from < to && from >= fromA && to <= toA) {
+            effects.push(restoreCommentEffect.of({
+              id,
+              from,
+              to
+            }));
+          }
+        }
+      });
+      return effects;
+    }),
+    // Handle paste or the undo of comment deletion.
+    EditorView5.updateListener.of((update2) => {
+      const restore = [];
+      for (let i = 0; i < update2.transactions.length; i++) {
+        const tr = update2.transactions[i];
+        for (let j = 0; j < restore.length; j++) {
+          restore[j] = mapTrackedComment(restore[j], tr.changes);
+        }
+        for (const effect of tr.effects) {
+          if (effect.is(restoreCommentEffect)) {
+            restore.push(effect.value);
+          }
+        }
+      }
       if (tracked) {
-        const paste = transactions.find((tr) => tr.isUserEvent("input.paste"));
+        const paste = update2.transactions.find((tr) => tr.isUserEvent("input.paste"));
         if (paste) {
           let found = -1;
           paste.changes.iterChanges((fromA, toA, fromB, toB, text) => {
             if (text.eq(tracked.text)) {
-              for (let i = transactions.indexOf(paste) + 1; i < transactions.length; i++) {
-                fromB = transactions[i].changes.mapPos(fromB);
+              for (let i = update2.transactions.indexOf(paste) + 1; i < update2.transactions.length; i++) {
+                fromB = update2.transactions[i].changes.mapPos(fromB);
               }
               found = fromB;
             }
           });
           if (found > -1) {
             for (const moved of tracked.comments) {
-              const range = {
+              restore.push({
+                id: moved.id,
                 from: found + moved.from,
                 to: found + moved.to
-              };
-              const cursor = Cursor.getCursorFromRange(state, range);
-              onUpdate(moved.id, cursor);
+              });
             }
           }
           tracked = null;
         }
       }
+      for (const comment of restore) {
+        const { comments: comments2 } = update2.startState.field(commentsState);
+        const exists = comments2.some((c) => c.comment.id === comment.id && c.range.from < c.range.to);
+        if (!exists) {
+          const cursor = Cursor.getCursorFromRange(update2.state, comment);
+          onUpdate(comment.id, cursor);
+        }
+      }
     })
   ];
 };
-var comments = (options = {}) => {
-  const { key: shortcut = "meta-'" } = options;
-  const handleSelect = debounce((state) => options.onSelect?.(state), 200);
-  const createCommentThread = (view) => {
-    invariant3(options.onCreate, void 0, {
-      F: __dxlog_file4,
-      L: 259,
-      S: void 0,
-      A: [
-        "options.onCreate",
-        ""
-      ]
+var mapTrackedComment = (comment, changes) => ({
+  id: comment.id,
+  from: changes.mapPos(comment.from, 1),
+  to: changes.mapPos(comment.to, 1)
+});
+var restoreCommentEffect = StateEffect2.define({
+  map: mapTrackedComment
+});
+var optionsFacet = Facet3.define({
+  combine: (providers) => providers[0]
+});
+var createComment = (view) => {
+  const options = view.state.facet(optionsFacet);
+  const { from, to } = view.state.selection.main;
+  if (from === to) {
+    return false;
+  }
+  if (to === view.state.doc.length) {
+    view.dispatch({
+      changes: {
+        from: to,
+        insert: "\n"
+      }
     });
-    const { from, to } = view.state.selection.main;
-    if (from === to) {
-      return false;
-    }
-    if (to === view.state.doc.length) {
+  }
+  const cursor = Cursor.getCursorFromRange(view.state, {
+    from,
+    to
+  });
+  if (cursor) {
+    const id = options.onCreate?.(cursor, view.coordsAtPos(from));
+    if (id) {
       view.dispatch({
-        changes: {
-          from: to,
-          insert: "\n"
+        effects: setSelection.of({
+          current: id
+        }),
+        selection: {
+          anchor: to
         }
       });
+      return true;
     }
-    const cursor = Cursor.getCursorFromRange(view.state, {
-      from,
-      to
-    });
-    if (cursor) {
-      const id = options.onCreate?.(cursor, view.coordsAtPos(from));
-      if (id) {
-        view.dispatch({
-          effects: setSelection.of({
-            current: id
-          }),
-          selection: {
-            anchor: from
-          }
-        });
-        return true;
-      }
-    }
-    return false;
-  };
+  }
+  return false;
+};
+var comments = (options = {}) => {
+  const { key: shortcut = "meta-'" } = options;
+  const handleSelect = debounce((state) => options.onSelect?.(state), 200);
   return [
+    optionsFacet.of(options),
     commentsState,
-    highlightDecorations,
+    commentsDecorations,
     styles2,
     //
     // Keymap.
@@ -1265,7 +1316,7 @@ var comments = (options = {}) => {
     options.onCreate ? keymap3.of([
       {
         key: shortcut,
-        run: callbackWrapper(createCommentThread)
+        run: callbackWrapper(createComment)
       }
     ]) : [],
     //
@@ -1403,6 +1454,7 @@ import { searchKeymap } from "@codemirror/search";
 import { EditorState } from "@codemirror/state";
 import { oneDarkHighlightStyle as oneDarkHighlightStyle2 } from "@codemirror/theme-one-dark";
 import { crosshairCursor, drawSelection as drawSelection2, dropCursor, EditorView as EditorView7, highlightActiveLine as highlightActiveLine2, keymap as keymap4, placeholder as placeholder2 } from "@codemirror/view";
+import { isNotFalsy as isNotFalsy2 } from "@dxos/util";
 
 // packages/ui/react-ui-editor/src/extensions/markdown/highlight.ts
 import { markdownLanguage as markdownLanguage2 } from "@codemirror/lang-markdown";
@@ -1593,11 +1645,11 @@ var markdownHighlightStyle = (readonly) => {
 };
 
 // packages/ui/react-ui-editor/src/extensions/markdown/bundle.ts
-var markdownBundle = ({ themeMode, placeholder: _placeholder }) => {
+var createMarkdownExtensions = ({ themeMode, placeholder: _placeholder, lineWrapping = true } = {}) => {
   return [
+    lineWrapping && EditorView7.lineWrapping,
     EditorState.allowMultipleSelections.of(true),
     EditorState.tabSize.of(2),
-    EditorView7.lineWrapping,
     // https://github.com/codemirror/basic-setup
     bracketMatching2(),
     closeBrackets2(),
@@ -1607,7 +1659,7 @@ var markdownBundle = ({ themeMode, placeholder: _placeholder }) => {
     highlightActiveLine2(),
     history2(),
     indentOnInput(),
-    _placeholder ? placeholder2(_placeholder) : [],
+    _placeholder && placeholder2(_placeholder),
     // Main extension.
     // https://github.com/codemirror/lang-markdown
     // https://codemirror.net/5/mode/markdown/index.html (demo).
@@ -1642,7 +1694,7 @@ var markdownBundle = ({ themeMode, placeholder: _placeholder }) => {
       // https://codemirror.net/docs/ref/#commands.standardKeymap
       ...standardKeymap
     ])
-  ];
+  ].filter(isNotFalsy2);
 };
 
 // packages/ui/react-ui-editor/src/extensions/markdown/code.ts
@@ -1652,26 +1704,43 @@ import { ViewPlugin as ViewPlugin3, EditorView as EditorView8, Decoration as Dec
 import { mx as mx2 } from "@dxos/react-ui-theme";
 var styles3 = EditorView8.baseTheme({
   "& .cm-code": {
-    paddingInline: "1rem !important",
     fontFamily: getToken("fontFamily.mono", []).join(",")
   },
   "& .cm-codeblock": {
-    display: "inline-block",
-    width: "100%"
+    width: "100%",
+    paddingInline: "1rem !important",
+    position: "relative",
+    "&::after": {
+      content: '""',
+      position: "absolute",
+      inset: 0
+    }
   },
-  "&light .cm-codeblock, &light .cm-codeblock.cm-activeLine": {
-    background: getToken("extend.colors.neutral.25")
+  "&light .cm-codeblock": {
+    "&::after": {
+      background: getToken("extend.semanticColors.input.light"),
+      mixBlendMode: "darken"
+    }
   },
-  "&dark .cm-codeblock, &dark .cm-codeblock.cm-activeLine": {
-    background: getToken("extend.colors.neutral.850")
+  "&dark .cm-codeblock": {
+    "&::after": {
+      background: getToken("extend.semanticColors.input.dark"),
+      mixBlendMode: "lighten"
+    }
   },
   "& .cm-codeblock-first": {
-    borderTopLeftRadius: ".5rem",
-    borderTopRightRadius: ".5rem"
+    display: "inline-block",
+    "&::after": {
+      borderTopLeftRadius: ".5rem",
+      borderTopRightRadius: ".5rem"
+    }
   },
   "& .cm-codeblock-last": {
-    borderBottomLeftRadius: ".5rem",
-    borderBottomRightRadius: ".5rem"
+    display: "inline-block",
+    "&::after": {
+      borderBottomLeftRadius: ".5rem",
+      borderBottomRightRadius: ".5rem"
+    }
   }
 });
 var getLineRange = (lines, from, to) => {
@@ -1715,7 +1784,7 @@ var buildDecorations = (view) => {
               }));
             } else {
               builder.add(block.from, block.from, Decoration3.line({
-                class: mx2("cm-code cm-codeblock")
+                class: mx2("cm-code cm-codeblock", i === range[0] && "cm-codeblock-first", i === range[1] && "cm-codeblock-last")
               }));
             }
           }
@@ -1743,16 +1812,156 @@ var code2 = () => {
   ];
 };
 
-// packages/ui/react-ui-editor/src/extensions/markdown/heading.ts
+// packages/ui/react-ui-editor/src/extensions/markdown/formatting.ts
+import { snippet } from "@codemirror/autocomplete";
 import { syntaxTree as syntaxTree2 } from "@codemirror/language";
 import { RangeSetBuilder as RangeSetBuilder2 } from "@codemirror/state";
-import { Decoration as Decoration4, ViewPlugin as ViewPlugin4 } from "@codemirror/view";
+import { Decoration as Decoration4, keymap as keymap5, ViewPlugin as ViewPlugin4 } from "@codemirror/view";
+var setHeading = (level) => (view) => {
+  const { selection: { ranges }, doc } = view.state;
+  const changes = [];
+  for (const range of ranges) {
+    const { number } = doc.lineAt(range.anchor);
+    const { from, to } = doc.line(number);
+    const line = doc.sliceString(from, to);
+    const [_, marks, spaces] = line.match(/(#+)(\s+)/) ?? [];
+    const current = marks?.length ?? 0;
+    if (level !== current) {
+      changes.push({
+        from,
+        to: from + current + (spaces?.length ?? 0),
+        insert: "#".repeat(level) + (level > 0 ? " " : "")
+      });
+    }
+  }
+  if (changes.length) {
+    view.dispatch({
+      changes
+    });
+  }
+  return true;
+};
+var toggleStyle = (mark2) => (view) => {
+  const { ranges } = view.state.selection;
+  for (const range of ranges) {
+    if (range.from === range.to) {
+      return false;
+    }
+    view.dispatch({
+      changes: [
+        {
+          from: range.from,
+          insert: mark2
+        },
+        {
+          from: range.to,
+          insert: mark2
+        }
+      ]
+    });
+  }
+  return true;
+};
+var snippets = {
+  codeblock: snippet([
+    "```#{lang}",
+    "	#{}",
+    "```"
+  ].join("\n")),
+  table: snippet([
+    "| #{col1} | #{col2} |",
+    "| ---- | ---- |",
+    "| #{val1} | #{val2} |",
+    "| #{val3} | #{val4} |"
+  ].join("\n"))
+};
+var insertCodeblock = (view) => {
+  const { selection: { main }, doc } = view.state;
+  const { number } = doc.lineAt(main.anchor);
+  const { from } = doc.line(number);
+  snippets.codeblock(view, null, from, from);
+};
+var insertTable = (view) => {
+  const { selection: { main }, doc } = view.state;
+  const { number } = doc.lineAt(main.anchor);
+  const { from } = doc.line(number);
+  snippets.table(view, null, from, from);
+};
+var toggleBold = toggleStyle("**");
+var toggleItalic = toggleStyle("_");
+var toggleStrikethrough = toggleStyle("~~");
+var toggleList = (view) => {
+};
+var formatting = (options = {}) => {
+  return [
+    keymap5.of([
+      {
+        key: "meta-b",
+        run: toggleBold
+      }
+    ]),
+    styling()
+  ];
+};
+var styling = () => {
+  const buildDecorations7 = (view) => {
+    const builder = new RangeSetBuilder2();
+    const { state } = view;
+    const cursor = state.selection.main.head;
+    const replace = (node, marks) => {
+      if (cursor <= node.from || cursor >= node.to) {
+        for (const mark2 of marks) {
+          builder.add(mark2.from, mark2.to, Decoration4.replace({}));
+        }
+      }
+    };
+    for (const { from, to } of view.visibleRanges) {
+      syntaxTree2(state).iterate({
+        enter: (node) => {
+          switch (node.name) {
+            case "Emphasis":
+            case "StrongEmphasis": {
+              const marks = node.node.getChildren("EmphasisMark");
+              replace(node, marks);
+              break;
+            }
+            case "Strikethrough": {
+              const marks = node.node.getChildren("StrikethroughMark");
+              replace(node, marks);
+              break;
+            }
+          }
+        },
+        from,
+        to
+      });
+    }
+    return builder.finish();
+  };
+  return [
+    ViewPlugin4.fromClass(class {
+      constructor(view) {
+        this.decorations = buildDecorations7(view);
+      }
+      update(update2) {
+        this.decorations = buildDecorations7(update2.view);
+      }
+    }, {
+      decorations: (value) => value.decorations
+    })
+  ];
+};
+
+// packages/ui/react-ui-editor/src/extensions/markdown/heading.ts
+import { syntaxTree as syntaxTree3 } from "@codemirror/language";
+import { RangeSetBuilder as RangeSetBuilder3 } from "@codemirror/state";
+import { Decoration as Decoration5, ViewPlugin as ViewPlugin5 } from "@codemirror/view";
 var buildDecorations2 = (view) => {
-  const builder = new RangeSetBuilder2();
+  const builder = new RangeSetBuilder3();
   const { state } = view;
   const cursor = state.selection.main.head;
   for (const { from, to } of view.visibleRanges) {
-    syntaxTree2(state).iterate({
+    syntaxTree3(state).iterate({
       enter: (node) => {
         switch (node.name) {
           case "ATXHeading1":
@@ -1763,8 +1972,8 @@ var buildDecorations2 = (view) => {
           case "ATXHeading6": {
             const mark2 = node.node.getChild("HeaderMark");
             if (mark2) {
-              if (view.state.readOnly || cursor < node.from || cursor > node.to) {
-                builder.add(mark2.from, mark2.to + 1, Decoration4.replace({}));
+              if (!view.hasFocus || view.state.readOnly || cursor < node.from || cursor > node.to) {
+                builder.add(mark2.from, mark2.to + 1, Decoration5.replace({}));
               }
             }
           }
@@ -1778,7 +1987,7 @@ var buildDecorations2 = (view) => {
 };
 var heading2 = () => {
   return [
-    ViewPlugin4.fromClass(class {
+    ViewPlugin5.fromClass(class {
       constructor(view) {
         this.decorations = buildDecorations2(view);
       }
@@ -1792,9 +2001,9 @@ var heading2 = () => {
 };
 
 // packages/ui/react-ui-editor/src/extensions/markdown/hr.ts
-import { syntaxTree as syntaxTree3 } from "@codemirror/language";
-import { RangeSetBuilder as RangeSetBuilder3 } from "@codemirror/state";
-import { Decoration as Decoration5, EditorView as EditorView9, ViewPlugin as ViewPlugin5, WidgetType as WidgetType3 } from "@codemirror/view";
+import { syntaxTree as syntaxTree4 } from "@codemirror/language";
+import { RangeSetBuilder as RangeSetBuilder4 } from "@codemirror/state";
+import { Decoration as Decoration6, EditorView as EditorView9, ViewPlugin as ViewPlugin6, WidgetType as WidgetType3 } from "@codemirror/view";
 var styles4 = EditorView9.baseTheme({
   "& .cm-hr": {
     // Note that block-level decorations should not have vertical margins,
@@ -1808,15 +2017,15 @@ var HorizontalRuleWidget = class extends WidgetType3 {
     return el;
   }
 };
-var decoration = Decoration5.replace({
+var decoration = Decoration6.replace({
   widget: new HorizontalRuleWidget()
 });
 var buildDecorations3 = (view) => {
-  const builder = new RangeSetBuilder3();
+  const builder = new RangeSetBuilder4();
   const { state } = view;
   const cursor = state.selection.main.head;
   for (const { from, to } of view.visibleRanges) {
-    syntaxTree3(state).iterate({
+    syntaxTree4(state).iterate({
       enter: (node) => {
         if (node.name === "HorizontalRule") {
           if (cursor <= node.from || cursor >= node.to) {
@@ -1832,7 +2041,7 @@ var buildDecorations3 = (view) => {
 };
 var hr = () => {
   return [
-    ViewPlugin5.fromClass(class {
+    ViewPlugin6.fromClass(class {
       constructor(view) {
         this.decorations = buildDecorations3(view);
       }
@@ -1847,13 +2056,13 @@ var hr = () => {
 };
 
 // packages/ui/react-ui-editor/src/extensions/markdown/image.ts
-import { syntaxTree as syntaxTree4 } from "@codemirror/language";
+import { syntaxTree as syntaxTree5 } from "@codemirror/language";
 import { StateField as StateField3 } from "@codemirror/state";
-import { Decoration as Decoration6, EditorView as EditorView10, WidgetType as WidgetType4 } from "@codemirror/view";
+import { Decoration as Decoration7, EditorView as EditorView10, WidgetType as WidgetType4 } from "@codemirror/view";
 var image = (options = {}) => {
   return StateField3.define({
     create: (state) => {
-      return Decoration6.set(buildDecorations4(0, state.doc.length, state));
+      return Decoration7.set(buildDecorations4(0, state.doc.length, state));
     },
     update: (value, tr) => {
       if (!tr.docChanged && !tr.selection) {
@@ -1882,14 +2091,14 @@ var image = (options = {}) => {
 var buildDecorations4 = (from, to, state) => {
   const decorations = [];
   const cursor = state.selection.main.head;
-  syntaxTree4(state).iterate({
+  syntaxTree5(state).iterate({
     enter: (node) => {
       if (node.name === "Image") {
         const urlNode = node.node.getChild("URL");
         if (urlNode) {
           const hide = state.readOnly || cursor < node.from || cursor > node.to;
           const url = state.sliceDoc(urlNode.from, urlNode.to);
-          decorations.push(Decoration6.replace({
+          decorations.push(Decoration7.replace({
             block: true,
             widget: new ImageWidget(url)
           }).range(hide ? node.from : node.to, node.to));
@@ -1919,13 +2128,13 @@ var ImageWidget = class extends WidgetType4 {
 };
 
 // packages/ui/react-ui-editor/src/extensions/markdown/link.ts
-import { syntaxTree as syntaxTree5 } from "@codemirror/language";
-import { RangeSetBuilder as RangeSetBuilder4 } from "@codemirror/state";
-import { hoverTooltip as hoverTooltip2, Decoration as Decoration7, ViewPlugin as ViewPlugin6, WidgetType as WidgetType5 } from "@codemirror/view";
+import { syntaxTree as syntaxTree6 } from "@codemirror/language";
+import { RangeSetBuilder as RangeSetBuilder5 } from "@codemirror/state";
+import { hoverTooltip as hoverTooltip2, Decoration as Decoration8, ViewPlugin as ViewPlugin7, WidgetType as WidgetType5 } from "@codemirror/view";
 import { tooltipContent } from "@dxos/react-ui-theme";
 var link = (options = {}) => {
   const extensions = [
-    ViewPlugin6.fromClass(class {
+    ViewPlugin7.fromClass(class {
       constructor(view) {
         this.decorations = buildDecorations5(view, options);
       }
@@ -1944,7 +2153,7 @@ var link = (options = {}) => {
       // https://codemirror.net/docs/ref/#view.hoverTooltip
       // https://github.com/codemirror/view/blob/main/src/tooltip.ts
       hoverTooltip2((view, pos, side) => {
-        const syntax = syntaxTree5(view.state).resolveInner(pos, side);
+        const syntax = syntaxTree6(view.state).resolveInner(pos, side);
         let link2 = null;
         for (let i = 0, node = syntax; !link2 && node && i < 5; node = node.parent, i++) {
           link2 = node.name === "Link" ? node : null;
@@ -2021,27 +2230,27 @@ var LinkText = class extends WidgetType5 {
   }
 };
 var buildDecorations5 = (view, options) => {
-  const builder = new RangeSetBuilder4();
+  const builder = new RangeSetBuilder5();
   const { state } = view;
   const cursor = state.selection.main.head;
   for (const { from, to } of view.visibleRanges) {
-    syntaxTree5(state).iterate({
+    syntaxTree6(state).iterate({
       enter: (node) => {
         if (node.name === "Link") {
-          const marks2 = node.node.getChildren("LinkMark");
-          const text = marks2.length >= 2 ? state.sliceDoc(marks2[0].to, marks2[1].from) : "";
+          const marks = node.node.getChildren("LinkMark");
+          const text = marks.length >= 2 ? state.sliceDoc(marks[0].to, marks[1].from) : "";
           const urlNode = node.node.getChild("URL");
           const url = urlNode ? state.sliceDoc(urlNode.from, urlNode.to) : "";
           if (!url) {
             return false;
           }
           if (!view.hasFocus || state.readOnly || cursor < node.from || cursor > node.to) {
-            builder.add(node.from, node.to, Decoration7.replace({
+            builder.add(node.from, node.to, Decoration8.replace({
               widget: new LinkText(text, options.link ? url : void 0)
             }));
           }
           if (options.onRender) {
-            builder.add(node.to, node.to, Decoration7.replace({
+            builder.add(node.to, node.to, Decoration8.replace({
               widget: new LinkButton(url, options.onRender)
             }));
           }
@@ -2056,9 +2265,9 @@ var buildDecorations5 = (view, options) => {
 };
 
 // packages/ui/react-ui-editor/src/extensions/markdown/table.ts
-import { syntaxTree as syntaxTree6 } from "@codemirror/language";
-import { RangeSetBuilder as RangeSetBuilder5, StateField as StateField4 } from "@codemirror/state";
-import { Decoration as Decoration8, EditorView as EditorView11, WidgetType as WidgetType6 } from "@codemirror/view";
+import { syntaxTree as syntaxTree7 } from "@codemirror/language";
+import { RangeSetBuilder as RangeSetBuilder6, StateField as StateField4 } from "@codemirror/state";
+import { Decoration as Decoration9, EditorView as EditorView11, WidgetType as WidgetType6 } from "@codemirror/view";
 var table = (options = {}) => {
   return StateField4.define({
     create: (state) => update(state, options),
@@ -2067,7 +2276,7 @@ var table = (options = {}) => {
   });
 };
 var update = (state, options) => {
-  const builder = new RangeSetBuilder5();
+  const builder = new RangeSetBuilder6();
   const cursor = state.selection.main.head;
   const tables = [];
   const getTable = () => tables[tables.length - 1];
@@ -2075,7 +2284,7 @@ var update = (state, options) => {
     const table2 = getTable();
     return table2.rows?.[table2.rows.length - 1];
   };
-  syntaxTree6(state).iterate({
+  syntaxTree7(state).iterate({
     enter: (node) => {
       switch (node.name) {
         case "Table": {
@@ -2107,10 +2316,10 @@ var update = (state, options) => {
   });
   tables.forEach((table2) => {
     const hide = state.readOnly || cursor < table2.from || cursor > table2.to;
-    hide && builder.add(table2.from, table2.to, Decoration8.replace({
+    hide && builder.add(table2.from, table2.to, Decoration9.replace({
       widget: new TableWidget(table2)
     }));
-    builder.add(table2.from, table2.to, Decoration8.mark({
+    builder.add(table2.from, table2.to, Decoration9.mark({
       class: "cm-table"
     }));
   });
@@ -2154,9 +2363,9 @@ var TableWidget = class extends WidgetType6 {
 };
 
 // packages/ui/react-ui-editor/src/extensions/markdown/tasklist.ts
-import { syntaxTree as syntaxTree7 } from "@codemirror/language";
-import { RangeSetBuilder as RangeSetBuilder6 } from "@codemirror/state";
-import { EditorView as EditorView12, Decoration as Decoration9, WidgetType as WidgetType7, ViewPlugin as ViewPlugin7 } from "@codemirror/view";
+import { syntaxTree as syntaxTree8 } from "@codemirror/language";
+import { RangeSetBuilder as RangeSetBuilder7 } from "@codemirror/state";
+import { EditorView as EditorView12, Decoration as Decoration10, WidgetType as WidgetType7, ViewPlugin as ViewPlugin8 } from "@codemirror/view";
 var styles5 = EditorView12.baseTheme({
   "& .cm-task": {
     color: getToken("extend.colors.blue.500")
@@ -2203,23 +2412,23 @@ var CheckboxWidget = class extends WidgetType7 {
     return false;
   }
 };
-var checkedDecoration = Decoration9.replace({
+var checkedDecoration = Decoration10.replace({
   widget: new CheckboxWidget(true)
 });
-var uncheckedDecoration = Decoration9.replace({
+var uncheckedDecoration = Decoration10.replace({
   widget: new CheckboxWidget(false)
 });
 var buildDecorations6 = (view) => {
-  const builder = new RangeSetBuilder6();
+  const builder = new RangeSetBuilder7();
   const { state } = view;
   const cursor = state.selection.main.head;
   for (const { from, to } of view.visibleRanges) {
-    syntaxTree7(state).iterate({
+    syntaxTree8(state).iterate({
       enter: (node) => {
         if (node.name === "TaskMarker") {
           if (cursor < node.from || cursor > node.to) {
             const checked = state.doc.sliceString(node.from + 1, node.to - 1) === "x";
-            builder.add(node.from - 2, node.from - 1, Decoration9.mark({
+            builder.add(node.from - 2, node.from - 1, Decoration10.mark({
               class: "cm-task"
             }));
             builder.add(node.from, node.to, checked ? checkedDecoration : uncheckedDecoration);
@@ -2234,7 +2443,7 @@ var buildDecorations6 = (view) => {
 };
 var tasklist = (options = {}) => {
   return [
-    ViewPlugin7.fromClass(class {
+    ViewPlugin8.fromClass(class {
       constructor(view) {
         this.decorations = buildDecorations6(view);
       }
@@ -2285,7 +2494,7 @@ var outliner = (options = {}) => {
 };
 
 // packages/ui/react-ui-editor/src/extensions/typewriter.ts
-import { keymap as keymap5 } from "@codemirror/view";
+import { keymap as keymap6 } from "@codemirror/view";
 var defaultItems = [
   "hello world!",
   "this is a test.",
@@ -2295,7 +2504,7 @@ var typewriter = ({ delay = 75, items = defaultItems } = {}) => {
   let t;
   let idx = 0;
   return [
-    keymap5.of([
+    keymap6.of([
       {
         // Reset.
         key: "alt-meta-'",
@@ -2372,8 +2581,9 @@ var defaultTheme = {
     outline: "none"
   },
   ".cm-scroller": {
-    overflow: "visible",
-    fontFamily: get3(tokens, "fontFamily.mono", []).join(",")
+    // overflow: 'visible',
+    fontFamily: get3(tokens, "fontFamily.mono", []).join(","),
+    lineHeight: 1.4
   },
   ".cm-content": {
     padding: 0,
@@ -2397,8 +2607,11 @@ var defaultTheme = {
   "&dark .cm-cursor, &dark .cm-dropCursor": {
     borderLeft: "2px solid white"
   },
-  ".cm-placeholder": {
-    fontWeight: 100
+  "&light .cm-placeholder": {
+    color: get3(tokens, "extend.semanticColors.description.light", "rgba(0,0,0,.2)")
+  },
+  "&dark .cm-placeholder": {
+    color: get3(tokens, "extend.semanticColors.description.dark", "rgba(255,255,255,.2)")
   },
   //
   // line
@@ -2407,7 +2620,7 @@ var defaultTheme = {
     paddingInline: 0
   },
   ".cm-activeLine": {
-    background: "inherit"
+    background: "transparent"
   },
   //
   // Selection
@@ -2578,15 +2791,12 @@ var codeTheme = {
 };
 
 // packages/ui/react-ui-editor/src/components/TextEditor/TextEditor.tsx
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/components/TextEditor/TextEditor.tsx";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/components/TextEditor/TextEditor.tsx";
 var EditorModes = [
   "default",
   "vim"
 ];
 var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, autoFocus, scrollTo, selection, editorMode, theme, slots = defaultSlots, extensions = [], debug }, forwardedRef) => {
-  const tabsterDOMAttribute = useFocusableGroup({
-    tabBehavior: "limited"
-  });
   const { themeMode } = useThemeContext();
   const rootRef = useRef(null);
   const [view, setView] = useState(null);
@@ -2594,7 +2804,15 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, autoFocus, s
     view
   ]);
   useEffect2(() => {
-    if (autoFocus) {
+    if (autoFocus && !view?.hasFocus) {
+      if (view?.state.selection.main?.from === 0) {
+        const { to } = view.state.doc.lineAt(0);
+        view?.dispatch({
+          selection: {
+            anchor: to
+          }
+        });
+      }
       view?.focus();
     }
   }, [
@@ -2612,8 +2830,8 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, autoFocus, s
         // TODO(burdon): Doesn't catch errors in keymap functions.
         EditorView13.exceptionSink.of((err) => {
           log2.catch(err, void 0, {
-            F: __dxlog_file5,
-            L: 123,
+            F: __dxlog_file3,
+            L: 134,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -2630,15 +2848,16 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, autoFocus, s
           class: slots.content?.className ?? ""
         }),
         // State.
+        EditorView13.editable.of(!readonly),
         EditorState2.readOnly.of(!!readonly),
         // Storage and replication.
         // NOTE: This must come before user extensions.
         model.extension,
-        // TODO(burdon): Factor out (requires special handling for Escape/focus).
+        // TODO(burdon): Factor out? (Requires special handling for Escape/Enter below).
         editorMode === "vim" && vim(),
         // Custom.
         ...extensions
-      ].filter(Boolean)
+      ].filter(isNotFalsy3)
     });
     const newView = new EditorView13({
       state,
@@ -2675,7 +2894,7 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, autoFocus, s
       }
       case "Escape": {
         if (editorMode === "vim" && (altKey || shiftKey || metaKey || ctrlKey)) {
-          rootRef.current?.focus();
+          view?.focus();
         }
         break;
       }
@@ -2688,9 +2907,9 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, autoFocus, s
     key: model.id,
     role: "none",
     tabIndex: 0,
-    onKeyUp: handleKeyUp,
     ...slots.root,
-    ...editorMode !== "vim" && tabsterDOMAttribute,
+    // {...(editorMode !== 'vim' && tabsterDOMAttribute)}
+    onKeyUp: handleKeyUp,
     ref: rootRef
   });
 });
@@ -2701,7 +2920,7 @@ var TextEditor = /* @__PURE__ */ forwardRef(({ readonly, placeholder: placeholde
     ref: forwardedRef,
     readonly,
     extensions: [
-      basicBundle({
+      createBasicBundle({
         themeMode,
         placeholder: placeholder3,
         lineWrapping
@@ -2720,7 +2939,7 @@ var MarkdownEditor = /* @__PURE__ */ forwardRef(({ readonly, placeholder: placeh
     ref: forwardedRef,
     readonly,
     extensions: [
-      markdownBundle({
+      createMarkdownExtensions({
         themeMode,
         placeholder: placeholder3
       }),
@@ -2733,11 +2952,10 @@ var MarkdownEditor = /* @__PURE__ */ forwardRef(({ readonly, placeholder: placeh
 });
 var defaultSlots = {
   root: {
-    // TODO(burdon): Add focusRing by default/as property?
-    className: mx3("flex flex-col grow overflow-y-auto", attentionSurface)
+    className: mx3("grow", focusRing)
   },
   editor: {
-    className: "h-full p-2"
+    className: "bs-full"
   }
 };
 var defaultTextSlots = {
@@ -2747,12 +2965,173 @@ var defaultMarkdownSlots = {
   ...defaultSlots
 };
 
+// packages/ui/react-ui-editor/src/components/Toolbar/Toolbar.tsx
+import { At, CaretRight, ChatText, Code, Image, Link, ListBullets, ListChecks, ListNumbers, TextStrikethrough, Table as Table2, TextB, TextItalic } from "@phosphor-icons/react";
+import { createContext } from "@radix-ui/react-context";
+import React2 from "react";
+import { Button, DensityProvider, Select } from "@dxos/react-ui";
+import { getSize } from "@dxos/react-ui-theme";
+var [ToolbarContextProvider, useToolbarContext] = createContext("Toolbar");
+var ToolbarRoot = ({ children, onAction }) => {
+  return /* @__PURE__ */ React2.createElement(ToolbarContextProvider, {
+    onAction
+  }, /* @__PURE__ */ React2.createElement(DensityProvider, {
+    density: "fine"
+  }, /* @__PURE__ */ React2.createElement("div", {
+    role: "toolbar",
+    className: "flex w-full shrink-0 p-2 gap-4 items-center whitespace-nowrap overflow-hidden"
+  }, children)));
+};
+var ToolbarButton = ({ Icon, onClick, title }) => {
+  const { onAction } = useToolbarContext("ToolbarButton");
+  const handleClick = () => {
+    const action = onClick();
+    if (action) {
+      onAction?.(action);
+    }
+  };
+  return /* @__PURE__ */ React2.createElement(Button, {
+    variant: "ghost",
+    classNames: "p-2",
+    onClick: handleClick,
+    title
+  }, /* @__PURE__ */ React2.createElement(Icon, {
+    className: getSize(5)
+  }));
+};
+var ToolbarSeparator = () => /* @__PURE__ */ React2.createElement("div", {
+  className: "grow"
+});
+var MarkdownHeading = () => {
+  const { onAction } = useToolbarContext("MarkdownFormatting");
+  return /* @__PURE__ */ React2.createElement(Select.Root, {
+    defaultValue: "0",
+    onValueChange: (value) => onAction?.({
+      type: "heading",
+      data: parseInt(value)
+    })
+  }, /* @__PURE__ */ React2.createElement(Select.TriggerButton, {
+    classNames: "w-[8rem]"
+  }), /* @__PURE__ */ React2.createElement(Select.Portal, null, /* @__PURE__ */ React2.createElement(Select.Content, null, /* @__PURE__ */ React2.createElement(Select.Viewport, null, /* @__PURE__ */ React2.createElement(Select.Option, {
+    value: "0"
+  }, "Paragraph"), [
+    1,
+    2,
+    3,
+    4,
+    5,
+    6
+  ].map((level) => /* @__PURE__ */ React2.createElement(Select.Option, {
+    key: level,
+    value: String(level)
+  }, "Heading ", level))))));
+};
+var MarkdownStyles = () => /* @__PURE__ */ React2.createElement("div", {
+  role: "none"
+}, /* @__PURE__ */ React2.createElement(ToolbarButton, {
+  Icon: TextB,
+  title: "Bold",
+  onClick: () => ({
+    type: "bold"
+  })
+}), /* @__PURE__ */ React2.createElement(ToolbarButton, {
+  Icon: TextItalic,
+  title: "Italic",
+  onClick: () => ({
+    type: "italic"
+  })
+}), /* @__PURE__ */ React2.createElement(ToolbarButton, {
+  Icon: TextStrikethrough,
+  title: "Strike-through",
+  onClick: () => ({
+    type: "strikethrough"
+  })
+}));
+var MarkdownLists = () => /* @__PURE__ */ React2.createElement("div", {
+  role: "none"
+}, /* @__PURE__ */ React2.createElement(ToolbarButton, {
+  Icon: ListBullets,
+  title: "Bullet list",
+  onClick: () => ({
+    type: "list"
+  })
+}), /* @__PURE__ */ React2.createElement(ToolbarButton, {
+  Icon: ListNumbers,
+  title: "Numbered list",
+  onClick: () => ({
+    type: "list-ordered"
+  })
+}), /* @__PURE__ */ React2.createElement(ToolbarButton, {
+  Icon: ListChecks,
+  title: "Task list",
+  onClick: () => ({
+    type: "list-tasks"
+  })
+}));
+var MarkdownBlocks = () => /* @__PURE__ */ React2.createElement("div", {
+  role: "none"
+}, /* @__PURE__ */ React2.createElement(ToolbarButton, {
+  Icon: CaretRight,
+  title: "Block quite",
+  onClick: () => ({
+    type: "blockquote"
+  })
+}), /* @__PURE__ */ React2.createElement(ToolbarButton, {
+  Icon: Code,
+  title: "Code block",
+  onClick: () => ({
+    type: "codeblock"
+  })
+}), /* @__PURE__ */ React2.createElement(ToolbarButton, {
+  Icon: Table2,
+  title: "Table",
+  onClick: () => ({
+    type: "table"
+  })
+}));
+var MarkdownLinks = () => /* @__PURE__ */ React2.createElement("div", {
+  role: "none"
+}, /* @__PURE__ */ React2.createElement(ToolbarButton, {
+  Icon: Link,
+  title: "Link",
+  onClick: () => ({
+    type: "link"
+  })
+}), /* @__PURE__ */ React2.createElement(ToolbarButton, {
+  Icon: At,
+  title: "Mention",
+  onClick: () => ({
+    type: "mention"
+  })
+}), /* @__PURE__ */ React2.createElement(ToolbarButton, {
+  Icon: Image,
+  title: "Image",
+  onClick: () => ({
+    type: "image"
+  })
+}));
+var MarkdownStandard = () => /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(MarkdownHeading, null), /* @__PURE__ */ React2.createElement(MarkdownStyles, null), /* @__PURE__ */ React2.createElement(MarkdownLists, null), /* @__PURE__ */ React2.createElement(MarkdownBlocks, null), /* @__PURE__ */ React2.createElement(MarkdownLinks, null));
+var MarkdownExtended = () => /* @__PURE__ */ React2.createElement(Toolbar.Button, {
+  Icon: ChatText,
+  title: "Create comment",
+  onClick: () => ({
+    type: "comment"
+  })
+});
+var Toolbar = {
+  Root: ToolbarRoot,
+  Button: ToolbarButton,
+  Separator: ToolbarSeparator,
+  Markdown: MarkdownStandard,
+  Extended: MarkdownExtended
+};
+
 // packages/ui/react-ui-editor/src/hooks/awareness-provider.ts
 import { DeferredTask, Event as Event2, sleep } from "@dxos/async";
 import { Context as Context2 } from "@dxos/context";
-import { invariant as invariant4 } from "@dxos/invariant";
+import { invariant as invariant2 } from "@dxos/invariant";
 import { log as log3 } from "@dxos/log";
-var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/hooks/awareness-provider.ts";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/hooks/awareness-provider.ts";
 var DEBOUNCE_INTERVAL = 100;
 var SpaceAwarenessProvider = class {
   constructor(params) {
@@ -2792,7 +3171,7 @@ var SpaceAwarenessProvider = class {
       log3.debug("failed to query awareness", {
         err
       }, {
-        F: __dxlog_file6,
+        F: __dxlog_file4,
         L: 89,
         S: this,
         C: (f, a) => f(...a)
@@ -2808,8 +3187,8 @@ var SpaceAwarenessProvider = class {
     return Array.from(this._remoteStates.values());
   }
   update(position) {
-    invariant4(this._postTask, void 0, {
-      F: __dxlog_file6,
+    invariant2(this._postTask, void 0, {
+      F: __dxlog_file4,
       L: 104,
       S: this,
       A: [
@@ -2825,8 +3204,8 @@ var SpaceAwarenessProvider = class {
     this._postTask.schedule();
   }
   _handleQueryMessage() {
-    invariant4(this._postTask, void 0, {
-      F: __dxlog_file6,
+    invariant2(this._postTask, void 0, {
+      F: __dxlog_file4,
       L: 115,
       S: this,
       A: [
@@ -2837,8 +3216,8 @@ var SpaceAwarenessProvider = class {
     this._postTask.schedule();
   }
   _handlePostMessage(message) {
-    invariant4(message.kind === "post", void 0, {
-      F: __dxlog_file6,
+    invariant2(message.kind === "post", void 0, {
+      F: __dxlog_file4,
       L: 120,
       S: this,
       A: [
@@ -2858,9 +3237,50 @@ var modelState = StateField5.define({
   update: (model) => model
 });
 
-// packages/ui/react-ui-editor/src/hooks/useTextEditor.ts
+// packages/ui/react-ui-editor/src/hooks/useActionHandler.ts
+var useActionHandler = (view) => {
+  return (action) => {
+    if (!view) {
+      return;
+    }
+    switch (action.type) {
+      case "heading":
+        setHeading(parseInt(action.data))(view);
+        break;
+      case "bold":
+        toggleBold(view);
+        break;
+      case "italic":
+        toggleItalic(view);
+        break;
+      case "strikethrough":
+        toggleStrikethrough(view);
+        break;
+      case "list":
+        toggleList(view);
+        break;
+      case "codeblock":
+        insertCodeblock(view);
+        break;
+      case "table":
+        insertTable(view);
+        break;
+      case "comment":
+        createComment(view);
+        break;
+    }
+    setTimeout(() => {
+      view.focus();
+      view.dispatch({
+        selection: view.state.selection
+      });
+    });
+  };
+};
+
+// packages/ui/react-ui-editor/src/hooks/useEditorView.ts
 import { useState as useState2 } from "react";
-var useTextEditor = () => {
+var useEditorView = () => {
   const [view, setView] = useState2(null);
   return [
     (ref) => {
@@ -2870,29 +3290,144 @@ var useTextEditor = () => {
   ];
 };
 
+// packages/ui/react-ui-editor/src/hooks/useTextEditor.ts
+import { EditorSelection, EditorState as EditorState3 } from "@codemirror/state";
+import { EditorView as EditorView14 } from "@codemirror/view";
+import { useEffect as useEffect3, useRef as useRef2, useState as useState3 } from "react";
+import { log as log4 } from "@dxos/log";
+import { isNotFalsy as isNotFalsy4 } from "@dxos/util";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/hooks/useTextEditor.ts";
+var useTextEditor = ({ autoFocus, scrollTo, debug, doc, selection, extensions } = {}) => {
+  const onUpdate = useRef2();
+  const [view, setView] = useState3();
+  const parentRef = useRef2(null);
+  useEffect3(() => {
+    if (parentRef.current) {
+      const state = EditorState3.create({
+        doc,
+        selection,
+        extensions: [
+          // TODO(burdon): Doesn't catch errors in keymap functions.
+          EditorView14.exceptionSink.of((err) => {
+            log4.catch(err, void 0, {
+              F: __dxlog_file5,
+              L: 57,
+              S: void 0,
+              C: (f, a) => f(...a)
+            });
+          }),
+          extensions,
+          EditorView14.updateListener.of(() => {
+            onUpdate.current?.();
+          })
+        ].filter(isNotFalsy4)
+      });
+      const view2 = new EditorView14({
+        parent: parentRef.current,
+        scrollTo,
+        state,
+        // NOTE: Uncomment to debug/monitor all transactions.
+        // https://codemirror.net/docs/ref/#view.EditorView.dispatch
+        dispatchTransactions: (trs, view3) => {
+          if (debug) {
+            logChanges(trs);
+          }
+          view3.update(trs);
+        }
+      });
+      setView(view2);
+    }
+    return () => {
+      view?.destroy();
+    };
+  }, [
+    parentRef
+  ]);
+  useEffect3(() => {
+    if (view) {
+      if (!selection && !view.state.selection.main.anchor) {
+        selection = EditorSelection.single(view.state.doc.line(1).to);
+      }
+      if (selection || scrollTo) {
+        onUpdate.current = () => {
+          onUpdate.current = void 0;
+          view.dispatch({
+            selection,
+            effects: scrollTo && [
+              scrollTo
+            ],
+            scrollIntoView: !scrollTo
+          });
+        };
+      }
+      if (autoFocus) {
+        view.focus();
+      }
+    }
+  }, [
+    view,
+    autoFocus,
+    selection,
+    scrollTo
+  ]);
+  return {
+    parentRef,
+    view
+  };
+};
+var createDataExtensions = ({ readonly = false } = {}) => {
+  return [
+    //
+    EditorState3.readOnly.of(readonly),
+    EditorView14.editable.of(!readonly)
+  ];
+};
+var createThemeExtensions = ({ theme, themeMode, slots } = {}) => {
+  return [
+    //
+    EditorView14.baseTheme(defaultTheme),
+    theme && EditorView14.theme(theme),
+    EditorView14.darkTheme.of(themeMode === "dark"),
+    EditorView14.editorAttributes.of({
+      class: slots?.editor?.className ?? ""
+    }),
+    EditorView14.contentAttributes.of({
+      class: slots?.content?.className ?? ""
+    })
+  ].filter(isNotFalsy4);
+};
+
 // packages/ui/react-ui-editor/src/hooks/useTextModel.ts
 import get4 from "lodash.get";
-import { useEffect as useEffect3, useState as useState3 } from "react";
+import { useEffect as useEffect4, useState as useState4 } from "react";
 import { generateName } from "@dxos/display-name";
 import { getRawDoc } from "@dxos/echo-schema";
-import { invariant as invariant5 } from "@dxos/invariant";
+import { invariant as invariant3 } from "@dxos/invariant";
 import { isAutomergeObject } from "@dxos/react-client/echo";
-import { isNotNullOrUndefined } from "@dxos/util";
-var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/hooks/useTextModel.ts";
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/hooks/useTextModel.ts";
 var useTextModel = (props) => {
   const { identity, space, text } = props;
-  const [model, setModel] = useState3();
-  useEffect3(() => setModel(createModel(props)), [
+  const [model, setModel] = useState4();
+  useEffect4(() => setModel(createModel(props)), [
     identity,
     space,
     text
   ]);
   return model;
 };
+var useInMemoryTextModel = ({ id, defaultContent }) => {
+  const [content, setContent] = useState4(defaultContent ?? "");
+  return {
+    id,
+    content,
+    setContent,
+    text: () => content
+  };
+};
 var createModel = ({ space, identity, text }) => {
-  invariant5(isAutomergeObject(text), void 0, {
-    F: __dxlog_file7,
-    L: 35,
+  invariant3(isAutomergeObject(text), void 0, {
+    F: __dxlog_file6,
+    L: 50,
     S: void 0,
     A: [
       "isAutomergeObject(text)",
@@ -2903,7 +3438,7 @@ var createModel = ({ space, identity, text }) => {
   const doc = getRawDoc(obj, [
     obj.field
   ]);
-  const awarenessProvider = space && new SpaceAwarenessProvider({
+  const awarenessProvider2 = space && new SpaceAwarenessProvider({
     space,
     channel: `automerge.awareness.${obj.id}`,
     info: {
@@ -2913,19 +3448,22 @@ var createModel = ({ space, identity, text }) => {
     },
     peerId: identity?.identityKey.toHex() ?? "Anonymous"
   });
+  const extensions = [
+    //
+    modelState.init(() => model),
+    automerge({
+      handle: doc.handle,
+      path: doc.path
+    })
+  ];
+  if (awarenessProvider2) {
+    extensions.push(awareness(awarenessProvider2));
+  }
   const model = {
     id: obj.id,
     content: doc,
     text: () => get4(doc.handle.docSync(), doc.path),
-    extension: [
-      modelState.init(() => model),
-      automerge3({
-        handle: doc.handle,
-        path: doc.path
-      }),
-      awarenessProvider && AwarenessProvider.of(awarenessProvider),
-      awareness()
-    ].filter(isNotNullOrUndefined),
+    extension: extensions,
     peer: identity ? {
       id: identity.identityKey.toHex(),
       name: identity.profile?.displayName
@@ -2934,7 +3472,6 @@ var createModel = ({ space, identity, text }) => {
   return model;
 };
 export {
-  AwarenessProvider,
   BaseTextEditor,
   Cursor,
   Doc,
@@ -2944,30 +3481,40 @@ export {
   SpaceAwarenessProvider,
   TextEditor,
   TextKind,
+  Toolbar,
   YText,
   YXmlFragment,
   autocomplete,
-  automerge3 as automerge,
+  automerge,
   awareness,
-  basicBundle,
+  awarenessProvider,
   blast,
   callbackWrapper,
   code2 as code,
   codeTheme,
   comments,
+  createBasicBundle,
+  createComment,
+  createDataExtensions,
+  createMarkdownExtensions,
+  createThemeExtensions,
   defaultMarkdownSlots,
   defaultOptions,
   defaultSlots,
   defaultTextSlots,
   defaultTheme,
+  focusComment,
+  formatting,
   getToken,
   heading2 as heading,
   hr,
   image,
+  insertCodeblock,
+  insertTable,
+  keymap7 as keymap,
   link,
   listener,
   logChanges,
-  markdownBundle,
   markdownHighlightStyle,
   markdownTags,
   markdownTagsExtensions,
@@ -2976,15 +3523,24 @@ export {
   modelState,
   outliner,
   setComments,
-  setFocus,
+  setHeading,
   setSelection,
   table,
   tags2 as tags,
   tasklist,
   textTheme,
+  toggleBold,
+  toggleItalic,
+  toggleList,
+  toggleStrikethrough,
+  toggleStyle,
   typewriter,
+  useActionHandler,
   useComments,
+  useEditorView,
+  useInMemoryTextModel,
   useTextEditor,
-  useTextModel
+  useTextModel,
+  useToolbarContext
 };
 //# sourceMappingURL=index.mjs.map