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

package/dist/lib/browser/index.mjs

@@ -7,51 +7,51 @@ import { tags as tags2 } from "@lezer/highlight";
 
 // packages/ui/react-ui-editor/src/components/TextEditor/TextEditor.tsx
 import { EditorState as EditorState2 } from "@codemirror/state";
-import { EditorView as EditorView13 } from "@codemirror/view";
+import { EditorView as EditorView12 } 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 React, { forwardRef, useCallback, useEffect, useImperativeHandle, useState, useRef } 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 { markdownLanguage } from "@codemirror/lang-markdown";
 import { keymap } from "@codemirror/view";
 var autocomplete = ({ onSearch }) => {
   return [
     // https://codemirror.net/docs/ref/#view.keymap
     // https://discuss.codemirror.net/t/how-can-i-replace-the-default-autocompletion-keymap-v6/3322
+    // TODO(burdon): Set custom keymap.
     keymap.of(completionKeymap),
     // https://codemirror.net/examples/autocompletion
     // https://codemirror.net/docs/ref/#autocomplete.autocompletion
     autocompletion({
-      // TODO(burdon): Set custom keymap.
-      // defaultKeymap: false,
+      defaultKeymap: false,
       // Don't start unless key press.
-      activateOnTyping: false,
-      // TODO(burdon): Option to create new page?
-      // TODO(burdon): Optional decoration via addToOptions
-      override: [
-        (context) => {
-          const match = context.matchBefore(/\w*/);
-          if (!match || match.from === match.to && !context.explicit) {
-            return null;
-          }
-          return {
-            from: match.from,
-            options: onSearch(match.text.toLowerCase())
-          };
+      activateOnTyping: false
+    }),
+    // TODO(burdon): Option to create new page?
+    // TODO(burdon): Optional decoration via addToOptions
+    markdownLanguage.data.of({
+      autocomplete: (context) => {
+        const match = context.matchBefore(/\w*/);
+        if (!match || match.from === match.to && !context.explicit) {
+          return null;
         }
-      ]
+        return {
+          from: match.from,
+          options: onSearch(match.text.toLowerCase())
+        };
+      }
     })
   ];
 };
 
 // packages/ui/react-ui-editor/src/extensions/automerge/automerge.ts
-import { Facet as Facet2, StateField } from "@codemirror/state";
-import { ViewPlugin } from "@codemirror/view";
+import { StateField } from "@codemirror/state";
 import { next as A } from "@dxos/automerge/automerge";
 
 // packages/ui/react-ui-editor/src/extensions/automerge/cursor.ts
@@ -93,12 +93,12 @@ var cursorConverter = (handle, path) => ({
 // packages/ui/react-ui-editor/src/extensions/automerge/defs.ts
 import { Annotation, StateEffect } from "@codemirror/state";
 var effectType = StateEffect.define({});
+var reconcileAnnotationType = Annotation.define();
+var getPath = (state, field) => state.field(field).path;
+var getLastHeads = (state, field) => state.field(field).lastHeads;
 var updateHeads = (newHeads) => effectType.of({
   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
@@ -236,85 +236,101 @@ var charPath = (textPath, candidatePath) => {
 
 // packages/ui/react-ui-editor/src/extensions/automerge/semaphore.ts
 var PatchSemaphore = class {
-  constructor(_field) {
+  // prettier-ignore
+  constructor(_handle, _field) {
+    this._handle = _handle;
     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);
+  }
+  // NOTE: Cannot destruct view.state.
+  reconcile(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({
-        effects: updateHeads(newHeads),
-        annotations: reconcileAnnotationType.of({})
+        changes: inverted,
+        annotations: reconcileAnnotationType.of(true)
       });
-      this._inReconcile = false;
-    };
+    }
+    let newHeads = updateAutomerge(this._field, this._handle, transactions, view.state);
+    if (newHeads === null || newHeads === void 0) {
+      newHeads = automerge2.getHeads(this._handle.docSync());
+    }
+    const diff = automerge2.equals(oldHeads, newHeads) ? [] : automerge2.diff(this._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
+// packages/ui/react-ui-editor/src/extensions/cursor.ts
 import { Facet } from "@codemirror/state";
-var DEFAULT_CURSOR_CONVERTER = {
+var defaultCursorConverter = {
   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)
+var Cursor = class _Cursor {
+  static {
+    this.converter = Facet.define({
+      combine: (providers) => providers[0] ?? defaultCursorConverter
     });
   }
+  static {
+    this.getCursorFromRange = (state, range) => {
+      const cursorConverter3 = state.facet(_Cursor.converter);
+      const from = cursorConverter3.toCursor(range.from);
+      const to = cursorConverter3.toCursor(range.to, -1);
+      return [
+        from,
+        to
+      ].join(":");
+    };
+  }
+  static {
+    this.getRangeFromCursor = (state, cursor) => {
+      const cursorConverter3 = state.facet(_Cursor.converter);
+      const parts = cursor.split(":");
+      const from = cursorConverter3.fromCursor(parts[0]);
+      const to = cursorConverter3.fromCursor(parts[1]);
+      return from !== void 0 && to !== void 0 ? {
+        from,
+        to
+      } : void 0;
+    };
+  }
 };
 
-// packages/ui/react-ui-editor/src/extensions/automerge/automerge.ts
-var semaphoreFacet = Facet2.define({
+// packages/ui/react-ui-editor/src/extensions/sync.ts
+import { Facet as Facet2 } from "@codemirror/state";
+var syncFacet = Facet2.define({
   combine: (values) => values.at(-1)
 });
+
+// packages/ui/react-ui-editor/src/extensions/automerge/automerge.ts
 var automerge3 = ({ handle, path }) => {
   const stateField = StateField.define({
     create: () => ({
+      path: path.slice(),
       lastHeads: A.getHeads(handle.docSync()),
-      unreconciledTransactions: [],
-      path: path.slice()
+      unreconciledTransactions: []
     }),
     update: (value, tr) => {
       const result = {
+        path: path.slice(),
         lastHeads: value.lastHeads,
-        unreconciledTransactions: value.unreconciledTransactions.slice(),
-        path: path.slice()
+        unreconciledTransactions: value.unreconciledTransactions.slice()
       };
       let clearUnreconciled = false;
       for (const effect of tr.effects) {
@@ -333,39 +349,19 @@ var automerge3 = ({ handle, path }) => {
       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);
-    }
-  });
+  const semaphore = new PatchSemaphore(handle, stateField);
   return {
     extension: [
-      CursorConverter.of(cursorConverter(handle, path)),
-      semaphoreFacet.of(semaphore),
-      stateField,
-      viewPlugin
+      Cursor.converter.of(cursorConverter(handle, path)),
+      syncFacet.of(semaphore),
+      stateField
     ]
   };
 };
 
 // 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 { Decoration, EditorView, ViewPlugin, WidgetType } from "@codemirror/view";
 import { Event } from "@dxos/async";
 import { Context } from "@dxos/context";
 var dummyProvider = {
@@ -385,7 +381,7 @@ var RemoteSelectionChangedAnnotation = Annotation2.define();
 var awareness = (provider = dummyProvider) => {
   return [
     AwarenessProvider.of(provider),
-    ViewPlugin2.fromClass(RemoteSelectionsDecorator, {
+    ViewPlugin.fromClass(RemoteSelectionsDecorator, {
       decorations: (value) => value.decorations
     }),
     styles
@@ -397,7 +393,7 @@ var RemoteSelectionsDecorator = class {
     this._ctx = new Context();
     this._lastAnchor = void 0;
     this._lastHead = void 0;
-    this._cursorConverter = view.state.facet(CursorConverter);
+    this._cursorConverter = view.state.facet(Cursor.converter);
     this._provider = view.state.facet(AwarenessProvider);
     this._provider.open();
     this._provider.remoteStateChange.on(this._ctx, () => {
@@ -412,13 +408,13 @@ var RemoteSelectionsDecorator = class {
     void this._ctx.dispose();
     this._provider.close();
   }
-  update(update4) {
-    this._updateLocalSelection(update4);
-    this._updateRemoteSelections(update4);
+  update(update2) {
+    this._updateLocalSelection(update2);
+    this._updateRemoteSelections(update2);
   }
-  _updateLocalSelection(update4) {
-    const hasFocus = update4.view.hasFocus && update4.view.dom.ownerDocument.hasFocus();
-    const { anchor = void 0, head = void 0 } = hasFocus ? update4.state.selection.main : {};
+  _updateLocalSelection(update2) {
+    const hasFocus = update2.view.hasFocus && update2.view.dom.ownerDocument.hasFocus();
+    const { anchor = void 0, head = void 0 } = hasFocus ? update2.state.selection.main : {};
     if (this._lastAnchor === anchor && this._lastHead === head) {
       return;
     }
@@ -429,7 +425,7 @@ var RemoteSelectionsDecorator = class {
       head: this._cursorConverter.toCursor(head)
     } : void 0);
   }
-  _updateRemoteSelections(update4) {
+  _updateRemoteSelections(update2) {
     const decorations = [];
     const awarenessStates = this._provider.getRemoteStates();
     for (const state of awarenessStates) {
@@ -438,10 +434,10 @@ var RemoteSelectionsDecorator = class {
       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 start = Math.min(Math.min(anchor, head), update2.view.state.doc.length);
+      const end = Math.min(Math.max(anchor, head), update2.view.state.doc.length);
+      const startLine = update2.view.state.doc.lineAt(start);
+      const endLine = update2.view.state.doc.lineAt(end);
       const color = state.info.color ?? "#30bced";
       const lightColor = state.info.lightColor ?? color + "33";
       if (startLine.number === endLine.number) {
@@ -452,7 +448,7 @@ var RemoteSelectionsDecorator = class {
             attributes: {
               style: `background-color: ${lightColor}`
             },
-            class: "cm-ySelection"
+            class: "cm-collab-selection"
           })
         });
       } else {
@@ -463,7 +459,7 @@ var RemoteSelectionsDecorator = class {
             attributes: {
               style: `background-color: ${color}`
             },
-            class: "cm-ySelection"
+            class: "cm-collab-selection"
           })
         });
         decorations.push({
@@ -473,18 +469,18 @@ var RemoteSelectionsDecorator = class {
             attributes: {
               style: `background-color: ${color}`
             },
-            class: "cm-ySelection"
+            class: "cm-collab-selection"
           })
         });
         for (let i = startLine.number + 1; i < endLine.number; i++) {
-          const linePos = update4.view.state.doc.line(i).from;
+          const linePos = update2.view.state.doc.line(i).from;
           decorations.push({
             from: linePos,
             to: linePos,
             value: Decoration.line({
               attributes: {
                 style: `background-color: ${color}`,
-                class: "cm-yLineSelection"
+                class: "cm-collab-selectionLine"
               }
             })
           });
@@ -504,23 +500,21 @@ var RemoteSelectionsDecorator = class {
   }
 };
 var RemoteCaretWidget = class extends WidgetType {
-  constructor(name, color) {
+  constructor(_name, _color) {
     super();
-    this.name = name;
-    this.color = color;
-    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;
+    span.className = "cm-collab-selectionCaret";
+    span.style.backgroundColor = this._color;
+    span.style.borderColor = this._color;
     const dot = document.createElement("div");
-    dot.className = "cm-ySelectionCaretDot";
+    dot.className = "cm-collab-selectionCaretDot";
     const info = document.createElement("div");
-    info.className = "cm-ySelectionInfo";
-    info.innerText = this.name;
+    info.className = "cm-collab-selectionInfo";
+    info.innerText = this._name;
     span.appendChild(document.createTextNode("\u2060"));
     span.appendChild(dot);
     span.appendChild(document.createTextNode("\u2060"));
@@ -528,15 +522,12 @@ var RemoteCaretWidget = class extends WidgetType {
     span.appendChild(document.createTextNode("\u2060"));
     return span;
   }
-  eq(widget) {
-    return widget.color === this.color;
-  }
-  compare(widget) {
-    return widget.color === this.color;
-  }
   updateDOM() {
     return false;
   }
+  eq(widget) {
+    return widget._color === this._color;
+  }
   get estimatedHeight() {
     return -1;
   }
@@ -545,12 +536,12 @@ var RemoteCaretWidget = class extends WidgetType {
   }
 };
 var styles = EditorView.baseTheme({
-  ".cm-ySelection": {},
-  ".cm-yLineSelection": {
+  ".cm-collab-selection": {},
+  ".cm-collab-selectionLine": {
     padding: 0,
     margin: "0px 2px 0px 4px"
   },
-  ".cm-ySelectionCaret": {
+  ".cm-collab-selectionCaret": {
     position: "relative",
     borderLeft: "1px solid black",
     borderRight: "1px solid black",
@@ -559,7 +550,7 @@ var styles = EditorView.baseTheme({
     boxSizing: "border-box",
     display: "inline"
   },
-  ".cm-ySelectionCaretDot": {
+  ".cm-collab-selectionCaretDot": {
     borderRadius: "50%",
     position: "absolute",
     width: ".4em",
@@ -570,11 +561,11 @@ var styles = EditorView.baseTheme({
     transition: "transform .3s ease-in-out",
     boxSizing: "border-box"
   },
-  ".cm-ySelectionCaret:hover > .cm-ySelectionCaretDot": {
+  ".cm-collab-selectionCaret:hover > .cm-collab-selectionCaretDot": {
     transformOrigin: "bottom center",
     transform: "scale(0)"
   },
-  ".cm-ySelectionInfo": {
+  ".cm-collab-selectionInfo": {
     position: "absolute",
     top: "-1.05em",
     left: "-1px",
@@ -590,12 +581,12 @@ var styles = EditorView.baseTheme({
     zIndex: 101,
     transition: "opacity .3s ease-in-out",
     backgroundColor: "inherit",
-    // these should be separate
+    // These should be separate.
     opacity: 0,
     transitionDelay: "0s",
     whiteSpace: "nowrap"
   },
-  ".cm-ySelectionCaret:hover > .cm-ySelectionInfo": {
+  ".cm-collab-selectionCaret:hover > .cm-collab-selectionInfo": {
     opacity: 1,
     transitionDelay: "0s"
   }
@@ -622,7 +613,7 @@ var basicBundle = ({ readonly, themeMode, placeholder: _placeholder }) => [
 import { EditorView as EditorView3, keymap as keymap2 } from "@codemirror/view";
 import defaultsDeep from "lodash.defaultsdeep";
 import { invariant } from "@dxos/invariant";
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/blast.ts";
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/blast.ts";
 var defaultOptions = {
   effect: 2,
   maxParticles: 200,
@@ -667,12 +658,12 @@ var blast = (options = defaultOptions) => {
   };
   return [
     // Cursor moved.
-    EditorView3.updateListener.of((update4) => {
-      if (blaster?.node !== update4.view.scrollDOM) {
+    EditorView3.updateListener.of((update2) => {
+      if (blaster?.node !== update2.view.scrollDOM) {
         if (blaster) {
           blaster.destroy();
         }
-        blaster = new Blaster(update4.view.scrollDOM, defaultsDeep({
+        blaster = new Blaster(update2.view.scrollDOM, defaultsDeep({
           particleGravity: 0.2,
           particleShrinkRate: 0.995,
           color: () => [
@@ -686,10 +677,10 @@ var blast = (options = defaultOptions) => {
       } else {
         blaster.resize();
       }
-      const current = update4.state.selection.main.head;
+      const current = update2.state.selection.main.head;
       if (current !== last) {
         last = current;
-        const { element, point } = getPoint(update4.view, current - 1);
+        const { element, point } = getPoint(update2.view, current - 1);
         if (element && point) {
           blaster.spawn({
             element,
@@ -749,7 +740,7 @@ var Blaster = class {
   }
   initialize() {
     invariant(!this._canvas && !this._ctx, void 0, {
-      F: __dxlog_file2,
+      F: __dxlog_file,
       L: 138,
       S: this,
       A: [
@@ -786,7 +777,7 @@ var Blaster = class {
   }
   start() {
     invariant(this._canvas && this._ctx, void 0, {
-      F: __dxlog_file2,
+      F: __dxlog_file,
       L: 177,
       S: this,
       A: [
@@ -929,8 +920,7 @@ var random = (min, max) => {
 };
 
 // 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 { ViewPlugin as ViewPlugin2, EditorView as EditorView4, Decoration as Decoration2 } from "@codemirror/view";
 import { mx as mx2 } from "@dxos/react-ui-theme";
 
 // packages/ui/react-ui-editor/src/styles/cursors.ts
@@ -1014,20 +1004,22 @@ 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);
 
 // packages/ui/react-ui-editor/src/styles/tokens.ts
+import get2 from "lodash.get";
 import { tailwindConfig } from "@dxos/react-ui-theme";
 var tokens = tailwindConfig({}).theme;
+var getToken = (path, defaultValue = void 0) => get2(tokens, path, defaultValue);
 
 // packages/ui/react-ui-editor/src/extensions/code.ts
 var CODE_REGEX = /```[\s\S]*?```/gs;
 var styles2 = EditorView4.baseTheme({
   "& .cm-codeblock": {
-    fontFamily: get2(tokens, "fontFamily.mono", []).join(",")
+    fontFamily: getToken("fontFamily.mono", []).join(",")
   },
   '&light [aria-readonly="true"] .cm-codeblock': {
-    background: get2(tokens, "extend.colors.neutral.50")
+    background: getToken("extend.colors.neutral.50")
   },
   '&dark [aria-readonly="true"] .cm-codeblock': {
-    background: get2(tokens, "extend.colors.neutral.850")
+    background: getToken("extend.colors.neutral.850")
   },
   '& [aria-readonly="true"] .cm-codeblock': {
     display: "block",
@@ -1053,32 +1045,35 @@ var getLineRange = (lines, from, to) => {
   ];
 };
 var code2 = () => {
-  const getDecorations = (view) => {
+  const buildDecorations4 = (view) => {
     const decorations = [];
-    if (view.state.readOnly) {
-      const text = view.state.doc.sliceString(0);
-      const matches = text.matchAll(CODE_REGEX);
-      const blocks = view.viewportLineBlocks;
-      for (const match of matches) {
-        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(Decoration2.line({
-            class: mx2("cm-codeblock", i === range[0] && "cm-codeblock-first", i === range[1] && "cm-codeblock-last")
-          }).range(block.from));
-        }
+    const text = view.state.doc.sliceString(0);
+    const matches = text.matchAll(CODE_REGEX);
+    const blocks = view.viewportLineBlocks;
+    for (const match of matches) {
+      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(Decoration2.line({
+          class: mx2("cm-codeblock", i === range[0] && "cm-codeblock-first", i === range[1] && "cm-codeblock-last")
+        }).range(block.from));
       }
     }
     return Decoration2.set(decorations);
   };
   return [
-    ViewPlugin3.fromClass(class {
+    ViewPlugin2.fromClass(class {
       constructor(view) {
-        this.decorations = getDecorations(view);
+        this.hasFocus = false;
+        this.decorations = buildDecorations4(view);
       }
-      update(update4) {
-        if (update4.docChanged || update4.viewportChanged) {
-          this.decorations = getDecorations(update4.view);
+      update(update2) {
+        if (
+          // TODO(burdon): Generalize for other extensions.
+          this.hasFocus !== update2.view.hasFocus || update2.startState.readOnly !== update2.view.state.readOnly || update2.docChanged || update2.viewportChanged
+        ) {
+          this.hasFocus = update2.view.hasFocus;
+          this.decorations = buildDecorations4(update2.view);
         }
       }
     }, {
@@ -1090,29 +1085,36 @@ var code2 = () => {
 
 // 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 { hoverTooltip, keymap as keymap3, Decoration as Decoration3, EditorView as EditorView5 } from "@codemirror/view";
 import sortBy from "lodash.sortby";
 import { debounce } from "@dxos/async";
 import { invariant as invariant2 } from "@dxos/invariant";
-import { log as log2 } from "@dxos/log";
 import { nonNullable } from "@dxos/util";
+
+// packages/ui/react-ui-editor/src/util.ts
+import { log } from "@dxos/log";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/util.ts";
+var callbackWrapper = (fn) => (...args) => {
+  try {
+    return fn(...args);
+  } catch (error) {
+    log.catch(error, void 0, {
+      F: __dxlog_file2,
+      L: 16,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+  }
+};
+
+// packages/ui/react-ui-editor/src/extensions/comments.ts
 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",
-    padding: "4px",
-    backgroundColor: "yellow"
-  },
-  "& .cm-bookmark-selected": {
-    backgroundColor: "orange"
-  },
   "& .cm-comment": {
-    backgroundColor: get3(tokens, "extend.colors.yellow.50")
+    backgroundColor: getToken("extend.colors.yellow.50")
   },
   "& .cm-comment-active": {
-    backgroundColor: get3(tokens, "extend.colors.yellow.100")
+    backgroundColor: getToken("extend.colors.yellow.100")
   }
 });
 var marks = {
@@ -1124,8 +1126,8 @@ var marks = {
   })
 };
 var setFocus = (view, thread) => {
-  const range = view.state.field(commentsStateField).ranges.find((range2) => range2.id === thread);
-  if (!range) {
+  const comment = view.state.field(commentsState).comments.find((range) => range.comment.id === thread);
+  if (!comment) {
     return;
   }
   view.dispatch({
@@ -1133,39 +1135,41 @@ var setFocus = (view, thread) => {
       active: thread
     }),
     selection: {
-      anchor: range.from
+      anchor: comment.range.from
     },
     scrollIntoView: true
   });
 };
-var setCommentRange = StateEffect2.define();
+var setComments = StateEffect2.define();
 var setSelection = StateEffect2.define();
 var setCommentState = StateEffect2.define();
-var commentsStateField = StateField2.define({
+var commentsState = StateField2.define({
   create: () => ({
-    ranges: []
+    comments: [],
+    selection: {}
   }),
   update: (value, tr) => {
-    const cursorConverter3 = tr.state.facet(CursorConverter);
     for (const effect of tr.effects) {
       if (effect.is(setSelection)) {
         return {
           ...value,
-          ...effect.value
+          selection: effect.value
         };
       }
-      if (effect.is(setCommentRange)) {
-        const { comments: comments2 } = effect.value;
-        const ranges = comments2.map((comment) => {
-          const range = getRangeFromCursor(cursorConverter3, comment.cursor);
+      if (effect.is(setComments)) {
+        const comments2 = effect.value.map((comment) => {
+          if (!comment.cursor) {
+            return void 0;
+          }
+          const range = Cursor.getRangeFromCursor(tr.state, comment.cursor);
           return range && {
-            ...comment,
-            ...range
+            comment,
+            range
           };
         }).filter(nonNullable);
         return {
           ...value,
-          ranges
+          comments: comments2
         };
       }
       if (effect.is(setCommentState)) {
@@ -1176,77 +1180,109 @@ var commentsStateField = StateField2.define({
   }
 });
 var highlightDecorations = EditorView5.decorations.compute([
-  commentsStateField
+  commentsState
 ], (state) => {
-  const { active, ranges } = state.field(commentsStateField);
-  const decorations = sortBy(ranges ?? [], (range) => range.from)?.flatMap((selection) => {
-    if (selection.from === selection.to) {
+  const { selection: { active }, comments: comments2 } = state.field(commentsState);
+  const decorations = sortBy(comments2 ?? [], (range) => range.range.from)?.flatMap((comment) => {
+    const range = comment.range;
+    if (!range || range.from === range.to) {
+      console.warn("Invalid range:", range);
       return void 0;
     }
-    const range = {
-      from: selection.from,
-      to: selection.to
-    };
-    if (selection.id === active) {
+    if (comment.comment.id === active) {
       return marks.highlightActive.range(range.from, range.to);
     } else {
       return marks.highlight.range(range.from, range.to);
     }
-  }).filter(nonNullable) ?? [];
+  }).filter(nonNullable);
   return Decoration3.set(decorations);
 });
-var BookmarkWidget = class extends WidgetType2 {
-  constructor(_anchor, _id, _handleClick) {
-    super();
-    this._anchor = _anchor;
-    this._id = _id;
-    this._handleClick = _handleClick;
-    invariant2(this._id, void 0, {
-      F: __dxlog_file3,
-      L: 169,
-      S: this,
-      A: [
-        "this._id",
-        ""
-      ]
-    });
-  }
-  eq(other) {
-    return this._anchor === other._anchor && this._id === other._id;
-  }
-  toDOM() {
-    const span = document.createElement("span");
-    span.className = "cm-bookmark";
-    span.textContent = "\u203B";
-    if (this._handleClick) {
-      span.onclick = () => this._handleClick();
+var trackPastedComments = (onUpdate) => {
+  let tracked = null;
+  const handleTrack = (event, view) => {
+    const comments2 = view.state.field(commentsState);
+    const { main } = view.state.selection;
+    const selectedRanges = comments2.comments.filter(({ range }) => range.from >= main.from && range.to <= main.to && range.from < range.to);
+    if (!selectedRanges.length) {
+      tracked = null;
+    } else {
+      tracked = {
+        text: view.state.doc.slice(main.from, main.to),
+        comments: selectedRanges.map(({ comment, range }) => ({
+          id: comment.id,
+          from: range.from - main.from,
+          to: range.to - main.from
+        }))
+      };
     }
-    return span;
-  }
+  };
+  return [
+    EditorView5.domEventHandlers({
+      cut: handleTrack,
+      copy: handleTrack
+    }),
+    // Handle paste.
+    EditorView5.updateListener.of(({ view, state, transactions }) => {
+      if (tracked) {
+        const paste = transactions.find((tr) => tr.isUserEvent("input.paste"));
+        if (paste) {
+          let found = -1;
+          paste.changes.iterChanges((fromA, toA, fromB, toB, text) => {
+            if (text.eq(tracked.text)) {
+              for (let i = transactions.indexOf(paste) + 1; i < transactions.length; i++) {
+                fromB = transactions[i].changes.mapPos(fromB);
+              }
+              found = fromB;
+            }
+          });
+          if (found > -1) {
+            state.facet(syncFacet)?.reconcile(view);
+            for (const moved of tracked.comments) {
+              const range = {
+                from: found + moved.from,
+                to: found + moved.to
+              };
+              const cursor = Cursor.getCursorFromRange(state, range);
+              onUpdate(moved.id, cursor);
+            }
+          }
+          tracked = null;
+        }
+      }
+    })
+  ];
 };
 var comments = (options = {}) => {
+  const { key: shortcut = "meta-'" } = options;
   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,
+      L: 262,
       S: void 0,
       A: [
         "options.onCreate",
         ""
       ]
     });
-    const { head, from, to } = view.state.selection.main;
+    const { from, to } = view.state.selection.main;
     if (from === to) {
       return false;
     }
-    const relPos = getCursorFromRange(cursorConverter3, {
+    if (to === view.state.doc.length) {
+      view.dispatch({
+        changes: {
+          from: to,
+          insert: "\n"
+        }
+      });
+    }
+    const cursor = Cursor.getCursorFromRange(view.state, {
       from,
       to
     });
-    if (relPos) {
-      const id = callbackWrapper(options.onCreate)(relPos);
+    if (cursor) {
+      const id = callbackWrapper(options.onCreate)(cursor, view.coordsAtPos(from));
       if (id) {
         view.dispatch({
           effects: setSelection.of({
@@ -1256,53 +1292,13 @@ var comments = (options = {}) => {
             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)
-          });
-        }
-      });
-    }
-    constructor(view) {
-      this.bookmarks = BookmarkViewPlugin.bookmarkMatcher.createDeco(view);
-    }
-    update(update4) {
-      this.bookmarks = BookmarkViewPlugin.bookmarkMatcher.updateDeco(update4, this.bookmarks);
-    }
-  }, {
-    decorations: (instance) => instance.bookmarks,
-    provide: (plugin) => EditorView5.atomicRanges.of((view) => {
-      return view.plugin(plugin)?.bookmarks || Decoration3.none;
-    })
-  });
   return [
-    bookmarksViewPlugin,
-    commentsStateField,
+    commentsState,
     highlightDecorations,
     styles3,
     //
@@ -1310,7 +1306,8 @@ var comments = (options = {}) => {
     //
     options.onCreate ? keymap3.of([
       {
-        key: options?.key ?? "meta-'",
+        key: shortcut,
+        // TODO(burdon): Check if there's a better way?
         run: callbackWrapper(createCommentThread)
       }
     ]) : [],
@@ -1327,7 +1324,7 @@ var comments = (options = {}) => {
           above: true,
           create: () => {
             const el = document.createElement("div");
-            options.onHover?.(el);
+            options.onHover(el, shortcut);
             return {
               dom: el,
               offset: {
@@ -1340,112 +1337,89 @@ var comments = (options = {}) => {
       }
       return null;
     }, {
-      hideOnChange: true,
+      // TODO(burdon): Hide on change triggered immediately?
+      // hideOnChange: true,
       hoverTime: 1e3
     }) : [],
     //
-    // Monitor cursor movement and text updates.
-    // TODO(burdon): Is there a better (finer grained) way to do this?
+    // Track deleted ranges and update ranges for decorations.
     //
     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)
-                });
-              }
+      let mod = false;
+      const { comments: comments2, ...value } = state.field(commentsState);
+      changes.iterChanges((from, to, from2, to2) => {
+        comments2.forEach(({ comment, range }) => {
+          if (from2 === to2) {
+            const newRange = Cursor.getRangeFromCursor(view.state, comment.cursor);
+            if (!newRange || newRange.to - newRange.from === 0) {
+              options.onDelete?.(comment.id);
             }
-            if (from <= range.to) {
-              const newRange = getRangeFromCursor(cursorConverter3, range.cursor);
-              Object.assign(range, newRange);
-              mod = true;
-            }
-          });
+          }
+          if (from <= range.to) {
+            const newRange = Cursor.getRangeFromCursor(view.state, comment.cursor);
+            Object.assign(range, newRange);
+            mod = true;
+          }
+        });
+      });
+      if (mod) {
+        view.dispatch({
+          effects: setCommentState.of({
+            comments: comments2,
+            ...value
+          })
         });
-        if (mod) {
-          view.dispatch({
-            effects: setCommentState.of({
-              active,
-              ranges
-            })
-          });
-        }
       }
-      {
-        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;
-          }
+    }),
+    //
+    // Track selection/proximity.
+    //
+    EditorView5.updateListener.of(({ view, state, changes }) => {
+      let min = Infinity;
+      const { selection: { active, closest }, comments: comments2 } = state.field(commentsState);
+      const { head } = state.selection.main;
+      const selection = {};
+      comments2.forEach(({ comment, range }) => {
+        if (head >= range.from && head <= range.to) {
+          selection.active = comment.id;
+          selection.closest = void 0;
+        }
+        if (!selection.active) {
+          const d = Math.min(Math.abs(head - range.from), Math.abs(head - range.to));
           if (d < min) {
-            selected.closest = comment.id;
+            selection.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)
-            }))
-          });
         }
+      });
+      if (selection.active !== active || selection.closest !== closest) {
+        view.dispatch({
+          effects: setSelection.of(selection)
+        });
+        handleSelect({
+          selection,
+          comments: comments2.map(({ comment, range }) => ({
+            comment,
+            range,
+            location: view.coordsAtPos(range.from)
+          }))
+        });
       }
-    })
+    }),
+    options.onUpdate ? trackPastedComments(options.onUpdate) : []
   ];
 };
-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/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";
+import { Decoration as Decoration4, EditorView as EditorView6, MatchDecorator, ViewPlugin as ViewPlugin3, WidgetType as WidgetType2 } from "@codemirror/view";
 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")}`
+    borderBottom: `1px solid ${getToken("extend.colors.neutral.200")}`
   }
 });
-var HorizontalRuleWidget = class extends WidgetType3 {
+var HorizontalRuleWidget = class extends WidgetType2 {
   constructor(_pos) {
     super();
     this._pos = _pos;
@@ -1459,43 +1433,62 @@ var HorizontalRuleWidget = class extends WidgetType3 {
     return el;
   }
 };
-var placeholderMatcher = new MatchDecorator2({
-  regexp: /^---$/g,
+var placeholderMatcher = new MatchDecorator({
+  // regexp: /(?<=\n\n)---/gs,
+  regexp: /^---$/gs,
   decoration: (match, view, pos) => Decoration4.replace({
     widget: new HorizontalRuleWidget(pos)
   })
 });
 var hr = () => [
   styles4,
-  ViewPlugin5.fromClass(class {
+  ViewPlugin3.fromClass(class {
     constructor(view) {
       this.rules = placeholderMatcher.createDeco(view);
     }
-    update(update4) {
-      this.rules = placeholderMatcher.updateDeco(update4, this.rules);
+    update(update2) {
+      this.rules = placeholderMatcher.updateDeco(update2, this.rules);
     }
   }, {
-    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;
-    })
+    decorations: (instance) => instance.rules
   })
 ];
 
 // packages/ui/react-ui-editor/src/extensions/image.ts
 import { syntaxTree } from "@codemirror/language";
-import { RangeSetBuilder, StateField as StateField3 } from "@codemirror/state";
-import { Decoration as Decoration5, EditorView as EditorView7, WidgetType as WidgetType4 } from "@codemirror/view";
+import { StateField as StateField3 } from "@codemirror/state";
+import { Decoration as Decoration5, EditorView as EditorView7, WidgetType as WidgetType3 } from "@codemirror/view";
 var image = (options = {}) => {
   return StateField3.define({
-    create: (state) => update(state, options),
-    update: (_, tr) => update(tr.state, options),
+    create: (state) => {
+      return Decoration5.set(buildDecorations(0, state.doc.length, state));
+    },
+    update: (value, tr) => {
+      if (!tr.docChanged && !tr.selection) {
+        return value;
+      }
+      const cursor = tr.state.selection.main.head;
+      const oldCursor = tr.changes.mapPos(tr.startState.selection.main.head);
+      let from = Math.min(cursor, oldCursor);
+      let to = Math.max(cursor, oldCursor);
+      tr.changes.iterChangedRanges((fromA, toA, fromB, toB) => {
+        from = Math.min(from, fromB);
+        to = Math.max(to, toB);
+      });
+      from = tr.state.doc.lineAt(from).from;
+      to = tr.state.doc.lineAt(to).to;
+      return value.map(tr.changes).update({
+        filterFrom: from,
+        filterTo: to,
+        filter: () => false,
+        add: buildDecorations(from, to, tr.state)
+      });
+    },
     provide: (field) => EditorView7.decorations.from(field)
   });
 };
-var update = (state, options) => {
-  const builder = new RangeSetBuilder();
+var buildDecorations = (from, to, state) => {
+  const decorations = [];
   const cursor = state.selection.main.head;
   syntaxTree(state).iterate({
     enter: (node) => {
@@ -1504,22 +1497,23 @@ 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, Decoration5.replace({
+          decorations.push(Decoration5.replace({
             block: true,
             widget: new ImageWidget(url)
-          }));
+          }).range(hide ? node.from : node.to, node.to));
         }
       }
-    }
+    },
+    from,
+    to
   });
-  return builder.finish();
+  return decorations;
 };
-var ImageWidget = class extends WidgetType4 {
+var ImageWidget = class extends WidgetType3 {
   constructor(_url) {
     super();
     this._url = _url;
   }
-  // TODO(burdon): Does this need to be unique for each position?
   eq(other) {
     return this._url === other._url;
   }
@@ -1527,22 +1521,29 @@ var ImageWidget = class extends WidgetType4 {
     const img = document.createElement("img");
     img.setAttribute("src", this._url);
     img.setAttribute("class", "cm-image");
+    img.onload = () => img.classList.add("cm-loaded-image");
     return img;
   }
 };
 
 // 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 { RangeSetBuilder } from "@codemirror/state";
+import { hoverTooltip as hoverTooltip2, Decoration as Decoration6, ViewPlugin as ViewPlugin4, WidgetType as WidgetType4 } 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)
+    ViewPlugin4.fromClass(class {
+      constructor(view) {
+        this.decorations = buildDecorations2(view, options);
+      }
+      update(update2) {
+        if (update2.docChanged || update2.viewportChanged || update2.selectionSet) {
+          this.decorations = buildDecorations2(update2.view, options);
+        }
+      }
+    }, {
+      decorations: (v) => v.decorations
     })
   ];
   if (options.onHover) {
@@ -1550,35 +1551,25 @@ var link = (options = {}) => {
       // 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) {
+      hoverTooltip2((view, pos, side) => {
+        const syntax = syntaxTree2(view.state).resolveInner(pos, side);
+        let link2 = null;
+        for (let i = 0, node = syntax; !link2 && node && i < 5; node = node.parent, i++) {
+          link2 = node.name === "Link" ? node : null;
+        }
+        const url = link2 && link2.getChild("URL");
+        if (!url || !link2) {
           return null;
         }
-        const [, , url] = match ?? [];
+        const urlText = view.state.sliceDoc(url.from, url.to);
         return {
-          pos: idx + from,
-          end: idx + from + match[0].length,
+          pos: link2.from,
+          end: link2.to,
           above: true,
           create: () => {
             const el = document.createElement("div");
             el.className = tooltipContent({}, "pli-2 plb-1");
-            options.onHover(el, url);
+            options.onHover(el, urlText);
             return {
               dom: el,
               offset: {
@@ -1593,15 +1584,14 @@ var link = (options = {}) => {
   }
   return extensions;
 };
-var LinkButton = class extends WidgetType5 {
-  constructor(_pos, _url, _onAttach) {
+var LinkButton = class extends WidgetType4 {
+  constructor(_url, _onAttach) {
     super();
-    this._pos = _pos;
     this._url = _url;
     this._onAttach = _onAttach;
   }
   eq(other) {
-    return this._pos === other._pos && this._url === other._url;
+    return this._url === other._url;
   }
   toDOM(view) {
     const el = document.createElement("span");
@@ -1609,7 +1599,7 @@ var LinkButton = class extends WidgetType5 {
     return el;
   }
 };
-var LinkText = class extends WidgetType5 {
+var LinkText = class extends WidgetType4 {
   constructor(_text, _url) {
     super();
     this._text = _text;
@@ -1638,46 +1628,51 @@ var LinkText = class extends WidgetType5 {
     return link2;
   }
 };
-var update2 = (state, options) => {
-  const builder = new RangeSetBuilder2();
+var buildDecorations2 = (view, options) => {
+  const builder = new RangeSetBuilder();
+  const { state } = view;
   const cursor = state.selection.main.head;
-  syntaxTree2(state).iterate({
-    enter: (node) => {
-      if (node.name === "Link") {
-        const marks2 = node.node.getChildren("LinkMark");
-        const text = marks2.length >= 2 ? state.sliceDoc(marks2[0].to, marks2[1].from) : "";
-        const urlNode = node.node.getChild("URL");
-        const url = urlNode ? state.sliceDoc(urlNode.from, urlNode.to) : "";
-        if (!url) {
+  for (const { from, to } of view.visibleRanges) {
+    syntaxTree2(state).iterate({
+      enter: (node) => {
+        if (node.name === "Link") {
+          const marks2 = node.node.getChildren("LinkMark");
+          const text = marks2.length >= 2 ? state.sliceDoc(marks2[0].to, marks2[1].from) : "";
+          const urlNode = node.node.getChild("URL");
+          const url = urlNode ? state.sliceDoc(urlNode.from, urlNode.to) : "";
+          if (!url) {
+            return false;
+          }
+          if (!view.hasFocus || state.readOnly || cursor < node.from || cursor > node.to) {
+            builder.add(node.from, node.to, Decoration6.replace({
+              widget: new LinkText(text, options.link ? url : void 0)
+            }));
+          }
+          if (options.onRender) {
+            builder.add(node.to, node.to, Decoration6.replace({
+              widget: new LinkButton(url, options.onRender)
+            }));
+          }
           return false;
         }
-        if (state.readOnly || cursor < node.from || cursor > node.to) {
-          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, Decoration6.replace({
-            widget: new LinkButton(node.from, url, options.onRender)
-          }));
-        }
-        return false;
-      }
-    }
-  });
+      },
+      from,
+      to
+    });
+  }
   return builder.finish();
 };
 
 // packages/ui/react-ui-editor/src/extensions/listener.ts
-import { EditorView as EditorView9 } from "@codemirror/view";
+import { EditorView as EditorView8 } from "@codemirror/view";
 var listener = ({ onFocus, onChange }) => {
   const extensions = [];
-  onFocus && extensions.push(EditorView9.focusChangeEffect.of((_, focused) => {
+  onFocus && extensions.push(EditorView8.focusChangeEffect.of((_, focused) => {
     onFocus(focused);
     return null;
   }));
-  onChange && extensions.push(EditorView9.updateListener.of((update4) => {
-    onChange(update4.state.doc.toString());
+  onChange && extensions.push(EditorView8.updateListener.of((update2) => {
+    onChange(update2.state.doc.toString());
   }));
   return extensions;
 };
@@ -1685,27 +1680,25 @@ var listener = ({ onFocus, onChange }) => {
 // 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";
+import { markdownLanguage as markdownLanguage3, markdown } from "@codemirror/lang-markdown";
 import { bracketMatching as bracketMatching2, defaultHighlightStyle as defaultHighlightStyle2, indentOnInput, syntaxHighlighting as syntaxHighlighting2 } from "@codemirror/language";
 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 EditorView10, highlightActiveLine, keymap as keymap4, placeholder as placeholder2 } from "@codemirror/view";
+import { crosshairCursor, drawSelection as drawSelection2, dropCursor, EditorView as EditorView9, highlightActiveLine, keymap as keymap4, placeholder as placeholder2 } from "@codemirror/view";
 
 // packages/ui/react-ui-editor/src/extensions/markdown/highlight.ts
-import { markdownLanguage } from "@codemirror/lang-markdown";
+import { markdownLanguage as markdownLanguage2 } from "@codemirror/lang-markdown";
 import { HighlightStyle } from "@codemirror/language";
 import { tags, styleTags, Tag } from "@lezer/highlight";
 import { Table } from "@lezer/markdown";
-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(),
   InlineCode: Tag.define(),
   LinkLabel: Tag.define(),
   LinkReference: Tag.define(),
@@ -1869,12 +1862,6 @@ var markdownHighlightStyle = (readonly) => {
       ],
       class: blockquote
     },
-    // TODO(burdon): Replace with extension.
-    // {
-    //   tag: [markdownTags.HorizontalRule],
-    //   class: mx(horizontalRule, readonly && '-indent-[100rem]'),
-    // },
-    // TODO(burdon): Only if being edited.
     {
       tag: [
         markdownTags.TableCell
@@ -1882,9 +1869,9 @@ var markdownHighlightStyle = (readonly) => {
       class: "font-mono"
     }
   ], {
-    scope: markdownLanguage,
+    scope: markdownLanguage2,
     all: {
-      fontFamily: get5(tokens, "fontFamily.body", []).join(",")
+      fontFamily: getToken("fontFamily.body", []).join(",")
     }
   });
 };
@@ -1894,7 +1881,7 @@ var markdownBundle = ({ readonly, themeMode, placeholder: _placeholder }) => {
   return [
     EditorState.allowMultipleSelections.of(true),
     EditorState.tabSize.of(2),
-    EditorView10.lineWrapping,
+    EditorView9.lineWrapping,
     customKeymap(),
     bracketMatching2(),
     closeBrackets2(),
@@ -1914,7 +1901,7 @@ var markdownBundle = ({ readonly, themeMode, placeholder: _placeholder }) => {
       // NOTE: This extends the parser; it doesn't affect rendering.
       // https://github.github.com/gfm
       // https://github.com/lezer-parser/markdown?tab=readme-ov-file#github-flavored-markdown
-      base: markdownLanguage2,
+      base: markdownLanguage3,
       // Languages for syntax highlighting fenced code blocks.
       codeLanguages: languages,
       // Parser extensions.
@@ -1965,24 +1952,24 @@ var mention = ({ onSearch }) => {
   });
 };
 
-// packages/ui/react-ui-editor/src/extensions/mermaid.ts
-var mermaid = () => {
+// packages/ui/react-ui-editor/src/extensions/outliner.ts
+var outliner = (options = {}) => {
   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 Decoration7, EditorView as EditorView11, WidgetType as WidgetType6 } from "@codemirror/view";
+import { RangeSetBuilder as RangeSetBuilder2, StateField as StateField4 } from "@codemirror/state";
+import { Decoration as Decoration7, EditorView as EditorView10, WidgetType as WidgetType5 } from "@codemirror/view";
 var table = (options = {}) => {
-  return StateField5.define({
-    create: (state) => update3(state, options),
-    update: (_, tr) => update3(tr.state, options),
-    provide: (field) => EditorView11.decorations.from(field)
+  return StateField4.define({
+    create: (state) => update(state, options),
+    update: (_, tr) => update(tr.state, options),
+    provide: (field) => EditorView10.decorations.from(field)
   });
 };
-var update3 = (state, options) => {
-  const builder = new RangeSetBuilder3();
+var update = (state, options) => {
+  const builder = new RangeSetBuilder2();
   const cursor = state.selection.main.head;
   const tables = [];
   const getTable = () => tables[tables.length - 1];
@@ -2023,7 +2010,6 @@ var update3 = (state, options) => {
   tables.forEach((table2) => {
     const hide = state.readOnly || cursor < table2.from || cursor > table2.to;
     hide && builder.add(table2.from, table2.to, Decoration7.replace({
-      block: true,
       widget: new TableWidget(table2)
     }));
     builder.add(table2.from, table2.to, Decoration7.mark({
@@ -2032,13 +2018,13 @@ var update3 = (state, options) => {
   });
   return builder.finish();
 };
-var TableWidget = class extends WidgetType6 {
+var TableWidget = class extends WidgetType5 {
   constructor(_table) {
     super();
     this._table = _table;
   }
   eq(other) {
-    return this._table.from === other?._table?.from;
+    return this._table.header?.join() === other._table.header?.join() && this._table.rows?.join() === other._table.rows?.join();
   }
   toDOM(view) {
     const table2 = document.createElement("table");
@@ -2064,91 +2050,92 @@ var TableWidget = class extends WidgetType6 {
     }
     return table2;
   }
+  ignoreEvent(e) {
+    return !/^mouse/.test(e.type);
+  }
 };
 
 // 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 WidgetType7 {
-  constructor(_pos, _checked, _indent, _onCheck) {
+import { syntaxTree as syntaxTree4 } from "@codemirror/language";
+import { RangeSetBuilder as RangeSetBuilder3 } from "@codemirror/state";
+import { EditorView as EditorView11, Decoration as Decoration8, WidgetType as WidgetType6, ViewPlugin as ViewPlugin5 } from "@codemirror/view";
+var CheckboxWidget = class extends WidgetType6 {
+  constructor(_checked) {
     super();
-    this._pos = _pos;
     this._checked = _checked;
-    this._indent = _indent;
-    this._onCheck = _onCheck;
   }
   eq(other) {
-    return this._pos === other._pos && this._checked === other._checked && this._indent === other._indent;
+    return this._checked === other._checked;
   }
   toDOM(view) {
-    const wrap = document.createElement("span");
-    wrap.className = "cm-task-item";
-    wrap.setAttribute("aria-hidden", "true");
-    wrap.style.setProperty("margin-left", this._indent * 24 + "px");
-    const input = wrap.appendChild(document.createElement("input"));
+    const input = document.createElement("input");
     input.type = "checkbox";
     input.checked = this._checked;
-    if (!this._onCheck) {
+    if (view.state.readOnly) {
       input.setAttribute("disabled", "true");
-    }
-    if (this._onCheck) {
-      input.onchange = (event) => {
-        this._onCheck?.(event.target.checked);
-        return true;
+    } else {
+      input.onmousedown = (event) => {
+        const pos = view.posAtDOM(input);
+        const text = view.state.sliceDoc(pos, pos + 3);
+        if (text === (this._checked ? "[x]" : "[ ]")) {
+          view.dispatch({
+            changes: {
+              from: pos + 1,
+              to: pos + 2,
+              insert: this._checked ? " " : "x"
+            }
+          });
+          event.preventDefault();
+        }
       };
     }
-    return wrap;
+    return input;
   }
   ignoreEvent() {
     return false;
   }
 };
+var checkedDeco = Decoration8.replace({
+  widget: new CheckboxWidget(true)
+});
+var uncheckedDeco = Decoration8.replace({
+  widget: new CheckboxWidget(false)
+});
 var tasklist = (options = {}) => {
-  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 Decoration8.replace({
-        widget: new CheckboxWidget(pos, checked, indent, view.state.readOnly ? void 0 : (checked2) => {
-          const idx = pos + match[0].indexOf("[") + 1;
-          view.dispatch({
-            changes: {
-              from: idx,
-              to: idx + 1,
-              insert: checked2 ? "x" : " "
-            },
-            // TODO(burdon): Restore cursor position? More useful to move to end of line (can indent).
-            selection: {
-              anchor: idx + 3
-            }
-          });
-        })
-      });
-    }
-  });
-  const tasks = ViewPlugin6.fromClass(class {
+  return ViewPlugin5.fromClass(class {
     constructor(view) {
-      this.tasks = taskMatcher.createDeco(view);
+      this.decorations = buildDecorations3(view);
     }
-    update(update4) {
-      this.tasks = taskMatcher.updateDeco(update4, this.tasks);
+    update(update2) {
+      if (update2.docChanged || update2.viewportChanged || update2.selectionSet) {
+        this.decorations = buildDecorations3(update2.view);
+      }
     }
   }, {
-    decorations: (value) => value.tasks,
-    provide: (plugin) => EditorView12.atomicRanges.of((view) => {
-      return view.plugin(plugin)?.tasks || Decoration8.none;
+    decorations: (v) => v.decorations,
+    // TODO(burdon): Is this still required?
+    provide: (plugin) => EditorView11.atomicRanges.of((view) => {
+      return view.plugin(plugin)?.decorations || Decoration8.none;
     })
   });
-  return [
-    tasks,
-    styles5
-  ];
+};
+var buildDecorations3 = (view) => {
+  const builder = new RangeSetBuilder3();
+  const { state } = view;
+  const cursor = state.selection.main.head;
+  for (const { from, to } of view.visibleRanges) {
+    syntaxTree4(state).iterate({
+      enter: (node) => {
+        if (node.name === "TaskMarker" && (cursor < node.from || cursor > node.to)) {
+          const checked = state.doc.sliceString(node.from + 1, node.to - 1) === "x";
+          builder.add(node.from, node.to, checked ? checkedDeco : uncheckedDeco);
+        }
+      },
+      from,
+      to
+    });
+  }
+  return builder.finish();
 };
 
 // packages/ui/react-ui-editor/src/extensions/typewriter.ts
@@ -2225,12 +2212,12 @@ var cursorConverter2 = (text) => ({
 
 // packages/ui/react-ui-editor/src/extensions/yjs/yjs.ts
 var yjs = (content, awareness2) => [
-  CursorConverter.of(cursorConverter2(content)),
+  Cursor.converter.of(cursorConverter2(content)),
   yCollab(content, awareness2)
 ];
 
 // packages/ui/react-ui-editor/src/themes/default.ts
-import get6 from "lodash.get";
+import get3 from "lodash.get";
 var defaultTheme = {
   //
   // Main layout:
@@ -2259,21 +2246,21 @@ var defaultTheme = {
   "&.cm-focused": {
     outline: "none"
   },
-  "& .cm-scroller": {
+  ".cm-scroller": {
     overflow: "visible",
-    fontFamily: get6(tokens, "fontFamily.mono", []).join(",")
+    fontFamily: get3(tokens, "fontFamily.mono", []).join(",")
   },
-  "& .cm-content": {
+  ".cm-content": {
     padding: 0,
     // NOTE: Base font size (otherwise defined by HTML tag, which might be different for storybook).
     fontSize: "16px"
   },
   "&light .cm-content": {
-    color: get6(tokens, "extend.colors.neutral.900", "black"),
+    color: get3(tokens, "extend.colors.neutral.900", "black"),
     caretColor: "black"
   },
   "&dark .cm-content": {
-    color: get6(tokens, "extend.colors.neutral.100", "white"),
+    color: get3(tokens, "extend.colors.neutral.100", "white"),
     caretColor: "white"
   },
   //
@@ -2285,158 +2272,120 @@ var defaultTheme = {
   "&dark .cm-cursor, &dark .cm-dropCursor": {
     borderLeft: "2px solid white"
   },
-  "& .cm-placeholder": {
+  ".cm-placeholder": {
     fontWeight: 100
   },
   //
   // line
   //
-  "& .cm-line": {
+  ".cm-line": {
     paddingInline: 0
   },
-  "& .cm-activeLine": {
+  ".cm-activeLine": {
     background: "inherit"
   },
   //
   // Selection
   //
   "&light .cm-selectionBackground": {
-    background: get6(tokens, "extend.colors.primary.100")
+    background: get3(tokens, "extend.colors.primary.100")
   },
   "&light.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground": {
-    background: get6(tokens, "extend.colors.primary.200")
+    background: get3(tokens, "extend.colors.primary.200")
   },
   "&dark .cm-selectionBackground": {
-    background: get6(tokens, "extend.colors.primary.700")
+    background: get3(tokens, "extend.colors.primary.700")
   },
   "&dark.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground": {
-    background: get6(tokens, "extend.colors.primary.600")
+    background: get3(tokens, "extend.colors.primary.600")
   },
   //
   // Search
   //
   "&light .cm-searchMatch": {
-    backgroundColor: get6(tokens, "extend.colors.yellow.100")
+    backgroundColor: get3(tokens, "extend.colors.yellow.100")
   },
   "&dark .cm-searchMatch": {
-    backgroundColor: get6(tokens, "extend.colors.yellow.700")
-  },
-  //
-  // collaboration
-  // TODO(burdon): Review classnames (YJS dependent?) Note: e2e tests depend on this class.
-  //
-  "&light .cm-ySelection, &light .cm-yLineSelection": {
-    mixBlendMode: "multiply"
-  },
-  "&dark .cm-ySelection, &dark .cm-yLineSelection": {
-    mixBlendMode: "screen"
-  },
-  "& .cm-ySelectionInfo": {
-    padding: "2px 4px",
-    marginBlockStart: "-4px"
-  },
-  "& .cm-ySelection, & .cm-selectionMatch": {
-    paddingBlockStart: ".15em",
-    paddingBlockEnd: ".15em"
-  },
-  "& .cm-ySelectionCaret": {
-    display: "inline-block",
-    insetBlockStart: ".1em",
-    blockSize: "1.4em",
-    verticalAlign: "top"
-  },
-  "& .cm-yLineSelection": {
-    margin: 0
+    backgroundColor: get3(tokens, "extend.colors.yellow.700")
   },
   //
   // link
   //
-  "& .cm-link": {
-    color: get6(tokens, "extend.colors.primary.500"),
+  ".cm-link": {
+    color: get3(tokens, "extend.colors.primary.500"),
     textDecorationLine: "underline",
     textDecorationThickness: "1px",
     textUnderlineOffset: "2px",
     borderRadius: ".125rem",
-    fontFamily: get6(tokens, "fontFamily.body", []).join(",")
+    fontFamily: get3(tokens, "fontFamily.body", []).join(",")
   },
   //
   // tooltip
   //
-  "& .cm-tooltip": {
+  ".cm-tooltip": {
     border: "none"
   },
-  "& .cm-tooltip-below": {},
+  ".cm-tooltip-below": {},
   //
   // autocomplete
   //
-  "& .cm-tooltip-autocomplete": {
+  ".cm-tooltip-autocomplete": {
     marginTop: "4px",
     marginLeft: "-3px"
   },
-  "& .cm-tooltip-autocomplete ul li": {},
-  "& .cm-tooltip-autocomplete ul li[aria-selected]": {},
-  "& .cm-completionIcon": {
+  ".cm-tooltip-autocomplete ul li": {},
+  ".cm-tooltip-autocomplete ul li[aria-selected]": {},
+  ".cm-completionIcon": {
     display: "none"
   },
-  "& .cm-completionLabel": {
-    fontFamily: get6(tokens, "fontFamily.body", []).join(",")
+  ".cm-completionLabel": {
+    fontFamily: get3(tokens, "fontFamily.body", []).join(",")
   },
-  "& .cm-completionMatchedText": {
+  ".cm-completionMatchedText": {
     textDecoration: "none"
   },
   //
-  // widgets
-  //
-  "& .cm-widgetBuffer": {
-    display: "none",
-    height: 0
-  },
-  //
   // table
   //
-  "& .cm-table *": {
-    fontFamily: `${get6(tokens, "fontFamily.mono", []).join(",")} !important`,
+  ".cm-table *": {
+    fontFamily: `${get3(tokens, "fontFamily.mono", []).join(",")} !important`,
     textDecoration: "none !important"
   },
-  "& .cm-table-head": {
+  ".cm-table-head": {
     padding: "2px 16px 2px 0px",
-    borderBottom: `1px solid ${get6(tokens, "extend.colors.neutral.500")}`,
+    borderBottom: `1px solid ${get3(tokens, "extend.colors.neutral.500")}`,
     fontWeight: 100,
     textAlign: "left",
-    color: get6(tokens, "extend.colors.neutral.500")
+    color: get3(tokens, "extend.colors.neutral.500")
   },
-  "& .cm-table-cell": {
+  ".cm-table-cell": {
     padding: "2px 16px 2px 0px"
   },
   //
   // image
   //
-  "& .cm-image": {
-    margin: "0.5rem 0"
+  ".cm-image": {
+    display: "block",
+    height: "0"
+  },
+  ".cm-image.cm-loaded-image": {
+    height: "auto",
+    borderTop: "0.5rem solid transparent",
+    borderBottom: "0.5rem solid transparent"
   },
   //
   // 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.
+  // 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(get6(tokens, "extend.fontSize", {})).reduce((acc, fontSize) => {
-    const height = get6(tokens, [
-      "extend",
-      "fontSize",
-      fontSize,
-      1,
-      "lineHeight"
-    ]);
-    acc[`& .text-${fontSize} + .cm-ySelectionCaret`] = {
-      height
-    };
-    acc[`& .text-${fontSize} + .cm-ySelection + .cm-ySelectionCaret`] = {
-      height
-    };
-    acc[`& .text-${fontSize} + .cm-widgetBuffer + .cm-ySelectionCaret`] = {
-      height
-    };
-    return acc;
-  }, {}),
+  // ...Object.keys(get(tokens, 'extend.fontSize', {})).reduce((acc: Record<string, any>, fontSize) => {
+  //   const height = get(tokens, ['extend', 'fontSize', fontSize, 1, 'lineHeight']);
+  //
+  //   acc[`& .text-${fontSize} + .cm-ySelectionCaret`] = { height };
+  //   acc[`& .text-${fontSize} + .cm-ySelection + .cm-ySelectionCaret`] = { height };
+  //   acc[`& .text-${fontSize} + .cm-widgetBuffer + .cm-ySelectionCaret`] = { height };
+  //   return acc;
+  // }, {}),
   /**
   * Panels
   * TODO(burdon): Needs styling attention (esp. dark mode).
@@ -2453,51 +2402,53 @@ var defaultTheme = {
   *   </div>
   * </div
   */
-  "& .cm-panels": {
-    border: `1px solid ${get6(tokens, "extend.colors.neutral.200")}`
+  ".cm-panels": {
+    border: `1px solid ${get3(tokens, "extend.colors.neutral.200")}`
   },
-  "& .cm-panel": {
-    background: get6(tokens, "extend.colors.neutral.50"),
-    fontFamily: get6(tokens, "fontFamily.body", []).join(",")
+  ".cm-panel": {
+    background: get3(tokens, "extend.colors.neutral.50"),
+    fontFamily: get3(tokens, "fontFamily.body", []).join(",")
   },
-  "& .cm-button": {
+  ".cm-button": {
     margin: "4px",
-    fontFamily: get6(tokens, "fontFamily.body", []).join(","),
-    background: get6(tokens, "extend.colors.neutral.100"),
+    fontFamily: get3(tokens, "fontFamily.body", []).join(","),
+    background: get3(tokens, "extend.colors.neutral.100"),
     backgroundImage: "none",
     border: "none",
     "&:hover": {
-      background: get6(tokens, "extend.colors.neutral.200")
+      background: get3(tokens, "extend.colors.neutral.200")
     },
     "&:active": {
-      background: get6(tokens, "extend.colors.neutral.300"),
+      background: get3(tokens, "extend.colors.neutral.300"),
       backgroundImage: "none"
     }
   },
-  "& .cm-panel input[type=checkbox]": {
+  ".cm-panel input[type=checkbox]": {
     marginRight: "0.4rem !important"
   }
 };
 var textTheme = {
-  "& .cm-scroller": {
-    fontFamily: get6(tokens, "fontFamily.body", []).join(",")
+  ".cm-scroller": {
+    fontFamily: get3(tokens, "fontFamily.body", []).join(",")
   },
-  "& .cm-placeholder": {
-    fontFamily: get6(tokens, "fontFamily.body", []).join(",")
+  ".cm-placeholder": {
+    fontFamily: get3(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: get6(tokens, "fontFamily.body", []).join(",")
+  ".cm-scroller": {
+    fontFamily: get3(tokens, "fontFamily.body", []).join(",")
+  },
+  ".cm-placeholder": {
+    fontFamily: get3(tokens, "fontFamily.body", []).join(",")
   }
 };
 var codeTheme = {
-  "& .cm-scroller": {
-    fontFamily: get6(tokens, "fontFamily.mono", []).join(",")
+  ".cm-scroller": {
+    fontFamily: get3(tokens, "fontFamily.mono", []).join(",")
   },
-  "& .cm-placeholder": {
-    fontFamily: get6(tokens, "fontFamily.mono", []).join(",")
+  ".cm-placeholder": {
+    fontFamily: get3(tokens, "fontFamily.mono", []).join(",")
   }
 };
 
@@ -2506,23 +2457,20 @@ var EditorModes = [
   "default",
   "vim"
 ];
-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 = void 0, view = void 0 } = {}, setEditor] = useState();
-  useImperativeHandle(forwardedRef, () => ({
-    root,
-    state,
-    view
-  }), [
+var useComments = (view, comments2) => {
+  useEffect(() => {
+    if (view && comments2 !== void 0) {
+      view.dispatch({
+        effects: setComments.of(comments2)
+      });
+    }
+  }, [
     view,
-    state,
-    root
+    comments2
   ]);
-  const { awareness: awareness2, peer } = model;
+};
+var useAwareness = ({ awareness: awareness2, peer }) => {
+  const { themeMode } = useThemeContext();
   useEffect(() => {
     if (awareness2 && peer) {
       awareness2.setLocalStateField("user", {
@@ -2543,54 +2491,70 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, comments: co
     peer,
     themeMode
   ]);
+};
+var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, autofocus, readonly, selection, comments: comments2, extensions = [], editorMode, theme, slots = defaultSlots }, forwardedRef) => {
+  const tabsterDOMAttribute = useFocusableGroup({
+    tabBehavior: "limited"
+  });
+  const { themeMode } = useThemeContext();
+  const rootRef = useRef(null);
+  const [view, setView] = useState(null);
+  useImperativeHandle(forwardedRef, () => view, [
+    view
+  ]);
   useEffect(() => {
-    if (view && comments2?.length) {
-      view.dispatch({
-        effects: setCommentRange.of({
-          model,
-          comments: comments2
-        })
-      });
+    if (autofocus) {
+      view?.focus();
     }
   }, [
     view,
-    comments2
+    autofocus
   ]);
+  useAwareness(model);
+  useComments(view, comments2);
   useEffect(() => {
-    if (!root) {
+    if (!model || !rootRef.current) {
       return;
     }
-    const state2 = EditorState2.create({
+    const state = EditorState2.create({
       doc: model.text(),
+      // TODO(burdon): Composer should store and set selection when switching documents.
+      selection,
       extensions: [
         readonly && EditorState2.readOnly.of(readonly),
-        // TODO(burdon): Factor out VIM mode? (manage via MarkdownPlugin).
-        editorMode === "vim" && vim(),
         // Theme.
         // TODO(burdon): Make theme configurable.
-        EditorView13.baseTheme(defaultTheme),
-        EditorView13.theme(slots?.editor?.theme ?? {}),
-        EditorView13.darkTheme.of(themeMode === "dark"),
-        // Storage and replication.
+        EditorView12.baseTheme(defaultTheme),
+        EditorView12.theme(theme ?? {}),
+        EditorView12.darkTheme.of(themeMode === "dark"),
+        // TODO(burdon): Factor out VIM mode? (manage via MarkdownPlugin).
+        editorMode === "vim" && vim(),
+        // Storage and replication (NOTE: must come before other extensions).
         model.extension,
         // Custom.
         ...extensions
       ].filter(Boolean)
     });
     view?.destroy();
-    setEditor({
-      state: state2,
-      view: new EditorView13({
-        state: state2,
-        parent: root
-      })
+    const newView = new EditorView12({
+      parent: rootRef.current,
+      state,
+      // NOTE: Uncomment to spy on all transactions.
+      // https://codemirror.net/docs/ref/#view.EditorView.dispatch
+      dispatch: (transaction, view2) => {
+        view2.update([
+          transaction
+        ]);
+        view2.state.facet(syncFacet)?.reconcile(view2);
+      }
     });
+    setView(newView);
     return () => {
-      view?.destroy();
-      setEditor(void 0);
+      newView?.destroy();
+      setView(null);
     };
   }, [
-    root,
+    rootRef,
     model,
     readonly,
     editorMode,
@@ -2599,12 +2563,10 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, comments: co
   const handleKeyUp = useCallback((event) => {
     const { key, altKey, shiftKey, metaKey, ctrlKey } = event;
     switch (key) {
-      case "Enter": {
-        view?.contentDOM.focus();
-        break;
-      }
       case "Escape": {
-        editorMode === "vim" && (altKey || shiftKey || metaKey || ctrlKey) && root?.focus();
+        if (editorMode === "vim" && (altKey || shiftKey || metaKey || ctrlKey)) {
+          rootRef.current?.focus();
+        }
         break;
       }
     }
@@ -2614,16 +2576,17 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, comments: co
   ]);
   return /* @__PURE__ */ React.createElement("div", {
     key: model.id,
-    ref: setRoot,
+    role: "none",
     tabIndex: 0,
-    ...slots?.root,
+    onKeyUp: handleKeyUp,
+    ...slots.root,
     ...editorMode !== "vim" && tabsterDOMAttribute,
-    onKeyUp: handleKeyUp
+    ref: rootRef
   });
 });
-var TextEditor = /* @__PURE__ */ forwardRef(({ readonly, extensions = [], slots: _slots, ...props }, forwardedRef) => {
+var TextEditor = /* @__PURE__ */ forwardRef(({ readonly, placeholder: placeholder3, extensions = [], theme = textTheme, slots, ...props }, forwardedRef) => {
   const { themeMode } = useThemeContext();
-  const slots = defaultsDeep2({}, _slots, defaultTextSlots);
+  const updatedSlots = defaultsDeep2({}, slots, defaultTextSlots);
   return /* @__PURE__ */ React.createElement(BaseTextEditor, {
     ref: forwardedRef,
     readonly,
@@ -2631,17 +2594,18 @@ var TextEditor = /* @__PURE__ */ forwardRef(({ readonly, extensions = [], slots:
       basicBundle({
         readonly,
         themeMode,
-        placeholder: slots?.editor?.placeholder
+        placeholder: placeholder3
       }),
       ...extensions
     ],
-    slots,
+    theme,
+    slots: updatedSlots,
     ...props
   });
 });
-var MarkdownEditor = /* @__PURE__ */ forwardRef(({ readonly, extensions = [], slots: _slots, ...props }, forwardedRef) => {
+var MarkdownEditor = /* @__PURE__ */ forwardRef(({ readonly, placeholder: placeholder3, extensions = [], theme = markdownTheme, slots, ...props }, forwardedRef) => {
   const { themeMode } = useThemeContext();
-  const slots = defaultsDeep2({}, _slots, defaultMarkdownSlots);
+  const updatedSlots = defaultsDeep2({}, slots, defaultMarkdownSlots);
   return /* @__PURE__ */ React.createElement(BaseTextEditor, {
     ref: forwardedRef,
     readonly,
@@ -2649,34 +2613,29 @@ var MarkdownEditor = /* @__PURE__ */ forwardRef(({ readonly, extensions = [], sl
       markdownBundle({
         readonly,
         themeMode,
-        placeholder: slots?.editor?.placeholder
+        placeholder: placeholder3
       }),
       ...extensions
     ],
-    slots,
+    theme,
+    slots: updatedSlots,
     ...props
   });
 });
 var defaultSlots = {
   root: {
-    className: mx3("p-2", inputSurface)
+    className: mx3("w-full p-2 overflow-y-auto", inputSurface)
   }
 };
 var defaultTextSlots = {
-  ...defaultSlots,
-  editor: {
-    theme: textTheme
-  }
+  ...defaultSlots
 };
 var defaultMarkdownSlots = {
-  ...defaultSlots,
-  editor: {
-    theme: markdownTheme
-  }
+  ...defaultSlots
 };
 
 // packages/ui/react-ui-editor/src/hooks/automerge.ts
-import get7 from "lodash.get";
+import get4 from "lodash.get";
 import { getRawDoc } from "@dxos/echo-schema";
 import { isNotNullOrUndefined } from "@dxos/util";
 
@@ -2684,7 +2643,7 @@ import { isNotNullOrUndefined } from "@dxos/util";
 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";
+import { log as log2 } 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 {
@@ -2723,7 +2682,7 @@ var SpaceAwarenessProvider = class {
     void this._space.postMessage(this._channel, {
       kind: "query"
     }).catch((err) => {
-      log3.debug("failed to query awareness", {
+      log2.debug("failed to query awareness", {
         err
       }, {
         F: __dxlog_file4,
@@ -2785,25 +2744,63 @@ var SpaceAwarenessProvider = class {
   }
 };
 
-// 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/defs.ts
+import { StateField as StateField5 } from "@codemirror/state";
+var modelState = StateField5.define({
+  create: () => void 0,
+  update: (model) => model
+});
+
+// packages/ui/react-ui-editor/src/hooks/automerge.ts
+var createAutomergeModel = ({ space, identity, text }) => {
+  const obj = text;
+  const doc = getRawDoc(obj, [
+    obj.field
+  ]);
+  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),
+    // 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;
+};
 
 // 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 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";
+import { log as log3 } from "@dxos/log";
 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,
+    L: 22,
     S: void 0,
     A: [
       "text?.doc && text?.content",
@@ -2819,34 +2816,6 @@ var createYjsModel = ({ identity, space, text }) => {
     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)
@@ -2889,14 +2858,14 @@ var YAwarenessProvider = class extends Observable {
     return this._awareness;
   }
   _handleAwarenessUpdate({ added, updated, removed }, origin) {
-    log4("awareness update", {
+    log3("awareness update", {
       added,
       updated,
       removed,
       origin
     }, {
       F: __dxlog_file5,
-      L: 122,
+      L: 101,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2907,9 +2876,9 @@ var YAwarenessProvider = class extends Observable {
     void this._space.postMessage(this._channel, encoding.toUint8Array(encoderAwareness));
   }
   _handleSpaceMessage({ payload }) {
-    log4("space message", payload, {
+    log3("space message", payload, {
       F: __dxlog_file5,
-      L: 131,
+      L: 110,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2953,13 +2922,11 @@ var YAwarenessProvider = class extends Observable {
 };
 
 // packages/ui/react-ui-editor/src/hooks/useTextModel.ts
-var modelState = StateField6.define({
-  create: () => void 0,
-  update: (model) => model
-});
+import { useEffect as useEffect2, useState as useState2 } from "react";
+import { isAutomergeObject } from "@dxos/react-client/echo";
 var useTextModel = (props) => {
   const { identity, space, text } = props;
-  const [model, setModel] = useState2(() => createModel(props));
+  const [model, setModel] = useState2();
   useEffect2(() => setModel(createModel(props)), [
     identity,
     space,
@@ -2977,47 +2944,10 @@ var createModel = (props) => {
     return void 0;
   }
 };
-
-// packages/ui/react-ui-editor/src/hooks/automerge.ts
-var createAutomergeModel = ({ space, identity, text }) => {
-  const obj = text;
-  const doc = getRawDoc(obj, [
-    obj.field
-  ]);
-  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: () => 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,
+  Cursor,
   Doc,
   EditorModes,
   MarkdownEditor,
@@ -3033,6 +2963,7 @@ export {
   awareness,
   basicBundle,
   blast,
+  callbackWrapper,
   code2 as code,
   codeTheme,
   comments,
@@ -3043,6 +2974,7 @@ export {
   defaultSlots,
   defaultTextSlots,
   defaultTheme,
+  getToken,
   hr,
   image,
   link,
@@ -3053,16 +2985,19 @@ export {
   markdownTagsExtensions,
   markdownTheme,
   mention,
-  mermaid,
   modelState,
-  setCommentRange,
+  outliner,
+  setComments,
   setFocus,
   setSelection,
+  syncFacet,
   table,
   tags2 as tags,
   tasklist,
   textTheme,
   typewriter,
+  useAwareness,
+  useComments,
   useTextModel,
   yjs
 };