@dxos/react-ui-editor 0.6.13 → 0.6.14-main.1366248

package/dist/lib/browser/index.mjs

@@ -43,31 +43,36 @@ import { ChatText, Code, CodeBlock, Image, Link, ListBullets, ListChecks, ListNu
 import { createContext } from "@radix-ui/react-context";
 import React3, { useEffect as useEffect2, useRef, useState as useState3 } from "react";
 import { useDropzone } from "react-dropzone";
-import { Button, DensityProvider, DropdownMenu, ElevationProvider, Toolbar as NaturalToolbar, Tooltip, useTranslation } from "@dxos/react-ui";
-import { getSize as getSize2 } from "@dxos/react-ui-theme";
+import { Button, DropdownMenu, ElevationProvider, Toolbar as NaturalToolbar, Tooltip, useTranslation } from "@dxos/react-ui";
+import { getSize } from "@dxos/react-ui-theme";
 
 // packages/ui/react-ui-editor/src/extensions/annotations.ts
 import { StateField } from "@codemirror/state";
 import { Decoration, EditorView } from "@codemirror/view";
 import { isNotFalsy } from "@dxos/util";
 
-// packages/ui/react-ui-editor/src/extensions/cursor.ts
+// packages/ui/react-ui-editor/src/util/facet.ts
 import { Facet } from "@codemirror/state";
+var singleValueFacet = (defaultValue) => Facet.define({
+  // Called immediately.
+  combine: (providers) => {
+    return providers[0] ?? defaultValue;
+  }
+});
+
+// packages/ui/react-ui-editor/src/util/cursor.ts
+var overlap = (a, b) => a.from <= b.to && a.to >= b.from;
 var defaultCursorConverter = {
   toCursor: (position) => position.toString(),
   fromCursor: (cursor) => parseInt(cursor)
 };
 var Cursor = class _Cursor {
   static {
-    this.converter = Facet.define({
-      combine: (providers) => {
-        return providers[0] ?? defaultCursorConverter;
-      }
-    });
+    this.converter = singleValueFacet(defaultCursorConverter);
   }
   static {
-    this.getCursorFromRange = (state2, range) => {
-      const cursorConverter2 = state2.facet(_Cursor.converter);
+    this.getCursorFromRange = (state, range) => {
+      const cursorConverter2 = state.facet(_Cursor.converter);
       const from = cursorConverter2.toCursor(range.from);
       const to = cursorConverter2.toCursor(range.to, -1);
       return [
@@ -77,8 +82,8 @@ var Cursor = class _Cursor {
     };
   }
   static {
-    this.getRangeFromCursor = (state2, cursor) => {
-      const cursorConverter2 = state2.facet(_Cursor.converter);
+    this.getRangeFromCursor = (state, cursor) => {
+      const cursorConverter2 = state.facet(_Cursor.converter);
       const parts = cursor.split(":");
       const from = cursorConverter2.fromCursor(parts[0]);
       const to = cursorConverter2.fromCursor(parts[1]);
@@ -90,20 +95,131 @@ var Cursor = class _Cursor {
   }
 };
 
+// packages/ui/react-ui-editor/src/util/debug.ts
+import { log } from "@dxos/log";
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/util/debug.ts";
+var wrapWithCatch = (fn) => {
+  return (...args) => {
+    try {
+      return fn(...args);
+    } catch (err) {
+      log.catch(err, void 0, {
+        F: __dxlog_file,
+        L: 15,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+    }
+  };
+};
+var callbackWrapper = (fn) => (...args) => {
+  try {
+    return fn(...args);
+  } catch (err) {
+    log.catch(err, void 0, {
+      F: __dxlog_file,
+      L: 29,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+  }
+};
+var debugDispatcher = (trs, view) => {
+  logChanges(trs);
+  view.update(trs);
+};
+var logChanges = (trs) => {
+  const changes = trs.flatMap((tr) => {
+    if (tr.changes.empty) {
+      return void 0;
+    }
+    const changes2 = [];
+    tr.changes.iterChanges((fromA, toA, fromB, toB, inserted) => changes2.push(JSON.stringify({
+      fromA,
+      toA,
+      fromB,
+      toB,
+      inserted: inserted.toString()
+    })));
+    return changes2;
+  }).filter(Boolean);
+  if (changes.length) {
+    log.info("changes", {
+      changes
+    }, {
+      F: __dxlog_file,
+      L: 62,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+  }
+};
+
+// packages/ui/react-ui-editor/src/util/dom.ts
+var flattenRect = (rect, left) => {
+  const x = left ? rect.left : rect.right;
+  return {
+    left: x,
+    right: x,
+    top: rect.top,
+    bottom: rect.bottom
+  };
+};
+var scratchRange;
+var textRange = (node, from, to = from) => {
+  const range = scratchRange || (scratchRange = document.createRange());
+  range.setEnd(node, to);
+  range.setStart(node, from);
+  return range;
+};
+var clientRectsFor = (dom) => {
+  if (dom.nodeType === 3) {
+    return textRange(dom, 0, dom.nodeValue.length).getClientRects();
+  } else if (dom.nodeType === 1) {
+    return dom.getClientRects();
+  } else {
+    return [];
+  }
+};
+
+// packages/ui/react-ui-editor/src/util/react.tsx
+import React from "react";
+import { createRoot } from "react-dom/client";
+import { ThemeProvider } from "@dxos/react-ui";
+import { defaultTx } from "@dxos/react-ui-theme";
+var createElement = (tag, options, children) => {
+  const el = document.createElement(tag);
+  if (options?.className) {
+    el.className = options.className;
+  }
+  if (children) {
+    el.append(...Array.isArray(children) ? children : [
+      children
+    ]);
+  }
+  return el;
+};
+var renderRoot = (root, node) => {
+  createRoot(root).render(/* @__PURE__ */ React.createElement(ThemeProvider, {
+    tx: defaultTx
+  }, node));
+  return root;
+};
+
 // packages/ui/react-ui-editor/src/extensions/annotations.ts
 var annotationMark = Decoration.mark({
   class: "cm-annotation"
 });
 var annotations = (options = {}) => {
-  const match = (state2) => {
+  const match = (state) => {
     const annotations2 = [];
-    const text = state2.doc.toString();
+    const text = state.doc.toString();
     if (options.match) {
       const matches = text.matchAll(options.match);
       for (const match2 of matches) {
         const from = match2.index;
         const to = from + match2[0].length;
-        const cursor = Cursor.getCursorFromRange(state2, {
+        const cursor = Cursor.getCursorFromRange(state, {
           from,
           to
         });
@@ -115,8 +231,8 @@ var annotations = (options = {}) => {
     return annotations2;
   };
   const annotationsState = StateField.define({
-    create: (state2) => {
-      return match(state2);
+    create: (state) => {
+      return match(state);
     },
     update: (value, tr) => {
       if (!tr.changes.empty) {
@@ -129,10 +245,10 @@ var annotations = (options = {}) => {
     annotationsState,
     EditorView.decorations.compute([
       annotationsState
-    ], (state2) => {
-      const annotations2 = state2.field(annotationsState);
+    ], (state) => {
+      const annotations2 = state.field(annotationsState);
       const decorations = annotations2.map((annotation) => {
-        const range = Cursor.getRangeFromCursor(state2, annotation.cursor);
+        const range = Cursor.getRangeFromCursor(state, annotation.cursor);
         return range && annotationMark.range(range.from, range.to);
       }).filter(isNotFalsy);
       return Decoration.set(decorations);
@@ -153,7 +269,7 @@ import { autocompletion, completionKeymap } from "@codemirror/autocomplete";
 import { markdownLanguage } from "@codemirror/lang-markdown";
 import { keymap } from "@codemirror/view";
 var autocomplete = ({ activateOnTyping, override, onSearch } = {}) => {
-  const extentions = [
+  const extensions = [
     // 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.
@@ -170,7 +286,7 @@ var autocomplete = ({ activateOnTyping, override, onSearch } = {}) => {
     })
   ];
   if (onSearch) {
-    extentions.push(
+    extensions.push(
       // TODO(burdon): Optional decoration via addToOptions
       markdownLanguage.data.of({
         autocomplete: (context) => {
@@ -186,7 +302,7 @@ var autocomplete = ({ activateOnTyping, override, onSearch } = {}) => {
       })
     );
   }
-  return extentions;
+  return extensions;
 };
 
 // packages/ui/react-ui-editor/src/extensions/automerge/automerge.ts
@@ -195,16 +311,16 @@ import { EditorView as EditorView2, ViewPlugin } from "@codemirror/view";
 import { next as A3 } from "@dxos/automerge/automerge";
 
 // packages/ui/react-ui-editor/src/extensions/automerge/cursor.ts
-import { log } from "@dxos/log";
+import { log as log2 } from "@dxos/log";
 import { fromCursor, toCursor } from "@dxos/react-client/echo";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/automerge/cursor.ts";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/automerge/cursor.ts";
 var cursorConverter = (accessor) => ({
   toCursor: (pos, assoc) => {
     try {
       return toCursor(accessor, pos, assoc);
     } catch (err) {
-      log.catch(err, void 0, {
-        F: __dxlog_file,
+      log2.catch(err, void 0, {
+        F: __dxlog_file2,
         L: 15,
         S: void 0,
         C: (f, a) => f(...a)
@@ -216,8 +332,8 @@ var cursorConverter = (accessor) => ({
     try {
       return fromCursor(accessor, cursor);
     } catch (err) {
-      log.catch(err, void 0, {
-        F: __dxlog_file,
+      log2.catch(err, void 0, {
+        F: __dxlog_file2,
         L: 24,
         S: void 0,
         C: (f, a) => f(...a)
@@ -229,8 +345,8 @@ var cursorConverter = (accessor) => ({
 
 // packages/ui/react-ui-editor/src/extensions/automerge/defs.ts
 import { Annotation, StateEffect } from "@codemirror/state";
-var getPath = (state2, field) => state2.field(field).path;
-var getLastHeads = (state2, field) => state2.field(field).lastHeads;
+var getPath = (state, field) => state.field(field).path;
+var getLastHeads = (state, field) => state.field(field).lastHeads;
 var updateHeadsEffect = StateEffect.define({});
 var updateHeads = (newHeads) => updateHeadsEffect.of({
   newHeads
@@ -245,8 +361,8 @@ import { next as A2 } from "@dxos/automerge/automerge";
 
 // packages/ui/react-ui-editor/src/extensions/automerge/update-automerge.ts
 import { next as A } from "@dxos/automerge/automerge";
-var updateAutomerge = (field, handle, transactions, state2) => {
-  const { lastHeads, path } = state2.field(field);
+var updateAutomerge = (field, handle, transactions, state) => {
+  const { lastHeads, path } = state.field(field);
   let hasChanges = false;
   for (const tr of transactions) {
     tr.changes.iterChanges(() => {
@@ -293,7 +409,7 @@ var updateCodeMirror = (view, selection, target, patches) => {
     annotations: reconcileAnnotation.of(false)
   });
 };
-var handlePatch = (patch, target, state2) => {
+var handlePatch = (patch, target, state) => {
   if (patch.action === "insert") {
     return handleInsert(target, patch);
   } else if (patch.action === "splice") {
@@ -301,7 +417,7 @@ var handlePatch = (patch, target, state2) => {
   } else if (patch.action === "del") {
     return handleDel(target, patch);
   } else if (patch.action === "put") {
-    return handlePut(target, patch, state2);
+    return handlePut(target, patch, state);
   } else {
     return null;
   }
@@ -345,7 +461,7 @@ var handleDel = (target, patch) => {
     }
   ];
 };
-var handlePut = (target, patch, state2) => {
+var handlePut = (target, patch, state) => {
   const index = charPath(target, [
     ...patch.path,
     0
@@ -353,7 +469,7 @@ var handlePut = (target, patch, state2) => {
   if (index == null) {
     return [];
   }
-  const length = state2.doc.length;
+  const length = state.doc.length;
   if (typeof patch.value !== "string") {
     return [];
   }
@@ -484,11 +600,11 @@ var automerge = (accessor) => {
 };
 
 // packages/ui/react-ui-editor/src/extensions/awareness/awareness.ts
-import { Annotation as Annotation2, Facet as Facet2, RangeSet } from "@codemirror/state";
+import { Annotation as Annotation2, RangeSet } from "@codemirror/state";
 import { Decoration as Decoration2, EditorView as EditorView3, ViewPlugin as ViewPlugin2, WidgetType } from "@codemirror/view";
 import { Event } from "@dxos/async";
 import { Context } from "@dxos/context";
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/awareness/awareness.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/awareness/awareness.ts";
 var dummyProvider = {
   remoteStateChange: new Event(),
   open: () => {
@@ -499,9 +615,7 @@ var dummyProvider = {
   update: () => {
   }
 };
-var awarenessProvider = Facet2.define({
-  combine: (providers) => providers[0] ?? dummyProvider
-});
+var awarenessProvider = singleValueFacet(dummyProvider);
 var RemoteSelectionChangedAnnotation = Annotation2.define();
 var awareness = (provider = dummyProvider) => {
   return [
@@ -515,8 +629,8 @@ var awareness = (provider = dummyProvider) => {
 var RemoteSelectionsDecorator = class {
   constructor(view) {
     this._ctx = new Context(void 0, {
-      F: __dxlog_file2,
-      L: 82
+      F: __dxlog_file3,
+      L: 80
     });
     this.decorations = RangeSet.of([]);
     this._cursorConverter = view.state.facet(Cursor.converter);
@@ -554,9 +668,9 @@ var RemoteSelectionsDecorator = class {
   _updateRemoteSelections(view) {
     const decorations = [];
     const awarenessStates = this._provider.getRemoteStates();
-    for (const state2 of awarenessStates) {
-      const anchor = state2.position?.anchor ? this._cursorConverter.fromCursor(state2.position.anchor) : null;
-      const head = state2.position?.head ? this._cursorConverter.fromCursor(state2.position.head) : null;
+    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;
       }
@@ -564,8 +678,8 @@ var RemoteSelectionsDecorator = class {
       const end = Math.min(Math.max(anchor, head), view.state.doc.length);
       const startLine = view.state.doc.lineAt(start);
       const endLine = view.state.doc.lineAt(end);
-      const darkColor = state2.info.darkColor;
-      const lightColor = state2.info.lightColor;
+      const darkColor = state.info.darkColor;
+      const lightColor = state.info.lightColor;
       if (startLine.number === endLine.number) {
         decorations.push({
           from: start,
@@ -618,7 +732,7 @@ var RemoteSelectionsDecorator = class {
         value: Decoration2.widget({
           side: head - anchor > 0 ? -1 : 1,
           block: false,
-          widget: new RemoteCaretWidget(state2.info.displayName ?? "Anonymous", darkColor)
+          widget: new RemoteCaretWidget(state.info.displayName ?? "Anonymous", darkColor)
         })
       });
     }
@@ -723,8 +837,8 @@ var styles2 = EditorView3.theme({
 import { DeferredTask, Event as Event2, sleep } from "@dxos/async";
 import { Context as Context2 } from "@dxos/context";
 import { invariant } from "@dxos/invariant";
-import { log as log2 } from "@dxos/log";
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/awareness/awareness-provider.ts";
+import { log as log3 } from "@dxos/log";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/awareness/awareness-provider.ts";
 var DEBOUNCE_INTERVAL = 100;
 var SpaceAwarenessProvider = class {
   constructor(params) {
@@ -737,7 +851,7 @@ var SpaceAwarenessProvider = class {
   }
   open() {
     this._ctx = new Context2(void 0, {
-      F: __dxlog_file3,
+      F: __dxlog_file4,
       L: 57
     });
     this._postTask = new DeferredTask(this._ctx, async () => {
@@ -764,10 +878,10 @@ var SpaceAwarenessProvider = class {
     void this._space.postMessage(this._channel, {
       kind: "query"
     }).catch((err) => {
-      log2.debug("failed to query awareness", {
+      log3.debug("failed to query awareness", {
         err
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file4,
         L: 91,
         S: this,
         C: (f, a) => f(...a)
@@ -784,7 +898,7 @@ var SpaceAwarenessProvider = class {
   }
   update(position) {
     invariant(this._postTask, void 0, {
-      F: __dxlog_file3,
+      F: __dxlog_file4,
       L: 106,
       S: this,
       A: [
@@ -801,7 +915,7 @@ var SpaceAwarenessProvider = class {
   }
   _handleQueryMessage() {
     invariant(this._postTask, void 0, {
-      F: __dxlog_file3,
+      F: __dxlog_file4,
       L: 117,
       S: this,
       A: [
@@ -813,7 +927,7 @@ var SpaceAwarenessProvider = class {
   }
   _handlePostMessage(message) {
     invariant(message.kind === "post", void 0, {
-      F: __dxlog_file3,
+      F: __dxlog_file4,
       L: 122,
       S: this,
       A: [
@@ -830,7 +944,7 @@ var SpaceAwarenessProvider = class {
 import { EditorView as EditorView4, keymap as keymap2 } from "@codemirror/view";
 import defaultsDeep from "lodash.defaultsdeep";
 import { invariant as invariant2 } from "@dxos/invariant";
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/blast.ts";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/blast.ts";
 var defaultOptions = {
   effect: 2,
   maxParticles: 200,
@@ -957,7 +1071,7 @@ var Blaster = class {
   }
   initialize() {
     invariant2(!this._canvas && !this._ctx, void 0, {
-      F: __dxlog_file4,
+      F: __dxlog_file5,
       L: 141,
       S: this,
       A: [
@@ -994,7 +1108,7 @@ var Blaster = class {
   }
   start() {
     invariant2(this._canvas && this._ctx, void 0, {
-      F: __dxlog_file4,
+      F: __dxlog_file5,
       L: 180,
       S: this,
       A: [
@@ -1144,14 +1258,12 @@ import { RangeSetBuilder } from "@codemirror/state";
 import { Decoration as Decoration3, EditorView as EditorView5, ViewPlugin as ViewPlugin3, WidgetType as WidgetType2 } from "@codemirror/view";
 
 // packages/ui/react-ui-editor/src/extensions/command/state.ts
-import { Facet as Facet3, StateEffect as StateEffect2, StateField as StateField3 } from "@codemirror/state";
+import { StateEffect as StateEffect2, StateField as StateField3 } from "@codemirror/state";
 import { showTooltip } from "@codemirror/view";
-var commandConfig = Facet3.define({
-  combine: (providers) => providers[0]
-});
+var commandConfig = singleValueFacet();
 var commandState = StateField3.define({
   create: () => ({}),
-  update: (state2, tr) => {
+  update: (state, tr) => {
     for (const effect of tr.effects) {
       if (effect.is(closeEffect)) {
         return {};
@@ -1202,7 +1314,7 @@ var commandState = StateField3.define({
         };
       }
     }
-    return state2;
+    return state;
   },
   provide: (field) => [
     showTooltip.from(field, (value) => value.tooltip ?? null)
@@ -1246,33 +1358,6 @@ var commandKeyBindings = [
   }
 ];
 
-// packages/ui/react-ui-editor/src/extensions/util/dom.ts
-var flattenRect = (rect, left) => {
-  const x = left ? rect.left : rect.right;
-  return {
-    left: x,
-    right: x,
-    top: rect.top,
-    bottom: rect.bottom
-  };
-};
-var scratchRange;
-var textRange = (node, from, to = from) => {
-  const range = scratchRange || (scratchRange = document.createRange());
-  range.setEnd(node, to);
-  range.setStart(node, from);
-  return range;
-};
-var clientRectsFor = (dom) => {
-  if (dom.nodeType === 3) {
-    return textRange(dom, 0, dom.nodeValue.length).getClientRects();
-  } else if (dom.nodeType === 1) {
-    return dom.getClientRects();
-  } else {
-    return [];
-  }
-};
-
 // packages/ui/react-ui-editor/src/extensions/command/hint.ts
 var CommandHint = class extends WidgetType2 {
   constructor(content) {
@@ -1355,112 +1440,115 @@ var command = (options) => {
 
 // packages/ui/react-ui-editor/src/extensions/comments.ts
 import { invertedEffects } from "@codemirror/commands";
-import { Facet as Facet4, StateEffect as StateEffect3, StateField as StateField4 } from "@codemirror/state";
-import { hoverTooltip, keymap as keymap4, Decoration as Decoration4, EditorView as EditorView7, ViewPlugin as ViewPlugin4 } from "@codemirror/view";
+import { StateEffect as StateEffect3, StateField as StateField4 } from "@codemirror/state";
+import { hoverTooltip, keymap as keymap5, Decoration as Decoration4, EditorView as EditorView8, ViewPlugin as ViewPlugin4 } from "@codemirror/view";
 import sortBy from "lodash.sortby";
 import { useEffect, useMemo, useState } from "react";
-import { debounce } from "@dxos/async";
-import { log as log5 } from "@dxos/log";
+import { debounce as debounce2 } from "@dxos/async";
+import { log as log4 } from "@dxos/log";
 import { nonNullable } from "@dxos/util";
 
-// packages/ui/react-ui-editor/src/extensions/util/error.ts
-import { log as log3 } from "@dxos/log";
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/util/error.ts";
-var wrapWithCatch = (fn) => {
-  return (...args) => {
-    try {
-      return fn(...args);
-    } catch (err) {
-      log3.catch(err, void 0, {
-        F: __dxlog_file5,
-        L: 12,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-    }
+// packages/ui/react-ui-editor/src/extensions/selection.ts
+import { Transaction } from "@codemirror/state";
+import { EditorView as EditorView7, keymap as keymap4 } from "@codemirror/view";
+import { debounce } from "@dxos/async";
+import { invariant as invariant3 } from "@dxos/invariant";
+import { isNotFalsy as isNotFalsy2 } from "@dxos/util";
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/selection.ts";
+var documentId = singleValueFacet();
+var stateRestoreAnnotation = "dxos.org/cm/state-restore";
+var createEditorStateTransaction = ({ scrollTo, selection }) => {
+  return {
+    selection,
+    scrollIntoView: !scrollTo,
+    effects: scrollTo ? EditorView7.scrollIntoView(scrollTo, {
+      yMargin: 96
+    }) : void 0,
+    annotations: Transaction.userEvent.of(stateRestoreAnnotation)
   };
 };
-
-// packages/ui/react-ui-editor/src/extensions/util/overlap.ts
-var overlap = (a, b) => a.from <= b.to && a.to >= b.from;
-
-// packages/ui/react-ui-editor/src/extensions/util/react.tsx
-import React from "react";
-import { createRoot } from "react-dom/client";
-import { ThemeProvider } from "@dxos/react-ui";
-import { defaultTx } from "@dxos/react-ui-theme";
-var createElement = (tag, options, children) => {
-  const el = document.createElement(tag);
-  if (options?.className) {
-    el.className = options.className;
-  }
-  if (children) {
-    el.append(...Array.isArray(children) ? children : [
-      children
-    ]);
-  }
-  return el;
-};
-var renderRoot = (root, node) => {
-  createRoot(root).render(/* @__PURE__ */ React.createElement(ThemeProvider, {
-    tx: defaultTx
-  }, node));
-  return root;
-};
-
-// packages/ui/react-ui-editor/src/util.ts
-import { log as log4 } from "@dxos/log";
-var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/util.ts";
-var callbackWrapper = (fn) => (...args) => {
-  try {
-    return fn(...args);
-  } catch (err) {
-    log4.catch(err, void 0, {
+var createEditorStateStore = (keyPrefix) => ({
+  getState: (id) => {
+    invariant3(id, void 0, {
       F: __dxlog_file6,
-      L: 18,
+      L: 47,
       S: void 0,
-      C: (f, a) => f(...a)
+      A: [
+        "id",
+        ""
+      ]
     });
-  }
-};
-var logChanges = (trs) => {
-  const changes = trs.flatMap((tr) => {
-    if (tr.changes.empty) {
-      return void 0;
-    }
-    const changes2 = [];
-    tr.changes.iterChanges((fromA, toA, fromB, toB, inserted) => changes2.push(JSON.stringify({
-      fromA,
-      toA,
-      fromB,
-      toB,
-      inserted: inserted.toString()
-    })));
-    return changes2;
-  }).filter(Boolean);
-  if (changes.length) {
-    log4.info("changes", {
-      changes
-    }, {
+    const state = localStorage.getItem(`${keyPrefix}/${id}`);
+    return state ? JSON.parse(state) : void 0;
+  },
+  setState: (id, state) => {
+    invariant3(id, void 0, {
       F: __dxlog_file6,
-      L: 39,
+      L: 53,
       S: void 0,
-      C: (f, a) => f(...a)
+      A: [
+        "id",
+        ""
+      ]
     });
+    localStorage.setItem(`${keyPrefix}/${id}`, JSON.stringify(state));
   }
+});
+var selectionState = ({ getState, setState } = {}) => {
+  const setStateDebounced = debounce(setState, 1e3);
+  return [
+    // TODO(burdon): Track scrolling (currently only updates when cursor moves).
+    // EditorView.domEventHandlers({
+    //   scroll: (event) => {
+    //     setStateDebounced(id, {});
+    //   },
+    // }),
+    EditorView7.updateListener.of(({ view, transactions }) => {
+      const id = view.state.facet(documentId);
+      if (!id || transactions.some((tr) => tr.isUserEvent(stateRestoreAnnotation))) {
+        return;
+      }
+      if (setState) {
+        const { scrollTop } = view.scrollDOM;
+        const pos = view.posAtCoords({
+          x: 0,
+          y: scrollTop
+        });
+        if (pos !== null) {
+          const { anchor, head } = view.state.selection.main;
+          setStateDebounced(id, {
+            scrollTo: pos,
+            selection: {
+              anchor,
+              head
+            }
+          });
+        }
+      }
+    }),
+    getState && keymap4.of([
+      {
+        key: "ctrl-r",
+        run: (view) => {
+          const state = getState(view.state.facet(documentId));
+          if (state) {
+            view.dispatch(createEditorStateTransaction(state));
+          }
+          return true;
+        }
+      }
+    ])
+  ].filter(isNotFalsy2);
 };
 
 // packages/ui/react-ui-editor/src/extensions/comments.ts
 var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/comments.ts";
-var documentId = Facet4.define({
-  combine: (values) => values[0]
-});
 var setComments = StateEffect3.define();
 var setSelection = StateEffect3.define();
 var setCommentState = StateEffect3.define();
 var commentsState = StateField4.define({
-  create: (state2) => ({
-    id: state2.facet(documentId),
+  create: (state) => ({
+    id: state.facet(documentId),
     comments: [],
     selection: {}
   }),
@@ -1496,7 +1584,7 @@ var commentsState = StateField4.define({
     return value;
   }
 });
-var styles3 = EditorView7.theme({
+var styles3 = EditorView8.theme({
   ".cm-comment, .cm-comment-current": {
     margin: "0 -3px",
     padding: "3px",
@@ -1516,16 +1604,16 @@ var createCommentMark = (id, isCurrent) => Decoration4.mark({
     "data-comment-id": id
   }
 });
-var commentsDecorations = EditorView7.decorations.compute([
+var commentsDecorations = EditorView8.decorations.compute([
   commentsState
-], (state2) => {
-  const { selection: { current }, comments: comments2 } = state2.field(commentsState);
+], (state) => {
+  const { selection: { current }, comments: comments2 } = state.field(commentsState);
   const decorations = sortBy(comments2 ?? [], (range) => range.range.from)?.flatMap((comment) => {
     const range = comment.range;
     if (!range) {
-      log5.warn("Invalid range:", range, {
+      log4.warn("Invalid range:", range, {
         F: __dxlog_file7,
-        L: 147,
+        L: 142,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -1539,7 +1627,7 @@ var commentsDecorations = EditorView7.decorations.compute([
   return Decoration4.set(decorations);
 });
 var commentClickedEffect = StateEffect3.define();
-var handleCommentClick = EditorView7.domEventHandlers({
+var handleCommentClick = EditorView8.domEventHandlers({
   click: (event, view) => {
     let target = event.target;
     const editorRoot = view.dom;
@@ -1578,7 +1666,7 @@ var trackPastedComments = (onUpdate) => {
     }
   };
   return [
-    EditorView7.domEventHandlers({
+    EditorView8.domEventHandlers({
       cut: handleTrack,
       copy: handleTrack
     }),
@@ -1600,7 +1688,7 @@ var trackPastedComments = (onUpdate) => {
       return effects;
     }),
     // Handle paste or the undo of comment deletion.
-    EditorView7.updateListener.of((update2) => {
+    EditorView8.updateListener.of((update2) => {
       const restore = [];
       for (let i = 0; i < update2.transactions.length; i++) {
         const tr = update2.transactions[i];
@@ -1687,15 +1775,13 @@ var createComment = (view) => {
   }
   return false;
 };
-var optionsFacet = Facet4.define({
-  combine: (providers) => providers[0]
-});
+var optionsFacet = singleValueFacet();
 var comments = (options = {}) => {
   const { key: shortcut = "meta-'" } = options;
-  const handleSelect = debounce((state2) => options.onSelect?.(state2), 200);
+  const handleSelect = debounce2((state) => options.onSelect?.(state), 200);
   return [
     optionsFacet.of(options),
-    documentId.of(options.id),
+    options.id ? documentId.of(options.id) : void 0,
     commentsState,
     commentsDecorations,
     handleCommentClick,
@@ -1703,17 +1789,17 @@ var comments = (options = {}) => {
     //
     // Keymap.
     //
-    options.onCreate ? keymap4.of([
+    options.onCreate && keymap5.of([
       {
         key: shortcut,
         run: callbackWrapper(createComment)
       }
-    ]) : [],
+    ]),
     //
     // Hover tooltip (for key shortcut hints, etc.)
     // TODO(burdon): Factor out to generic hints extension for current selection/line.
     //
-    options.onHover ? hoverTooltip((view, pos) => {
+    options.onHover && hoverTooltip((view, pos) => {
       const selection = view.state.selection.main;
       if (selection && pos >= selection.from && pos <= selection.to) {
         return {
@@ -1738,13 +1824,13 @@ var comments = (options = {}) => {
       // TODO(burdon): Hide on change triggered immediately?
       // hideOnChange: true,
       hoverTime: 1e3
-    }) : [],
+    }),
     //
     // Track deleted ranges and update ranges for decorations.
     //
-    EditorView7.updateListener.of(({ view, state: state2, changes }) => {
+    EditorView8.updateListener.of(({ view, state, changes }) => {
       let mod = false;
-      const { comments: comments2, ...value } = state2.field(commentsState);
+      const { comments: comments2, ...value } = state.field(commentsState);
       changes.iterChanges((from, to, from2, to2) => {
         comments2.forEach(({ comment, range }) => {
           if (from2 === to2) {
@@ -1774,10 +1860,10 @@ var comments = (options = {}) => {
     //
     // Track selection/proximity.
     //
-    EditorView7.updateListener.of(({ view, state: state2 }) => {
+    EditorView8.updateListener.of(({ view, state }) => {
       let min = Infinity;
-      const { selection: { current, closest }, comments: comments2 } = state2.field(commentsState);
-      const { head } = state2.selection.main;
+      const { selection: { current, closest }, comments: comments2 } = state.field(commentsState);
+      const { head } = state.selection.main;
       const selection = {};
       comments2.forEach(({ comment, range }) => {
         if (head >= range.from && head <= range.to) {
@@ -1798,7 +1884,7 @@ var comments = (options = {}) => {
         });
         handleSelect({
           selection,
-          id: state2.facet(documentId),
+          id: state.facet(documentId),
           comments: comments2.map(({ comment, range }) => ({
             comment,
             range,
@@ -1807,8 +1893,8 @@ var comments = (options = {}) => {
         });
       }
     }),
-    options.onUpdate ? trackPastedComments(options.onUpdate) : []
-  ];
+    options.onUpdate && trackPastedComments(options.onUpdate)
+  ].filter(nonNullable);
 };
 var scrollThreadIntoView = (view, id, center = true) => {
   const comment = view.state.field(commentsState).comments.find((range2) => range2.comment.id === id);
@@ -1828,7 +1914,7 @@ var scrollThreadIntoView = (view, id, center = true) => {
           anchor: range.from
         } : void 0,
         effects: [
-          needsScroll ? EditorView7.scrollIntoView(range.from, center ? {
+          needsScroll ? EditorView8.scrollIntoView(range.from, center ? {
             y: "center"
           } : void 0) : [],
           needsSelectionUpdate ? setSelection.of({
@@ -1839,9 +1925,12 @@ var scrollThreadIntoView = (view, id, center = true) => {
     }
   }
 };
-var selectionOverlapsComment = (state2) => {
-  const { selection } = state2;
-  const commentState = state2.field(commentsState);
+var selectionOverlapsComment = (state) => {
+  const commentState = state.field(commentsState, false);
+  if (commentState === void 0) {
+    return false;
+  }
+  const { selection } = state;
   for (const range of selection.ranges) {
     if (commentState.comments.some(({ range: commentRange }) => overlap(commentRange, range))) {
       return true;
@@ -1849,8 +1938,8 @@ var selectionOverlapsComment = (state2) => {
   }
   return false;
 };
-var hasActiveSelection = (state2) => {
-  return state2.selection.ranges.some((range) => !range.empty);
+var hasActiveSelection = (state) => {
+  return state.selection.ranges.some((range) => !range.empty);
 };
 var ExternalCommentSync = class {
   constructor(view, id, subscribe, getComments) {
@@ -1877,11 +1966,11 @@ var createExternalCommentSync = (id, subscribe, getComments) => ViewPlugin4.from
   }
 });
 var useCommentState = () => {
-  const [state2, setState] = useState({
+  const [state, setState] = useState({
     comment: false,
     selection: false
   });
-  const observer = useMemo(() => EditorView7.updateListener.of((update2) => {
+  const observer = useMemo(() => EditorView8.updateListener.of((update2) => {
     if (update2.docChanged || update2.selectionSet) {
       setState({
         comment: selectionOverlapsComment(update2.state),
@@ -1890,7 +1979,7 @@ var useCommentState = () => {
     }
   }), []);
   return [
-    state2,
+    state,
     observer
   ];
 };
@@ -1909,7 +1998,7 @@ var useComments = (view, id, comments2) => {
   });
 };
 var useCommentClickListener = (onCommentClick) => {
-  return useMemo(() => EditorView7.updateListener.of((update2) => {
+  return useMemo(() => EditorView8.updateListener.of((update2) => {
     update2.transactions.forEach((transaction) => {
       transaction.effects.forEach((effect) => {
         if (effect.is(commentClickedEffect)) {
@@ -1925,38 +2014,19 @@ var useCommentClickListener = (onCommentClick) => {
 // packages/ui/react-ui-editor/src/extensions/debug.ts
 import { syntaxTree } from "@codemirror/language";
 import { StateField as StateField5 } from "@codemirror/state";
-var debugNodeLogger = (log9 = console.log) => {
-  const logTokens = (state2) => syntaxTree(state2).iterate({
-    enter: (node) => log9(node.type)
+var debugNodeLogger = (log8 = console.log) => {
+  const logTokens = (state) => syntaxTree(state).iterate({
+    enter: (node) => log8(node.type)
   });
   return StateField5.define({
-    create: (state2) => logTokens(state2),
+    create: (state) => logTokens(state),
     update: (_, tr) => logTokens(tr.state)
   });
 };
 
-// packages/ui/react-ui-editor/src/extensions/doc.ts
-import { Facet as Facet5 } from "@codemirror/state";
-import { invariant as invariant3 } from "@dxos/invariant";
-var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/doc.ts";
-var documentId2 = Facet5.define({
-  combine: (providers) => {
-    invariant3(providers.length <= 1, void 0, {
-      F: __dxlog_file8,
-      L: 14,
-      S: void 0,
-      A: [
-        "providers.length <= 1",
-        ""
-      ]
-    });
-    return providers[0];
-  }
-});
-
 // packages/ui/react-ui-editor/src/extensions/dnd.ts
-import { dropCursor, EditorView as EditorView8 } from "@codemirror/view";
-var styles4 = EditorView8.theme({
+import { dropCursor, EditorView as EditorView9 } from "@codemirror/view";
+var styles4 = EditorView9.theme({
   ".cm-dropCursor": {
     borderLeft: "2px solid var(--dx-accentText)",
     color: "var(--dx-accentText)",
@@ -1970,7 +2040,7 @@ var dropFile = (options = {}) => {
   return [
     styles4,
     dropCursor(),
-    EditorView8.domEventHandlers({
+    EditorView9.domEventHandlers({
       drop: (event, view) => {
         event.preventDefault();
         const files = event.dataTransfer?.files;
@@ -1997,13 +2067,44 @@ import { bracketMatching, defaultHighlightStyle, syntaxHighlighting } from "@cod
 import { searchKeymap } from "@codemirror/search";
 import { EditorState } from "@codemirror/state";
 import { oneDarkHighlightStyle } from "@codemirror/theme-one-dark";
-import { EditorView as EditorView9, drawSelection, dropCursor as dropCursor2, highlightActiveLine, keymap as keymap5, lineNumbers, placeholder, scrollPastEnd } from "@codemirror/view";
+import { EditorView as EditorView11, drawSelection, dropCursor as dropCursor2, highlightActiveLine, keymap as keymap6, lineNumbers, placeholder, scrollPastEnd } from "@codemirror/view";
 import defaultsDeep2 from "lodash.defaultsdeep";
 import merge from "lodash.merge";
 import { generateName } from "@dxos/display-name";
-import { log as log6 } from "@dxos/log";
+import { log as log5 } from "@dxos/log";
 import { hueTokens } from "@dxos/react-ui-theme";
-import { hexToHue, isNotFalsy as isNotFalsy2 } from "@dxos/util";
+import { hexToHue, isNotFalsy as isNotFalsy3 } from "@dxos/util";
+
+// packages/ui/react-ui-editor/src/extensions/focus.ts
+import { StateEffect as StateEffect4, StateField as StateField6 } from "@codemirror/state";
+import { EditorView as EditorView10 } from "@codemirror/view";
+var focusEffect = StateEffect4.define();
+var focusField = StateField6.define({
+  create: () => false,
+  update: (value, tr) => {
+    for (const effect of tr.effects) {
+      if (effect.is(focusEffect)) {
+        return effect.value;
+      }
+    }
+    return value;
+  }
+});
+var focus = [
+  focusField,
+  EditorView10.domEventHandlers({
+    focus: (event, view) => {
+      setTimeout(() => view.dispatch({
+        effects: focusEffect.of(true)
+      }));
+    },
+    blur: (event, view) => {
+      setTimeout(() => view.dispatch({
+        effects: focusEffect.of(false)
+      }));
+    }
+  })
+];
 
 // packages/ui/react-ui-editor/src/styles/markdown.ts
 import { mx } from "@dxos/react-ui-theme";
@@ -2016,11 +2117,9 @@ var headings = {
   6: "text-md"
 };
 var theme = {
-  mark: "opacity-50",
   code: "font-mono !no-underline text-neutral-700 dark:text-neutral-300",
   codeMark: "font-mono text-primary-500",
-  // TODO(burdon): Replace with widget.
-  blockquote: "pl-1 mr-1 border-is-4 border-orange-500 dark:border-orange-500 dark:text-neutral-500",
+  mark: "opacity-50",
   heading: (level) => {
     return mx(headings[level], "dark:text-primary-400");
   }
@@ -2063,9 +2162,11 @@ var defaultTheme = {
   /**
   * Gutters
   * NOTE: Gutters should have the same top margin as the content.
+  * NOTE: They can't be transparent since the content needs to scroll below.
   */
   ".cm-gutters": {
-    background: "var(--surface-bg)"
+    background: "var(--surface-bg)",
+    borderRight: "none"
   },
   ".cm-gutter": {},
   ".cm-gutter.cm-lineNumbers .cm-gutterElement": {
@@ -2086,7 +2187,7 @@ var defaultTheme = {
     paddingInline: 0
   },
   ".cm-activeLine": {
-    background: "var(--dx-hoverSurface)"
+    background: "var(--dx-cmActiveLine)"
   },
   /**
   * Cursor (layer).
@@ -2234,7 +2335,7 @@ var defaultTheme = {
 };
 
 // packages/ui/react-ui-editor/src/extensions/factories.ts
-var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/factories.ts";
+var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/factories.ts";
 var preventNewline = EditorState.transactionFilter.of((tr) => tr.newDoc.lines > 1 ? [] : tr);
 var defaultBasicOptions = {
   allowMultipleSelections: true,
@@ -2242,6 +2343,7 @@ var defaultBasicOptions = {
   closeBrackets: true,
   drawSelection: true,
   editable: true,
+  focus: true,
   history: true,
   keymap: "standard",
   lineWrapping: true,
@@ -2257,10 +2359,10 @@ var createBasicExtensions = (_props) => {
   const props = defaultsDeep2({}, _props, defaultBasicOptions);
   return [
     // NOTE: Doesn't catch errors in keymap functions.
-    EditorView9.exceptionSink.of((err) => {
-      log6.catch(err, void 0, {
-        F: __dxlog_file9,
-        L: 93,
+    EditorView11.exceptionSink.of((err) => {
+      log5.catch(err, void 0, {
+        F: __dxlog_file8,
+        L: 96,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -2272,19 +2374,20 @@ var createBasicExtensions = (_props) => {
     props.drawSelection && drawSelection({
       cursorBlinkRate: 1200
     }),
+    props.focus && focus,
     props.highlightActiveLine && highlightActiveLine(),
     props.history && history(),
     props.lineNumbers && lineNumbers(),
-    props.lineWrapping && EditorView9.lineWrapping,
+    props.lineWrapping && EditorView11.lineWrapping,
     props.placeholder && placeholder(props.placeholder),
     props.readonly && [
       EditorState.readOnly.of(true),
-      EditorView9.editable.of(false)
+      EditorView11.editable.of(false)
     ],
     props.scrollPastEnd && scrollPastEnd(),
     props.tabSize && EditorState.tabSize.of(props.tabSize),
     // https://codemirror.net/docs/ref/#view.KeyBinding
-    keymap5.of([
+    keymap6.of([
       ...(props.keymap && keymaps[props.keymap]) ?? [],
       // NOTE: Tabs are also configured by markdown extension.
       // https://codemirror.net/docs/ref/#commands.indentWithTab
@@ -2297,8 +2400,8 @@ var createBasicExtensions = (_props) => {
       ...props.history ? historyKeymap : [],
       // https://codemirror.net/docs/ref/#search.searchKeymap
       ...props.search ? searchKeymap : []
-    ].filter(isNotFalsy2))
-  ].filter(isNotFalsy2);
+    ].filter(isNotFalsy3))
+  ].filter(isNotFalsy3);
 };
 var defaultThemeSlots = {
   editor: {
@@ -2308,17 +2411,17 @@ var defaultThemeSlots = {
 var createThemeExtensions = ({ themeMode, styles: styles5, syntaxHighlighting: _syntaxHighlighting, slots: _slots } = {}) => {
   const slots = defaultsDeep2({}, _slots, defaultThemeSlots);
   return [
-    EditorView9.darkTheme.of(themeMode === "dark"),
-    EditorView9.baseTheme(styles5 ? merge({}, defaultTheme, styles5) : defaultTheme),
+    EditorView11.darkTheme.of(themeMode === "dark"),
+    EditorView11.baseTheme(styles5 ? merge({}, defaultTheme, styles5) : defaultTheme),
     // https://github.com/codemirror/theme-one-dark
     _syntaxHighlighting && (themeMode === "dark" ? syntaxHighlighting(oneDarkHighlightStyle) : syntaxHighlighting(defaultHighlightStyle)),
-    slots.editor?.className && EditorView9.editorAttributes.of({
+    slots.editor?.className && EditorView11.editorAttributes.of({
       class: slots.editor.className
     }),
-    slots.content?.className && EditorView9.contentAttributes.of({
+    slots.content?.className && EditorView11.contentAttributes.of({
       class: slots.content.className
     })
-  ].filter(isNotFalsy2);
+  ].filter(isNotFalsy3);
 };
 var createDataExtensions = ({ id, text, space, identity }) => {
   const extensions = [];
@@ -2344,10 +2447,9 @@ var createDataExtensions = ({ id, text, space, identity }) => {
 
 // packages/ui/react-ui-editor/src/extensions/folding.tsx
 import { codeFolding, foldGutter } from "@codemirror/language";
-import { EditorView as EditorView10 } from "@codemirror/view";
+import { EditorView as EditorView12 } from "@codemirror/view";
 import React2 from "react";
 import { Icon } from "@dxos/react-ui";
-import { getSize } from "@dxos/react-ui-theme";
 var folding = (_props = {}) => [
   codeFolding({
     placeholderDOM: () => {
@@ -2356,22 +2458,24 @@ var folding = (_props = {}) => [
   }),
   foldGutter({
     markerDOM: (open) => {
-      return renderRoot(createElement("div", {
+      const el = createElement("div", {
         className: "flex h-full items-center"
-      }), /* @__PURE__ */ React2.createElement(Icon, {
+      });
+      return renderRoot(el, /* @__PURE__ */ React2.createElement(Icon, {
         icon: "ph--caret-right--regular",
+        size: 3,
         classNames: [
-          getSize(3),
           "mx-3 cursor-pointer",
           open && "rotate-90"
         ]
       }));
     }
   }),
-  EditorView10.theme({
+  EditorView12.theme({
     ".cm-foldGutter": {
       opacity: 0.3,
-      transition: "opacity 0.3s"
+      transition: "opacity 0.3s",
+      width: "32px"
     },
     ".cm-foldGutter:hover": {
       opacity: 1
@@ -2380,15 +2484,15 @@ var folding = (_props = {}) => [
 ];
 
 // packages/ui/react-ui-editor/src/extensions/listener.ts
-import { EditorView as EditorView11 } from "@codemirror/view";
+import { EditorView as EditorView13 } from "@codemirror/view";
 var listener = ({ onFocus, onChange }) => {
   const extensions = [];
-  onFocus && extensions.push(EditorView11.focusChangeEffect.of((_, focusing) => {
+  onFocus && extensions.push(EditorView13.focusChangeEffect.of((_, focusing) => {
     onFocus(focusing);
     return null;
   }));
-  onChange && extensions.push(EditorView11.updateListener.of((update2) => {
-    onChange(update2.state.doc.toString());
+  onChange && extensions.push(EditorView13.updateListener.of((update2) => {
+    onChange(update2.state.doc.toString(), update2.state.facet(documentId));
   }));
   return extensions;
 };
@@ -2397,7 +2501,7 @@ var listener = ({ onFocus, onChange }) => {
 import { snippet } from "@codemirror/autocomplete";
 import { syntaxTree as syntaxTree2 } from "@codemirror/language";
 import { EditorSelection } from "@codemirror/state";
-import { EditorView as EditorView12, keymap as keymap6 } from "@codemirror/view";
+import { EditorView as EditorView14, keymap as keymap7 } from "@codemirror/view";
 import { useMemo as useMemo2, useState as useState2 } from "react";
 var formattingEquals = (a, b) => a.blockType === b.blockType && a.strong === b.strong && a.emphasis === b.emphasis && a.strikethrough === b.strikethrough && a.code === b.code && a.link === b.link && a.listStyle === b.listStyle && a.blockQuote === b.blockQuote;
 var Inline;
@@ -2414,13 +2518,13 @@ var List;
   List2[List2["Task"] = 2] = "Task";
 })(List || (List = {}));
 var setHeading = (level) => {
-  return ({ state: state2, dispatch }) => {
-    const { selection: { ranges }, doc } = state2;
+  return ({ state, dispatch }) => {
+    const { selection: { ranges }, doc } = state;
     const changes = [];
     let prevBlock = -1;
     for (const range of ranges) {
       let sawBlock = false;
-      syntaxTree2(state2).iterate({
+      syntaxTree2(state).iterate({
         from: range.from,
         to: range.to,
         enter: (node) => {
@@ -2473,7 +2577,7 @@ var setHeading = (level) => {
         }
       });
       let line;
-      if (!sawBlock && range.empty && level > 0 && !/\S/.test((line = state2.doc.lineAt(range.from)).text)) {
+      if (!sawBlock && range.empty && level > 0 && !/\S/.test((line = state.doc.lineAt(range.from)).text)) {
         changes.push({
           from: line.from,
           to: line.to,
@@ -2484,10 +2588,10 @@ var setHeading = (level) => {
     if (!changes.length) {
       return false;
     }
-    const changeSet = state2.changes(changes);
-    dispatch(state2.update({
+    const changeSet = state.changes(changes);
+    dispatch(state.update({
       changes: changeSet,
-      selection: state2.selection.map(changeSet, 1),
+      selection: state.selection.map(changeSet, 1),
       userEvent: "format.setHeading",
       scrollIntoView: true
     }));
@@ -2495,14 +2599,14 @@ var setHeading = (level) => {
   };
 };
 var setStyle = (type, enable) => {
-  return ({ state: state2, dispatch }) => {
+  return ({ state, dispatch }) => {
     const marker = inlineMarkerText(type);
-    const changes = state2.changeByRange((range) => {
+    const changes = state.changeByRange((range) => {
       if (!enable && range.empty) {
-        const after = state2.doc.sliceString(range.head, range.head + 6);
+        const after = state.doc.sliceString(range.head, range.head + 6);
         const found = after.indexOf(marker);
         if (found >= 0 && /^[*~`]*$/.test(after.slice(0, found))) {
-          const before = state2.doc.sliceString(range.head - 6, range.head);
+          const before = state.doc.sliceString(range.head - 6, range.head);
           if (before.slice(before.length - found - marker.length, before.length - found) === marker && [
             ...before.slice(before.length - found)
           ].reverse().join("") === after.slice(0, found)) {
@@ -2529,14 +2633,14 @@ var setStyle = (type, enable) => {
       let startCovered = false;
       let endCovered = false;
       let { from, to } = range;
-      syntaxTree2(state2).iterate({
+      syntaxTree2(state).iterate({
         from,
         to,
         enter: (node) => {
           const { name } = node;
           if (Object.hasOwn(Textblocks, name) && Textblocks[name] !== "codeblock") {
             blockStart = blockContentStart(node);
-            blockEnd = blockContentEnd(node, state2.doc);
+            blockEnd = blockContentEnd(node, state.doc);
             startCovered = endCovered = false;
           } else if (name === "Link" || name === "Image" && enable) {
             if (from < node.from && to > node.from && to <= node.to) {
@@ -2581,7 +2685,7 @@ var setStyle = (type, enable) => {
                 });
                 if (markType !== type && closeStart >= to) {
                   changesAtEnd.push({
-                    from: skipSpaces(Math.min(to, blockEnd), state2.doc, 1, blockEnd),
+                    from: skipSpaces(Math.min(to, blockEnd), state.doc, 1, blockEnd),
                     insert: inlineMarkerText(markType)
                   });
                 }
@@ -2593,7 +2697,7 @@ var setStyle = (type, enable) => {
                 });
                 if (markType !== type && openEnd <= from) {
                   changes2.push({
-                    from: skipSpaces(Math.max(from, blockStart), state2.doc, -1, blockStart),
+                    from: skipSpaces(Math.max(from, blockStart), state.doc, -1, blockStart),
                     insert: inlineMarkerText(markType)
                   });
                 }
@@ -2623,7 +2727,7 @@ var setStyle = (type, enable) => {
                 changes2.push(startCovered);
               } else if (startCovered) {
                 changes2.push({
-                  from: skipSpaces(rangeStart, state2.doc, -1, blockStart),
+                  from: skipSpaces(rangeStart, state.doc, -1, blockStart),
                   insert: marker
                 });
               }
@@ -2631,7 +2735,7 @@ var setStyle = (type, enable) => {
                 changes2.push(endCovered);
               } else if (endCovered) {
                 changes2.push({
-                  from: skipSpaces(rangeEnd, state2.doc, 1, blockEnd),
+                  from: skipSpaces(rangeEnd, state.doc, 1, blockEnd),
                   insert: marker
                 });
               }
@@ -2639,7 +2743,7 @@ var setStyle = (type, enable) => {
           }
         }
       });
-      if (blockStart < 0 && range.empty && enable && !/\S/.test(state2.doc.lineAt(range.from).text)) {
+      if (blockStart < 0 && range.empty && enable && !/\S/.test(state.doc.lineAt(range.from).text)) {
         return {
           changes: {
             from: range.head,
@@ -2648,13 +2752,13 @@ var setStyle = (type, enable) => {
           range: EditorSelection.cursor(range.head + marker.length)
         };
       }
-      const changeSet = state2.changes(changes2.concat(changesAtEnd));
+      const changeSet = state.changes(changes2.concat(changesAtEnd));
       return {
         changes: changeSet,
         range: range.empty && !changeSet.empty ? EditorSelection.cursor(range.head + marker.length) : EditorSelection.range(changeSet.mapPos(range.from, 1), changeSet.mapPos(range.to, -1))
       };
     });
-    dispatch(state2.update(changes, {
+    dispatch(state.update(changes, {
       userEvent: enable ? "format.style.add" : "format.style.remove",
       scrollIntoView: true
     }));
@@ -2731,8 +2835,8 @@ var insertTable = (view) => {
   const { from } = doc.line(number);
   snippets.table(view, null, from, from);
 };
-var removeLinkInner = (from, to, changes, state2) => {
-  syntaxTree2(state2).iterate({
+var removeLinkInner = (from, to, changes, state) => {
+  syntaxTree2(state).iterate({
     from,
     to,
     enter: (node) => {
@@ -2746,8 +2850,8 @@ var removeLinkInner = (from, to, changes, state2) => {
             });
           } else if (name === "LinkTitle" || name === "URL") {
             changes.push({
-              from: skipSpaces(node2.from, state2.doc, -1),
-              to: skipSpaces(node2.to, state2.doc, 1)
+              from: skipSpaces(node2.from, state.doc, -1),
+              to: skipSpaces(node2.to, state.doc, 1)
             });
           }
         });
@@ -2756,15 +2860,15 @@ var removeLinkInner = (from, to, changes, state2) => {
     }
   });
 };
-var removeLink = ({ state: state2, dispatch }) => {
+var removeLink = ({ state, dispatch }) => {
   const changes = [];
-  for (const { from, to } of state2.selection.ranges) {
-    removeLinkInner(from, to, changes, state2);
+  for (const { from, to } of state.selection.ranges) {
+    removeLinkInner(from, to, changes, state);
   }
   if (!changes) {
     return false;
   }
-  dispatch(state2.update({
+  dispatch(state.update({
     changes,
     userEvent: "format.link.remove",
     scrollIntoView: true
@@ -2772,17 +2876,17 @@ var removeLink = ({ state: state2, dispatch }) => {
   return true;
 };
 var addLink = ({ url, image: image2 } = {}) => {
-  return ({ state: state2, dispatch }) => {
-    const changes = state2.changeByRange((range) => {
+  return ({ state, dispatch }) => {
+    const changes = state.changeByRange((range) => {
       let { from, to } = range;
       const cutStyles = [];
       let okay = null;
-      syntaxTree2(state2).iterate({
+      syntaxTree2(state).iterate({
         from,
         to,
         enter: (node) => {
           if (Object.hasOwn(Textblocks, node.name)) {
-            okay = Textblocks[node.name] !== "codeblock" && from >= blockContentStart(node) && to <= blockContentEnd(node, state2.doc);
+            okay = Textblocks[node.name] !== "codeblock" && from >= blockContentStart(node) && to <= blockContentEnd(node, state.doc);
           } else if (Object.hasOwn(InlineMarker, node.name)) {
             const sNode = node.node;
             if (node.from < from && node.to <= to) {
@@ -2802,7 +2906,7 @@ var addLink = ({ url, image: image2 } = {}) => {
         }
       });
       if (okay === null) {
-        const line = state2.doc.lineAt(from);
+        const line = state.doc.lineAt(from);
         okay = to <= line.to && !/\S/.test(line.text.slice(from - line.from));
       }
       if (!okay) {
@@ -2812,26 +2916,26 @@ var addLink = ({ url, image: image2 } = {}) => {
       }
       const changes2 = [];
       const changesAfter = [];
-      removeLinkInner(from, to, changesAfter, state2);
+      removeLinkInner(from, to, changesAfter, state);
       let cursorOffset = 1;
       for (const style of cutStyles) {
         const type = InlineMarker[style.name];
         const mark = inlineMarkerText(type);
         if (style.from < from) {
           changes2.push({
-            from: skipSpaces(from, state2.doc, -1),
+            from: skipSpaces(from, state.doc, -1),
             insert: mark
           });
           changesAfter.push({
-            from: skipSpaces(from, state2.doc, 1, to),
+            from: skipSpaces(from, state.doc, 1, to),
             insert: mark
           });
         } else {
           changes2.push({
-            from: skipSpaces(to, state2.doc, -1, from),
+            from: skipSpaces(to, state.doc, -1, from),
             insert: mark
           });
-          const after = skipSpaces(to, state2.doc, 1);
+          const after = skipSpaces(to, state.doc, 1);
           if (after === to) {
             cursorOffset += mark.length;
           }
@@ -2848,7 +2952,7 @@ var addLink = ({ url, image: image2 } = {}) => {
         from: to,
         insert: `](${url ?? ""})`
       });
-      const changeSet = state2.changes(changes2.concat(changesAfter));
+      const changeSet = state.changes(changes2.concat(changesAfter));
       return {
         changes: changeSet,
         range: EditorSelection.cursor(changeSet.mapPos(to, 1) - cursorOffset - (url ? url.length + 2 : 0))
@@ -2857,7 +2961,7 @@ var addLink = ({ url, image: image2 } = {}) => {
     if (changes.changes.empty) {
       return false;
     }
-    dispatch(state2.update(changes, {
+    dispatch(state.update(changes, {
       userEvent: "format.link.add",
       scrollIntoView: true
     }));
@@ -2865,14 +2969,14 @@ var addLink = ({ url, image: image2 } = {}) => {
   };
 };
 var addList = (type) => {
-  return ({ state: state2, dispatch }) => {
+  return ({ state, dispatch }) => {
     let lastBlock = -1;
     let counter = 1;
     let first = true;
     let parentColumn = null;
     const blocks = [];
-    for (const { from, to } of state2.selection.ranges) {
-      syntaxTree2(state2).iterate({
+    for (const { from, to } of state.selection.ranges) {
+      syntaxTree2(state).iterate({
         from,
         to,
         enter: (node) => {
@@ -2884,7 +2988,7 @@ var addList = (type) => {
               }
               if (before?.name === (type === 0 ? "OrderedList" : "BulletList")) {
                 const item = before.lastChild;
-                const itemLine = state2.doc.lineAt(item.from);
+                const itemLine = state.doc.lineAt(item.from);
                 const itemText = itemLine.text.slice(item.from - itemLine.from);
                 parentColumn = item.from - itemLine.from + /^\s*/.exec(itemText)[0].length;
                 if (type === 0) {
@@ -2919,10 +3023,10 @@ var addList = (type) => {
       });
     }
     if (!blocks.length) {
-      const { from, to } = state2.doc.lineAt(state2.selection.main.anchor);
+      const { from, to } = state.doc.lineAt(state.selection.main.anchor);
       if (from === to) {
         const insert = type === 1 ? "- " : type === 0 ? "1. " : "- [ ] ";
-        dispatch(state2.update({
+        dispatch(state.update({
           changes: [
             {
               from,
@@ -2943,11 +3047,11 @@ var addList = (type) => {
     for (let i = 0; i < blocks.length; i++) {
       const { node, counter: counter2, parentColumn: parentColumn2 } = blocks[i];
       const nodeFrom = node.name === "CodeBlock" ? node.from - 4 : node.from;
-      let padding = nodeFrom > 0 && !/\s/.test(state2.doc.sliceString(nodeFrom - 1, nodeFrom)) ? 1 : 0;
+      let padding = nodeFrom > 0 && !/\s/.test(state.doc.sliceString(nodeFrom - 1, nodeFrom)) ? 1 : 0;
       if (type === 0) {
         padding += String(counter2).length;
       }
-      let line = state2.doc.lineAt(nodeFrom);
+      let line = state.doc.lineAt(nodeFrom);
       const column = nodeFrom - line.from;
       if (parentColumn2 !== null && parentColumn2 > column) {
         padding = Math.max(padding, parentColumn2 - column);
@@ -2972,7 +3076,7 @@ var addList = (type) => {
         insert: mark
       });
       while (line.to < node.to) {
-        line = state2.doc.lineAt(line.to + 1);
+        line = state.doc.lineAt(line.to + 1);
         const open = /^[\s>]*/.exec(line.text)[0].length;
         changes.push({
           from: line.from + Math.min(open, column),
@@ -2987,13 +3091,13 @@ var addList = (type) => {
         next = next.nextSibling;
       }
       if (next?.name === "OrderedList") {
-        renumberListItems(next.firstChild, last.counter + 1, changes, state2.doc);
+        renumberListItems(next.firstChild, last.counter + 1, changes, state.doc);
       }
     }
-    const changeSet = state2.changes(changes);
-    dispatch(state2.update({
+    const changeSet = state.changes(changes);
+    dispatch(state.update({
       changes: changeSet,
-      selection: state2.selection.map(changeSet, 1),
+      selection: state.selection.map(changeSet, 1),
       userEvent: "format.list.add",
       scrollIntoView: true
     }));
@@ -3001,13 +3105,13 @@ var addList = (type) => {
   };
 };
 var removeList = (type) => {
-  return ({ state: state2, dispatch }) => {
+  return ({ state, dispatch }) => {
     let lastBlock = -1;
     const changes = [];
     const stack = [];
     const targetNodeType = type === 0 ? "OrderedList" : type === 1 ? "BulletList" : "TaskList";
-    for (const { from, to } of state2.selection.ranges) {
-      syntaxTree2(state2).iterate({
+    for (const { from, to } of state.selection.ranges) {
+      syntaxTree2(state).iterate({
         from,
         to,
         enter: (node) => {
@@ -3024,7 +3128,7 @@ var removeList = (type) => {
             stack.pop();
           } else if (name === "ListItem" && stack[stack.length - 1] === targetNodeType && node.from !== lastBlock) {
             lastBlock = node.from;
-            let line = state2.doc.lineAt(node.from);
+            let line = state.doc.lineAt(node.from);
             const mark = /^\s*(\d+[.)] |[-*+] (\[[ x]\] )?)/.exec(line.text.slice(node.from - line.from));
             if (!mark) {
               return false;
@@ -3035,7 +3139,7 @@ var removeList = (type) => {
               to: node.from + mark[0].length
             });
             while (line.to < node.to) {
-              line = state2.doc.lineAt(line.to + 1);
+              line = state.doc.lineAt(line.to + 1);
               const open = /^[\s>]*/.exec(line.text)[0].length;
               if (open > column) {
                 changes.push({
@@ -3045,7 +3149,7 @@ var removeList = (type) => {
               }
             }
             if (node.to >= to) {
-              renumberListItems(node.node.nextSibling, 1, changes, state2.doc);
+              renumberListItems(node.node.nextSibling, 1, changes, state.doc);
             }
             return false;
           }
@@ -3055,7 +3159,7 @@ var removeList = (type) => {
     if (!changes.length) {
       return false;
     }
-    dispatch(state2.update({
+    dispatch(state.update({
       changes,
       userEvent: "format.list.remove",
       scrollIntoView: true
@@ -3089,12 +3193,12 @@ var renumberListItems = (item, counter, changes, doc) => {
   }
 };
 var setBlockquote = (enable) => {
-  return ({ state: state2, dispatch }) => {
+  return ({ state, dispatch }) => {
     const lines = [];
     let lastBlock = -1;
-    for (const { from, to } of state2.selection.ranges) {
+    for (const { from, to } of state.selection.ranges) {
       const sawBlock = false;
-      syntaxTree2(state2).iterate({
+      syntaxTree2(state).iterate({
         from,
         to,
         enter: (node) => {
@@ -3103,9 +3207,9 @@ var setBlockquote = (enable) => {
               return false;
             }
             lastBlock = node.from;
-            let line2 = state2.doc.lineAt(node.from);
+            let line2 = state.doc.lineAt(node.from);
             if (line2.number > 1) {
-              const prevLine = state2.doc.line(line2.number - 1);
+              const prevLine = state.doc.line(line2.number - 1);
               if (/^[>\s]*$/.test(prevLine.text)) {
                 if (!enable || lines.length && lines[lines.length - 1].number === prevLine.number - 1) {
                   lines.push(prevLine);
@@ -3117,10 +3221,10 @@ var setBlockquote = (enable) => {
               if (line2.to >= node.to) {
                 break;
               }
-              line2 = state2.doc.line(line2.number + 1);
+              line2 = state.doc.line(line2.number + 1);
             }
-            if (!enable && line2.number < state2.doc.lines) {
-              const nextLine = state2.doc.line(line2.number + 1);
+            if (!enable && line2.number < state.doc.lines) {
+              const nextLine = state.doc.line(line2.number + 1);
               if (/^[>\s]*$/.test(nextLine.text)) {
                 lines.push(nextLine);
               }
@@ -3130,7 +3234,7 @@ var setBlockquote = (enable) => {
         }
       });
       let line;
-      if (!sawBlock && enable && from === to && !/\S/.test((line = state2.doc.lineAt(from)).text)) {
+      if (!sawBlock && enable && from === to && !/\S/.test((line = state.doc.lineAt(from)).text)) {
         lines.push(line);
       }
     }
@@ -3154,10 +3258,10 @@ var setBlockquote = (enable) => {
     if (!changes.length) {
       return false;
     }
-    const changeSet = state2.changes(changes);
-    dispatch(state2.update({
+    const changeSet = state.changes(changes);
+    dispatch(state.update({
       changes: changeSet,
-      selection: state2.selection.map(changeSet, 1),
+      selection: state.selection.map(changeSet, 1),
       userEvent: enable ? "format.blockquote.add" : "format.blockquote.remove",
       scrollIntoView: true
     }));
@@ -3170,11 +3274,11 @@ var toggleBlockquote = (target) => {
   return (getFormatting(target.state).blockQuote ? removeBlockquote : addBlockquote)(target);
 };
 var addCodeblock = (target) => {
-  const { state: state2, dispatch } = target;
-  const { selection } = state2;
+  const { state, dispatch } = target;
+  const { selection } = state;
   if (selection.ranges.length === 1 && selection.main.empty) {
     const { head } = selection.main;
-    const line = state2.doc.lineAt(head);
+    const line = state.doc.lineAt(head);
     if (!/\S/.test(line.text) && head === line.from) {
       snippets.codeblock(target, null, line.from, line.to);
       return true;
@@ -3184,7 +3288,7 @@ var addCodeblock = (target) => {
   for (const { from, to } of selection.ranges) {
     let blockFrom = from;
     let blockTo = to;
-    syntaxTree2(state2).iterate({
+    syntaxTree2(state).iterate({
       from,
       to,
       enter: (node) => {
@@ -3193,8 +3297,8 @@ var addCodeblock = (target) => {
             blockFrom = node.from;
             blockTo = node.to;
           } else {
-            blockFrom = Math.min(blockFrom, state2.doc.lineAt(node.from).from);
-            blockTo = Math.max(blockTo, state2.doc.lineAt(node.to).to);
+            blockFrom = Math.min(blockFrom, state.doc.lineAt(node.from).from);
+            blockTo = Math.max(blockTo, state.doc.lineAt(node.to).to);
           }
         }
       }
@@ -3212,7 +3316,7 @@ var addCodeblock = (target) => {
     return false;
   }
   const changes = ranges.map(({ from, to }) => {
-    const column = from - state2.doc.lineAt(from).from;
+    const column = from - state.doc.lineAt(from).from;
     return [
       {
         from,
@@ -3224,30 +3328,30 @@ var addCodeblock = (target) => {
       }
     ];
   });
-  dispatch(state2.update({
+  dispatch(state.update({
     changes,
     userEvent: "format.codeblock.add",
     scrollIntoView: true
   }));
   return true;
 };
-var removeCodeblock = ({ state: state2, dispatch }) => {
+var removeCodeblock = ({ state, dispatch }) => {
   let lastBlock = -1;
   const changes = [];
-  for (const { from, to } of state2.selection.ranges) {
-    syntaxTree2(state2).iterate({
+  for (const { from, to } of state.selection.ranges) {
+    syntaxTree2(state).iterate({
       from,
       to,
       enter: (node) => {
         if (Textblocks[node.name] === "codeblock" && lastBlock !== node.from) {
           lastBlock = node.from;
-          const firstLine = state2.doc.lineAt(node.from);
+          const firstLine = state.doc.lineAt(node.from);
           if (node.name === "FencedCode") {
             changes.push({
               from: node.from,
               to: firstLine.to + 1 + node.from - firstLine.from
             });
-            const lastLine = state2.doc.lineAt(node.to);
+            const lastLine = state.doc.lineAt(node.to);
             if (/^([\s>]|[-*+] |\d+[).])*`+$/.test(lastLine.text)) {
               changes.push({
                 from: lastLine.from - (lastLine.number === firstLine.number + 1 ? 0 : 1),
@@ -3256,7 +3360,7 @@ var removeCodeblock = ({ state: state2, dispatch }) => {
             }
           } else {
             const column = node.from - firstLine.from;
-            for (let line = firstLine; ; line = state2.doc.line(line.number + 1)) {
+            for (let line = firstLine; ; line = state.doc.line(line.number + 1)) {
               changes.push({
                 from: line.from + column - 4,
                 to: line.from + column
@@ -3273,7 +3377,7 @@ var removeCodeblock = ({ state: state2, dispatch }) => {
   if (!changes.length) {
     return false;
   }
-  dispatch(state2.update({
+  dispatch(state.update({
     changes,
     userEvent: "format.codeblock.remove",
     scrollIntoView: true
@@ -3285,7 +3389,7 @@ var toggleCodeblock = (target) => {
 };
 var formattingKeymap = (_options = {}) => {
   return [
-    keymap6.of([
+    keymap7.of([
       {
         key: "meta-b",
         run: toggleStrong
@@ -3336,7 +3440,7 @@ var Textblocks = {
   TableCell: "tablecell",
   Task: "paragraph"
 };
-var getFormatting = (state2) => {
+var getFormatting = (state) => {
   let blockType = null;
   const inline = [
     null,
@@ -3345,7 +3449,7 @@ var getFormatting = (state2) => {
     null
   ];
   let link = false;
-  let blockQuote = null;
+  let blockQuote2 = null;
   let listStyle = null;
   const stack = [];
   let currentBlock = null;
@@ -3362,7 +3466,7 @@ var getFormatting = (state2) => {
         continue;
       } else if (currentBlock.active[i]) {
         inline[i] = true;
-      } else if (/\S/.test(state2.doc.sliceString(currentBlock.pos, upto))) {
+      } else if (/\S/.test(state.doc.sliceString(currentBlock.pos, upto))) {
         inline[i] = false;
       }
     }
@@ -3373,12 +3477,12 @@ var getFormatting = (state2) => {
       currentBlock.pos = Math.min(upto, currentBlock.end);
     }
   };
-  const { selection } = state2;
+  const { selection } = state;
   for (const range of selection.ranges) {
     if (range.empty && inline.some((v) => v === null)) {
       const contextSize = Math.min(range.head, 6);
-      const contextBefore = state2.doc.sliceString(range.head - contextSize, range.head);
-      let contextAfter = state2.doc.sliceString(range.head, range.head + contextSize);
+      const contextBefore = state.doc.sliceString(range.head - contextSize, range.head);
+      let contextAfter = state.doc.sliceString(range.head, range.head + contextSize);
       for (let i = 0; i < contextSize; i++) {
         const ch = contextAfter[i];
         if (ch !== contextBefore[contextBefore.length - 1 - i] || !/[~`*]/.test(ch)) {
@@ -3397,7 +3501,7 @@ var getFormatting = (state2) => {
         }
       }
     }
-    syntaxTree2(state2).iterate({
+    syntaxTree2(state).iterate({
       from: range.from,
       to: range.to,
       enter: (node) => {
@@ -3454,10 +3558,10 @@ var getFormatting = (state2) => {
               hasList = stack[i] === "TaskList" ? "task" : stack[i] === "BulletList" ? "bullet" : "ordered";
             }
           }
-          if (blockQuote === null) {
-            blockQuote = hasQuote;
-          } else if (!hasQuote && blockQuote) {
-            blockQuote = false;
+          if (blockQuote2 === null) {
+            blockQuote2 = hasQuote;
+          } else if (!hasQuote && blockQuote2) {
+            blockQuote2 = false;
           }
           if (listStyle === null) {
             listStyle = hasList;
@@ -3471,12 +3575,12 @@ var getFormatting = (state2) => {
       }
     });
   }
-  const { from, to } = state2.doc.lineAt(selection.main.anchor);
+  const { from, to } = state.doc.lineAt(selection.main.anchor);
   const blankLine = from === to;
   return {
     blankLine,
     blockType: blockType || null,
-    blockQuote: blockQuote ?? false,
+    blockQuote: blockQuote2 ?? false,
     code: inline[3] ?? false,
     emphasis: inline[1] ?? false,
     strong: inline[0] ?? false,
@@ -3486,8 +3590,8 @@ var getFormatting = (state2) => {
   };
 };
 var useFormattingState = () => {
-  const [state2, setState] = useState2();
-  const observer = useMemo2(() => EditorView12.updateListener.of((update2) => {
+  const [state, setState] = useState2();
+  const observer = useMemo2(() => EditorView14.updateListener.of((update2) => {
     if (update2.docChanged || update2.selectionSet) {
       setState((prevState) => {
         const newState = getFormatting(update2.state);
@@ -3499,7 +3603,7 @@ var useFormattingState = () => {
     }
   }), []);
   return [
-    state2,
+    state,
     observer
   ];
 };
@@ -3560,7 +3664,7 @@ import { markdownLanguage as markdownLanguage3, markdown } from "@codemirror/lan
 import { syntaxHighlighting as syntaxHighlighting2 } from "@codemirror/language";
 import { languages } from "@codemirror/language-data";
 import { lintKeymap } from "@codemirror/lint";
-import { keymap as keymap7 } from "@codemirror/view";
+import { keymap as keymap8 } from "@codemirror/view";
 
 // packages/ui/react-ui-editor/src/extensions/markdown/highlight.ts
 import { markdownLanguage as markdownLanguage2 } from "@codemirror/lang-markdown";
@@ -3727,12 +3831,6 @@ var markdownHighlightStyle = (_options = {}) => {
       ],
       class: theme.code
     },
-    {
-      tag: [
-        markdownTags.QuoteMark
-      ],
-      class: theme.blockquote
-    },
     {
       tag: [
         markdownTags.TableCell
@@ -3772,7 +3870,7 @@ var createMarkdownExtensions = ({ themeMode } = {}) => {
     }),
     // Custom styles.
     syntaxHighlighting2(markdownHighlightStyle()),
-    keymap7.of([
+    keymap8.of([
       // https://codemirror.net/docs/ref/#commands.indentWithTab
       indentWithTab2,
       // https://codemirror.net/docs/ref/#commands.defaultKeymap
@@ -3785,18 +3883,18 @@ var createMarkdownExtensions = ({ themeMode } = {}) => {
 
 // packages/ui/react-ui-editor/src/extensions/markdown/debug.ts
 import { syntaxTree as syntaxTree3 } from "@codemirror/language";
-import { StateField as StateField6 } from "@codemirror/state";
-var debugTree = (cb) => StateField6.define({
-  create: (state2) => cb(convertTreeToJson(state2)),
+import { StateField as StateField7 } from "@codemirror/state";
+var debugTree = (cb) => StateField7.define({
+  create: (state) => cb(convertTreeToJson(state)),
   update: (value, tr) => cb(convertTreeToJson(tr.state))
 });
-var convertTreeToJson = (state2) => {
+var convertTreeToJson = (state) => {
   const treeToJson = (cursor) => {
     const node = {
       type: cursor.type.name,
       from: cursor.from,
       to: cursor.to,
-      text: state2.doc.slice(cursor.from, cursor.to).toString(),
+      text: state.doc.slice(cursor.from, cursor.to).toString(),
       children: []
     };
     if (cursor.firstChild()) {
@@ -3807,19 +3905,19 @@ var convertTreeToJson = (state2) => {
     }
     return node;
   };
-  return treeToJson(syntaxTree3(state2).cursor());
+  return treeToJson(syntaxTree3(state).cursor());
 };
 
 // packages/ui/react-ui-editor/src/extensions/markdown/decorate.ts
 import { syntaxTree as syntaxTree7 } from "@codemirror/language";
-import { RangeSetBuilder as RangeSetBuilder3, StateEffect as StateEffect4 } from "@codemirror/state";
-import { EditorView as EditorView16, Decoration as Decoration7, WidgetType as WidgetType5, ViewPlugin as ViewPlugin6 } from "@codemirror/view";
+import { RangeSetBuilder as RangeSetBuilder3, StateEffect as StateEffect5 } from "@codemirror/state";
+import { EditorView as EditorView18, Decoration as Decoration7, WidgetType as WidgetType5, ViewPlugin as ViewPlugin6 } from "@codemirror/view";
 import { invariant as invariant4 } from "@dxos/invariant";
 import { mx as mx2 } from "@dxos/react-ui-theme";
 
 // packages/ui/react-ui-editor/src/extensions/markdown/changes.ts
 import { syntaxTree as syntaxTree4 } from "@codemirror/language";
-import { Transaction } from "@codemirror/state";
+import { Transaction as Transaction2 } from "@codemirror/state";
 import { ViewPlugin as ViewPlugin5 } from "@codemirror/view";
 var adjustChanges = () => {
   return ViewPlugin5.fromClass(class {
@@ -3827,7 +3925,7 @@ var adjustChanges = () => {
       const tree = syntaxTree4(update2.state);
       const adjustments = [];
       for (const tr of update2.transactions) {
-        const event = tr.annotation(Transaction.userEvent);
+        const event = tr.annotation(Transaction2.userEvent);
         switch (event) {
           //
           // Enter
@@ -3963,36 +4061,38 @@ var getValidUrl = (str) => {
 
 // packages/ui/react-ui-editor/src/extensions/markdown/image.ts
 import { syntaxTree as syntaxTree5 } from "@codemirror/language";
-import { StateField as StateField7 } from "@codemirror/state";
-import { Decoration as Decoration5, EditorView as EditorView13, WidgetType as WidgetType3 } from "@codemirror/view";
+import { StateField as StateField8 } from "@codemirror/state";
+import { Decoration as Decoration5, EditorView as EditorView15, WidgetType as WidgetType3 } from "@codemirror/view";
 var image = (_options = {}) => {
-  return StateField7.define({
-    create: (state2) => {
-      return Decoration5.set(buildDecorations(0, state2.doc.length, state2));
-    },
-    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) => EditorView13.decorations.from(field)
-  });
+  return [
+    StateField8.define({
+      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) => EditorView15.decorations.from(field)
+    })
+  ];
 };
 var preloaded = /* @__PURE__ */ new Set();
 var preloadImage = (url) => {
@@ -4002,16 +4102,19 @@ var preloadImage = (url) => {
     preloaded.add(url);
   }
 };
-var buildDecorations = (from, to, state2) => {
+var buildDecorations = (from, to, state) => {
   const decorations = [];
-  const cursor = state2.selection.main.head;
-  syntaxTree5(state2).iterate({
+  const cursor = state.selection.main.head;
+  syntaxTree5(state).iterate({
     enter: (node) => {
       if (node.name === "Image") {
         const urlNode = node.node.getChild("URL");
         if (urlNode) {
-          const hide2 = state2.readOnly || cursor < node.from || cursor > node.to;
-          const url = state2.sliceDoc(urlNode.from, urlNode.to);
+          const hide2 = state.readOnly || cursor < node.from || cursor > node.to || !state.field(focusField);
+          const url = state.sliceDoc(urlNode.from, urlNode.to);
+          if (url.match(/^https?:\/\//) === null && url.match(/^file?:\/\//) === null) {
+            return;
+          }
           preloadImage(url);
           decorations.push(Decoration5.replace({
             block: true,
@@ -4037,18 +4140,20 @@ var ImageWidget = class extends WidgetType3 {
     const img = document.createElement("img");
     img.setAttribute("src", this._url);
     img.setAttribute("class", "cm-image");
-    img.onload = () => img.classList.add("cm-loaded-image");
+    if (view.state.field(focusField)) {
+      img.onload = () => img.classList.add("cm-loaded-image");
+    } else {
+      img.classList.add("cm-loaded-image");
+    }
     return img;
   }
 };
-var imageUpload = (options = {}) => {
-};
 
 // packages/ui/react-ui-editor/src/extensions/markdown/styles.ts
-import { EditorView as EditorView14 } from "@codemirror/view";
+import { EditorView as EditorView16 } from "@codemirror/view";
 var bulletListIndentationWidth = 24;
 var orderedListIndentationWidth = 36;
-var formattingStyles = EditorView14.theme({
+var formattingStyles = EditorView16.theme({
   /**
   * Horizontal rule.
   */
@@ -4077,6 +4182,15 @@ var formattingStyles = EditorView14.theme({
     width: `${orderedListIndentationWidth}px`
   },
   /**
+  * Blockquote.
+  */
+  "& .cm-blockquote": {
+    background: "var(--dx-cmCodeblock)",
+    borderLeft: "2px solid var(--dx-cmSeparator)",
+    paddingLeft: "1rem",
+    margin: "0"
+  },
+  /**
   * Code and codeblocks.
   */
   "& .cm-code": {
@@ -4138,25 +4252,25 @@ var formattingStyles = EditorView14.theme({
 
 // packages/ui/react-ui-editor/src/extensions/markdown/table.ts
 import { syntaxTree as syntaxTree6 } from "@codemirror/language";
-import { RangeSetBuilder as RangeSetBuilder2, StateField as StateField8 } from "@codemirror/state";
-import { Decoration as Decoration6, EditorView as EditorView15, WidgetType as WidgetType4 } from "@codemirror/view";
+import { RangeSetBuilder as RangeSetBuilder2, StateField as StateField9 } from "@codemirror/state";
+import { Decoration as Decoration6, EditorView as EditorView17, WidgetType as WidgetType4 } from "@codemirror/view";
 var table = (options = {}) => {
-  return StateField8.define({
-    create: (state2) => update(state2, options),
+  return StateField9.define({
+    create: (state) => update(state, options),
     update: (_, tr) => update(tr.state, options),
-    provide: (field) => EditorView15.decorations.from(field)
+    provide: (field) => EditorView17.decorations.from(field)
   });
 };
-var update = (state2, _options) => {
+var update = (state, _options) => {
   const builder = new RangeSetBuilder2();
-  const cursor = state2.selection.main.head;
+  const cursor = state.selection.main.head;
   const tables = [];
   const getTable = () => tables[tables.length - 1];
   const getRow = () => {
     const table2 = getTable();
     return table2.rows?.[table2.rows.length - 1];
   };
-  syntaxTree6(state2).iterate({
+  syntaxTree6(state).iterate({
     enter: (node) => {
       switch (node.name) {
         case "Table": {
@@ -4177,9 +4291,9 @@ var update = (state2, _options) => {
         case "TableCell": {
           const row = getRow();
           if (row) {
-            row.push(state2.sliceDoc(node.from, node.to));
+            row.push(state.sliceDoc(node.from, node.to));
           } else {
-            getTable().header?.push(state2.sliceDoc(node.from, node.to));
+            getTable().header?.push(state.sliceDoc(node.from, node.to));
           }
           break;
         }
@@ -4187,7 +4301,7 @@ var update = (state2, _options) => {
     }
   });
   tables.forEach((table2) => {
-    const replace = state2.readOnly || cursor < table2.from || cursor > table2.to;
+    const replace = state.readOnly || cursor < table2.from || cursor > table2.to;
     if (replace) {
       builder.add(table2.from, table2.to, Decoration6.replace({
         block: true,
@@ -4236,7 +4350,7 @@ var TableWidget = class extends WidgetType4 {
 };
 
 // packages/ui/react-ui-editor/src/extensions/markdown/decorate.ts
-var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/markdown/decorate.ts";
+var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/markdown/decorate.ts";
 var Unicode = {
   emDash: "\u2014",
   bullet: "\u2022",
@@ -4259,6 +4373,7 @@ var LinkButton = class extends WidgetType5 {
   eq(other) {
     return this.url === other.url;
   }
+  // TODO(burdon): Create icon and link directly without react?
   toDOM(view) {
     const el = document.createElement("span");
     this.render(el, this.url);
@@ -4326,6 +4441,9 @@ var TextWidget = class extends WidgetType5 {
   }
 };
 var hide = Decoration7.replace({});
+var blockQuote = Decoration7.line({
+  class: mx2("cm-blockquote")
+});
 var fencedCodeLine = Decoration7.line({
   class: mx2("cm-code cm-codeblock-line")
 });
@@ -4347,9 +4465,9 @@ var checkedTask = Decoration7.replace({
 var uncheckedTask = Decoration7.replace({
   widget: new CheckboxWidget(false)
 });
-var editingRange = (state2, range, focus) => {
-  const { readOnly, selection: { main: { head } } } = state2;
-  return focus && !readOnly && head >= range.from && head <= range.to;
+var editingRange = (state, range, focus2) => {
+  const { readOnly, selection: { main: { head } } } = state;
+  return focus2 && !readOnly && head >= range.from && head <= range.to;
 };
 var autoHideTags = /* @__PURE__ */ new Set([
   "CodeMark",
@@ -4359,15 +4477,15 @@ var autoHideTags = /* @__PURE__ */ new Set([
   "SubscriptMark",
   "SuperscriptMark"
 ]);
-var buildDecorations2 = (view, options, focus) => {
+var buildDecorations2 = (view, options, focus2) => {
   const deco = new RangeSetBuilder3();
   const atomicDeco = new RangeSetBuilder3();
-  const { state: state2 } = view;
+  const { state } = view;
   const headerLevels = [];
   const getHeaderLevels = (node, level) => {
     invariant4(level > 0, void 0, {
-      F: __dxlog_file10,
-      L: 176,
+      F: __dxlog_file9,
+      L: 178,
       S: void 0,
       A: [
         "level > 0",
@@ -4405,8 +4523,8 @@ var buildDecorations2 = (view, options, focus) => {
   };
   const getCurrentListLevel = () => {
     invariant4(listLevels.length, void 0, {
-      F: __dxlog_file10,
-      L: 198,
+      F: __dxlog_file9,
+      L: 200,
       S: void 0,
       A: [
         "listLevels.length",
@@ -4431,7 +4549,7 @@ var buildDecorations2 = (view, options, focus) => {
         if (options.numberedHeadings?.from !== void 0) {
           headers[level - 1].number++;
         }
-        const editing = editingRange(state2, node, focus);
+        const editing = editingRange(state, node, focus2);
         if (editing) {
           break;
         }
@@ -4463,7 +4581,7 @@ var buildDecorations2 = (view, options, focus) => {
         break;
       }
       case "ListItem": {
-        const line = state2.doc.lineAt(node.from);
+        const line = state.doc.lineAt(node.from);
         const list = getCurrentListLevel();
         const width = list.type === "OrderedList" ? orderedListIndentationWidth : bulletListIndentationWidth;
         const offset = ((list.level ?? 0) + 1) * width;
@@ -4485,23 +4603,46 @@ var buildDecorations2 = (view, options, focus) => {
           break;
         }
         const label = list.type === "OrderedList" ? `${++list.number}.` : Unicode.bulletSmall;
-        const line = state2.doc.lineAt(node.from);
-        const to = state2.doc.sliceString(node.to, node.to + 1) === " " ? node.to + 1 : node.to;
+        const line = state.doc.lineAt(node.from);
+        const to = state.doc.sliceString(node.to, node.to + 1) === " " ? node.to + 1 : node.to;
         atomicDeco.add(line.from, to, Decoration7.replace({
           widget: new TextWidget(label, list.type === "OrderedList" ? "cm-list-mark cm-list-mark-ordered" : "cm-list-mark cm-list-mark-bullet")
         }));
         break;
       }
       case "TaskMarker": {
-        const checked = state2.doc.sliceString(node.from + 1, node.to - 1) === "x";
-        const line = state2.doc.lineAt(node.from);
-        const to = state2.doc.sliceString(node.to, node.to + 1) === " " ? node.to + 1 : node.to;
+        const checked = state.doc.sliceString(node.from + 1, node.to - 1) === "x";
+        const line = state.doc.lineAt(node.from);
+        const to = state.doc.sliceString(node.to, node.to + 1) === " " ? node.to + 1 : node.to;
         atomicDeco.add(line.from, to, checked ? checkedTask : uncheckedTask);
         break;
       }
+      //
+      // Blockquote > QuoteMark > Paragraph
+      //
+      case "Blockquote": {
+        const editing = editingRange(state, node, focus2);
+        const quoteMark = node.node.getChild("QuoteMark");
+        const paragraph = node.node.getChild("Paragraph");
+        if (!editing && quoteMark && paragraph) {
+          atomicDeco.add(quoteMark.from, paragraph.from, hide);
+        }
+        for (const block of view.viewportLineBlocks) {
+          if (block.to < node.from) {
+            continue;
+          }
+          if (block.from > node.to) {
+            break;
+          }
+          deco.add(block.from, block.from, blockQuote);
+        }
+        break;
+      }
+      //
       // CommentBlock
+      //
       case "CommentBlock": {
-        const editing = editingRange(state2, node, focus);
+        const editing = editingRange(state, node, focus2);
         for (const block of view.viewportLineBlocks) {
           if (block.to < node.from) {
             continue;
@@ -4509,16 +4650,18 @@ var buildDecorations2 = (view, options, focus) => {
           if (block.from > node.to) {
             break;
           }
-          const first = block.from <= node.from;
-          const last = block.to >= node.to && /^(\s>)*-->$/.test(state2.doc.sliceString(block.from, block.to));
-          deco.add(block.from, block.from, first ? commentBlockLineFirst : last ? commentBlockLineLast : commentBlockLine);
-          if (!editing && (first || last)) {
+          const isFirst = block.from <= node.from;
+          const isLast = block.to >= node.to && /^(\s>)*-->$/.test(state.doc.sliceString(block.from, block.to));
+          deco.add(block.from, block.from, isFirst ? commentBlockLineFirst : isLast ? commentBlockLineLast : commentBlockLine);
+          if (!editing && (isFirst || isLast)) {
             atomicDeco.add(block.from, block.to, hide);
           }
         }
         break;
       }
+      //
       // FencedCode > CodeMark > [CodeInfo] > CodeText > CodeMark
+      //
       case "FencedCode": {
         for (const block of view.viewportLineBlocks) {
           if (block.to < node.from) {
@@ -4528,22 +4671,24 @@ var buildDecorations2 = (view, options, focus) => {
             break;
           }
           const first = block.from <= node.from;
-          const last = block.to >= node.to && /^(\s>)*```$/.test(state2.doc.sliceString(block.from, block.to));
+          const last = block.to >= node.to && /^(\s>)*```$/.test(state.doc.sliceString(block.from, block.to));
           deco.add(block.from, block.from, first ? fencedCodeLineFirst : last ? fencedCodeLineLast : fencedCodeLine);
-          const editing = editingRange(state2, node, focus);
+          const editing = editingRange(state, node, focus2);
           if (!editing && (first || last)) {
             atomicDeco.add(block.from, block.to, hide);
           }
         }
         return false;
       }
+      //
       // Link > [LinkMark, URL]
+      //
       case "Link": {
         const marks = node.node.getChildren("LinkMark");
         const urlNode = node.node.getChild("URL");
-        const editing = editingRange(state2, node, focus);
+        const editing = editingRange(state, node, focus2);
         if (urlNode && marks.length >= 2) {
-          const url = state2.sliceDoc(urlNode.from, urlNode.to);
+          const url = state.sliceDoc(urlNode.from, urlNode.to);
           if (!editing) {
             atomicDeco.add(node.from, marks[0].to, hide);
           }
@@ -4564,16 +4709,18 @@ var buildDecorations2 = (view, options, focus) => {
         }
         break;
       }
+      //
       // HR
+      //
       case "HorizontalRule": {
-        if (!editingRange(state2, node, focus)) {
+        if (!editingRange(state, node, focus2)) {
           deco.add(node.from, node.to, horizontalRule);
         }
         break;
       }
       default: {
         if (autoHideTags.has(node.name)) {
-          if (!editingRange(state2, node.node.parent, focus)) {
+          if (!editingRange(state, node.node.parent, focus2)) {
             atomicDeco.add(node.from, node.to, hide);
           }
         }
@@ -4589,7 +4736,7 @@ var buildDecorations2 = (view, options, focus) => {
       }
     }
   };
-  const tree = syntaxTree7(state2);
+  const tree = syntaxTree7(state);
   if (options.numberedHeadings?.from === void 0) {
     for (const { from, to } of view.visibleRanges) {
       tree.iterate({
@@ -4610,7 +4757,7 @@ var buildDecorations2 = (view, options, focus) => {
     atomicDeco: atomicDeco.finish()
   };
 };
-var forceUpdate = StateEffect4.define();
+var forceUpdate = StateEffect5.define();
 var decorateMarkdown = (options = {}) => {
   return [
     ViewPlugin6.fromClass(class {
@@ -4645,9 +4792,9 @@ var decorateMarkdown = (options = {}) => {
       }
     }, {
       provide: (plugin) => [
-        EditorView16.atomicRanges.of((view) => view.plugin(plugin)?.atomicDeco ?? Decoration7.none),
-        EditorView16.decorations.of((view) => view.plugin(plugin)?.atomicDeco ?? Decoration7.none),
-        EditorView16.decorations.of((view) => view.plugin(plugin)?.deco ?? Decoration7.none)
+        EditorView18.atomicRanges.of((view) => view.plugin(plugin)?.atomicDeco ?? Decoration7.none),
+        EditorView18.decorations.of((view) => view.plugin(plugin)?.atomicDeco ?? Decoration7.none),
+        EditorView18.decorations.of((view) => view.plugin(plugin)?.deco ?? Decoration7.none)
       ]
     }),
     image(),
@@ -4661,40 +4808,42 @@ var decorateMarkdown = (options = {}) => {
 import { syntaxTree as syntaxTree8 } from "@codemirror/language";
 import { hoverTooltip as hoverTooltip2 } from "@codemirror/view";
 import { tooltipContent } from "@dxos/react-ui-theme";
-var linkTooltip = (render) => hoverTooltip2((view, pos, side) => {
-  const syntax = syntaxTree8(view.state).resolveInner(pos, side);
-  let link = null;
-  for (let i = 0, node = syntax; !link && node && i < 5; node = node.parent, i++) {
-    link = node.name === "Link" ? node : null;
-  }
-  const url = link && link.getChild("URL");
-  if (!url || !link) {
-    return null;
-  }
-  const urlText = view.state.sliceDoc(url.from, url.to);
-  return {
-    pos: link.from,
-    end: link.to,
-    above: true,
-    create: () => {
-      const el = document.createElement("div");
-      el.className = tooltipContent({}, "pli-2 plb-1");
-      render(el, urlText);
-      return {
-        dom: el,
-        offset: {
-          x: 0,
-          y: 4
-        }
-      };
+var linkTooltip = (render) => {
+  return hoverTooltip2((view, pos, side) => {
+    const syntax = syntaxTree8(view.state).resolveInner(pos, side);
+    let link = null;
+    for (let i = 0, node = syntax; !link && node && i < 5; node = node.parent, i++) {
+      link = node.name === "Link" ? node : null;
     }
-  };
-});
+    const url = link && link.getChild("URL");
+    if (!url || !link) {
+      return null;
+    }
+    const urlText = view.state.sliceDoc(url.from, url.to);
+    return {
+      pos: link.from,
+      end: link.to,
+      above: true,
+      create: () => {
+        const el = document.createElement("div");
+        el.className = tooltipContent({}, "pli-2 plb-1");
+        render(el, urlText);
+        return {
+          dom: el,
+          offset: {
+            x: 0,
+            y: 4
+          }
+        };
+      }
+    };
+  });
+};
 
 // packages/ui/react-ui-editor/src/extensions/mention.ts
 import { autocompletion as autocompletion2 } from "@codemirror/autocomplete";
-import { log as log7 } from "@dxos/log";
-var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/mention.ts";
+import { log as log6 } from "@dxos/log";
+var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/mention.ts";
 var mention = ({ onSearch }) => {
   return autocompletion2({
     // TODO(burdon): Not working.
@@ -4706,10 +4855,10 @@ var mention = ({ onSearch }) => {
     icons: false,
     override: [
       (context) => {
-        log7.info("completion context", {
+        log6.info("completion context", {
           context
         }, {
-          F: __dxlog_file11,
+          F: __dxlog_file10,
           L: 26,
           S: void 0,
           C: (f, a) => f(...a)
@@ -4730,11 +4879,9 @@ var mention = ({ onSearch }) => {
 };
 
 // packages/ui/react-ui-editor/src/extensions/modes.ts
-import { Facet as Facet6 } from "@codemirror/state";
-import { keymap as keymap8 } from "@codemirror/view";
+import { keymap as keymap9 } from "@codemirror/view";
 import { vim } from "@replit/codemirror-vim";
 import { vscodeKeymap } from "@replit/codemirror-vscode-keymap";
-var focusEvent = "focus.container";
 var EditorViewModes = [
   "preview",
   "readonly",
@@ -4745,9 +4892,7 @@ var EditorInputModes = [
   "vim",
   "vscode"
 ];
-var editorInputMode = Facet6.define({
-  combine: (modes) => modes[0] ?? {}
-});
+var editorInputMode = singleValueFacet({});
 var InputModeExtensions = {
   default: [],
   vscode: [
@@ -4755,7 +4900,7 @@ var InputModeExtensions = {
     editorInputMode.of({
       type: "vscode"
     }),
-    keymap8.of(vscodeKeymap)
+    keymap9.of(vscodeKeymap)
   ],
   vim: [
     // https://github.com/replit/codemirror-vim
@@ -4764,13 +4909,11 @@ var InputModeExtensions = {
       type: "vim",
       noTabster: true
     }),
-    keymap8.of([
+    keymap9.of([
       {
         key: "Alt-Escape",
         run: (view) => {
-          view.dispatch({
-            userEvent: focusEvent
-          });
+          view.dom.parentElement?.focus();
           return true;
         }
       }
@@ -4778,99 +4921,6 @@ var InputModeExtensions = {
   ]
 };
 
-// packages/ui/react-ui-editor/src/extensions/state.ts
-import { Transaction as Transaction2 } from "@codemirror/state";
-import { EditorView as EditorView17, keymap as keymap9 } from "@codemirror/view";
-import { debounce as debounce2 } from "@dxos/async";
-import { invariant as invariant5 } from "@dxos/invariant";
-import { isNotFalsy as isNotFalsy3 } from "@dxos/util";
-var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/state.ts";
-var stateRestoreAnnotation = "dxos.org/cm/state-restore";
-var keyPrefix = "dxos.org/react-ui-editor/state";
-var localStorageStateStoreAdapter = {
-  getState: (id) => {
-    invariant5(id, void 0, {
-      F: __dxlog_file12,
-      L: 34,
-      S: void 0,
-      A: [
-        "id",
-        ""
-      ]
-    });
-    const state2 = localStorage.getItem(`${keyPrefix}/${id}`);
-    return state2 ? JSON.parse(state2) : void 0;
-  },
-  setState: (id, state2) => {
-    invariant5(id, void 0, {
-      F: __dxlog_file12,
-      L: 40,
-      S: void 0,
-      A: [
-        "id",
-        ""
-      ]
-    });
-    localStorage.setItem(`${keyPrefix}/${id}`, JSON.stringify(state2));
-  }
-};
-var createEditorStateTransaction = ({ scrollTo, selection }) => {
-  return {
-    selection,
-    scrollIntoView: !scrollTo,
-    effects: scrollTo ? EditorView17.scrollIntoView(scrollTo, {
-      yMargin: 96
-    }) : void 0,
-    annotations: Transaction2.userEvent.of(stateRestoreAnnotation)
-  };
-};
-var state = ({ getState, setState } = {}) => {
-  const setStateDebounced = debounce2(setState, 1e3);
-  return [
-    // TODO(burdon): Track scrolling (currently only updates when cursor moves).
-    // EditorView.domEventHandlers({
-    //   scroll: (event) => {
-    //     setStateDebounced(id, {});
-    //   },
-    // }),
-    EditorView17.updateListener.of(({ view, transactions }) => {
-      const id = view.state.facet(documentId2);
-      if (!id || transactions.some((tr) => tr.isUserEvent(stateRestoreAnnotation))) {
-        return;
-      }
-      if (setState) {
-        const { scrollTop } = view.scrollDOM;
-        const pos = view.posAtCoords({
-          x: 0,
-          y: scrollTop
-        });
-        if (pos !== null) {
-          const { anchor, head } = view.state.selection.main;
-          setStateDebounced(id, {
-            scrollTo: pos,
-            selection: {
-              anchor,
-              head
-            }
-          });
-        }
-      }
-    }),
-    getState && keymap9.of([
-      {
-        key: "ctrl-r",
-        run: (view) => {
-          const state2 = getState(view.state.facet(documentId2));
-          if (state2) {
-            view.dispatch(createEditorStateTransaction(state2));
-          }
-          return true;
-        }
-      }
-    ])
-  ].filter(isNotFalsy3);
-};
-
 // packages/ui/react-ui-editor/src/extensions/typewriter.ts
 import { keymap as keymap10 } from "@codemirror/view";
 var defaultItems = [
@@ -4929,7 +4979,7 @@ var typewriter = ({ delay = 75, items = defaultItems } = {}) => {
 };
 
 // packages/ui/react-ui-editor/src/components/Toolbar/Toolbar.tsx
-var iconStyles = getSize2(5);
+var iconStyles = getSize(5);
 var buttonStyles = "min-bs-0 p-2";
 var tooltipProps = {
   side: "top",
@@ -4940,12 +4990,10 @@ var ToolbarSeparator = () => /* @__PURE__ */ React3.createElement("div", {
   className: "grow"
 });
 var [ToolbarContextProvider, useToolbarContext] = createContext("Toolbar");
-var ToolbarRoot = ({ children, onAction, classNames, state: state2 }) => {
+var ToolbarRoot = ({ children, onAction, classNames, state }) => {
   return /* @__PURE__ */ React3.createElement(ToolbarContextProvider, {
     onAction,
-    state: state2
-  }, /* @__PURE__ */ React3.createElement(DensityProvider, {
-    density: "fine"
+    state
   }, /* @__PURE__ */ React3.createElement(ElevationProvider, {
     elevation: "chrome"
   }, /* @__PURE__ */ React3.createElement(NaturalToolbar.Root, {
@@ -4956,7 +5004,7 @@ var ToolbarRoot = ({ children, onAction, classNames, state: state2 }) => {
     style: {
       contain: "layout"
     }
-  }, children))));
+  }, children)));
 };
 var ToolbarToggleButton = ({ Icon: Icon2, children, ...props }) => {
   return /* @__PURE__ */ React3.createElement(Tooltip.Root, null, /* @__PURE__ */ React3.createElement(Tooltip.Trigger, {
@@ -4995,8 +5043,8 @@ var HeadingIcons = {
 };
 var MarkdownHeading = () => {
   const { t } = useTranslation(translationKey);
-  const { onAction, state: state2 } = useToolbarContext("MarkdownFormatting");
-  const blockType = state2 ? state2.blockType : "paragraph";
+  const { onAction, state } = useToolbarContext("MarkdownFormatting");
+  const blockType = state ? state.blockType : "paragraph";
   const header = blockType && /heading(\d)/.exec(blockType);
   const value = header ? header[1] : blockType === "paragraph" || !blockType ? "0" : void 0;
   const HeadingIcon = HeadingIcons[value ?? "0"];
@@ -5060,43 +5108,43 @@ var markdownStyles = [
   {
     type: "strong",
     Icon: TextB,
-    getState: (state2) => !!state2?.strong
+    getState: (state) => !!state?.strong
   },
   {
     type: "emphasis",
     Icon: TextItalic,
-    getState: (state2) => !!state2?.emphasis
+    getState: (state) => !!state?.emphasis
   },
   {
     type: "strikethrough",
     Icon: TextStrikethrough,
-    getState: (state2) => !!state2?.strikethrough
+    getState: (state) => !!state?.strikethrough
   },
   {
     type: "code",
     Icon: Code,
-    getState: (state2) => !!state2?.code
+    getState: (state) => !!state?.code
   },
   {
     type: "link",
     Icon: Link,
-    getState: (state2) => !!state2?.link
+    getState: (state) => !!state?.link
   }
 ];
 var MarkdownStyles = () => {
-  const { onAction, state: state2 } = useToolbarContext("MarkdownStyles");
+  const { onAction, state } = useToolbarContext("MarkdownStyles");
   const { t } = useTranslation(translationKey);
   return /* @__PURE__ */ React3.createElement(NaturalToolbar.ToggleGroup, {
     type: "multiple",
-    value: markdownStyles.filter(({ getState }) => state2 && getState(state2)).map(({ type }) => type)
+    value: markdownStyles.filter(({ getState }) => state && getState(state)).map(({ type }) => type)
   }, markdownStyles.map(({ type, getState, Icon: Icon2 }) => /* @__PURE__ */ React3.createElement(ToolbarToggleButton, {
     key: type,
     value: type,
     Icon: Icon2,
-    disabled: state2?.blockType === "codeblock",
-    onClick: state2 ? () => onAction?.({
+    disabled: state?.blockType === "codeblock",
+    onClick: state ? () => onAction?.({
       type,
-      data: !getState(state2)
+      data: !getState(state)
     }) : void 0
   }, t(`${type} label`))));
 };
@@ -5104,32 +5152,32 @@ var markdownLists = [
   {
     type: "list-bullet",
     Icon: ListBullets,
-    getState: (state2) => state2.listStyle === "bullet"
+    getState: (state) => state.listStyle === "bullet"
   },
   {
     type: "list-ordered",
     Icon: ListNumbers,
-    getState: (state2) => state2.listStyle === "ordered"
+    getState: (state) => state.listStyle === "ordered"
   },
   {
     type: "list-task",
     Icon: ListChecks,
-    getState: (state2) => state2.listStyle === "task"
+    getState: (state) => state.listStyle === "task"
   }
 ];
 var MarkdownLists = () => {
-  const { onAction, state: state2 } = useToolbarContext("MarkdownStyles");
+  const { onAction, state } = useToolbarContext("MarkdownStyles");
   const { t } = useTranslation(translationKey);
   return /* @__PURE__ */ React3.createElement(NaturalToolbar.ToggleGroup, {
     type: "single",
-    value: state2?.listStyle ? `list-${state2.listStyle}` : ""
+    value: state?.listStyle ? `list-${state.listStyle}` : ""
   }, markdownLists.map(({ type, getState, Icon: Icon2 }) => /* @__PURE__ */ React3.createElement(ToolbarToggleButton, {
     key: type,
     value: type,
     Icon: Icon2,
-    onClick: state2 ? () => onAction?.({
+    onClick: state ? () => onAction?.({
       type,
-      data: !getState(state2)
+      data: !getState(state)
     }) : void 0
   }, t(`${type} label`))));
 };
@@ -5137,24 +5185,24 @@ var markdownBlocks = [
   {
     type: "blockquote",
     Icon: Quotes,
-    getState: (state2) => !!state2?.blockQuote
+    getState: (state) => !!state?.blockQuote
   },
   {
     type: "codeblock",
     Icon: CodeBlock,
-    getState: (state2) => state2.blockType === "codeblock"
+    getState: (state) => state.blockType === "codeblock"
   },
   {
     type: "table",
     Icon: Table2,
-    getState: (state2) => state2.blockType === "tablecell",
-    disabled: (state2) => !state2.blankLine
+    getState: (state) => state.blockType === "tablecell",
+    disabled: (state) => !state.blankLine
   }
 ];
 var MarkdownBlocks = () => {
-  const { onAction, state: state2 } = useToolbarContext("MarkdownStyles");
+  const { onAction, state } = useToolbarContext("MarkdownStyles");
   const { t } = useTranslation(translationKey);
-  const value = markdownBlocks.find(({ getState }) => state2 && getState(state2));
+  const value = markdownBlocks.find(({ getState }) => state && getState(state));
   return /* @__PURE__ */ React3.createElement(NaturalToolbar.ToggleGroup, {
     type: "single",
     value: value?.type ?? ""
@@ -5162,10 +5210,10 @@ var MarkdownBlocks = () => {
     key: type,
     value: type,
     Icon: Icon2,
-    disabled: !state2 || disabled?.(state2),
-    onClick: state2 ? () => onAction?.({
+    disabled: !state || disabled?.(state),
+    onClick: state ? () => onAction?.({
       type,
-      data: !getState(state2)
+      data: !getState(state)
     }) : void 0
   }, t(`${type} label`))));
 };
@@ -5278,12 +5326,12 @@ var MarkdownView = ({ mode }) => {
   })), /* @__PURE__ */ React3.createElement(DropdownMenu.Arrow, null)))), /* @__PURE__ */ React3.createElement(Tooltip.Portal, null, /* @__PURE__ */ React3.createElement(Tooltip.Content, tooltipProps, t("view mode label"), /* @__PURE__ */ React3.createElement(Tooltip.Arrow, null))));
 };
 var MarkdownActions = () => {
-  const { onAction, state: state2 } = useToolbarContext("MarkdownActions");
+  const { onAction, state } = useToolbarContext("MarkdownActions");
   const { t } = useTranslation(translationKey);
   let commentToolTipKey = "comment label";
-  if (state2?.comment) {
+  if (state?.comment) {
     commentToolTipKey = "selection overlaps existing comment label";
-  } else if (state2?.selection === false) {
+  } else if (state?.selection === false) {
     commentToolTipKey = "select text to comment label";
   }
   return /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(ToolbarButton, {
@@ -5299,7 +5347,7 @@ var MarkdownActions = () => {
     onClick: () => onAction?.({
       type: "comment"
     }),
-    disabled: !state2 || state2.comment || !state2.selection
+    disabled: !state || state.comment || !state.selection
   }, t(commentToolTipKey)));
 };
 var Toolbar = {
@@ -5313,20 +5361,20 @@ var Toolbar = {
 };
 
 // packages/ui/react-ui-editor/src/defaults.ts
-import { EditorView as EditorView18 } from "@codemirror/view";
+import { EditorView as EditorView19 } from "@codemirror/view";
 import { mx as mx3 } from "@dxos/react-ui-theme";
 var margin = "!mt-[1rem]";
 var editorContent = mx3(margin, "!mli-auto w-full max-w-[min(50rem,100%-2rem)]");
 var editorFullWidth = mx3(margin);
 var editorWithToolbarLayout = "grid grid-cols-1 grid-rows-[min-content_1fr] data-[toolbar=disabled]:grid-rows-[1fr] justify-center content-start overflow-hidden";
-var editorGutter = EditorView18.theme({
+var editorGutter = EditorView19.theme({
   // Match margin from content.
   ".cm-gutters": {
     marginTop: "16px",
     paddingRight: "1rem"
   }
 });
-var editorMonospace = EditorView18.theme({
+var editorMonospace = EditorView19.theme({
   ".cm-content": {
     fontFamily: fontMono
   }
@@ -5339,29 +5387,28 @@ var useActionHandler = (view) => {
 
 // packages/ui/react-ui-editor/src/hooks/useTextEditor.ts
 import { EditorState as EditorState2 } from "@codemirror/state";
-import { EditorView as EditorView19 } from "@codemirror/view";
+import { EditorView as EditorView20 } from "@codemirror/view";
 import { useFocusableGroup } from "@fluentui/react-tabster";
 import { useCallback, useEffect as useEffect3, useMemo as useMemo3, useRef as useRef2, useState as useState4 } from "react";
-import { log as log8 } from "@dxos/log";
+import { log as log7 } from "@dxos/log";
 import { getProviderValue, isNotFalsy as isNotFalsy4 } from "@dxos/util";
-var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/hooks/useTextEditor.ts";
+var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/hooks/useTextEditor.ts";
 var instanceCount = 0;
 var useTextEditor = (props = {}, deps = []) => {
   const { id, initialValue, extensions, autoFocus, scrollTo, selection, moveToEndOfLine, debug } = useMemo3(() => getProviderValue(props), deps ?? []);
   const [instanceId] = useState4(() => `text-editor-${++instanceCount}`);
-  const onUpdate = useRef2();
   const [view, setView] = useState4();
   const parentRef = useRef2(null);
   useEffect3(() => {
     let view2;
     if (parentRef.current) {
-      log8("create", {
+      log7("create", {
         id,
         instanceId,
         doc: initialValue?.length ?? 0
       }, {
-        F: __dxlog_file13,
-        L: 76,
+        F: __dxlog_file11,
+        L: 75,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -5377,56 +5424,48 @@ var useTextEditor = (props = {}, deps = []) => {
           anchor
         };
       }
-      const state2 = EditorState2.create({
+      const state = EditorState2.create({
         doc: initialValue,
-        selection: initialSelection,
+        // selection: initialSelection,
         extensions: [
-          id && documentId2.of(id),
-          // NOTE: Doesn't catch errors in keymap functions.
-          EditorView19.exceptionSink.of((err) => {
-            log8.catch(err, void 0, {
-              F: __dxlog_file13,
-              L: 98,
+          id && documentId.of(id),
+          extensions,
+          // NOTE: This doesn't catch errors in keymap functions.
+          EditorView20.exceptionSink.of((err) => {
+            log7.catch(err, void 0, {
+              F: __dxlog_file11,
+              L: 97,
               S: void 0,
               C: (f, a) => f(...a)
             });
-          }),
-          extensions,
-          EditorView19.updateListener.of(() => {
-            setTimeout(() => {
-              onUpdate.current?.();
-            });
           })
         ].filter(isNotFalsy4)
       });
-      view2 = new EditorView19({
+      view2 = new EditorView20({
         parent: parentRef.current,
-        selection: initialSelection,
-        state: state2,
-        // NOTE: Uncomment to debug/monitor all transactions.
-        // https://codemirror.net/docs/ref/#view.EditorView.dispatch
-        dispatchTransactions: (trs, view3) => {
-          if (debug) {
-            logChanges(trs);
-          }
-          view3.update(trs);
-        }
+        state,
+        scrollTo: scrollTo ? EditorView20.scrollIntoView(scrollTo, {
+          yMargin: 96
+        }) : void 0,
+        dispatchTransactions: debug ? debugDispatcher : void 0
       });
-      if (!initialValue && moveToEndOfLine) {
+      if (moveToEndOfLine && !initialSelection) {
         const { to } = view2.state.doc.lineAt(0);
-        view2.dispatch({
-          selection: {
-            anchor: to
-          }
-        });
+        if (to) {
+          view2.dispatch({
+            selection: {
+              anchor: to
+            }
+          });
+        }
       }
       setView(view2);
     }
     return () => {
-      log8("destroy", {
+      log7("destroy", {
         id
       }, {
-        F: __dxlog_file13,
+        F: __dxlog_file11,
         L: 134,
         S: void 0,
         C: (f, a) => f(...a)
@@ -5436,21 +5475,30 @@ var useTextEditor = (props = {}, deps = []) => {
   }, deps);
   useEffect3(() => {
     if (view) {
-      onUpdate.current = () => {
-        onUpdate.current = void 0;
+      if (scrollTo || selection) {
+        if (selection && selection.anchor > view.state.doc.length) {
+          log7.warn("invalid selection", {
+            length: view.state.doc.length,
+            scrollTo,
+            selection
+          }, {
+            F: __dxlog_file11,
+            L: 143,
+            S: void 0,
+            C: (f, a) => f(...a)
+          });
+          return;
+        }
         view.dispatch(createEditorStateTransaction({
           scrollTo,
           selection
         }));
-      };
-      if (view.state.facet(editorInputMode).noTabster) {
-        parentRef.current?.removeAttribute("data-tabster");
       }
     }
   }, [
     view,
-    selection,
-    scrollTo
+    scrollTo,
+    selection
   ]);
   useEffect3(() => {
     if (view && autoFocus) {
@@ -5461,7 +5509,10 @@ var useTextEditor = (props = {}, deps = []) => {
     view
   ]);
   const focusableGroup = useFocusableGroup({
-    tabBehavior: "limited"
+    tabBehavior: "limited",
+    ignoreDefaultKeydown: {
+      Escape: view?.state.facet(editorInputMode).noTabster
+    }
   });
   const handleKeyUp = useCallback((event) => {
     const { key, target, currentTarget } = event;
@@ -5510,6 +5561,7 @@ export {
   awarenessProvider,
   blast,
   callbackWrapper,
+  clientRectsFor,
   command,
   comments,
   commentsState,
@@ -5517,15 +5569,18 @@ export {
   createBasicExtensions,
   createComment,
   createDataExtensions,
+  createEditorStateStore,
   createEditorStateTransaction,
+  createElement,
   createExternalCommentSync,
   createMarkdownExtensions,
   createThemeExtensions,
+  debugDispatcher,
   debugNodeLogger,
   debugTree,
   decorateMarkdown,
   defaultOptions,
-  documentId2 as documentId,
+  documentId,
   dropFile,
   editorContent,
   editorFullWidth,
@@ -5533,23 +5588,24 @@ export {
   editorInputMode,
   editorMonospace,
   editorWithToolbarLayout,
-  focusEvent,
+  flattenRect,
+  focus,
+  focusField,
   folding,
   formattingEquals,
   formattingKeymap,
   getFormatting,
   image,
-  imageUpload,
   insertTable,
   keymap11 as keymap,
   linkTooltip,
   listener,
-  localStorageStateStoreAdapter,
   logChanges,
   markdownHighlightStyle,
   markdownTags,
   markdownTagsExtensions,
   mention,
+  overlap,
   preventNewline,
   processAction,
   removeBlockquote,
@@ -5557,16 +5613,19 @@ export {
   removeLink,
   removeList,
   removeStyle,
+  renderRoot,
   scrollThreadIntoView,
   selectionOverlapsComment,
+  selectionState,
   setBlockquote,
   setComments,
   setHeading,
   setSelection,
   setStyle,
-  state,
+  singleValueFacet,
   table,
   tags2 as tags,
+  textRange,
   toggleBlockquote,
   toggleCodeblock,
   toggleEmphasis,
@@ -5583,6 +5642,7 @@ export {
   useComments,
   useFormattingState,
   useTextEditor,
-  useToolbarContext
+  useToolbarContext,
+  wrapWithCatch
 };
 //# sourceMappingURL=index.mjs.map