@dxos/react-ui-editor 0.3.10 → 0.3.11-main.008b7c6

package/dist/lib/browser/index.mjs

@@ -5,7 +5,18 @@ import { Doc, YText, YXmlFragment } from "@dxos/text-model";
 // packages/ui/react-ui-editor/src/components/TextEditor/index.ts
 import { tags as tags2 } from "@lezer/highlight";
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/autocomplete.ts
+// 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, useImperativeHandle, useState } from "react";
+import { generateName } from "@dxos/display-name";
+import { useThemeContext } from "@dxos/react-ui";
+import { getColorForValue, inputSurface, mx as mx3 } from "@dxos/react-ui-theme";
+
+// packages/ui/react-ui-editor/src/extensions/autocomplete.ts
 import { autocompletion, completionKeymap } from "@codemirror/autocomplete";
 import { keymap } from "@codemirror/view";
 var autocomplete = ({ onSearch }) => {
@@ -38,13 +49,565 @@ var autocomplete = ({ onSearch }) => {
   ];
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/basic.ts
+// packages/ui/react-ui-editor/src/extensions/automerge/automerge.ts
+import { Facet as Facet2, StateField } from "@codemirror/state";
+import { ViewPlugin } from "@codemirror/view";
+import { next as A } 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";
+var cursorConverter = (handle, path) => ({
+  // TODO(burdon): Handle assoc to associate with a previous character.
+  toCursor: (pos) => {
+    const doc = handle.docSync();
+    if (!doc) {
+      return "";
+    }
+    const value = get(doc, path);
+    if (typeof value === "string" && value.length <= pos) {
+      return "end";
+    }
+    return automerge.getCursor(doc, path.slice(), pos);
+  },
+  fromCursor: (cursor) => {
+    if (cursor === "") {
+      return 0;
+    }
+    const doc = handle.docSync();
+    if (!doc) {
+      return 0;
+    }
+    if (cursor === "end") {
+      const value = get(doc, path);
+      if (typeof value === "string") {
+        return value.length;
+      } else {
+        return 0;
+      }
+    }
+    return automerge.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 updateHeads = (newHeads) => effectType.of({
+  newHeads
+});
+var getLastHeads = (state, field) => state.field(field).lastHeads;
+var getPath = (state, field) => state.field(field).path;
+var reconcileAnnotationType = Annotation.define();
+var isReconcileTx = (tr) => !!tr.annotation(reconcileAnnotationType);
+
+// packages/ui/react-ui-editor/src/extensions/automerge/semaphore.ts
+import { next as automerge2 } from "@dxos/automerge/automerge";
+
+// packages/ui/react-ui-editor/src/extensions/automerge/update-automerge.ts
+import { next as am } from "@dxos/automerge/automerge";
+var updateAutomerge = (field, handle, transactions, state) => {
+  const { lastHeads, path } = state.field(field);
+  let hasChanges = false;
+  for (const tr of transactions) {
+    tr.changes.iterChanges(() => {
+      hasChanges = true;
+    });
+  }
+  if (!hasChanges) {
+    return void 0;
+  }
+  const newHeads = handle.changeAt(lastHeads, (doc) => {
+    for (const tr of transactions) {
+      tr.changes.iterChanges((fromA, toA, _fromB, _toB, inserted) => {
+        am.splice(doc, path, fromA, toA - fromA, inserted.toString());
+      });
+    }
+  });
+  return newHeads ?? void 0;
+};
+
+// packages/ui/react-ui-editor/src/extensions/automerge/update-codemirror.ts
+import { ChangeSet } from "@codemirror/state";
+var updateCodeMirror = (view, selection, target, patches) => {
+  for (const patch of patches) {
+    const changeSpec = handlePatch(patch, target, view.state);
+    if (changeSpec != null) {
+      const changeSet = ChangeSet.of(changeSpec, view.state.doc.length, "\n");
+      selection = selection.map(changeSet, 1);
+      view.dispatch({
+        changes: changeSet,
+        annotations: reconcileAnnotationType.of({})
+      });
+    }
+  }
+  view.dispatch({
+    selection,
+    annotations: reconcileAnnotationType.of({})
+  });
+};
+var handlePatch = (patch, target, state) => {
+  if (patch.action === "insert") {
+    return handleInsert(target, patch);
+  } else if (patch.action === "splice") {
+    return handleSplice(target, patch);
+  } else if (patch.action === "del") {
+    return handleDel(target, patch);
+  } else if (patch.action === "put") {
+    return handlePut(target, patch, state);
+  } else {
+    return null;
+  }
+};
+var handleInsert = (target, patch) => {
+  const index = charPath(target, patch.path);
+  if (index == null) {
+    return [];
+  }
+  const text = patch.values.map((v) => v ? v.toString() : "").join("");
+  return [
+    {
+      from: index,
+      to: index,
+      insert: text
+    }
+  ];
+};
+var handleSplice = (target, patch) => {
+  const index = charPath(target, patch.path);
+  if (index == null) {
+    return [];
+  }
+  return [
+    {
+      from: index,
+      insert: patch.value
+    }
+  ];
+};
+var handleDel = (target, patch) => {
+  const index = charPath(target, patch.path);
+  if (index == null) {
+    return [];
+  }
+  const length = patch.length || 1;
+  return [
+    {
+      from: index,
+      to: index + length
+    }
+  ];
+};
+var handlePut = (target, patch, state) => {
+  const index = charPath(target, [
+    ...patch.path,
+    0
+  ]);
+  if (index == null) {
+    return [];
+  }
+  const length = state.doc.length;
+  if (typeof patch.value !== "string") {
+    return [];
+  }
+  return [
+    {
+      from: 0,
+      to: length,
+      insert: patch.value
+    }
+  ];
+};
+var charPath = (textPath, candidatePath) => {
+  if (candidatePath.length !== textPath.length + 1) {
+    return null;
+  }
+  for (let i = 0; i < textPath.length; i++) {
+    if (textPath[i] !== candidatePath[i]) {
+      return null;
+    }
+  }
+  const index = candidatePath[candidatePath.length - 1];
+  if (typeof index === "number") {
+    return index;
+  }
+  return null;
+};
+
+// packages/ui/react-ui-editor/src/extensions/automerge/semaphore.ts
+var PatchSemaphore = class {
+  constructor(_field) {
+    this._field = _field;
+    this._inReconcile = false;
+    this._queue = [];
+    this.reconcile = (handle, view) => {
+      if (this._inReconcile) {
+        return;
+      }
+      this._inReconcile = true;
+      const path = getPath(view.state, this._field);
+      const oldHeads = getLastHeads(view.state, this._field);
+      let selection = view.state.selection;
+      const transactions = view.state.field(this._field).unreconciledTransactions.filter((tx) => !isReconcileTx(tx));
+      const toInvert = transactions.slice().reverse();
+      for (const tx of toInvert) {
+        const inverted = tx.changes.invert(tx.startState.doc);
+        selection = selection.map(inverted);
+        view.dispatch({
+          changes: inverted,
+          annotations: reconcileAnnotationType.of(true)
+        });
+      }
+      let newHeads = updateAutomerge(this._field, handle, transactions, view.state);
+      if (newHeads === null || newHeads === void 0) {
+        newHeads = automerge2.getHeads(handle.docSync());
+      }
+      const diff = automerge2.equals(oldHeads, newHeads) ? [] : automerge2.diff(handle.docSync(), oldHeads, newHeads);
+      updateCodeMirror(view, selection, path, diff);
+      view.dispatch({
+        effects: updateHeads(newHeads),
+        annotations: reconcileAnnotationType.of({})
+      });
+      this._inReconcile = false;
+    };
+  }
+};
+
+// packages/ui/react-ui-editor/src/util/cursor.ts
+import { Facet } from "@codemirror/state";
+var DEFAULT_CURSOR_CONVERTER = {
+  toCursor: (position) => position.toString(),
+  fromCursor: (cursor) => parseInt(cursor)
+};
+var CursorConverter = Facet.define({
+  combine: (providers) => providers[0] ?? DEFAULT_CURSOR_CONVERTER
+});
+
+// packages/ui/react-ui-editor/src/util/util.ts
+import { log } from "@dxos/log";
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/util/util.ts";
+var callbackWrapper = (fn) => (...args) => {
+  try {
+    return fn(...args);
+  } catch (error) {
+    log.catch(error, void 0, {
+      F: __dxlog_file,
+      L: 16,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+  }
+};
+
+// packages/ui/react-ui-editor/src/extensions/automerge/automerge.ts
+var semaphoreFacet = Facet2.define({
+  combine: (values) => values.at(-1)
+});
+var automerge3 = ({ handle, path }) => {
+  const stateField = StateField.define({
+    create: () => ({
+      lastHeads: A.getHeads(handle.docSync()),
+      unreconciledTransactions: [],
+      path: path.slice()
+    }),
+    update: (value, tr) => {
+      const result = {
+        lastHeads: value.lastHeads,
+        unreconciledTransactions: value.unreconciledTransactions.slice(),
+        path: path.slice()
+      };
+      let clearUnreconciled = false;
+      for (const effect of tr.effects) {
+        if (effect.is(effectType)) {
+          result.lastHeads = effect.value.newHeads;
+          clearUnreconciled = true;
+        }
+      }
+      if (clearUnreconciled) {
+        result.unreconciledTransactions = [];
+      } else {
+        if (!isReconcileTx(tr)) {
+          result.unreconciledTransactions.push(tr);
+        }
+      }
+      return result;
+    }
+  });
+  const semaphore = new PatchSemaphore(stateField);
+  const viewPlugin = ViewPlugin.fromClass(class AutomergeCodemirrorViewPlugin {
+    constructor(_view) {
+      this._view = _view;
+      this._handleChange = () => {
+        this._view.state.facet(semaphoreFacet).reconcile(handle, this._view);
+      };
+      handle.addListener("change", this._handleChange);
+    }
+    update(update4) {
+      if (update4.transactions.length > 0 && update4.transactions.some((tr) => !isReconcileTx(tr))) {
+        queueMicrotask(() => {
+          this._view.state.facet(semaphoreFacet).reconcile(handle, this._view);
+        });
+      }
+    }
+    destroy() {
+      handle.addListener("change", this._handleChange);
+    }
+  });
+  return {
+    extension: [
+      CursorConverter.of(cursorConverter(handle, path)),
+      semaphoreFacet.of(semaphore),
+      stateField,
+      viewPlugin
+    ]
+  };
+};
+
+// packages/ui/react-ui-editor/src/extensions/awareness.ts
+import { Annotation as Annotation2, Facet as Facet3, RangeSet } from "@codemirror/state";
+import { Decoration, EditorView, ViewPlugin as ViewPlugin2, WidgetType } from "@codemirror/view";
+import { Event } from "@dxos/async";
+import { Context } from "@dxos/context";
+var dummyProvider = {
+  remoteStateChange: new Event(),
+  open: () => {
+  },
+  close: () => {
+  },
+  update: () => {
+  },
+  getRemoteStates: () => []
+};
+var AwarenessProvider = Facet3.define({
+  combine: (providers) => providers[0] ?? dummyProvider
+});
+var RemoteSelectionChangedAnnotation = Annotation2.define();
+var awareness = (provider = dummyProvider) => {
+  return [
+    AwarenessProvider.of(provider),
+    ViewPlugin2.fromClass(RemoteSelectionsDecorator, {
+      decorations: (value) => value.decorations
+    }),
+    styles
+  ];
+};
+var RemoteSelectionsDecorator = class {
+  constructor(view) {
+    this.decorations = RangeSet.of([]);
+    this._ctx = new Context();
+    this._lastAnchor = void 0;
+    this._lastHead = void 0;
+    this._cursorConverter = view.state.facet(CursorConverter);
+    this._provider = view.state.facet(AwarenessProvider);
+    this._provider.open();
+    this._provider.remoteStateChange.on(this._ctx, () => {
+      view.dispatch({
+        annotations: [
+          RemoteSelectionChangedAnnotation.of([])
+        ]
+      });
+    });
+  }
+  destroy() {
+    void this._ctx.dispose();
+    this._provider.close();
+  }
+  update(update4) {
+    this._updateLocalSelection(update4);
+    this._updateRemoteSelections(update4);
+  }
+  _updateLocalSelection(update4) {
+    const hasFocus = update4.view.hasFocus && update4.view.dom.ownerDocument.hasFocus();
+    const { anchor = void 0, head = void 0 } = hasFocus ? update4.state.selection.main : {};
+    if (this._lastAnchor === anchor && this._lastHead === head) {
+      return;
+    }
+    this._lastAnchor = anchor;
+    this._lastHead = head;
+    this._provider.update(anchor !== void 0 && head !== void 0 ? {
+      anchor: this._cursorConverter.toCursor(anchor),
+      head: this._cursorConverter.toCursor(head)
+    } : void 0);
+  }
+  _updateRemoteSelections(update4) {
+    const decorations = [];
+    const awarenessStates = this._provider.getRemoteStates();
+    for (const state of awarenessStates) {
+      const anchor = state.position?.anchor ? this._cursorConverter.fromCursor(state.position.anchor) : null;
+      const head = state.position?.head ? this._cursorConverter.fromCursor(state.position.head) : null;
+      if (anchor == null || head == null) {
+        continue;
+      }
+      const start = Math.min(Math.min(anchor, head), update4.view.state.doc.length);
+      const end = Math.min(Math.max(anchor, head), update4.view.state.doc.length);
+      const startLine = update4.view.state.doc.lineAt(start);
+      const endLine = update4.view.state.doc.lineAt(end);
+      const color = state.info.color ?? "#30bced";
+      const lightColor = state.info.lightColor ?? color + "33";
+      if (startLine.number === endLine.number) {
+        decorations.push({
+          from: start,
+          to: end,
+          value: Decoration.mark({
+            attributes: {
+              style: `background-color: ${lightColor}`
+            },
+            class: "cm-ySelection"
+          })
+        });
+      } else {
+        decorations.push({
+          from: start,
+          to: startLine.from + startLine.length,
+          value: Decoration.mark({
+            attributes: {
+              style: `background-color: ${color}`
+            },
+            class: "cm-ySelection"
+          })
+        });
+        decorations.push({
+          from: endLine.from,
+          to: end,
+          value: Decoration.mark({
+            attributes: {
+              style: `background-color: ${color}`
+            },
+            class: "cm-ySelection"
+          })
+        });
+        for (let i = startLine.number + 1; i < endLine.number; i++) {
+          const linePos = update4.view.state.doc.line(i).from;
+          decorations.push({
+            from: linePos,
+            to: linePos,
+            value: Decoration.line({
+              attributes: {
+                style: `background-color: ${color}`,
+                class: "cm-yLineSelection"
+              }
+            })
+          });
+        }
+      }
+      decorations.push({
+        from: head,
+        to: head,
+        value: Decoration.widget({
+          side: head - anchor > 0 ? -1 : 1,
+          block: false,
+          widget: new RemoteCaretWidget(state.info.displayName ?? "Anonymous", color)
+        })
+      });
+    }
+    this.decorations = Decoration.set(decorations, true);
+  }
+};
+var RemoteCaretWidget = class extends WidgetType {
+  constructor(name, color) {
+    super();
+    this.name = name;
+    this.color = color;
+    this.name = name;
+    this.color = color;
+  }
+  toDOM() {
+    const span = document.createElement("span");
+    span.className = "cm-ySelectionCaret";
+    span.style.backgroundColor = this.color;
+    span.style.borderColor = this.color;
+    const dot = document.createElement("div");
+    dot.className = "cm-ySelectionCaretDot";
+    const info = document.createElement("div");
+    info.className = "cm-ySelectionInfo";
+    info.innerText = this.name;
+    span.appendChild(document.createTextNode("\u2060"));
+    span.appendChild(dot);
+    span.appendChild(document.createTextNode("\u2060"));
+    span.appendChild(info);
+    span.appendChild(document.createTextNode("\u2060"));
+    return span;
+  }
+  eq(widget) {
+    return widget.color === this.color;
+  }
+  compare(widget) {
+    return widget.color === this.color;
+  }
+  updateDOM() {
+    return false;
+  }
+  get estimatedHeight() {
+    return -1;
+  }
+  ignoreEvent() {
+    return true;
+  }
+};
+var styles = EditorView.baseTheme({
+  ".cm-ySelection": {},
+  ".cm-yLineSelection": {
+    padding: 0,
+    margin: "0px 2px 0px 4px"
+  },
+  ".cm-ySelectionCaret": {
+    position: "relative",
+    borderLeft: "1px solid black",
+    borderRight: "1px solid black",
+    marginLeft: "-1px",
+    marginRight: "-1px",
+    boxSizing: "border-box",
+    display: "inline"
+  },
+  ".cm-ySelectionCaretDot": {
+    borderRadius: "50%",
+    position: "absolute",
+    width: ".4em",
+    height: ".4em",
+    top: "-.2em",
+    left: "-.2em",
+    backgroundColor: "inherit",
+    transition: "transform .3s ease-in-out",
+    boxSizing: "border-box"
+  },
+  ".cm-ySelectionCaret:hover > .cm-ySelectionCaretDot": {
+    transformOrigin: "bottom center",
+    transform: "scale(0)"
+  },
+  ".cm-ySelectionInfo": {
+    position: "absolute",
+    top: "-1.05em",
+    left: "-1px",
+    fontSize: ".75em",
+    fontFamily: "serif",
+    fontStyle: "normal",
+    fontWeight: "normal",
+    lineHeight: "normal",
+    userSelect: "none",
+    color: "white",
+    paddingLeft: "2px",
+    paddingRight: "2px",
+    zIndex: 101,
+    transition: "opacity .3s ease-in-out",
+    backgroundColor: "inherit",
+    // these should be separate
+    opacity: 0,
+    transitionDelay: "0s",
+    whiteSpace: "nowrap"
+  },
+  ".cm-ySelectionCaret:hover > .cm-ySelectionInfo": {
+    opacity: 1,
+    transitionDelay: "0s"
+  }
+});
+
+// packages/ui/react-ui-editor/src/extensions/basic.ts
 import { closeBrackets } from "@codemirror/autocomplete";
 import { bracketMatching, defaultHighlightStyle, syntaxHighlighting } from "@codemirror/language";
 import { oneDarkHighlightStyle } from "@codemirror/theme-one-dark";
-import { drawSelection, EditorView, placeholder } from "@codemirror/view";
+import { drawSelection, EditorView as EditorView2, placeholder } from "@codemirror/view";
 var basicBundle = ({ readonly, themeMode, placeholder: _placeholder }) => [
-  EditorView.lineWrapping,
+  EditorView2.lineWrapping,
   // TODO(burdon): Compare with minimalSetup.
   // https://codemirror.net/docs/ref/#codemirror.minimalSetup
   bracketMatching(),
@@ -55,11 +618,11 @@ var basicBundle = ({ readonly, themeMode, placeholder: _placeholder }) => [
   themeMode === "dark" ? syntaxHighlighting(oneDarkHighlightStyle) : syntaxHighlighting(defaultHighlightStyle)
 ].filter(Boolean);
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/blast.ts
-import { EditorView as EditorView2, keymap as keymap2 } from "@codemirror/view";
+// packages/ui/react-ui-editor/src/extensions/blast.ts
+import { EditorView as EditorView3, keymap as keymap2 } from "@codemirror/view";
 import defaultsDeep from "lodash.defaultsdeep";
 import { invariant } from "@dxos/invariant";
-var __dxlog_file = "/home/circleci/project/packages/ui/react-ui-editor/src/components/TextEditor/extensions/blast.ts";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/blast.ts";
 var defaultOptions = {
   effect: 2,
   maxParticles: 200,
@@ -104,7 +667,7 @@ var blast = (options = defaultOptions) => {
   };
   return [
     // Cursor moved.
-    EditorView2.updateListener.of((update4) => {
+    EditorView3.updateListener.of((update4) => {
       if (blaster?.node !== update4.view.scrollDOM) {
         if (blaster) {
           blaster.destroy();
@@ -186,7 +749,7 @@ var Blaster = class {
   }
   initialize() {
     invariant(!this._canvas && !this._ctx, void 0, {
-      F: __dxlog_file,
+      F: __dxlog_file2,
       L: 138,
       S: this,
       A: [
@@ -223,7 +786,7 @@ var Blaster = class {
   }
   start() {
     invariant(this._canvas && this._ctx, void 0, {
-      F: __dxlog_file,
+      F: __dxlog_file2,
       L: 177,
       S: this,
       A: [
@@ -365,11 +928,49 @@ var random = (min, max) => {
   return min + ~~(Math.random() * (max - min + 1));
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/code.ts
-import { ViewPlugin, EditorView as EditorView3, Decoration } from "@codemirror/view";
-import get from "lodash.get";
+// packages/ui/react-ui-editor/src/extensions/code.ts
+import { ViewPlugin as ViewPlugin3, EditorView as EditorView4, Decoration as Decoration2 } from "@codemirror/view";
+import get2 from "lodash.get";
 import { mx as mx2 } from "@dxos/react-ui-theme";
 
+// packages/ui/react-ui-editor/src/styles/cursors.ts
+import * as random2 from "lib0/random";
+var cursorColors = [
+  {
+    color: "#30bced",
+    light: "#30bced33"
+  },
+  {
+    color: "#6eeb83",
+    light: "#6eeb8333"
+  },
+  {
+    color: "#ffbc42",
+    light: "#ffbc4233"
+  },
+  {
+    color: "#ecd444",
+    light: "#ecd44433"
+  },
+  {
+    color: "#ee6352",
+    light: "#ee635233"
+  },
+  {
+    color: "#9ac2c9",
+    light: "#9ac2c933"
+  },
+  {
+    color: "#8acb88",
+    light: "#8acb8833"
+  },
+  {
+    color: "#1be7ff",
+    light: "#1be7ff33"
+  }
+];
+var cursorColor = cursorColors[random2.uint32() % cursorColors.length];
+
 // packages/ui/react-ui-editor/src/styles/markdown.ts
 import { mx } from "@dxos/react-ui-theme";
 var headings = {
@@ -411,31 +1012,33 @@ var code = "font-mono !no-underline text-neutral-700 dark:text-neutral-300";
 var codeMark = "font-mono text-primary-500";
 var inlineUrl = mx(code, "px-1");
 var blockquote = mx("pl-1 mr-1 border-is-4 border-primary-500/70 dark:border-primary-500/30", light);
-var horizontalRule = "flex mlb-4 border-b text-neutral-100 dark:text-neutral-900 border-neutral-200 dark:border-neutral-800";
 
 // packages/ui/react-ui-editor/src/styles/tokens.ts
 import { tailwindConfig } from "@dxos/react-ui-theme";
 var tokens = tailwindConfig({}).theme;
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/code.ts
+// packages/ui/react-ui-editor/src/extensions/code.ts
 var CODE_REGEX = /```[\s\S]*?```/gs;
-var styles = EditorView3.baseTheme({
-  "& .cm-code-block": {
-    display: "block",
-    paddingInline: "4px !important"
+var styles2 = EditorView4.baseTheme({
+  "& .cm-codeblock": {
+    fontFamily: get2(tokens, "fontFamily.mono", []).join(",")
   },
-  "&light .cm-code-block": {
-    background: get(tokens, "extend.colors.neutral.50")
+  '&light [aria-readonly="true"] .cm-codeblock': {
+    background: get2(tokens, "extend.colors.neutral.50")
   },
-  "&dark .cm-code-block": {
-    background: get(tokens, "extend.colors.neutral.850")
+  '&dark [aria-readonly="true"] .cm-codeblock': {
+    background: get2(tokens, "extend.colors.neutral.850")
   },
-  "& .cm-code-block-first": {
+  '& [aria-readonly="true"] .cm-codeblock': {
+    display: "block",
+    paddingInline: "4px !important"
+  },
+  '& [aria-readonly="true"] .cm-codeblock-first': {
     paddingTop: "4px !important",
     borderTopLeftRadius: "4px",
     borderTopRightRadius: "4px"
   },
-  "& .cm-code-block-last": {
+  '& [aria-readonly="true"] .cm-codeblock-last': {
     paddingBottom: "4px !important",
     borderBottomLeftRadius: "4px",
     borderBottomRightRadius: "4px"
@@ -460,16 +1063,16 @@ var code2 = () => {
         const range = getLineRange(blocks, match.index, match.index + match[0].length);
         for (let i = range[0]; i <= range[1]; i++) {
           const block = blocks[i];
-          decorations.push(Decoration.line({
-            class: mx2("cm-code-block", i === range[0] && "cm-code-block-first", i === range[1] && "cm-code-block-last")
+          decorations.push(Decoration2.line({
+            class: mx2("cm-codeblock", i === range[0] && "cm-codeblock-first", i === range[1] && "cm-codeblock-last")
           }).range(block.from));
         }
       }
     }
-    return Decoration.set(decorations);
+    return Decoration2.set(decorations);
   };
   return [
-    ViewPlugin.fromClass(class {
+    ViewPlugin3.fromClass(class {
       constructor(view) {
         this.decorations = getDecorations(view);
       }
@@ -481,73 +1084,21 @@ var code2 = () => {
     }, {
       decorations: (value) => value.decorations
     }),
-    styles
-  ];
-};
-
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/demo.ts
-import { keymap as keymap3 } from "@codemirror/view";
-var defaultItems = [
-  "hello world!",
-  "this is a test.",
-  "this is [DXOS](https://dxos.org)"
-];
-var demo = ({ delay = 75, items = defaultItems } = {}) => {
-  let t;
-  let idx = 0;
-  return [
-    keymap3.of([
-      {
-        // Reset.
-        key: "alt-meta-'",
-        run: (view) => {
-          clearTimeout(t);
-          idx = 0;
-          return true;
-        }
-      },
-      {
-        // Next prompt.
-        // TODO(burdon): Press 1-9 to select prompt?
-        key: "shift-meta-'",
-        run: (view) => {
-          clearTimeout(t);
-          const text = items[idx++];
-          if (idx === items?.length) {
-            idx = 0;
-          }
-          let i = 0;
-          const insert = (d = 0) => {
-            t = setTimeout(() => {
-              const pos = view.state.selection.main.head;
-              view.dispatch({
-                changes: {
-                  from: pos,
-                  insert: text[i++]
-                },
-                selection: {
-                  anchor: pos + 1
-                }
-              });
-              if (i < text.length) {
-                insert(Math.random() * delay * (text[i] === " " ? 2 : 1));
-              }
-            }, d);
-          };
-          insert();
-          return true;
-        }
-      }
-    ])
+    styles2
   ];
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/comments.ts
-import { keymap as keymap4, Decoration as Decoration2, EditorView as EditorView4, MatchDecorator, ViewPlugin as ViewPlugin2, WidgetType } from "@codemirror/view";
+// packages/ui/react-ui-editor/src/extensions/comments.ts
+import { StateEffect as StateEffect2, StateField as StateField2 } from "@codemirror/state";
+import { hoverTooltip, keymap as keymap3, Decoration as Decoration3, EditorView as EditorView5, MatchDecorator, ViewPlugin as ViewPlugin4, WidgetType as WidgetType2 } from "@codemirror/view";
+import get3 from "lodash.get";
+import sortBy from "lodash.sortby";
 import { debounce } from "@dxos/async";
 import { invariant as invariant2 } from "@dxos/invariant";
-var __dxlog_file2 = "/home/circleci/project/packages/ui/react-ui-editor/src/components/TextEditor/extensions/comments.ts";
-var styles2 = EditorView4.baseTheme({
+import { log as log2 } from "@dxos/log";
+import { nonNullable } from "@dxos/util";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/comments.ts";
+var styles3 = EditorView5.baseTheme({
   "& .cm-bookmark": {
     cursor: "pointer",
     margin: "4px",
@@ -556,17 +1107,103 @@ var styles2 = EditorView4.baseTheme({
   },
   "& .cm-bookmark-selected": {
     backgroundColor: "orange"
+  },
+  "& .cm-comment": {
+    backgroundColor: get3(tokens, "extend.colors.yellow.50")
+  },
+  "& .cm-comment-active": {
+    backgroundColor: get3(tokens, "extend.colors.yellow.100")
+  }
+});
+var marks = {
+  highlight: Decoration3.mark({
+    class: "cm-comment"
+  }),
+  highlightActive: Decoration3.mark({
+    class: "cm-comment-active"
+  })
+};
+var setFocus = (view, thread) => {
+  const range = view.state.field(commentsStateField).ranges.find((range2) => range2.id === thread);
+  if (!range) {
+    return;
+  }
+  view.dispatch({
+    effects: setSelection.of({
+      active: thread
+    }),
+    selection: {
+      anchor: range.from
+    },
+    scrollIntoView: true
+  });
+};
+var setCommentRange = StateEffect2.define();
+var setSelection = StateEffect2.define();
+var setCommentState = StateEffect2.define();
+var commentsStateField = StateField2.define({
+  create: () => ({
+    ranges: []
+  }),
+  update: (value, tr) => {
+    const cursorConverter3 = tr.state.facet(CursorConverter);
+    for (const effect of tr.effects) {
+      if (effect.is(setSelection)) {
+        return {
+          ...value,
+          ...effect.value
+        };
+      }
+      if (effect.is(setCommentRange)) {
+        const { comments: comments2 } = effect.value;
+        const ranges = comments2.map((comment) => {
+          const range = getRangeFromCursor(cursorConverter3, comment.cursor);
+          return range && {
+            ...comment,
+            ...range
+          };
+        }).filter(nonNullable);
+        return {
+          ...value,
+          ranges
+        };
+      }
+      if (effect.is(setCommentState)) {
+        return effect.value;
+      }
+    }
+    return value;
   }
 });
-var BookmarkWidget = class extends WidgetType {
-  constructor(_pos, _id, _handleClick) {
+var highlightDecorations = EditorView5.decorations.compute([
+  commentsStateField
+], (state) => {
+  const { active, ranges } = state.field(commentsStateField);
+  const decorations = sortBy(ranges ?? [], (range) => range.from)?.flatMap((selection) => {
+    if (selection.from === selection.to) {
+      return void 0;
+    }
+    const range = {
+      from: selection.from,
+      to: selection.to
+    };
+    if (selection.id === active) {
+      return marks.highlightActive.range(range.from, range.to);
+    } else {
+      return marks.highlight.range(range.from, range.to);
+    }
+  }).filter(nonNullable) ?? [];
+  return Decoration3.set(decorations);
+});
+var BookmarkWidget = class extends WidgetType2 {
+  constructor(_anchor, _id, _handleClick) {
     super();
-    this._pos = _pos;
+    this._anchor = _anchor;
     this._id = _id;
     this._handleClick = _handleClick;
     invariant2(this._id, void 0, {
-      F: __dxlog_file2,
-      L: 37,
+      F: __dxlog_file3,
+      L: 169,
       S: this,
       A: [
         "this._id",
@@ -575,227 +1212,286 @@ var BookmarkWidget = class extends WidgetType {
     });
   }
   eq(other) {
-    return this._id === other._id;
+    return this._anchor === other._anchor && this._id === other._id;
   }
   toDOM() {
     const span = document.createElement("span");
     span.className = "cm-bookmark";
-    span.textContent = "\xA7";
-    span.onclick = () => this._handleClick();
+    span.textContent = "\u203B";
+    if (this._handleClick) {
+      span.onclick = () => this._handleClick();
+    }
     return span;
   }
 };
 var comments = (options = {}) => {
-  let active;
-  const bookmarkMatcher = new MatchDecorator({
-    regexp: /\[\^(\w+)\]/g,
-    decoration: (match, view, pos) => {
-      const id = match[1];
-      return Decoration2.replace({
-        id,
-        widget: new BookmarkWidget(pos, id, () => handleUpdate({
-          active: id
-        }))
+  const handleSelect = debounce((state) => options.onSelect?.(state), 200);
+  const createCommentThread = (view) => {
+    const cursorConverter3 = view.state.facet(CursorConverter);
+    invariant2(options.onCreate, void 0, {
+      F: __dxlog_file3,
+      L: 225,
+      S: void 0,
+      A: [
+        "options.onCreate",
+        ""
+      ]
+    });
+    const { head, from, to } = view.state.selection.main;
+    if (from === to) {
+      return false;
+    }
+    const relPos = getCursorFromRange(cursorConverter3, {
+      from,
+      to
+    });
+    if (relPos) {
+      const id = callbackWrapper(options.onCreate)(relPos);
+      if (id) {
+        view.dispatch({
+          effects: setSelection.of({
+            active: id
+          }),
+          selection: {
+            anchor: from
+          }
+        });
+        if (options.footnote) {
+          const tag = `[^${id}]`;
+          view.dispatch({
+            changes: {
+              from: head,
+              insert: tag
+            },
+            selection: {
+              anchor: head + tag.length
+            }
+          });
+        }
+        return true;
+      }
+    }
+    return false;
+  };
+  const bookmarksViewPlugin = ViewPlugin4.fromClass(class BookmarkViewPlugin {
+    static {
+      // Match markdown footnotes (option).
+      // https://www.markdownguide.org/extended-syntax/#footnotes
+      this.bookmarkMatcher = new MatchDecorator({
+        regexp: /\[\^(\w+)\]/g,
+        decoration: (match, view, pos) => {
+          const id = match[1];
+          return Decoration3.replace({
+            id,
+            widget: new BookmarkWidget(pos, id)
+          });
+        }
       });
     }
-  });
-  const bookmarks = ViewPlugin2.fromClass(class {
     constructor(view) {
-      this.bookmarks = bookmarkMatcher.createDeco(view);
+      this.bookmarks = BookmarkViewPlugin.bookmarkMatcher.createDeco(view);
     }
     update(update4) {
-      this.bookmarks = bookmarkMatcher.updateDeco(update4, this.bookmarks);
+      this.bookmarks = BookmarkViewPlugin.bookmarkMatcher.updateDeco(update4, this.bookmarks);
     }
   }, {
     decorations: (instance) => instance.bookmarks,
-    provide: (plugin) => EditorView4.atomicRanges.of((view) => {
-      return view.plugin(plugin)?.bookmarks || Decoration2.none;
+    provide: (plugin) => EditorView5.atomicRanges.of((view) => {
+      return view.plugin(plugin)?.bookmarks || Decoration3.none;
     })
   });
-  const handleUpdate = debounce((data) => {
-    options.onUpdate?.(data);
-  }, 200);
   return [
-    keymap4.of([
+    bookmarksViewPlugin,
+    commentsStateField,
+    highlightDecorations,
+    styles3,
+    //
+    // Keymap.
+    //
+    options.onCreate ? keymap3.of([
       {
-        key: options?.key ?? "shift-meta-c",
-        run: (view) => {
-          const { from, to, head } = view.state.selection.main;
-          const id = options.onCreate?.(from, to);
-          if (id) {
-            const tag = `[^${id}]`;
-            view.dispatch({
-              changes: {
-                from: head,
-                insert: tag
-              },
-              selection: {
-                anchor: head + tag.length
+        key: options?.key ?? "meta-'",
+        run: callbackWrapper(createCommentThread)
+      }
+    ]) : [],
+    //
+    // Hover tooltip (for key shortcut hints, etc.)
+    // TODO(burdon): Factor out to generic hints extension for current selection/line.
+    //
+    options.onHover ? hoverTooltip((view, pos) => {
+      const selection = view.state.selection.main;
+      if (selection && pos >= selection.from && pos <= selection.to) {
+        return {
+          pos: selection.from,
+          end: selection.to,
+          above: true,
+          create: () => {
+            const el = document.createElement("div");
+            options.onHover?.(el);
+            return {
+              dom: el,
+              offset: {
+                x: 0,
+                y: 8
               }
-            });
-            return true;
+            };
           }
-          return false;
-        }
-      }
-    ]),
-    bookmarks,
-    // Monitor cursor movement.
-    EditorView4.updateListener.of((update4) => {
-      active = void 0;
-      if (!options.onUpdate) {
-        return;
+        };
       }
-      const { view, state } = update4;
-      const pos = state.selection.main.head;
-      const decorations = [];
-      const rangeSet = view.plugin(bookmarks)?.bookmarks;
-      let closest = Infinity;
-      const { from, to } = (
-        /* view.visibleRanges?.[0] ?? */
-        {
-          from: 0,
-          to: state.doc.length
-        }
-      );
-      rangeSet?.between(from, to, (from2, to2, value) => {
-        decorations.push({
-          from: from2,
-          to: to2,
-          value
+      return null;
+    }, {
+      hideOnChange: true,
+      hoverTime: 1e3
+    }) : [],
+    //
+    // Monitor cursor movement and text updates.
+    // TODO(burdon): Is there a better (finer grained) way to do this?
+    //
+    EditorView5.updateListener.of(({ view, state, changes }) => {
+      const cursorConverter3 = view.state.facet(CursorConverter);
+      {
+        let mod = false;
+        const { active, ranges } = state.field(commentsStateField);
+        changes.iterChanges((from, to, from2, to2) => {
+          ranges.forEach((range) => {
+            if (from2 === to2) {
+              const newRange = getRangeFromCursor(cursorConverter3, range.cursor);
+              if (!newRange || newRange.to - newRange.from === 0) {
+                log2.info("deleted comment", {
+                  thread: range.id
+                }, {
+                  F: __dxlog_file3,
+                  L: 359,
+                  S: void 0,
+                  C: (f, a) => f(...a)
+                });
+              }
+            }
+            if (from <= range.to) {
+              const newRange = getRangeFromCursor(cursorConverter3, range.cursor);
+              Object.assign(range, newRange);
+              mod = true;
+            }
+          });
         });
-        const d = Math.min(Math.abs(pos - from2), Math.abs(pos - to2));
-        if (d < closest) {
-          active = value.spec.id;
-          closest = d;
+        if (mod) {
+          view.dispatch({
+            effects: setCommentState.of({
+              active,
+              ranges
+            })
+          });
         }
-      });
-      if (decorations.length) {
-        handleUpdate({
-          active,
-          items: decorations.map(({ from: from2, value: { spec: { id } } }) => ({
-            id,
-            pos: from2,
-            location: view.coordsAtPos(from2)
-          }))
+      }
+      {
+        const { head } = state.selection.main;
+        let min = Infinity;
+        const { active, closest, ranges } = state.field(commentsStateField);
+        const selected = {
+          active: void 0,
+          closest: void 0
+        };
+        ranges.forEach((comment) => {
+          const d = Math.min(Math.abs(head - comment.from), Math.abs(head - comment.to));
+          if (head >= comment.from && head <= comment.to) {
+            selected.active = comment.id;
+          }
+          if (d < min) {
+            selected.closest = comment.id;
+            min = d;
+          }
         });
+        if (selected.active !== active || selected.closest !== closest) {
+          view.dispatch({
+            effects: setSelection.of(selected)
+          });
+          handleSelect({
+            ...selected,
+            ranges: ranges.map((range) => ({
+              ...range,
+              location: view.coordsAtPos(range.from)
+            }))
+          });
+        }
       }
-    }),
-    styles2
+    })
   ];
 };
+var getCursorFromRange = (cursorConverter3, range) => {
+  const from = cursorConverter3.toCursor(range.from);
+  const to = cursorConverter3.toCursor(range.to, -1);
+  return [
+    from,
+    to
+  ].join(":");
+};
+var getRangeFromCursor = (cursorConverter3, cursor) => {
+  const parts = cursor.split(":");
+  const from = cursorConverter3.fromCursor(parts[0]);
+  const to = cursorConverter3.fromCursor(parts[1]);
+  return from && to ? {
+    from,
+    to
+  } : void 0;
+};
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/highlight.ts
-import { StateEffect, StateField } from "@codemirror/state";
-import { Decoration as Decoration3, EditorView as EditorView5 } from "@codemirror/view";
-import sortBy from "lodash.sortby";
-import { useEffect } from "react";
-var styles3 = EditorView5.baseTheme({
-  "& .cm-highlight": {
-    backgroundColor: "yellow"
-  },
-  "& .cm-highlight::before": {
-    content: "]"
-  },
-  "& .cm-highlight-active": {
-    backgroundColor: "lime"
+// packages/ui/react-ui-editor/src/extensions/hr.ts
+import { Decoration as Decoration4, EditorView as EditorView6, MatchDecorator as MatchDecorator2, ViewPlugin as ViewPlugin5, WidgetType as WidgetType3 } from "@codemirror/view";
+import get4 from "lodash.get";
+var styles4 = EditorView6.baseTheme({
+  "& .cm-hr": {
+    // TODO(burdon): ???
+    // Note that block-level decorations should not have vertical margins,
+    borderBottom: `1px solid ${get4(tokens, "extend.colors.neutral.200")}`
   }
 });
-var marks = {
-  highlight: Decoration3.mark({
-    class: "cm-highlight"
-  }),
-  HighlightActive: Decoration3.mark({
-    class: "cm-highlight-active"
-  })
-};
-var setHighlights = StateEffect.define();
-var useHighlights = (view, ranges = []) => {
-  useEffect(() => {
-    view?.dispatch({
-      effects: setHighlights.of(ranges)
-    });
-  }, [
-    view,
-    ranges
-  ]);
-};
-var highlightStateField = StateField.define({
-  create: () => [],
-  update: (threads, tr) => {
-    for (const effect of tr.effects) {
-      if (effect.is(setHighlights)) {
-        return effect.value;
-      }
-    }
-    return threads;
+var HorizontalRuleWidget = class extends WidgetType3 {
+  constructor(_pos) {
+    super();
+    this._pos = _pos;
+  }
+  eq(other) {
+    return this._pos === other._pos;
   }
+  toDOM(view) {
+    const el = document.createElement("div");
+    el.className = "cm-hr";
+    return el;
+  }
+};
+var placeholderMatcher = new MatchDecorator2({
+  regexp: /^---$/g,
+  decoration: (match, view, pos) => Decoration4.replace({
+    widget: new HorizontalRuleWidget(pos)
+  })
 });
-var highlightDecorations = EditorView5.decorations.compute([
-  highlightStateField
-], (state) => {
-  const selectionRanges = state.field(highlightStateField);
-  const decorations = sortBy(selectionRanges ?? [], (selection) => selection.from)?.flatMap((selection) => {
-    const range = {
-      from: selection.from,
-      to: selection.to + 1
-    };
-    if (selection.to > selection.from) {
-      if (selection.active) {
-        return marks.HighlightActive.range(range.from, range.to);
-      } else {
-        return marks.highlight.range(range.from, range.to);
-      }
-    } else {
-      return [];
+var hr = () => [
+  styles4,
+  ViewPlugin5.fromClass(class {
+    constructor(view) {
+      this.rules = placeholderMatcher.createDeco(view);
     }
-  }) ?? [];
-  return Decoration3.set(decorations);
-});
-var listener = (options) => {
-  return EditorView5.updateListener.of((update4) => {
-    const { view, state } = update4;
-    const { head } = state.selection.main;
-    const ranges = state.field(highlightStateField);
-    let mod = false;
-    const newRanges = ranges.map((range) => {
-      const active = head >= range.from && head <= range.to;
-      if (active !== range.active) {
-        mod = true;
-        return {
-          ...range,
-          active
-        };
-      } else {
-        return range;
-      }
-    });
-    if (mod) {
-      view.dispatch({
-        effects: setHighlights.of(newRanges)
-      });
-      options?.onChange?.(newRanges.find((range) => range.active)?.id);
+    update(update4) {
+      this.rules = placeholderMatcher.updateDeco(update4, this.rules);
     }
-  });
-};
-var highlight = (options = {}) => {
-  return [
-    highlightStateField,
-    highlightDecorations,
-    listener(options),
-    styles3
-  ];
-};
+  }, {
+    decorations: (instance) => instance.rules,
+    // TODO(burdon): Is this really atomic (cursor can move into ---).
+    provide: (plugin) => EditorView6.atomicRanges.of((view) => {
+      return view.plugin(plugin)?.rules || Decoration4.none;
+    })
+  })
+];
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/image.ts
+// packages/ui/react-ui-editor/src/extensions/image.ts
 import { syntaxTree } from "@codemirror/language";
-import { RangeSetBuilder, StateField as StateField2 } from "@codemirror/state";
-import { Decoration as Decoration4, EditorView as EditorView6, WidgetType as WidgetType2 } from "@codemirror/view";
+import { RangeSetBuilder, StateField as StateField3 } from "@codemirror/state";
+import { Decoration as Decoration5, EditorView as EditorView7, WidgetType as WidgetType4 } from "@codemirror/view";
 var image = (options = {}) => {
-  return StateField2.define({
+  return StateField3.define({
     create: (state) => update(state, options),
     update: (_, tr) => update(tr.state, options),
-    provide: (field) => EditorView6.decorations.from(field)
+    provide: (field) => EditorView7.decorations.from(field)
   });
 };
 var update = (state, options) => {
@@ -808,7 +1504,8 @@ var update = (state, options) => {
         if (urlNode) {
           const hide = state.readOnly || cursor < node.from || cursor > node.to;
           const url = state.sliceDoc(urlNode.from, urlNode.to);
-          builder.add(hide ? node.from : node.to, node.to, Decoration4.replace({
+          builder.add(hide ? node.from : node.to, node.to, Decoration5.replace({
+            block: true,
             widget: new ImageWidget(url)
           }));
         }
@@ -817,13 +1514,14 @@ var update = (state, options) => {
   });
   return builder.finish();
 };
-var ImageWidget = class extends WidgetType2 {
+var ImageWidget = class extends WidgetType4 {
   constructor(_url) {
     super();
     this._url = _url;
   }
+  // TODO(burdon): Does this need to be unique for each position?
   eq(other) {
-    return this._url === other?._url;
+    return this._url === other._url;
   }
   toDOM(view) {
     const img = document.createElement("img");
@@ -832,19 +1530,70 @@ var ImageWidget = class extends WidgetType2 {
     return img;
   }
 };
-
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/link.ts
-import { syntaxTree as syntaxTree2 } from "@codemirror/language";
-import { RangeSetBuilder as RangeSetBuilder2, StateField as StateField3 } from "@codemirror/state";
-import { Decoration as Decoration5, EditorView as EditorView7, WidgetType as WidgetType3 } from "@codemirror/view";
-var link = (options = {}) => {
-  return StateField3.define({
-    create: (state) => update2(state, options),
-    update: (_, tr) => update2(tr.state, options),
-    provide: (field) => EditorView7.decorations.from(field)
-  });
-};
-var LinkButton = class extends WidgetType3 {
+
+// packages/ui/react-ui-editor/src/extensions/link.ts
+import { syntaxTree as syntaxTree2 } from "@codemirror/language";
+import { RangeSetBuilder as RangeSetBuilder2, StateField as StateField4 } from "@codemirror/state";
+import { Decoration as Decoration6, EditorView as EditorView8, WidgetType as WidgetType5, hoverTooltip as hoverTooltip2 } from "@codemirror/view";
+import { tooltipContent } from "@dxos/react-ui-theme";
+var markdownLinkRegexp = /\[([^\]]+)]\(([^)]+)\)/;
+var link = (options = {}) => {
+  const extensions = [
+    StateField4.define({
+      create: (state) => update2(state, options),
+      update: (_, tr) => update2(tr.state, options),
+      provide: (field) => EditorView8.decorations.from(field)
+    })
+  ];
+  if (options.onHover) {
+    extensions.push(
+      // https://codemirror.net/examples/tooltip
+      // https://codemirror.net/docs/ref/#view.hoverTooltip
+      // https://github.com/codemirror/view/blob/main/src/tooltip.ts
+      hoverTooltip2((view, pos) => {
+        const { from, text } = view.state.doc.lineAt(pos);
+        const p = pos - from;
+        let idx = 0;
+        let match;
+        do {
+          match = text.substring(idx).match(markdownLinkRegexp);
+          if (!match) {
+            match = void 0;
+            break;
+          }
+          idx = text.indexOf(match[0]);
+          if (p >= idx && p < idx + match[0].length) {
+            break;
+          }
+          idx += match[0].length;
+        } while (true);
+        if (!match) {
+          return null;
+        }
+        const [, , url] = match ?? [];
+        return {
+          pos: idx + from,
+          end: idx + from + match[0].length,
+          above: true,
+          create: () => {
+            const el = document.createElement("div");
+            el.className = tooltipContent({}, "pli-2 plb-1");
+            options.onHover(el, url);
+            return {
+              dom: el,
+              offset: {
+                x: 0,
+                y: 4
+              }
+            };
+          }
+        };
+      })
+    );
+  }
+  return extensions;
+};
+var LinkButton = class extends WidgetType5 {
   constructor(_pos, _url, _onAttach) {
     super();
     this._pos = _pos;
@@ -860,15 +1609,14 @@ var LinkButton = class extends WidgetType3 {
     return el;
   }
 };
-var LinkText = class extends WidgetType3 {
-  constructor(_pos, _text, _url) {
+var LinkText = class extends WidgetType5 {
+  constructor(_text, _url) {
     super();
-    this._pos = _pos;
     this._text = _text;
     this._url = _url;
   }
   eq(other) {
-    return this._pos === other._pos && this._url === other._url;
+    return this._url === other._url;
   }
   toDOM(view) {
     const link2 = document.createElement("a");
@@ -882,7 +1630,7 @@ var LinkText = class extends WidgetType3 {
       link2.onclick = () => {
         view.dispatch({
           selection: {
-            anchor: this._pos
+            anchor: view.posAtDOM(link2)
           }
         });
       };
@@ -904,12 +1652,12 @@ var update2 = (state, options) => {
           return false;
         }
         if (state.readOnly || cursor < node.from || cursor > node.to) {
-          builder.add(node.from, node.to, Decoration5.replace({
-            widget: new LinkText(node.from, text, options.link ? url : void 0)
+          builder.add(node.from, node.to, Decoration6.replace({
+            widget: new LinkText(text, options.link ? url : void 0)
           }));
         }
         if (options.onRender) {
-          builder.add(node.to, node.to, Decoration5.replace({
+          builder.add(node.to, node.to, Decoration6.replace({
             widget: new LinkButton(node.from, url, options.onRender)
           }));
         }
@@ -920,21 +1668,21 @@ var update2 = (state, options) => {
   return builder.finish();
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/listener.ts
-import { StateField as StateField4 } from "@codemirror/state";
-var listener2 = ({ onChange }) => {
-  return StateField4.define({
-    create: () => null,
-    update: (_value, transaction) => {
-      if (transaction.docChanged && onChange) {
-        onChange(transaction.newDoc.toString());
-      }
-      return null;
-    }
-  });
+// packages/ui/react-ui-editor/src/extensions/listener.ts
+import { EditorView as EditorView9 } from "@codemirror/view";
+var listener = ({ onFocus, onChange }) => {
+  const extensions = [];
+  onFocus && extensions.push(EditorView9.focusChangeEffect.of((_, focused) => {
+    onFocus(focused);
+    return null;
+  }));
+  onChange && extensions.push(EditorView9.updateListener.of((update4) => {
+    onChange(update4.state.doc.toString());
+  }));
+  return extensions;
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/markdown/bundle.ts
+// packages/ui/react-ui-editor/src/extensions/markdown/bundle.ts
 import { closeBrackets as closeBrackets2, closeBracketsKeymap } from "@codemirror/autocomplete";
 import { history, historyKeymap, indentWithTab, standardKeymap } from "@codemirror/commands";
 import { markdownLanguage as markdownLanguage2, markdown } from "@codemirror/lang-markdown";
@@ -943,22 +1691,21 @@ import { languages } from "@codemirror/language-data";
 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 EditorView8, highlightActiveLine, keymap as keymap5, placeholder as placeholder2 } from "@codemirror/view";
+import { crosshairCursor, drawSelection as drawSelection2, dropCursor, EditorView as EditorView10, highlightActiveLine, keymap as keymap4, placeholder as placeholder2 } from "@codemirror/view";
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/markdown/highlight.ts
+// packages/ui/react-ui-editor/src/extensions/markdown/highlight.ts
 import { markdownLanguage } from "@codemirror/lang-markdown";
 import { HighlightStyle } from "@codemirror/language";
 import { tags, styleTags, Tag } from "@lezer/highlight";
 import { Table } from "@lezer/markdown";
-import get2 from "lodash.get";
-import { mx as mx3 } from "@dxos/react-ui-theme";
+import get5 from "lodash.get";
 var markdownTags = {
   Blockquote: Tag.define(),
   CodeMark: Tag.define(),
   CodeText: Tag.define(),
   EmphasisMark: Tag.define(),
   HeaderMark: Tag.define(),
-  HorizontalRule: Tag.define(),
+  // HorizontalRule: Tag.define(),
   InlineCode: Tag.define(),
   LinkLabel: Tag.define(),
   LinkReference: Tag.define(),
@@ -1123,12 +1870,10 @@ var markdownHighlightStyle = (readonly) => {
       class: blockquote
     },
     // TODO(burdon): Replace with extension.
-    {
-      tag: [
-        markdownTags.HorizontalRule
-      ],
-      class: mx3(horizontalRule, readonly && "-indent-[100rem]")
-    },
+    // {
+    //   tag: [markdownTags.HorizontalRule],
+    //   class: mx(horizontalRule, readonly && '-indent-[100rem]'),
+    // },
     // TODO(burdon): Only if being edited.
     {
       tag: [
@@ -1139,17 +1884,17 @@ var markdownHighlightStyle = (readonly) => {
   ], {
     scope: markdownLanguage,
     all: {
-      fontFamily: get2(tokens, "fontFamily.body", []).join(",")
+      fontFamily: get5(tokens, "fontFamily.body", []).join(",")
     }
   });
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/markdown/bundle.ts
+// packages/ui/react-ui-editor/src/extensions/markdown/bundle.ts
 var markdownBundle = ({ readonly, themeMode, placeholder: _placeholder }) => {
   return [
     EditorState.allowMultipleSelections.of(true),
     EditorState.tabSize.of(2),
-    EditorView8.lineWrapping,
+    EditorView10.lineWrapping,
     customKeymap(),
     bracketMatching2(),
     closeBrackets2(),
@@ -1184,7 +1929,7 @@ var markdownBundle = ({ readonly, themeMode, placeholder: _placeholder }) => {
     syntaxHighlighting2(markdownHighlightStyle(readonly))
   ].filter(Boolean);
 };
-var customKeymap = () => keymap5.of([
+var customKeymap = () => keymap4.of([
   // https://codemirror.net/docs/ref/#commands.indentWithTab
   indentWithTab,
   // https://codemirror.net/docs/ref/#commands.standardKeymap
@@ -1197,7 +1942,7 @@ var customKeymap = () => keymap5.of([
   ...searchKeymap
 ]);
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/mention.ts
+// packages/ui/react-ui-editor/src/extensions/mention.ts
 import { autocompletion as autocompletion2 } from "@codemirror/autocomplete";
 var mention = ({ onSearch }) => {
   return autocompletion2({
@@ -1220,15 +1965,20 @@ var mention = ({ onSearch }) => {
   });
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/table.ts
+// packages/ui/react-ui-editor/src/extensions/mermaid.ts
+var mermaid = () => {
+  return [];
+};
+
+// packages/ui/react-ui-editor/src/extensions/table.ts
 import { syntaxTree as syntaxTree3 } from "@codemirror/language";
 import { RangeSetBuilder as RangeSetBuilder3, StateField as StateField5 } from "@codemirror/state";
-import { Decoration as Decoration6, EditorView as EditorView9, WidgetType as WidgetType4 } from "@codemirror/view";
+import { Decoration as Decoration7, EditorView as EditorView11, WidgetType as WidgetType6 } from "@codemirror/view";
 var table = (options = {}) => {
   return StateField5.define({
     create: (state) => update3(state, options),
     update: (_, tr) => update3(tr.state, options),
-    provide: (field) => EditorView9.decorations.from(field)
+    provide: (field) => EditorView11.decorations.from(field)
   });
 };
 var update3 = (state, options) => {
@@ -1272,16 +2022,17 @@ var update3 = (state, options) => {
   });
   tables.forEach((table2) => {
     const hide = state.readOnly || cursor < table2.from || cursor > table2.to;
-    hide && builder.add(table2.from, table2.to, Decoration6.replace({
+    hide && builder.add(table2.from, table2.to, Decoration7.replace({
+      block: true,
       widget: new TableWidget(table2)
     }));
-    builder.add(table2.from, table2.to, Decoration6.mark({
+    builder.add(table2.from, table2.to, Decoration7.mark({
       class: "cm-table"
     }));
   });
   return builder.finish();
 };
-var TableWidget = class extends WidgetType4 {
+var TableWidget = class extends WidgetType6 {
   constructor(_table) {
     super();
     this._table = _table;
@@ -1315,15 +2066,15 @@ var TableWidget = class extends WidgetType4 {
   }
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/tasklist.ts
-import { EditorView as EditorView10, Decoration as Decoration7, WidgetType as WidgetType5, MatchDecorator as MatchDecorator2, ViewPlugin as ViewPlugin3 } from "@codemirror/view";
-var styles4 = EditorView10.baseTheme({
+// packages/ui/react-ui-editor/src/extensions/tasklist.ts
+import { EditorView as EditorView12, Decoration as Decoration8, WidgetType as WidgetType7, MatchDecorator as MatchDecorator3, ViewPlugin as ViewPlugin6 } from "@codemirror/view";
+var styles5 = EditorView12.baseTheme({
   "& .cm-task-item": {
     paddingLeft: "4px",
     paddingRight: "8px"
   }
 });
-var CheckboxWidget = class extends WidgetType5 {
+var CheckboxWidget = class extends WidgetType7 {
   constructor(_pos, _checked, _indent, _onCheck) {
     super();
     this._pos = _pos;
@@ -1358,12 +2109,12 @@ var CheckboxWidget = class extends WidgetType5 {
   }
 };
 var tasklist = (options = {}) => {
-  const taskMatcher = new MatchDecorator2({
+  const taskMatcher = new MatchDecorator3({
     regexp: /^(\s*)- \[([ xX])\]\s/g,
     decoration: (match, view, pos) => {
       const indent = Math.floor(match[1].length / 2);
       const checked = match[2] === "x" || match[2] === "X";
-      return Decoration7.replace({
+      return Decoration8.replace({
         widget: new CheckboxWidget(pos, checked, indent, view.state.readOnly ? void 0 : (checked2) => {
           const idx = pos + match[0].indexOf("[") + 1;
           view.dispatch({
@@ -1381,7 +2132,7 @@ var tasklist = (options = {}) => {
       });
     }
   });
-  const tasks = ViewPlugin3.fromClass(class {
+  const tasks = ViewPlugin6.fromClass(class {
     constructor(view) {
       this.tasks = taskMatcher.createDeco(view);
     }
@@ -1390,69 +2141,116 @@ var tasklist = (options = {}) => {
     }
   }, {
     decorations: (value) => value.tasks,
-    provide: (plugin) => EditorView10.atomicRanges.of((view) => {
-      return view.plugin(plugin)?.tasks || Decoration7.none;
+    provide: (plugin) => EditorView12.atomicRanges.of((view) => {
+      return view.plugin(plugin)?.tasks || Decoration8.none;
     })
   });
   return [
     tasks,
-    styles4
+    styles5
   ];
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/tooltip.tsx
-import { hoverTooltip } from "@codemirror/view";
-import { tooltipContent } from "@dxos/react-ui-theme";
-var markdownLinkRegexp = /\[([^\]]+)]\(([^)]+)\)/;
-var tooltip = ({ onHover, regexp = markdownLinkRegexp }) => hoverTooltip((view, pos) => {
-  const { from, text } = view.state.doc.lineAt(pos);
-  const p = pos - from;
+// packages/ui/react-ui-editor/src/extensions/typewriter.ts
+import { keymap as keymap5 } from "@codemirror/view";
+var defaultItems = [
+  "hello world!",
+  "this is a test.",
+  "this is [DXOS](https://dxos.org)"
+];
+var typewriter = ({ delay = 75, items = defaultItems } = {}) => {
+  let t;
   let idx = 0;
-  let match;
-  do {
-    match = text.substring(idx).match(regexp);
-    if (!match) {
-      match = void 0;
-      break;
-    }
-    idx = text.indexOf(match[0]);
-    if (p >= idx && p < idx + match[0].length) {
-      break;
-    }
-    idx += match[0].length;
-  } while (true);
-  if (!match) {
-    return null;
-  }
-  const [, , url] = match ?? [];
-  return {
-    pos: idx + from,
-    end: idx + from + match[0].length,
-    above: true,
-    create: () => {
-      const el = document.createElement("div");
-      el.className = tooltipContent({}, "pli-2 plb-1");
-      onHover(el, url);
-      return {
-        dom: el,
-        offset: {
-          x: 0,
-          y: 12
+  return [
+    keymap5.of([
+      {
+        // Reset.
+        key: "alt-meta-'",
+        run: (view) => {
+          clearTimeout(t);
+          idx = 0;
+          return true;
         }
-      };
-    }
-  };
+      },
+      {
+        // Next prompt.
+        // TODO(burdon): Press 1-9 to select prompt?
+        key: "shift-meta-'",
+        run: (view) => {
+          clearTimeout(t);
+          const text = items[idx++];
+          if (idx === items?.length) {
+            idx = 0;
+          }
+          let i = 0;
+          const insert = (d = 0) => {
+            t = setTimeout(() => {
+              const pos = view.state.selection.main.head;
+              view.dispatch({
+                changes: {
+                  from: pos,
+                  insert: text[i++]
+                },
+                selection: {
+                  anchor: pos + 1
+                }
+              });
+              if (i < text.length) {
+                insert(Math.random() * delay * (text[i] === " " ? 2 : 1));
+              }
+            }, d);
+          };
+          insert();
+          return true;
+        }
+      }
+    ])
+  ];
+};
+
+// packages/ui/react-ui-editor/src/extensions/yjs/yjs.ts
+import { yCollab } from "y-codemirror.next";
+
+// packages/ui/react-ui-editor/src/extensions/yjs/cursor.ts
+import * as Y from "yjs";
+import { arrayToString, stringToArray } from "@dxos/util";
+var cursorConverter2 = (text) => ({
+  toCursor: (index, assoc) => {
+    return arrayToString(Y.encodeRelativePosition(Y.createRelativePositionFromTypeIndex(text, index, assoc)));
+  },
+  fromCursor: (cursor) => {
+    return Y.createAbsolutePositionFromRelativePosition(Y.decodeRelativePosition(stringToArray(cursor)), text.doc)?.index ?? 0;
+  }
 });
 
-// packages/ui/react-ui-editor/src/components/TextEditor/themes/default.ts
-import get3 from "lodash.get";
+// packages/ui/react-ui-editor/src/extensions/yjs/yjs.ts
+var yjs = (content, awareness2) => [
+  CursorConverter.of(cursorConverter2(content)),
+  yCollab(content, awareness2)
+];
+
+// packages/ui/react-ui-editor/src/themes/default.ts
+import get6 from "lodash.get";
 var defaultTheme = {
   //
   // Main layout:
-  // <div class=".cm-editor .cm-focused">
-  //   <div class=".cm-scroller">
-  //     <div class=".cm-content" role="textbox" contenteditable="true">
-  //       <div class=".cm-line" />
+  // https://codemirror.net/examples/styling
+  //
+  // <div class="cm-editor [cm-focused] [generated classes]">
+  //   <div class="cm-scroller">
+  //     <div class="cm-gutters">
+  //       <div class="cm-gutter [...]">
+  //         <div class="cm-gutterElement">...</div>
+  //       </div>
+  //     </div>
+  //     <div class="cm-content" role="textbox" contenteditable="true">
+  //       <div class="cm-line"></div>
+  //     </div>
+  //     <div class="cm-selectionLayer">
+  //       <div class="cm-selectionBackground"></div>
+  //     </div>
+  //     <div class="cm-cursorLayer">
+  //       <div class="cm-cursor"></div>
   //     </div>
   //   </div>
   // </div>
@@ -1463,19 +2261,19 @@ var defaultTheme = {
   },
   "& .cm-scroller": {
     overflow: "visible",
-    fontFamily: get3(tokens, "fontFamily.mono", []).join(",")
+    fontFamily: get6(tokens, "fontFamily.mono", []).join(",")
   },
   "& .cm-content": {
     padding: 0,
-    // Base font size (otherwise defined by HTML tag, which might be different for storybook).
+    // NOTE: Base font size (otherwise defined by HTML tag, which might be different for storybook).
     fontSize: "16px"
   },
   "&light .cm-content": {
-    color: get3(tokens, "extend.colors.neutral.900", "black"),
+    color: get6(tokens, "extend.colors.neutral.900", "black"),
     caretColor: "black"
   },
   "&dark .cm-content": {
-    color: get3(tokens, "extend.colors.neutral.100", "white"),
+    color: get6(tokens, "extend.colors.neutral.100", "white"),
     caretColor: "white"
   },
   //
@@ -1496,28 +2294,36 @@ var defaultTheme = {
   "& .cm-line": {
     paddingInline: 0
   },
-  "& .cm-line *": {},
   "& .cm-activeLine": {
-    backgroundColor: "transparent"
+    background: "inherit"
   },
   //
-  // selection
+  // Selection
   //
-  "&light .cm-selectionBackground, &light.cm-focused .cm-selectionBackground": {
-    background: get3(tokens, "extend.colors.primary.150", "#00ffff")
+  "&light .cm-selectionBackground": {
+    background: get6(tokens, "extend.colors.primary.100")
+  },
+  "&light.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground": {
+    background: get6(tokens, "extend.colors.primary.200")
+  },
+  "&dark .cm-selectionBackground": {
+    background: get6(tokens, "extend.colors.primary.700")
   },
-  "&dark .cm-selectionBackground, &dark.cm-focused .cm-selectionBackground": {
-    background: get3(tokens, "extend.colors.primary.850", "#00ffff")
+  "&dark.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground": {
+    background: get6(tokens, "extend.colors.primary.600")
   },
-  "&light .cm-selectionMatch": {
-    background: get3(tokens, "extend.colors.primary.250", "#00ffff") + "44"
+  //
+  // Search
+  //
+  "&light .cm-searchMatch": {
+    backgroundColor: get6(tokens, "extend.colors.yellow.100")
   },
-  "&dark .cm-selectionMatch": {
-    background: get3(tokens, "extend.colors.primary.600", "#00ffff") + "44"
+  "&dark .cm-searchMatch": {
+    backgroundColor: get6(tokens, "extend.colors.yellow.700")
   },
   //
   // collaboration
-  // TODO(burdon): Review classnames (YJS dependent?)
+  // TODO(burdon): Review classnames (YJS dependent?) Note: e2e tests depend on this class.
   //
   "&light .cm-ySelection, &light .cm-yLineSelection": {
     mixBlendMode: "multiply"
@@ -1546,12 +2352,12 @@ var defaultTheme = {
   // link
   //
   "& .cm-link": {
-    color: get3(tokens, "extend.colors.primary.500"),
+    color: get6(tokens, "extend.colors.primary.500"),
     textDecorationLine: "underline",
     textDecorationThickness: "1px",
     textUnderlineOffset: "2px",
     borderRadius: ".125rem",
-    fontFamily: get3(tokens, "fontFamily.body", []).join(",")
+    fontFamily: get6(tokens, "fontFamily.body", []).join(",")
   },
   //
   // tooltip
@@ -1573,7 +2379,7 @@ var defaultTheme = {
     display: "none"
   },
   "& .cm-completionLabel": {
-    fontFamily: get3(tokens, "fontFamily.body", []).join(",")
+    fontFamily: get6(tokens, "fontFamily.body", []).join(",")
   },
   "& .cm-completionMatchedText": {
     textDecoration: "none"
@@ -1589,15 +2395,15 @@ var defaultTheme = {
   // table
   //
   "& .cm-table *": {
-    fontFamily: `${get3(tokens, "fontFamily.mono", []).join(",")} !important`,
+    fontFamily: `${get6(tokens, "fontFamily.mono", []).join(",")} !important`,
     textDecoration: "none !important"
   },
   "& .cm-table-head": {
     padding: "2px 16px 2px 0px",
-    borderBottom: `1px solid ${get3(tokens, "extend.colors.neutral.500")}`,
+    borderBottom: `1px solid ${get6(tokens, "extend.colors.neutral.500")}`,
     fontWeight: 100,
     textAlign: "left",
-    color: get3(tokens, "extend.colors.neutral.500")
+    color: get6(tokens, "extend.colors.neutral.500")
   },
   "& .cm-table-cell": {
     padding: "2px 16px 2px 0px"
@@ -1612,8 +2418,8 @@ var defaultTheme = {
   // font size
   // TODO(thure): This appears to be the best or only way to set selection caret heights, but it's far more verbose than it needs to be.
   //
-  ...Object.keys(get3(tokens, "extend.fontSize", {})).reduce((acc, fontSize) => {
-    const height = get3(tokens, [
+  ...Object.keys(get6(tokens, "extend.fontSize", {})).reduce((acc, fontSize) => {
+    const height = get6(tokens, [
       "extend",
       "fontSize",
       fontSize,
@@ -1633,6 +2439,7 @@ var defaultTheme = {
   }, {}),
   /**
   * Panels
+  * TODO(burdon): Needs styling attention (esp. dark mode).
   * https://github.com/codemirror/search/blob/main/src/search.ts#L745
   *
   * Find/replace panel.
@@ -1647,71 +2454,65 @@ var defaultTheme = {
   * </div
   */
   "& .cm-panels": {
-    border: `1px solid ${get3(tokens, "extend.colors.neutral.200")}`,
-    borderBottom: "none"
+    border: `1px solid ${get6(tokens, "extend.colors.neutral.200")}`
   },
   "& .cm-panel": {
-    background: get3(tokens, "extend.colors.neutral.50"),
-    fontFamily: get3(tokens, "fontFamily.body", []).join(",")
+    background: get6(tokens, "extend.colors.neutral.50"),
+    fontFamily: get6(tokens, "fontFamily.body", []).join(",")
   },
   "& .cm-button": {
     margin: "4px",
-    fontFamily: get3(tokens, "fontFamily.body", []).join(","),
-    background: get3(tokens, "extend.colors.neutral.100"),
-    border: "none"
-  },
-  "& .cm-searchMatch": {
-    backgroundColor: get3(tokens, "extend.colors.yellow.100")
+    fontFamily: get6(tokens, "fontFamily.body", []).join(","),
+    background: get6(tokens, "extend.colors.neutral.100"),
+    backgroundImage: "none",
+    border: "none",
+    "&:hover": {
+      background: get6(tokens, "extend.colors.neutral.200")
+    },
+    "&:active": {
+      background: get6(tokens, "extend.colors.neutral.300"),
+      backgroundImage: "none"
+    }
   },
-  "& .cm-searchMatch.cm-searchMatch-selected": {
-    backgroundColor: get3(tokens, "extend.colors.primary.100")
+  "& .cm-panel input[type=checkbox]": {
+    marginRight: "0.4rem !important"
   }
 };
 var textTheme = {
   "& .cm-scroller": {
-    fontFamily: get3(tokens, "fontFamily.body", []).join(",")
+    fontFamily: get6(tokens, "fontFamily.body", []).join(",")
   },
   "& .cm-placeholder": {
-    fontFamily: get3(tokens, "fontFamily.body", []).join(",")
+    fontFamily: get6(tokens, "fontFamily.body", []).join(",")
   }
 };
 var markdownTheme = {
   // NOTE: Must leave base font family as is (i.e., monospace) due to fenced code blocks.
   "& .cm-placeholder": {
-    fontFamily: get3(tokens, "fontFamily.body", []).join(",")
+    fontFamily: get6(tokens, "fontFamily.body", []).join(",")
   }
 };
 var codeTheme = {
   "& .cm-scroller": {
-    fontFamily: get3(tokens, "fontFamily.mono", []).join(",")
+    fontFamily: get6(tokens, "fontFamily.mono", []).join(",")
   },
   "& .cm-placeholder": {
-    fontFamily: get3(tokens, "fontFamily.mono", []).join(",")
+    fontFamily: get6(tokens, "fontFamily.mono", []).join(",")
   }
 };
 
 // packages/ui/react-ui-editor/src/components/TextEditor/TextEditor.tsx
-import { EditorState as EditorState2 } from "@codemirror/state";
-import { EditorView as EditorView11 } 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, useState } from "react";
-import { generateName } from "@dxos/display-name";
-import { useThemeContext } from "@dxos/react-ui";
-import { getColorForValue, inputSurface, mx as mx4 } from "@dxos/react-ui-theme";
 var EditorModes = [
   "default",
   "vim"
 ];
-var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, editorMode, extensions = [], slots = defaultSlots }, forwardedRef) => {
+var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, comments: comments2, extensions = [], editorMode, slots = defaultSlots }, forwardedRef) => {
   const { themeMode } = useThemeContext();
   const tabsterDOMAttribute = useFocusableGroup({
     tabBehavior: "limited"
   });
   const [root, setRoot] = useState(null);
-  const [state, setState] = useState();
-  const [view, setView] = useState();
+  const [{ state = void 0, view = void 0 } = {}, setEditor] = useState();
   useImperativeHandle(forwardedRef, () => ({
     root,
     state,
@@ -1721,10 +2522,10 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, editorMode,
     state,
     root
   ]);
-  const { awareness, peer } = model;
-  useEffect2(() => {
-    if (awareness && peer) {
-      awareness.setLocalStateField("user", {
+  const { awareness: awareness2, peer } = model;
+  useEffect(() => {
+    if (awareness2 && peer) {
+      awareness2.setLocalStateField("user", {
         name: peer.name ?? generateName(peer.id),
         color: getColorForValue({
           value: peer.id,
@@ -1738,11 +2539,24 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, editorMode,
       });
     }
   }, [
-    awareness,
+    awareness2,
     peer,
     themeMode
   ]);
-  useEffect2(() => {
+  useEffect(() => {
+    if (view && comments2?.length) {
+      view.dispatch({
+        effects: setCommentRange.of({
+          model,
+          comments: comments2
+        })
+      });
+    }
+  }, [
+    view,
+    comments2
+  ]);
+  useEffect(() => {
     if (!root) {
       return;
     }
@@ -1750,14 +2564,13 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, editorMode,
       doc: model.text(),
       extensions: [
         readonly && EditorState2.readOnly.of(readonly),
-        // TODO(burdon): Factor out VIM mode?
+        // TODO(burdon): Factor out VIM mode? (manage via MarkdownPlugin).
         editorMode === "vim" && vim(),
         // Theme.
-        // TODO(burdon): Make optional.
-        EditorView11.baseTheme(defaultTheme),
-        EditorView11.theme(slots?.editor?.theme ?? {}),
-        // TODO(burdon): themeMode doesn't change in storybooks.
-        EditorView11.darkTheme.of(themeMode === "dark"),
+        // TODO(burdon): Make theme configurable.
+        EditorView13.baseTheme(defaultTheme),
+        EditorView13.theme(slots?.editor?.theme ?? {}),
+        EditorView13.darkTheme.of(themeMode === "dark"),
         // Storage and replication.
         model.extension,
         // Custom.
@@ -1765,22 +2578,23 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, editorMode,
       ].filter(Boolean)
     });
     view?.destroy();
-    setView(new EditorView11({
+    setEditor({
       state: state2,
-      parent: root
-    }));
-    setState(state2);
+      view: new EditorView13({
+        state: state2,
+        parent: root
+      })
+    });
     return () => {
       view?.destroy();
-      setView(void 0);
-      setState(void 0);
+      setEditor(void 0);
     };
   }, [
     root,
     model,
-    themeMode,
     readonly,
-    editorMode
+    editorMode,
+    themeMode
   ]);
   const handleKeyUp = useCallback((event) => {
     const { key, altKey, shiftKey, metaKey, ctrlKey } = event;
@@ -1840,336 +2654,218 @@ var MarkdownEditor = /* @__PURE__ */ forwardRef(({ readonly, extensions = [], sl
       ...extensions
     ],
     slots,
-    ...props
-  });
-});
-var defaultSlots = {
-  root: {
-    className: mx4("p-2", inputSurface)
-  }
-};
-var defaultTextSlots = {
-  ...defaultSlots,
-  editor: {
-    theme: textTheme
-  }
-};
-var defaultMarkdownSlots = {
-  ...defaultSlots,
-  editor: {
-    theme: markdownTheme
-  }
-};
-
-// packages/ui/react-ui-editor/src/hooks/useTextModel.ts
-import get4 from "lodash.get";
-import { useEffect as useEffect3, useState as useState2 } from "react";
-import { yCollab } from "y-codemirror.next";
-import { invariant as invariant3 } from "@dxos/invariant";
-import { getRawDoc, isActualAutomergeObject } from "@dxos/react-client/echo";
-
-// packages/ui/react-ui-editor/src/hooks/automerge/plugin.ts
-import { Annotation, Facet, StateEffect as StateEffect2, StateField as StateField6 } from "@codemirror/state";
-import { ViewPlugin as ViewPlugin4 } from "@codemirror/view";
-import * as automerge2 from "@dxos/automerge/automerge";
-
-// packages/ui/react-ui-editor/src/hooks/automerge/PatchSemaphore.ts
-import { next as automerge } from "@dxos/automerge/automerge";
-
-// packages/ui/react-ui-editor/src/hooks/automerge/translation/automerge-to-codemirror.ts
-import { ChangeSet } from "@codemirror/state";
-var automergeToCodemirror = (view, selection, target, patches) => {
-  for (const patch of patches) {
-    const changeSpec = handlePatch(patch, target, view.state);
-    if (changeSpec != null) {
-      const changeSet = ChangeSet.of(changeSpec, view.state.doc.length, "\n");
-      selection = selection.map(changeSet, 1);
-      view.dispatch({
-        changes: changeSet,
-        annotations: reconcileAnnotationType.of({})
-      });
-    }
-  }
-  view.dispatch({
-    selection,
-    annotations: reconcileAnnotationType.of({})
-  });
-};
-var handlePatch = (patch, target, state) => {
-  if (patch.action === "insert") {
-    return handleInsert(target, patch);
-  } else if (patch.action === "splice") {
-    return handleSplice(target, patch);
-  } else if (patch.action === "del") {
-    return handleDel(target, patch);
-  } else if (patch.action === "put") {
-    return handlePut(target, patch, state);
-  } else {
-    return null;
-  }
-};
-var handleInsert = (target, patch) => {
-  const index = charPath(target, patch.path);
-  if (index == null) {
-    return [];
-  }
-  const text = patch.values.map((v) => v ? v.toString() : "").join("");
-  return [
-    {
-      from: index,
-      to: index,
-      insert: text
-    }
-  ];
-};
-var handleSplice = (target, patch) => {
-  const index = charPath(target, patch.path);
-  if (index == null) {
-    return [];
-  }
-  return [
-    {
-      from: index,
-      insert: patch.value
-    }
-  ];
-};
-var handleDel = (target, patch) => {
-  const index = charPath(target, patch.path);
-  if (index == null) {
-    return [];
-  }
-  const length = patch.length || 1;
-  return [
-    {
-      from: index,
-      to: index + length
-    }
-  ];
-};
-var handlePut = (target, patch, state) => {
-  const index = charPath(target, [
-    ...patch.path,
-    0
-  ]);
-  if (index == null) {
-    return [];
-  }
-  const length = state.doc.length;
-  if (typeof patch.value !== "string") {
-    return [];
-  }
-  return [
-    {
-      from: 0,
-      to: length,
-      insert: patch.value
-    }
-  ];
-};
-var charPath = (textPath, candidatePath) => {
-  if (candidatePath.length !== textPath.length + 1) {
-    return null;
-  }
-  for (let i = 0; i < textPath.length; i++) {
-    if (textPath[i] !== candidatePath[i]) {
-      return null;
-    }
-  }
-  const index = candidatePath[candidatePath.length - 1];
-  if (typeof index === "number") {
-    return index;
+    ...props
+  });
+});
+var defaultSlots = {
+  root: {
+    className: mx3("p-2", inputSurface)
   }
-  return null;
 };
-
-// packages/ui/react-ui-editor/src/hooks/automerge/translation/codemirror-to-automerge.ts
-import { next as am } from "@dxos/automerge/automerge";
-var codemirrorToAutomerge = (field, handle, transactions, state) => {
-  const { lastHeads, path } = state.field(field);
-  let hasChanges = false;
-  for (const tr of transactions) {
-    tr.changes.iterChanges(() => {
-      hasChanges = true;
-    });
+var defaultTextSlots = {
+  ...defaultSlots,
+  editor: {
+    theme: textTheme
   }
-  if (!hasChanges) {
-    return void 0;
+};
+var defaultMarkdownSlots = {
+  ...defaultSlots,
+  editor: {
+    theme: markdownTheme
   }
-  const newHeads = handle.changeAt(lastHeads, (doc) => {
-    for (const tr of transactions) {
-      tr.changes.iterChanges((fromA, toA, _fromB, _toB, inserted) => {
-        am.splice(doc, path, fromA, toA - fromA, inserted.toString());
-      });
-    }
-  });
-  return newHeads ?? void 0;
 };
 
-// packages/ui/react-ui-editor/src/hooks/automerge/PatchSemaphore.ts
-var PatchSemaphore = class {
-  constructor(field) {
-    this._inReconcile = false;
-    this._queue = [];
-    this.reconcile = (handle, view) => {
-      if (this._inReconcile) {
-        return;
-      }
-      this._inReconcile = true;
-      const path = getPath(view.state, this._field);
-      const oldHeads = getLastHeads(view.state, this._field);
-      let selection = view.state.selection;
-      const transactions = view.state.field(this._field).unreconciledTransactions.filter((tx) => !isReconcileTx(tx));
-      const toInvert = transactions.slice().reverse();
-      for (const tx of toInvert) {
-        const inverted = tx.changes.invert(tx.startState.doc);
-        selection = selection.map(inverted);
-        view.dispatch({
-          changes: inverted,
-          annotations: reconcileAnnotationType.of(true)
+// packages/ui/react-ui-editor/src/hooks/automerge.ts
+import get7 from "lodash.get";
+import { getRawDoc } from "@dxos/echo-schema";
+import { isNotNullOrUndefined } from "@dxos/util";
+
+// 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 invariant3 } from "@dxos/invariant";
+import { log as log3 } from "@dxos/log";
+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) {
+    this.remoteStateChange = new Event2();
+    this._remoteStates = /* @__PURE__ */ new Map();
+    this._space = params.space;
+    this._channel = params.channel;
+    this._peerId = params.peerId;
+    this._info = params.info;
+  }
+  open() {
+    this._ctx = new Context2();
+    this._postTask = new DeferredTask(this._ctx, async () => {
+      if (this._localState) {
+        await this._space.postMessage(this._channel, {
+          kind: "post",
+          state: this._localState
         });
+        await sleep(DEBOUNCE_INTERVAL);
       }
-      let newHeads = codemirrorToAutomerge(this._field, handle, transactions, view.state);
-      if (newHeads === null || newHeads === void 0) {
-        newHeads = automerge.getHeads(handle.docSync());
+    });
+    const unsubscribe = this._space.listen(this._channel, (message) => {
+      switch (message.payload.kind) {
+        case "query": {
+          this._handleQueryMessage();
+          break;
+        }
+        case "post": {
+          this._handlePostMessage(message.payload);
+          break;
+        }
       }
-      const diff = automerge.equals(oldHeads, newHeads) ? [] : automerge.diff(handle.docSync(), oldHeads, newHeads);
-      automergeToCodemirror(view, selection, path, diff);
-      view.dispatch({
-        effects: updateHeads(newHeads),
-        annotations: reconcileAnnotationType.of({})
+    });
+    this._ctx.onDispose(unsubscribe);
+    void this._space.postMessage(this._channel, {
+      kind: "query"
+    }).catch((err) => {
+      log3.debug("failed to query awareness", {
+        err
+      }, {
+        F: __dxlog_file4,
+        L: 85,
+        S: this,
+        C: (f, a) => f(...a)
       });
-      this._inReconcile = false;
+    });
+  }
+  close() {
+    void this._ctx?.dispose();
+    this._ctx = void 0;
+    this._postTask = void 0;
+  }
+  update(position) {
+    invariant3(this._postTask, void 0, {
+      F: __dxlog_file4,
+      L: 96,
+      S: this,
+      A: [
+        "this._postTask",
+        ""
+      ]
+    });
+    this._localState = {
+      peerId: this._peerId,
+      position,
+      info: this._info
     };
-    if (field !== void 0) {
-      this._field = field;
-    }
+    this._postTask.schedule();
+  }
+  getRemoteStates() {
+    return Array.from(this._remoteStates.values());
+  }
+  _handleQueryMessage() {
+    invariant3(this._postTask, void 0, {
+      F: __dxlog_file4,
+      L: 111,
+      S: this,
+      A: [
+        "this._postTask",
+        ""
+      ]
+    });
+    this._postTask.schedule();
+  }
+  _handlePostMessage(message) {
+    invariant3(message.kind === "post", void 0, {
+      F: __dxlog_file4,
+      L: 116,
+      S: this,
+      A: [
+        "message.kind === 'post'",
+        ""
+      ]
+    });
+    this._remoteStates.set(message.state.peerId, message.state);
+    this.remoteStateChange.emit();
   }
 };
 
-// packages/ui/react-ui-editor/src/hooks/automerge/plugin.ts
-var effectType = StateEffect2.define({});
-var updateHeads = (newHeads) => effectType.of({
-  newHeads
-});
-var getLastHeads = (state, field) => state.field(field).lastHeads;
-var getPath = (state, field) => state.field(field).path;
-var semaphoreFacet = Facet.define({
-  combine: (values) => values.at(-1)
-});
-var automergePlugin = (handle, path) => {
-  const stateField = StateField6.define({
-    create: () => ({
-      lastHeads: automerge2.getHeads(handle.docSync()),
-      unreconciledTransactions: [],
-      path: path.slice()
-    }),
-    update: (value, tr) => {
-      const result = {
-        lastHeads: value.lastHeads,
-        unreconciledTransactions: value.unreconciledTransactions.slice(),
-        path: path.slice()
-      };
-      let clearUnreconciled = false;
-      for (const effect of tr.effects) {
-        if (effect.is(effectType)) {
-          result.lastHeads = effect.value.newHeads;
-          clearUnreconciled = true;
-        }
-      }
-      if (clearUnreconciled) {
-        result.unreconciledTransactions = [];
-      } else {
-        if (!isReconcileTx(tr)) {
-          result.unreconciledTransactions.push(tr);
-        }
-      }
-      return result;
-    }
-  });
-  const semaphore = new PatchSemaphore(stateField);
-  const viewPlugin = ViewPlugin4.fromClass(class AutomergeCodemirrorViewPlugin {
-    constructor(view) {
-      this._handleChange = () => {
-        this._view.state.facet(semaphoreFacet).reconcile(handle, this._view);
-      };
-      this._view = view;
-      handle.addListener("change", this._handleChange);
-    }
-    update(update4) {
-      if (update4.transactions.length > 0 && update4.transactions.some((t) => !isReconcileTx(t))) {
-        queueMicrotask(() => {
-          this._view.state.facet(semaphoreFacet).reconcile(handle, this._view);
-        });
-      }
-    }
-    destroy() {
-      handle.addListener("change", this._handleChange);
-    }
-  });
-  return {
-    extension: [
-      stateField,
-      semaphoreFacet.of(semaphore),
-      viewPlugin
-    ]
-  };
-};
-var reconcileAnnotationType = Annotation.define();
-var isReconcileTx = (tr) => !!tr.annotation(reconcileAnnotationType);
-
-// packages/ui/react-ui-editor/src/hooks/yjs/cursors.ts
-import * as random2 from "lib0/random";
-var cursorColors = [
-  {
-    color: "#30bced",
-    light: "#30bced33"
-  },
-  {
-    color: "#6eeb83",
-    light: "#6eeb8333"
-  },
-  {
-    color: "#ffbc42",
-    light: "#ffbc4233"
-  },
-  {
-    color: "#ecd444",
-    light: "#ecd44433"
-  },
-  {
-    color: "#ee6352",
-    light: "#ee635233"
-  },
-  {
-    color: "#9ac2c9",
-    light: "#9ac2c933"
-  },
-  {
-    color: "#8acb88",
-    light: "#8acb8833"
-  },
-  {
-    color: "#1be7ff",
-    light: "#1be7ff33"
-  }
-];
-var cursorColor = cursorColors[random2.uint32() % cursorColors.length];
+// packages/ui/react-ui-editor/src/hooks/useTextModel.ts
+import { StateField as StateField6 } from "@codemirror/state";
+import { useEffect as useEffect2, useState as useState2 } from "react";
+import { isAutomergeObject } from "@dxos/react-client/echo";
 
-// packages/ui/react-ui-editor/src/hooks/yjs/space-provider.ts
+// packages/ui/react-ui-editor/src/hooks/yjs.ts
 import * as decoding from "lib0/decoding";
 import * as encoding from "lib0/encoding";
 import { Observable } from "lib0/observable";
-import * as awarenessProtocol from "y-protocols/awareness";
-import { log } from "@dxos/log";
-var __dxlog_file3 = "/home/circleci/project/packages/ui/react-ui-editor/src/hooks/yjs/space-provider.ts";
+import * as YP from "y-protocols/awareness";
+import * as Y2 from "yjs";
+import { invariant as invariant4 } from "@dxos/invariant";
+import { log as log4 } from "@dxos/log";
+import { arrayToString as arrayToString2, stringToArray as stringToArray2 } from "@dxos/util";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/hooks/yjs.ts";
+var createYjsModel = ({ identity, space, text }) => {
+  invariant4(text?.doc && text?.content, void 0, {
+    F: __dxlog_file5,
+    L: 23,
+    S: void 0,
+    A: [
+      "text?.doc && text?.content",
+      ""
+    ]
+  });
+  const provider = space ? new YAwarenessProvider({
+    space,
+    doc: text.doc,
+    channel: `yjs.awareness.${text.id}`
+  }) : void 0;
+  const model = {
+    id: text.doc.guid,
+    content: text.content,
+    text: () => text.content.toString(),
+    // https://github.com/yjs/yjs?tab=readme-ov-file#relative-positions
+    // TODO(dmaretskyi): Refactor as cursor-converter.
+    getCursorFromRange: (range) => {
+      const from = Y2.encodeRelativePosition(Y2.createRelativePositionFromTypeIndex(text.content, range.from));
+      const to = Y2.encodeRelativePosition(Y2.createRelativePositionFromTypeIndex(text.content, range.to, -1));
+      return [
+        arrayToString2(from),
+        arrayToString2(to)
+      ].join(":");
+    },
+    getRangeFromCursor: (cursor) => {
+      invariant4(text.doc, void 0, {
+        F: __dxlog_file5,
+        L: 40,
+        S: void 0,
+        A: [
+          "text.doc",
+          ""
+        ]
+      });
+      const parts = cursor.split(":");
+      const from = Y2.createAbsolutePositionFromRelativePosition(Y2.decodeRelativePosition(stringToArray2(parts[0])), text.doc);
+      const to = Y2.createAbsolutePositionFromRelativePosition(Y2.decodeRelativePosition(stringToArray2(parts[1])), text.doc);
+      return from && to ? {
+        from: from.index,
+        to: to.index
+      } : void 0;
+    },
+    extension: [
+      modelState.init(() => model),
+      yjs(text.content, provider?.awareness)
+    ],
+    awareness: provider?.awareness,
+    peer: identity ? {
+      id: identity.identityKey.toHex(),
+      name: identity.profile?.displayName
+    } : void 0
+  };
+  return model;
+};
 var messageAwareness = 1;
 var messageQueryAwareness = 3;
-var SpaceAwarenessProvider = class extends Observable {
-  constructor({ space, doc, channel, awareness }) {
+var YAwarenessProvider = class extends Observable {
+  constructor({ space, doc, channel, awareness: awareness2 }) {
     super();
     this._space = space;
-    this._awareness = awareness ?? new awarenessProtocol.Awareness(doc);
+    this._awareness = awareness2 ?? new YP.Awareness(doc);
     this._channel = channel;
     this._clientId = doc.clientID;
     this._awareness.on("update", this._handleAwarenessUpdate.bind(this));
@@ -2184,7 +2880,7 @@ var SpaceAwarenessProvider = class extends Observable {
     void this._space.postMessage(this._channel, encoding.toUint8Array(encoderAwarenessQuery));
     const encoderAwarenessState = encoding.createEncoder();
     encoding.writeVarUint(encoderAwarenessState, messageAwareness);
-    encoding.writeVarUint8Array(encoderAwarenessState, awarenessProtocol.encodeAwarenessUpdate(this.awareness, [
+    encoding.writeVarUint8Array(encoderAwarenessState, YP.encodeAwarenessUpdate(this.awareness, [
       this._clientId
     ]));
     void this._space.postMessage(this._channel, encoding.toUint8Array(encoderAwarenessState));
@@ -2193,27 +2889,27 @@ var SpaceAwarenessProvider = class extends Observable {
     return this._awareness;
   }
   _handleAwarenessUpdate({ added, updated, removed }, origin) {
-    log("awareness update", {
+    log4("awareness update", {
       added,
       updated,
       removed,
       origin
     }, {
-      F: __dxlog_file3,
-      L: 67,
+      F: __dxlog_file5,
+      L: 122,
       S: this,
       C: (f, a) => f(...a)
     });
     const changedClients = added.concat(updated).concat(removed);
     const encoderAwareness = encoding.createEncoder();
     encoding.writeVarUint(encoderAwareness, messageAwareness);
-    encoding.writeVarUint8Array(encoderAwareness, awarenessProtocol.encodeAwarenessUpdate(this._awareness, changedClients));
+    encoding.writeVarUint8Array(encoderAwareness, YP.encodeAwarenessUpdate(this._awareness, changedClients));
     void this._space.postMessage(this._channel, encoding.toUint8Array(encoderAwareness));
   }
   _handleSpaceMessage({ payload }) {
-    log("space message", payload, {
-      F: __dxlog_file3,
-      L: 79,
+    log4("space message", payload, {
+      F: __dxlog_file5,
+      L: 131,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2230,12 +2926,12 @@ var SpaceAwarenessProvider = class extends Observable {
     let sendReply = false;
     switch (messageType) {
       case messageAwareness: {
-        awarenessProtocol.applyAwarenessUpdate(this._awareness, decoding.readVarUint8Array(decoder), this);
+        YP.applyAwarenessUpdate(this._awareness, decoding.readVarUint8Array(decoder), this);
         break;
       }
       case messageQueryAwareness: {
         encoding.writeVarUint(encoder, messageAwareness);
-        encoding.writeVarUint8Array(encoder, awarenessProtocol.encodeAwarenessUpdate(this._awareness, Array.from(this._awareness.getStates().keys())));
+        encoding.writeVarUint8Array(encoder, YP.encodeAwarenessUpdate(this._awareness, Array.from(this._awareness.getStates().keys())));
         sendReply = true;
         break;
       }
@@ -2250,130 +2946,124 @@ var SpaceAwarenessProvider = class extends Observable {
     return encoder;
   }
   _handleBeforeUnload() {
-    awarenessProtocol.removeAwarenessStates(this._awareness, [
+    YP.removeAwarenessStates(this._awareness, [
       this._clientId
     ], "window unload");
   }
 };
 
 // packages/ui/react-ui-editor/src/hooks/useTextModel.ts
-var __dxlog_file4 = "/home/circleci/project/packages/ui/react-ui-editor/src/hooks/useTextModel.ts";
-var useTextModel = ({ identity, space, text }) => {
-  const [model, setModel] = useState2(() => createModel({
-    identity,
-    space,
-    text
-  }));
-  useEffect3(() => {
-    setModel(createModel({
-      identity,
-      space,
-      text
-    }));
-  }, [
+var modelState = StateField6.define({
+  create: () => void 0,
+  update: (model) => model
+});
+var useTextModel = (props) => {
+  const { identity, space, text } = props;
+  const [model, setModel] = useState2(() => createModel(props));
+  useEffect2(() => setModel(createModel(props)), [
     identity,
     space,
     text
   ]);
   return model;
 };
-var createModel = (options) => {
-  const { text } = options;
-  if (isActualAutomergeObject(text)) {
-    return createAutomergeModel(options);
+var createModel = (props) => {
+  const { text } = props;
+  if (isAutomergeObject(text)) {
+    return createAutomergeModel(props);
+  } else if (text?.doc) {
+    return createYjsModel(props);
   } else {
-    if (!text?.doc) {
-      return void 0;
-    }
-    return createYjsModel(options);
+    return void 0;
   }
 };
-var createYjsModel = ({ identity, space, text }) => {
-  invariant3(text?.doc && text?.content, void 0, {
-    F: __dxlog_file4,
-    L: 81,
-    S: void 0,
-    A: [
-      "text?.doc && text?.content",
-      ""
-    ]
-  });
-  const provider = space ? new SpaceAwarenessProvider({
-    space,
-    doc: text.doc,
-    channel: `yjs.awareness.${text.id}`
-  }) : void 0;
-  return {
-    id: text.doc.guid,
-    content: text.content,
-    text: () => text.content.toString(),
-    ranges: [],
-    extension: yCollab(text.content, provider?.awareness),
-    awareness: provider?.awareness,
-    peer: identity ? {
-      id: identity.identityKey.toHex(),
-      name: identity.profile?.displayName
-    } : void 0
-  };
-};
-var createAutomergeModel = ({ identity, text }) => {
+
+// packages/ui/react-ui-editor/src/hooks/automerge.ts
+var createAutomergeModel = ({ space, identity, text }) => {
   const obj = text;
   const doc = getRawDoc(obj, [
     obj.field
   ]);
-  return {
+  const awarenessProvider = space && new SpaceAwarenessProvider({
+    space,
+    channel: `automerge.awareness.${obj.id}`,
+    info: {
+      displayName: identity?.profile?.displayName ?? "",
+      color: cursorColor.color,
+      lightColor: cursorColor.light
+    },
+    peerId: identity?.identityKey.toHex() ?? "Anonymous"
+  });
+  const model = {
     id: obj.id,
     content: doc,
-    text: () => get4(doc.handle.docSync(), doc.path),
-    ranges: [],
-    extension: automergePlugin(doc.handle, doc.path),
+    text: () => get7(doc.handle.docSync(), doc.path),
+    // TODO(burdon): https://automerge.org/automerge/api-docs/js/functions/next.getCursor.html
+    extension: [
+      modelState.init(() => model),
+      automerge3({
+        handle: doc.handle,
+        path: doc.path
+      }),
+      awarenessProvider && AwarenessProvider.of(awarenessProvider),
+      awareness()
+    ].filter(isNotNullOrUndefined),
     peer: identity ? {
       id: identity.identityKey.toHex(),
       name: identity.profile?.displayName
     } : void 0
   };
+  return model;
 };
 export {
+  AwarenessProvider,
   BaseTextEditor,
   Doc,
   EditorModes,
   MarkdownEditor,
+  RemoteSelectionsDecorator,
   SpaceAwarenessProvider,
   TextEditor,
   TextKind,
+  YAwarenessProvider,
   YText,
   YXmlFragment,
   autocomplete,
+  automerge3 as automerge,
+  awareness,
   basicBundle,
   blast,
   code2 as code,
   codeTheme,
   comments,
-  cursorColor,
+  createAutomergeModel,
+  createYjsModel,
   defaultMarkdownSlots,
   defaultOptions,
   defaultSlots,
   defaultTextSlots,
   defaultTheme,
-  demo,
-  highlight,
-  highlightDecorations,
-  highlightStateField,
+  hr,
   image,
   link,
-  listener2 as listener,
+  listener,
   markdownBundle,
   markdownHighlightStyle,
   markdownTags,
   markdownTagsExtensions,
   markdownTheme,
   mention,
+  mermaid,
+  modelState,
+  setCommentRange,
+  setFocus,
+  setSelection,
   table,
   tags2 as tags,
   tasklist,
   textTheme,
-  tooltip,
-  useHighlights,
-  useTextModel
+  typewriter,
+  useTextModel,
+  yjs
 };
 //# sourceMappingURL=index.mjs.map