@dxos/ui-editor 0.8.4-main.bc674ce → 0.8.4-main.d05673bc65

package/dist/lib/browser/index.mjs

@@ -13,17 +13,17 @@ import { TextKind } from "@dxos/protocols/proto/dxos/echo/model/text";
 
 // src/defaults.ts
 import { mx } from "@dxos/ui-theme";
-var editorWidth = "!mli-auto is-full max-is-[min(50rem,100%-4rem)]";
+var editorWidth = "!mx-auto w-full max-w-[min(50rem,100%-4rem)]";
 var editorSlots = {
   scroll: {
-    className: "pbs-2"
+    className: "pt-2"
   },
   content: {
     className: editorWidth
   }
 };
 var editorWithToolbarLayout = "grid grid-cols-1 grid-rows-[min-content_1fr] data-[toolbar=disabled]:grid-rows-[1fr] justify-center content-start overflow-hidden";
-var stackItemContentEditorClassNames = (role) => mx("p-0.5 dx-focus-ring-inset attention-surface data-[toolbar=disabled]:pbs-2", role === "section" ? "[&_.cm-scroller]:overflow-hidden [&_.cm-scroller]:min-bs-24" : "min-bs-0");
+var stackItemContentEditorClassNames = (role) => mx("dx-attention-surface p-0.5 dx-focus-ring-inset data-[toolbar=disabled]:pt-2", role === "section" ? "[&_.cm-scroller]:overflow-hidden [&_.cm-scroller]:min-h-24" : "dx-container overflow-hidden");
 
 // src/extensions/annotations.ts
 import { RangeSetBuilder } from "@codemirror/state";
@@ -58,7 +58,7 @@ var annotations = ({ match } = {}) => {
       ".cm-annotation": {
         textDecoration: "underline",
         textDecorationStyle: "wavy",
-        textDecorationColor: "var(--dx-errorText)"
+        textDecorationColor: "var(--color-error-text)"
       }
     })
   ];
@@ -501,192 +501,210 @@ var typeahead = ({ onComplete } = {}) => {
   ];
 };
 
-// src/extensions/autoscroll.ts
-import { StateEffect as StateEffect2 } from "@codemirror/state";
+// src/extensions/auto-scroll.ts
 import { EditorView as EditorView5, ViewPlugin as ViewPlugin6 } from "@codemirror/view";
-import { debounce } from "@dxos/async";
+import { addEventListener, combine, throttle } from "@dxos/async";
 import { Domino } from "@dxos/ui";
 
-// src/extensions/scrolling.ts
+// src/extensions/scroller.ts
 import { StateEffect } from "@codemirror/state";
 import { EditorView as EditorView4, ViewPlugin as ViewPlugin5 } from "@codemirror/view";
-var scrollToLineEffect = StateEffect.define();
-var smoothScroll = ({ offset = 0, position = "start" } = {}) => {
-  const scrollPlugin = ViewPlugin5.fromClass(class SmoothScrollPlugin {
+import { log as log2 } from "@dxos/log";
+var __dxlog_file2 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/scroller.ts";
+var scrollerLineEffect = StateEffect.define();
+var scrollerCrawlEffect = StateEffect.define();
+var scrollToLine = (view, options) => {
+  view.dispatch({
+    effects: scrollerLineEffect.of(options)
+  });
+};
+var scroller = ({ overScroll = 0 } = {}) => {
+  const scrollPlugin = ViewPlugin5.fromClass(class ScrollerPlugin {
     view;
+    crawler;
     constructor(view) {
       this.view = view;
+      this.crawler = createCrawler(this.view);
     }
     // No-op.
     destroy() {
+      this.crawler.cancel();
     }
-    /**
-    * Perform smooth scroll to the specified line.
-    */
-    scrollToLine(lineNumber, options) {
-      const { offset: animOffset = 0, position: animPosition, behavior } = options;
-      const doc = this.view.state.doc;
-      const scroller = this.view.scrollDOM;
-      const targetLine = Math.max(0, lineNumber - 1);
-      if (behavior === "instant") {
-        requestAnimationFrame(() => {
-          this.view.dispatch({
-            selection: {
-              anchor: doc.line(targetLine + 1).from
-            },
-            scrollIntoView: true
-          });
-        });
-        return;
-      }
-      if (targetLine >= doc.lines) {
-        const targetScrollTop2 = scroller.scrollHeight - scroller.clientHeight + (animOffset || 0);
-        this.animateScroll(scroller, targetScrollTop2);
-        return;
-      }
-      const lineStart = doc.line(targetLine + 1).from;
-      const coords = this.view.coordsAtPos(lineStart);
-      if (!coords) {
-        return;
-      }
-      const currentScrollTop = scroller.scrollTop;
-      const scrollerRect = scroller.getBoundingClientRect();
-      const maxScrollTop = scroller.scrollHeight - scroller.clientHeight;
-      let targetScrollTop;
-      if (animPosition === "end") {
-        targetScrollTop = currentScrollTop + coords.bottom - scrollerRect.bottom + animOffset;
+    cancel() {
+      this.crawler.cancel();
+    }
+    crawl(start = false) {
+      if (start) {
+        this.crawler.scroll();
       } else {
-        targetScrollTop = currentScrollTop + coords.top - scrollerRect.top + animOffset;
+        this.crawler.cancel();
       }
-      const clampedScrollTop = Math.max(0, Math.min(targetScrollTop, maxScrollTop));
-      this.animateScroll(scroller, clampedScrollTop);
     }
-    /**
-    * Animate scroll using browser's built-in smooth scrolling.
-    */
-    animateScroll(element, targetScrollTop) {
-      if (Math.abs(targetScrollTop - element.scrollTop) < 1) {
-        return;
+    scroll({ line, offset = 0, position, behavior = "instant" }) {
+      const { scrollTop, scrollHeight, clientHeight } = this.view.scrollDOM;
+      const scrollerRect = this.view.scrollDOM.getBoundingClientRect();
+      const doc = this.view.state.doc;
+      let targetScrollTop = scrollHeight - clientHeight + offset;
+      if (line >= 0 && line <= doc.lines - 1) {
+        const lineStart = doc.line(line + 1).from;
+        const coords = this.view.coordsAtPos(lineStart);
+        if (coords) {
+          const currentScrollTop = scrollTop;
+          const maxScrollTop = scrollHeight - clientHeight;
+          if (position === "end") {
+            targetScrollTop = currentScrollTop + coords.bottom - scrollerRect.bottom + offset;
+          } else {
+            targetScrollTop = currentScrollTop + coords.top - scrollerRect.top + offset;
+          }
+          targetScrollTop = Math.max(0, Math.min(targetScrollTop, maxScrollTop));
+        }
       }
-      element.scrollTo({
-        top: targetScrollTop,
-        behavior: "smooth"
+      requestAnimationFrame(() => {
+        this.view.scrollDOM.scrollTo({
+          top: targetScrollTop,
+          behavior
+        });
       });
     }
   });
   return [
     scrollPlugin,
-    // Update listener to handle scroll effects.
+    // Listen for effect.s
     EditorView4.updateListener.of((update2) => {
       update2.transactions.forEach((transaction) => {
-        for (const effect of transaction.effects) {
-          if (effect.is(scrollToLineEffect)) {
-            const { line, options = {} } = effect.value;
-            const plugin = update2.view.plugin(scrollPlugin);
-            if (plugin) {
-              plugin.scrollToLine(line, {
-                offset,
-                position,
-                ...options
-              });
+        try {
+          const plugin = update2.view.plugin(scrollPlugin);
+          if (plugin) {
+            for (const effect of transaction.effects) {
+              if (effect.is(scrollerCrawlEffect)) {
+                plugin.crawl(effect.value);
+              } else if (effect.is(scrollerLineEffect)) {
+                plugin.scroll(effect.value);
+              }
             }
           }
+        } catch (err) {
+          log2.catch(err, void 0, {
+            F: __dxlog_file2,
+            L: 145,
+            S: void 0,
+            C: (f, a) => f(...a)
+          });
         }
       });
+    }),
+    // Styles.
+    EditorView4.theme({
+      ".cm-content": {
+        paddingBottom: `${overScroll}px`
+      },
+      ".cm-scroller": {
+        overflowAnchor: "none",
+        paddingBottom: "0"
+      },
+      ".cm-scroller.cm-hide-scrollbar::-webkit-scrollbar": {
+        display: "none"
+      },
+      ".cm-scroller::-webkit-scrollbar-thumb": {
+        background: "transparent",
+        transition: "background 0.15s"
+      },
+      "&:hover .cm-scroller::-webkit-scrollbar-thumb": {
+        background: "var(--color-scrollbar-thumb)"
+      },
+      ".cm-scroll-button": {
+        position: "absolute",
+        bottom: "0.5rem",
+        right: "1rem"
+      }
     })
   ];
 };
-var scrollToLine = (view, line, options) => {
-  view.dispatch({
-    effects: scrollToLineEffect.of({
-      line,
-      options
-    })
-  });
-};
+function createCrawler(view, k = 0.3, maxStep = 2, targetDelta = 0.5) {
+  const el = view.scrollDOM;
+  let currentTop = 0;
+  let rafId = null;
+  function frame() {
+    const targetTop = el.scrollHeight - el.clientHeight;
+    const delta = targetTop - currentTop;
+    const absDelta = Math.abs(delta);
+    if (absDelta < targetDelta) {
+      el.scrollTop = targetTop;
+      currentTop = targetTop;
+      rafId = null;
+      return;
+    }
+    const step = Math.sign(delta) * Math.min(absDelta, Math.max(1, Math.min(absDelta * k, maxStep)));
+    currentTop += step;
+    el.scrollTop = currentTop;
+    rafId = requestAnimationFrame(frame);
+  }
+  return {
+    scroll: () => {
+      if (rafId === null) {
+        currentTop = el.scrollTop;
+        rafId = requestAnimationFrame(frame);
+      }
+    },
+    cancel: () => {
+      if (rafId !== null) {
+        cancelAnimationFrame(rafId);
+        rafId = null;
+      }
+    }
+  };
+}
 
-// src/extensions/autoscroll.ts
-var scrollToBottomEffect = StateEffect2.define();
-var autoScroll = ({ autoScroll: autoScroll2 = true, threshold = 100, throttleDelay = 1e3, onAutoScroll } = {}) => {
+// src/extensions/auto-scroll.ts
+var autoScroll = (_ = {}) => {
   let buttonContainer;
-  let hideTimeout;
-  let lastScrollTop = 0;
   let isPinned = true;
-  const setPinned = (pin) => {
-    isPinned = pin;
-    buttonContainer?.classList.toggle("opacity-0", pin);
-  };
-  const hideScrollbar = (view) => {
-    view.scrollDOM.classList.add("cm-hide-scrollbar");
-    clearTimeout(hideTimeout);
-    hideTimeout = setTimeout(() => {
-      view.scrollDOM.classList.remove("cm-hide-scrollbar");
-    }, 1e3);
-  };
-  const scrollToBottom = (view, behavior) => {
-    setPinned(true);
-    hideScrollbar(view);
-    const line = view.state.doc.lineAt(view.state.doc.length);
-    view.dispatch({
-      selection: {
-        anchor: line.to,
-        head: line.to
-      },
-      effects: scrollToLineEffect.of({
-        line: line.number,
-        options: {
-          position: "end",
-          offset: threshold,
-          behavior
-        }
-      })
-    });
+  const setPinned = (pinned) => {
+    buttonContainer?.classList.toggle("opacity-0", pinned);
+    isPinned = pinned;
   };
-  const checkDistance = debounce((view) => {
-    const scrollerRect = view.scrollDOM.getBoundingClientRect();
-    const coords = view.coordsAtPos(view.state.doc.length);
-    const distanceFromBottom = coords ? coords.bottom - scrollerRect.bottom : 0;
-    setPinned(distanceFromBottom < 0);
-  }, 1e3);
-  const triggerUpdate = debounce((view) => scrollToBottom(view), throttleDelay);
   return [
     // Update listener for logging when scrolling is needed.
-    EditorView5.updateListener.of(({ view, transactions, heightChanged }) => {
-      transactions.forEach((transaction) => {
-        for (const effect of transaction.effects) {
-          if (effect.is(scrollToBottomEffect)) {
-            scrollToBottom(view, effect.value);
+    EditorView5.updateListener.of(({ view, heightChanged, state }) => {
+      if (heightChanged) {
+        if (isPinned) {
+          const { scrollTop, scrollHeight, clientHeight } = view.scrollDOM;
+          const delta = scrollHeight - scrollTop - clientHeight;
+          if (delta > 0 && scrollTop > 0) {
+            setPinned(true);
+            view.dispatch({
+              effects: scrollerCrawlEffect.of(true)
+            });
+          } else if (delta < 0) {
+            setPinned(false);
           }
-        }
-      });
-      if (heightChanged && isPinned) {
-        const coords = view.coordsAtPos(view.state.doc.length);
-        const scrollerRect = view.scrollDOM.getBoundingClientRect();
-        const distanceFromBottom = coords ? scrollerRect.bottom - coords.bottom : 0;
-        if (autoScroll2 && distanceFromBottom < threshold) {
-          const shouldScroll = onAutoScroll?.({
-            view,
-            distanceFromBottom
-          }) ?? true;
-          if (shouldScroll) {
-            triggerUpdate(view);
+        } else {
+          if (state.doc.length === 0) {
+            setPinned(true);
           }
-        } else if (distanceFromBottom < 0) {
-          setPinned(false);
         }
       }
     }),
-    // Detect user scroll.
-    EditorView5.domEventHandlers({
-      scroll: (event, view) => {
-        const currentScrollTop = view.scrollDOM.scrollTop;
-        const scrollingUp = currentScrollTop < lastScrollTop;
-        lastScrollTop = currentScrollTop;
-        if (scrollingUp) {
-          setPinned(false);
-        } else {
-          checkDistance(view);
-        }
+    // Detect user scroll and unpin (or re-pin if scrolled to the bottom).
+    ViewPlugin6.fromClass(class {
+      cleanup;
+      constructor(view) {
+        this.cleanup = createUserScrollDetector(view.scrollDOM, throttle(() => {
+          requestAnimationFrame(() => {
+            const { scrollTop, scrollHeight, clientHeight } = view.scrollDOM;
+            const delta = scrollHeight - scrollTop - clientHeight;
+            const pinned = delta === 0;
+            setPinned(pinned);
+            if (!pinned) {
+              view.dispatch({
+                effects: scrollerCrawlEffect.of(false)
+              });
+            }
+          });
+        }, 500));
+      }
+      destroy() {
+        this.cleanup();
       }
     }),
     // Scroll button.
@@ -695,34 +713,33 @@ var autoScroll = ({ autoScroll: autoScroll2 = true, threshold = 100, throttleDel
         const icon = Domino.of("dx-icon").attributes({
           icon: "ph--arrow-down--regular"
         });
-        const button = Domino.of("button").classNames("dx-button bg-accentSurface").attributes({
+        const button = Domino.of("button").classNames("dx-button bg-accent-surface").attributes({
           "data-density": "fine"
         }).children(icon).on("click", () => {
-          scrollToBottom(view);
+          setPinned(true);
+          view.dispatch({
+            effects: scrollerLineEffect.of({
+              line: -1,
+              position: "end",
+              behavior: "smooth"
+            })
+          });
         });
         buttonContainer = Domino.of("div").classNames("cm-scroll-button transition-opacity duration-300 opacity-0").children(button).root;
         view.scrollDOM.parentElement.appendChild(buttonContainer);
       }
-    }),
-    // Styles.
-    EditorView5.theme({
-      ".cm-scroller": {
-        scrollbarWidth: "thin"
-      },
-      ".cm-scroller.cm-hide-scrollbar": {
-        scrollbarWidth: "none"
-      },
-      ".cm-scroller.cm-hide-scrollbar::-webkit-scrollbar": {
-        display: "none"
-      },
-      ".cm-scroll-button": {
-        position: "absolute",
-        bottom: "0.5rem",
-        right: "1rem"
-      }
     })
   ];
 };
+function createUserScrollDetector(element, onUserScroll) {
+  return combine(addEventListener(element, "wheel", () => onUserScroll(), {
+    passive: true
+  }), addEventListener(element, "pointerdown", (event) => {
+    if (event.clientX > element.getBoundingClientRect().right - (element.offsetWidth - element.clientWidth)) {
+      onUserScroll();
+    }
+  }));
+}
 
 // src/extensions/automerge/automerge.ts
 import { next as A3 } from "@automerge/automerge";
@@ -736,15 +753,15 @@ var initialSync = Transaction.userEvent.of("initial.sync");
 
 // src/extensions/automerge/cursor.ts
 import { fromCursor, toCursor } from "@dxos/echo-db";
-import { log as log2 } from "@dxos/log";
-var __dxlog_file2 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/automerge/cursor.ts";
+import { log as log3 } from "@dxos/log";
+var __dxlog_file3 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/automerge/cursor.ts";
 var cursorConverter = (accessor) => ({
   toCursor: (pos, assoc) => {
     try {
       return toCursor(accessor, pos, assoc);
     } catch (err) {
-      log2.catch(err, void 0, {
-        F: __dxlog_file2,
+      log3.catch(err, void 0, {
+        F: __dxlog_file3,
         L: 15,
         S: void 0,
         C: (f, a) => f(...a)
@@ -756,8 +773,8 @@ var cursorConverter = (accessor) => ({
     try {
       return fromCursor(accessor, cursor2);
     } catch (err) {
-      log2.catch(err, void 0, {
-        F: __dxlog_file2,
+      log3.catch(err, void 0, {
+        F: __dxlog_file3,
         L: 24,
         S: void 0,
         C: (f, a) => f(...a)
@@ -768,10 +785,10 @@ var cursorConverter = (accessor) => ({
 });
 
 // src/extensions/automerge/defs.ts
-import { Annotation, StateEffect as StateEffect3 } from "@codemirror/state";
+import { Annotation, StateEffect as StateEffect2 } from "@codemirror/state";
 var getPath = (state, field) => state.field(field).path;
 var getLastHeads = (state, field) => state.field(field).lastHeads;
-var updateHeadsEffect = StateEffect3.define({});
+var updateHeadsEffect = StateEffect2.define({});
 var updateHeads = (newHeads) => updateHeadsEffect.of({
   newHeads
 });
@@ -782,7 +799,7 @@ var isReconcile = (tr) => {
 
 // src/extensions/automerge/sync.ts
 import { next as A2 } from "@automerge/automerge";
-import { log as log3 } from "@dxos/log";
+import { log as log4 } from "@dxos/log";
 
 // src/extensions/automerge/update-automerge.ts
 import { next as A } from "@automerge/automerge";
@@ -923,7 +940,7 @@ var charPath = (textPath, candidatePath) => {
 };
 
 // src/extensions/automerge/sync.ts
-var __dxlog_file3 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/automerge/sync.ts";
+var __dxlog_file4 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/automerge/sync.ts";
 var Syncer = class {
   _handle;
   _state;
@@ -946,8 +963,8 @@ var Syncer = class {
     this._pending = false;
   }
   onEditorChange(view) {
-    log3("onEditorChange", void 0, {
-      F: __dxlog_file3,
+    log4("onEditorChange", void 0, {
+      F: __dxlog_file4,
       L: 45,
       S: this,
       C: (f, a) => f(...a)
@@ -962,8 +979,8 @@ var Syncer = class {
     }
   }
   onAutomergeChange(view) {
-    log3("onAutomergeChange", void 0, {
-      F: __dxlog_file3,
+    log4("onAutomergeChange", void 0, {
+      F: __dxlog_file4,
       L: 60,
       S: this,
       C: (f, a) => f(...a)
@@ -1029,6 +1046,15 @@ var automerge = (accessor) => {
           const value = DocAccessor.getValue(accessor);
           const current = this._view.state.doc.toString();
           if (value !== current) {
+            console.warn("ENABLING INITIAL SYNC -- THIS MAY BE A REGRESSION");
+            this._view.dispatch({
+              changes: {
+                from: 0,
+                to: this._view.state.doc.length,
+                insert: value
+              },
+              annotations: initialSync
+            });
           }
         });
       }
@@ -1056,7 +1082,7 @@ import { Annotation as Annotation2, RangeSet } from "@codemirror/state";
 import { Decoration as Decoration5, EditorView as EditorView7, ViewPlugin as ViewPlugin8, WidgetType as WidgetType3 } from "@codemirror/view";
 import { Event } from "@dxos/async";
 import { Context } from "@dxos/context";
-var __dxlog_file4 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/awareness/awareness.ts";
+var __dxlog_file5 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/awareness/awareness.ts";
 var dummyProvider = {
   remoteStateChange: new Event(),
   open: () => {
@@ -1080,7 +1106,7 @@ var awareness = (provider = dummyProvider) => {
 };
 var RemoteSelectionsDecorator = class {
   _ctx = new Context(void 0, {
-    F: __dxlog_file4,
+    F: __dxlog_file5,
     L: 80
   });
   _cursorConverter;
@@ -1293,8 +1319,8 @@ var styles = EditorView7.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 log4 } from "@dxos/log";
-var __dxlog_file5 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/awareness/awareness-provider.ts";
+import { log as log5 } from "@dxos/log";
+var __dxlog_file6 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/awareness/awareness-provider.ts";
 var DEBOUNCE_INTERVAL = 100;
 var SpaceAwarenessProvider = class {
   _remoteStates = /* @__PURE__ */ new Map();
@@ -1314,7 +1340,7 @@ var SpaceAwarenessProvider = class {
   }
   open() {
     this._ctx = new Context2(void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 57
     });
     this._postTask = new DeferredTask(this._ctx, async () => {
@@ -1341,10 +1367,10 @@ var SpaceAwarenessProvider = class {
     void this._messenger.postMessage(this._channel, {
       kind: "query"
     }).catch((err) => {
-      log4.debug("failed to query awareness", {
+      log5.debug("failed to query awareness", {
         err
       }, {
-        F: __dxlog_file5,
+        F: __dxlog_file6,
         L: 91,
         S: this,
         C: (f, a) => f(...a)
@@ -1361,7 +1387,7 @@ var SpaceAwarenessProvider = class {
   }
   update(position) {
     invariant(this._postTask, void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 106,
       S: this,
       A: [
@@ -1378,7 +1404,7 @@ var SpaceAwarenessProvider = class {
   }
   _handleQueryMessage() {
     invariant(this._postTask, void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 117,
       S: this,
       A: [
@@ -1390,7 +1416,7 @@ var SpaceAwarenessProvider = class {
   }
   _handlePostMessage(message) {
     invariant(message.kind === "post", void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 122,
       S: this,
       A: [
@@ -1406,9 +1432,9 @@ var SpaceAwarenessProvider = class {
 // src/extensions/blast.ts
 import { EditorView as EditorView8, keymap as keymap3 } from "@codemirror/view";
 import defaultsDeep from "lodash.defaultsdeep";
-import { throttle } from "@dxos/async";
+import { throttle as throttle2 } from "@dxos/async";
 import { invariant as invariant2 } from "@dxos/invariant";
-var __dxlog_file6 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/blast.ts";
+var __dxlog_file7 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/blast.ts";
 var defaultOptions = {
   effect: 2,
   maxParticles: 200,
@@ -1527,7 +1553,7 @@ var Blaster = class {
   }
   initialize() {
     invariant2(!this._canvas && !this._ctx, void 0, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 142,
       S: this,
       A: [
@@ -1564,7 +1590,7 @@ var Blaster = class {
   }
   start() {
     invariant2(this._canvas && this._ctx, void 0, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 181,
       S: this,
       A: [
@@ -1598,11 +1624,11 @@ var Blaster = class {
     this.drawParticles();
     requestAnimationFrame(this.loop.bind(this));
   }
-  shake = throttle(({ time }) => {
+  shake = throttle2(({ time }) => {
     this._shakeTime = this._shakeTimeMax || time;
     this._shakeTimeMax = time;
   }, 100);
-  spawn = throttle(({ element, point }) => {
+  spawn = throttle2(({ element, point }) => {
     const color = getRGBComponents(element, this._options.color);
     const numParticles = random(this._options.particleNumRange.min, this._options.particleNumRange.max);
     const dir = this._lastPoint.x === point.x ? 0 : this._lastPoint.x < point.x ? 1 : -1;
@@ -1776,11 +1802,11 @@ var blocks = () => [
     ".cm-line.block-line": {
       paddingLeft: "0.75rem",
       paddingRight: "0.75rem",
-      borderLeft: "1px solid var(--dx-subduedSeparator)",
-      borderRight: "1px solid var(--dx-subduedSeparator)"
+      borderLeft: "1px solid var(--color-subdued-separator)",
+      borderRight: "1px solid var(--color-subdued-separator)"
     },
     ".cm-line.block-single": {
-      border: "1px solid var(--dx-subduedSeparator)",
+      border: "1px solid var(--color-subdued-separator)",
       borderRadius: "6px",
       paddingTop: "0.5rem",
       paddingBottom: "0.5rem",
@@ -1788,7 +1814,7 @@ var blocks = () => [
       marginBottom: "0.5rem"
     },
     ".cm-line.block-first": {
-      borderTop: "1px solid var(--dx-subduedSeparator)",
+      borderTop: "1px solid var(--color-subdued-separator)",
       borderTopLeftRadius: "6px",
       borderTopRightRadius: "6px",
       paddingTop: "0.5rem",
@@ -1796,7 +1822,7 @@ var blocks = () => [
     },
     ".cm-line.block-middle": {},
     ".cm-line.block-last": {
-      borderBottom: "1px solid var(--dx-subduedSeparator)",
+      borderBottom: "1px solid var(--color-subdued-separator)",
       borderBottomLeftRadius: "6px",
       borderBottomRightRadius: "6px",
       paddingBottom: "0.5rem",
@@ -1806,13 +1832,13 @@ var blocks = () => [
 ];
 
 // src/extensions/bookmarks.ts
-import { Prec as Prec3, StateEffect as StateEffect4, StateField as StateField2 } from "@codemirror/state";
+import { Prec as Prec3, StateEffect as StateEffect3, StateField as StateField2 } from "@codemirror/state";
 import { keymap as keymap4 } from "@codemirror/view";
-import { log as log5 } from "@dxos/log";
-var __dxlog_file7 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/bookmarks.ts";
-var addBookmark = StateEffect4.define();
-var removeBookmark = StateEffect4.define();
-var clearBookmarks = StateEffect4.define();
+import { log as log6 } from "@dxos/log";
+var __dxlog_file8 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/bookmarks.ts";
+var addBookmark = StateEffect3.define();
+var removeBookmark = StateEffect3.define();
+var clearBookmarks = StateEffect3.define();
 var bookmarks = () => {
   return [
     bookmarksField,
@@ -1821,8 +1847,8 @@ var bookmarks = () => {
         key: "Mod-ArrowUp",
         run: (view) => {
           const bookmarks2 = view.state.field(bookmarksField);
-          log5("up", bookmarks2, {
-            F: __dxlog_file7,
+          log6("up", bookmarks2, {
+            F: __dxlog_file8,
             L: 29,
             S: void 0,
             C: (f, a) => f(...a)
@@ -1834,8 +1860,8 @@ var bookmarks = () => {
         key: "Mod-ArrowDown",
         run: (view) => {
           const bookmarks2 = view.state.field(bookmarksField);
-          log5("down", bookmarks2, {
-            F: __dxlog_file7,
+          log6("down", bookmarks2, {
+            F: __dxlog_file8,
             L: 37,
             S: void 0,
             C: (f, a) => f(...a)
@@ -1876,22 +1902,22 @@ var bookmarksField = StateField2.define({
 
 // src/extensions/comments.ts
 import { invertedEffects } from "@codemirror/commands";
-import { StateEffect as StateEffect5, StateField as StateField3 } from "@codemirror/state";
+import { StateEffect as StateEffect4, StateField as StateField3 } from "@codemirror/state";
 import { Decoration as Decoration7, EditorView as EditorView11, ViewPlugin as ViewPlugin10, hoverTooltip, keymap as keymap6 } from "@codemirror/view";
 import sortBy from "lodash.sortby";
-import { debounce as debounce3 } from "@dxos/async";
-import { log as log6 } from "@dxos/log";
+import { debounce as debounce2 } from "@dxos/async";
+import { log as log7 } from "@dxos/log";
 import { isNonNullable } from "@dxos/util";
 
 // src/extensions/selection.ts
 import { Transaction as Transaction3 } from "@codemirror/state";
 import { EditorView as EditorView10, keymap as keymap5 } from "@codemirror/view";
-import { debounce as debounce2 } from "@dxos/async";
+import { debounce } from "@dxos/async";
 import { invariant as invariant3 } from "@dxos/invariant";
 import { isTruthy } from "@dxos/util";
-var __dxlog_file8 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/selection.ts";
+var __dxlog_file9 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/selection.ts";
 var documentId = singleValueFacet();
-var stateRestoreAnnotation = "dxos.org/cm/state-restore";
+var stateRestoreAnnotation = "org.dxos.cm.state-restore";
 var createEditorStateTransaction = ({ scrollTo, selection }) => {
   return {
     selection,
@@ -1905,7 +1931,7 @@ var createEditorStateTransaction = ({ scrollTo, selection }) => {
 var createEditorStateStore = (keyPrefix) => ({
   getState: (id) => {
     invariant3(id, void 0, {
-      F: __dxlog_file8,
+      F: __dxlog_file9,
       L: 47,
       S: void 0,
       A: [
@@ -1918,7 +1944,7 @@ var createEditorStateStore = (keyPrefix) => ({
   },
   setState: (id, state) => {
     invariant3(id, void 0, {
-      F: __dxlog_file8,
+      F: __dxlog_file9,
       L: 53,
       S: void 0,
       A: [
@@ -1930,7 +1956,7 @@ var createEditorStateStore = (keyPrefix) => ({
   }
 });
 var selectionState = ({ getState, setState } = {}) => {
-  const setStateDebounced = debounce2(setState, 1e3);
+  const setStateDebounced = debounce(setState, 1e3);
   return [
     // TODO(burdon): Track scrolling (currently only updates when cursor moves).
     // EditorView.domEventHandlers({
@@ -1977,10 +2003,10 @@ var selectionState = ({ getState, setState } = {}) => {
 };
 
 // src/extensions/comments.ts
-var __dxlog_file9 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/comments.ts";
-var setComments = StateEffect5.define();
-var setSelection = StateEffect5.define();
-var setCommentState = StateEffect5.define();
+var __dxlog_file10 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/comments.ts";
+var setComments = StateEffect4.define();
+var setSelection = StateEffect4.define();
+var setCommentState = StateEffect4.define();
 var commentsState = StateField3.define({
   create: (state) => ({
     id: state.facet(documentId),
@@ -2022,14 +2048,14 @@ var commentsState = StateField3.define({
 var styles2 = EditorView11.theme({
   ".cm-comment, .cm-comment-current": {
     padding: "3px 0",
-    color: "var(--dx-cmCommentText)",
-    backgroundColor: "var(--dx-cmCommentSurface)"
+    color: "var(--color-cm-comment-text)",
+    backgroundColor: "var(--color-cm-comment-surface)"
   },
   ".cm-comment > span, .cm-comment-current > span": {
     boxDecorationBreak: "clone",
-    boxShadow: "0 0 1px 3px var(--dx-cmCommentSurface)",
-    backgroundColor: "var(--dx-cmCommentSurface)",
-    color: "var(--dx-cmCommentText)",
+    boxShadow: "0 0 1px 3px var(--color-cm-comment-surface)",
+    backgroundColor: "var(--color-cm-comment-surface)",
+    color: "var(--color-cm-comment-text)",
     cursor: "pointer"
   }
 });
@@ -2047,8 +2073,8 @@ var commentsDecorations = EditorView11.decorations.compute([
   const decorations2 = sortBy(comments2 ?? [], (range) => range.range.from)?.flatMap((comment) => {
     const range = comment.range;
     if (!range) {
-      log6.warn("Invalid range:", range, {
-        F: __dxlog_file9,
+      log7.warn("Invalid range:", range, {
+        F: __dxlog_file10,
         L: 140,
         S: void 0,
         C: (f, a) => f(...a)
@@ -2062,7 +2088,7 @@ var commentsDecorations = EditorView11.decorations.compute([
   }).filter(isNonNullable);
   return Decoration7.set(decorations2);
 });
-var commentClickedEffect = StateEffect5.define();
+var commentClickedEffect = StateEffect4.define();
 var handleCommentClick = EditorView11.domEventHandlers({
   click: (event, view) => {
     let target = event.target;
@@ -2180,7 +2206,7 @@ var mapTrackedComment = (comment, changes) => ({
   from: changes.mapPos(comment.from, 1),
   to: changes.mapPos(comment.to, 1)
 });
-var restoreCommentEffect = StateEffect5.define({
+var restoreCommentEffect = StateEffect4.define({
   map: mapTrackedComment
 });
 var createComment = (view) => {
@@ -2214,7 +2240,7 @@ var createComment = (view) => {
 var optionsFacet = singleValueFacet();
 var comments = (options = {}) => {
   const { key: shortcut = "meta-'" } = options;
-  const handleSelect = debounce3((state) => options.onSelect?.(state), 200);
+  const handleSelect = debounce2((state) => options.onSelect?.(state), 200);
   return [
     optionsFacet.of(options),
     options.id ? documentId.of(options.id) : void 0,
@@ -2392,9 +2418,9 @@ var createExternalCommentSync = (id, subscribe, getComments) => ViewPlugin10.fro
 // src/extensions/debug.ts
 import { syntaxTree } from "@codemirror/language";
 import { StateField as StateField4 } from "@codemirror/state";
-var debugNodeLogger = (log11 = console.log) => {
+var debugNodeLogger = (log12 = console.log) => {
   const logTokens = (state) => syntaxTree(state).iterate({
-    enter: (node) => log11(node.type)
+    enter: (node) => log12(node.type)
   });
   return StateField4.define({
     create: (state) => logTokens(state),
@@ -2429,8 +2455,8 @@ var dropFile = (options = {}) => {
 };
 var styles3 = EditorView12.theme({
   ".cm-dropCursor": {
-    borderLeft: "2px solid var(--dx-accentText)",
-    color: "var(--dx-accentText)",
+    borderLeft: "2px solid var(--color-accent-text)",
+    color: "var(--color-accent-text)",
     padding: "0 4px"
   },
   ".cm-dropCursor:after": {
@@ -2448,43 +2474,62 @@ import { EditorView as EditorView15, ViewPlugin as ViewPlugin11, drawSelection,
 import { vscodeDarkStyle, vscodeLightStyle } from "@uiw/codemirror-theme-vscode";
 import defaultsDeep2 from "lodash.defaultsdeep";
 import { generateName } from "@dxos/display-name";
-import { log as log7 } from "@dxos/log";
+import { log as log8 } from "@dxos/log";
 import { hexToHue, isTruthy as isTruthy2 } from "@dxos/util";
 
-// src/styles/markdown.ts
+// src/styles/theme.ts
+import { EditorView as EditorView13 } from "@codemirror/view";
 import { mx as mx3 } from "@dxos/ui-theme";
 var headings = {
-  1: "text-4xl",
-  2: "text-3xl",
-  3: "text-2xl",
-  4: "text-xl",
-  5: "text-lg",
-  6: ""
+  1: {
+    className: "text-4xl",
+    fontSize: "var(--text-4xl)",
+    lineHeight: "var(--text-4xl--line-height)"
+  },
+  2: {
+    className: "text-3xl",
+    fontSize: "var(--text-3xl)",
+    lineHeight: "var(--text-3xl--line-height)"
+  },
+  3: {
+    className: "text-2xl",
+    fontSize: "var(--text-2xl)",
+    lineHeight: "var(--text-2xl--line-height)"
+  },
+  4: {
+    className: "text-xl",
+    fontSize: "var(--text-xl)",
+    lineHeight: "var(--text-xl--line-height)"
+  },
+  5: {
+    className: "text-lg",
+    fontSize: "var(--text-lg)",
+    lineHeight: "var(--text-lg--line-height)"
+  },
+  6: {
+    className: "text-base",
+    fontSize: "var(--text-base)",
+    lineHeight: "var(--text-base--line-height)"
+  }
 };
 var markdownTheme = {
-  code: "font-mono !no-underline text-neutral-700 dark:text-neutral-300",
-  codeMark: "font-mono text-primary-500",
+  code: "font-mono no-underline! text-cm-code",
+  codeMark: "font-mono text-cm-code-mark",
   mark: "opacity-50",
-  heading: (level) => {
-    return mx3(headings[level], "dark:text-neutral-400");
-  }
+  heading: (level) => ({
+    className: mx3(headings[level].className, "font-light text-cm-heading"),
+    color: "var(--color-cm-heading) !important",
+    lineHeight: headings[level].lineHeight,
+    fontSize: headings[level].fontSize,
+    fontWeight: "100 !important"
+  })
 };
-
-// src/styles/theme.ts
-import { EditorView as EditorView13 } from "@codemirror/view";
-
-// src/styles/tokens.ts
-import { tokens } from "@dxos/ui-theme";
-import { get } from "@dxos/util";
-var getToken = (path, defaultValue) => {
-  const value = get(tokens, path, defaultValue);
-  return value?.toString() ?? "";
-};
-var fontBody = getToken("fontFamily.body");
-var fontMono = getToken("fontFamily.mono");
-
-// src/styles/theme.ts
+var fontBody = "Inter Variable, ui-sans-serif, system-ui, sans-serif";
+var fontMono = "JetBrains Mono Variable, ui-monospace, Cascadia Code, Source Code Pro, monospace";
 var baseTheme = EditorView13.baseTheme({
+  /**
+  * Outer frame.
+  */
   "&": {},
   "&.cm-focused": {
     outline: "none"
@@ -2493,7 +2538,18 @@ var baseTheme = EditorView13.baseTheme({
   * Scroller
   */
   ".cm-scroller": {
-    overflowY: "auto"
+    overflowAnchor: "none"
+  },
+  ".cm-scroller::-webkit-scrollbar": {
+    width: "8px"
+  },
+  ".cm-scroller::-webkit-scrollbar-track": {},
+  ".cm-scroller::-webkit-scrollbar-thumb": {
+    background: "transparent",
+    transition: "background 0.15s"
+  },
+  "&:hover .cm-scroller::-webkit-scrollbar-thumb": {
+    background: "var(--color-scrollbar-thumb)"
   },
   /**
   * Content
@@ -2515,8 +2571,8 @@ var baseTheme = EditorView13.baseTheme({
   ".cm-gutter": {},
   ".cm-gutter.cm-lineNumbers": {
     paddingRight: "4px",
-    borderRight: "1px solid var(--dx-subduedSeparator)",
-    color: "var(--dx-subduedText)"
+    borderRight: "1px solid var(--color-subdued-separator)",
+    color: "var(--color-subdued)"
   },
   ".cm-gutter.cm-lineNumbers .cm-gutterElement": {
     minWidth: "40px"
@@ -2536,25 +2592,25 @@ var baseTheme = EditorView13.baseTheme({
     paddingInline: 0
   },
   ".cm-activeLine": {
-    background: "var(--dx-cmActiveLine)"
+    background: "var(--color-cm-active-line)"
   },
   /**
   * Cursor (layer).
   */
   ".cm-cursor, .cm-dropCursor": {
-    borderLeft: "2px solid var(--dx-cmCursor)"
+    borderLeft: "2px solid var(--color-cm-cursor)"
   },
   ".cm-placeholder": {
-    color: "var(--dx-placeholder)"
+    color: "var(--color-placeholder)"
   },
   /**
   * Selection (layer).
   */
   ".cm-selectionBackground": {
-    background: "var(--dx-cmSelection)"
+    background: "var(--color-cm-selection)"
   },
   "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground": {
-    background: "var(--dx-cmFocusedSelection)"
+    background: "var(--color-cm-focused-selection)"
   },
   /**
   * Search.
@@ -2564,8 +2620,8 @@ var baseTheme = EditorView13.baseTheme({
     margin: "0 -3px",
     padding: "3px",
     borderRadius: "3px",
-    background: "var(--dx-cmHighlightSurface)",
-    color: "var(--dx-cmHighlight)"
+    background: "var(--color-cm-highlight-surface)",
+    color: "var(--color-cm-highlight)"
   },
   ".cm-searchMatch-selected": {
     textDecoration: "underline"
@@ -2576,20 +2632,29 @@ var baseTheme = EditorView13.baseTheme({
   ".cm-link": {
     textDecorationLine: "underline",
     textDecorationThickness: "1px",
-    textDecorationColor: "var(--dx-separator)",
+    textDecorationColor: "var(--color-separator)",
     textUnderlineOffset: "2px",
     borderRadius: ".125rem"
   },
   ".cm-link > span": {
-    color: "var(--dx-accentText)"
+    color: "var(--color-accent-text)"
+  },
+  ".cm-link > span:hover": {
+    color: "var(--color-accent-text-hover)"
   },
   /**
   * Tooltip.
   */
   ".cm-tooltip": {
-    background: "var(--dx-baseSurface)"
+    background: "var(--color-modal-surface)"
   },
   ".cm-tooltip-below": {},
+  ".cm-tooltip-hover": {
+    background: "var(--color-modal-surface)",
+    border: "1px solid var(--color-separator)",
+    borderRadius: "4px",
+    overflow: "hidden"
+  },
   /**
   * Autocomplete.
   * https://github.com/codemirror/autocomplete/blob/main/src/completion.ts
@@ -2597,7 +2662,7 @@ var baseTheme = EditorView13.baseTheme({
   ".cm-tooltip.cm-tooltip-autocomplete": {
     marginTop: "6px",
     marginLeft: "-10px",
-    border: "2px solid var(--dx-separator)",
+    border: "2px solid var(--color-separator)",
     borderRadius: "4px"
   },
   ".cm-tooltip.cm-tooltip-autocomplete > ul": {
@@ -2607,12 +2672,12 @@ var baseTheme = EditorView13.baseTheme({
     padding: "4px"
   },
   ".cm-tooltip.cm-tooltip-autocomplete > ul > li[aria-selected]": {
-    background: "var(--dx-activeSurface)",
-    color: "var(--dx-activeSurfaceText)"
+    background: "var(--color-active-surface)",
+    color: "var(--color-base-surface-text)"
   },
   ".cm-tooltip.cm-tooltip-autocomplete > ul > completion-section": {
     paddingLeft: "4px !important",
-    color: "var(--dx-hoverSurfaceText)"
+    color: "var(--color-base-surface-text)"
   },
   /**
   * Completion info.
@@ -2621,17 +2686,17 @@ var baseTheme = EditorView13.baseTheme({
     width: "360px !important",
     margin: "-10px 1px 0 1px",
     padding: "8px !important",
-    borderColor: "var(--dx-separator)"
+    borderColor: "var(--color-separator)"
   },
   ".cm-completionIcon": {
     display: "none"
   },
   ".cm-completionLabel": {
-    color: "var(--dx-description)",
+    color: "var(--color-description)",
     padding: "0 4px"
   },
   ".cm-completionMatchedText": {
-    color: "var(--dx-baseText)",
+    color: "var(--color-base-surface-text)",
     textDecoration: "none !important"
   },
   /**
@@ -2655,7 +2720,7 @@ var baseTheme = EditorView13.baseTheme({
     backgroundColor: "var(--surface-bg)"
   },
   ".cm-panel input, .cm-panel button, .cm-panel label": {
-    color: "var(--dx-subdued)",
+    color: "var(--color-subdued)",
     fontSize: "14px",
     all: "unset",
     margin: "3px !important",
@@ -2663,10 +2728,10 @@ var baseTheme = EditorView13.baseTheme({
     outline: "1px solid transparent"
   },
   ".cm-panel input, .cm-panel button": {
-    backgroundColor: "var(--dx-inputSurface)"
+    backgroundColor: "var(--color-input-surface)"
   },
   ".cm-panel input:focus, .cm-panel button:focus": {
-    outline: "1px solid var(--dx-neutralFocusIndicator)"
+    outline: "1px solid var(--color-neutral-focus-indicator)"
   },
   ".cm-panel label": {
     display: "inline-flex",
@@ -2679,25 +2744,26 @@ var baseTheme = EditorView13.baseTheme({
     height: "8px",
     marginRight: "6px !important",
     padding: "2px !important",
-    color: "var(--dx-neutralFocusIndicator)"
+    color: "var(--color-neutral-focus-indicator)"
   },
   ".cm-panel button": {
     "&:hover": {
-      backgroundColor: "var(--dx-accentSurfaceHover) !important"
+      // TODO(burdon): Replace with layer and @apply bg-accent-surface-hover
+      backgroundColor: "var(--color-accent-surface-hover) !important"
     },
     "&:active": {
-      backgroundColor: "var(--dx-accentSurfaceHover)"
+      backgroundColor: "var(--color-accent-surface-hover)"
     }
   },
   ".cm-panel.cm-search": {
     padding: "4px",
-    borderTop: "1px solid var(--dx-separator)"
+    borderTop: "1px solid var(--color-separator)"
   }
 });
 var editorGutter = EditorView13.theme({
   ".cm-gutters": {
     // NOTE: Non-transparent background required to cover content if scrolling horizontally.
-    background: "var(--dx-baseSurface) !important",
+    background: "var(--color-base-surface) !important",
     paddingRight: "1rem"
   }
 });
@@ -2715,9 +2781,9 @@ var createFontTheme = ({ monospace } = {}) => EditorView13.theme({
 });
 
 // src/extensions/focus.ts
-import { StateEffect as StateEffect6, StateField as StateField5 } from "@codemirror/state";
+import { StateEffect as StateEffect5, StateField as StateField5 } from "@codemirror/state";
 import { EditorView as EditorView14 } from "@codemirror/view";
-var focusEffect = StateEffect6.define();
+var focusEffect = StateEffect5.define();
 var focusField = StateField5.define({
   create: () => false,
   update: (value, tr) => {
@@ -2746,7 +2812,7 @@ var focus = [
 ];
 
 // src/extensions/factories.ts
-var __dxlog_file10 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/factories.ts";
+var __dxlog_file11 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/factories.ts";
 var tabbable = EditorView15.contentAttributes.of({
   tabindex: "0"
 });
@@ -2801,9 +2867,9 @@ var createBasicExtensions = (propsProp) => {
   return [
     // NOTE: Doesn't catch errors in keymap functions.
     EditorView15.exceptionSink.of((err) => {
-      log7.catch(err, void 0, {
-        F: __dxlog_file10,
-        L: 132,
+      log8.catch(err, void 0, {
+        F: __dxlog_file11,
+        L: 131,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -2855,12 +2921,12 @@ var createBasicExtensions = (propsProp) => {
 };
 var grow = {
   editor: {
-    className: "bs-full is-full"
+    className: "h-full w-full"
   }
 };
 var fullWidth = {
   editor: {
-    className: "is-full"
+    className: "w-full"
   }
 };
 var defaultThemeSlots = grow;
@@ -2903,8 +2969,8 @@ var createDataExtensions = ({ id, text, messenger, identity }) => {
       channel: `awareness.${id}`,
       peerId: identity.identityKey.toHex(),
       info: {
-        darkColor: `var(--dx-${hue}Cursor)`,
-        lightColor: `var(--dx-${hue}Cursor)`,
+        darkColor: `var(--color-${hue}-border)`,
+        lightColor: `var(--color-${hue}-border)`,
         displayName: identity.profile?.displayName ?? generateName(identity.identityKey.toHex())
       }
     })));
@@ -2923,7 +2989,7 @@ var folding = () => {
     }),
     foldGutter({
       markerDOM: (open) => {
-        return Domino2.of("div").classNames("flex bs-full justify-center items-center").children(Domino2.of("svg", Domino2.SVG).classNames(mx4("is-4 bs-4 cursor-pointer", open && "rotate-90")).children(Domino2.of("use", Domino2.SVG).attributes({
+        return Domino2.of("div").classNames("flex h-full justify-center items-center").children(Domino2.of("svg", Domino2.SVG).classNames(mx4("w-4 h-4 cursor-pointer", open && "rotate-90")).children(Domino2.of("use", Domino2.SVG).attributes({
           href: Domino2.icon("ph--caret-right--regular")
         }))).root;
       }
@@ -4219,6 +4285,11 @@ import { markdownLanguage } from "@codemirror/lang-markdown";
 import { HighlightStyle as HighlightStyle2 } from "@codemirror/language";
 import { Tag, styleTags, tags } from "@lezer/highlight";
 import { Table } from "@lezer/markdown";
+var styles4 = {
+  code: "font-mono no-underline! text-cm-code",
+  codeMark: "font-mono text-cm-code-mark",
+  mark: "opacity-50"
+};
 var markdownTags = {
   Blockquote: Tag.define(),
   CodeMark: Tag.define(),
@@ -4300,7 +4371,7 @@ var markdownHighlightStyle = (_options = {}) => {
         markdownTags.LinkReference,
         markdownTags.ListMark
       ],
-      class: markdownTheme.mark
+      class: styles4.mark
     },
     // Markdown marks.
     {
@@ -4311,7 +4382,7 @@ var markdownHighlightStyle = (_options = {}) => {
         markdownTags.QuoteMark,
         markdownTags.EmphasisMark
       ],
-      class: markdownTheme.mark
+      class: styles4.mark
     },
     // E.g., code block language (after ```).
     {
@@ -4320,7 +4391,7 @@ var markdownHighlightStyle = (_options = {}) => {
         tags.function(tags.variableName),
         tags.labelName
       ],
-      class: markdownTheme.codeMark
+      class: styles4.codeMark
     },
     // Fonts.
     {
@@ -4330,30 +4401,38 @@ var markdownHighlightStyle = (_options = {}) => {
       ],
       class: "font-mono"
     },
-    // Headings.
+    // Headings — use CSS properties only (no class:) so CodeMirror generates scoped CSS via
+    // StyleModule that overrides vscodeDarkStyle's t.heading rule. When class: is present,
+    // HighlightStyle silently ignores all other CSS properties (they're mutually exclusive).
+    // Font sizes use Tailwind v4 CSS variables so nothing is hardcoded.
+    {
+      tag: tags.heading,
+      color: "var(--color-cm-heading) !important",
+      fontWeight: "300"
+    },
     {
       tag: tags.heading1,
-      class: markdownTheme.heading(1)
+      ...markdownTheme.heading(1)
     },
     {
       tag: tags.heading2,
-      class: markdownTheme.heading(2)
+      ...markdownTheme.heading(2)
     },
     {
       tag: tags.heading3,
-      class: markdownTheme.heading(3)
+      ...markdownTheme.heading(3)
     },
     {
       tag: tags.heading4,
-      class: markdownTheme.heading(4)
+      ...markdownTheme.heading(4)
     },
     {
       tag: tags.heading5,
-      class: markdownTheme.heading(5)
+      ...markdownTheme.heading(5)
     },
     {
       tag: tags.heading6,
-      class: markdownTheme.heading(6)
+      ...markdownTheme.heading(6)
     },
     // Emphasis.
     {
@@ -4378,7 +4457,7 @@ var markdownHighlightStyle = (_options = {}) => {
         markdownTags.CodeText,
         markdownTags.InlineCode
       ],
-      class: markdownTheme.code
+      class: styles4.code
     },
     {
       tag: [
@@ -4483,7 +4562,7 @@ var convertTreeToJson = (state) => {
 
 // src/extensions/markdown/decorate.ts
 import { syntaxTree as syntaxTree7 } from "@codemirror/language";
-import { Prec as Prec4, RangeSetBuilder as RangeSetBuilder5, StateEffect as StateEffect7 } from "@codemirror/state";
+import { Prec as Prec4, RangeSetBuilder as RangeSetBuilder5, StateEffect as StateEffect6 } from "@codemirror/state";
 import { Decoration as Decoration11, EditorView as EditorView23, ViewPlugin as ViewPlugin14, WidgetType as WidgetType7 } from "@codemirror/view";
 import { invariant as invariant4 } from "@dxos/invariant";
 import { mx as mx6 } from "@dxos/ui-theme";
@@ -4735,7 +4814,7 @@ var formattingStyles = EditorView21.theme({
     width: "100%",
     height: "0",
     verticalAlign: "middle",
-    borderTop: "1px solid var(--dx-cmSeparator)",
+    borderTop: "1px solid var(--color-cm-separator)",
     opacity: 0.5
   },
   /**
@@ -4758,8 +4837,8 @@ var formattingStyles = EditorView21.theme({
   * Blockquote.
   */
   "& .cm-blockquote": {
-    background: "var(--dx-cmCodeblock)",
-    borderLeft: "2px solid var(--dx-cmSeparator)",
+    background: "var(--color-cm-codeblock)",
+    borderLeft: "2px solid var(--color-cm-separator)",
     paddingLeft: "1rem",
     margin: "0"
   },
@@ -4770,7 +4849,7 @@ var formattingStyles = EditorView21.theme({
     fontFamily: fontMono
   },
   "& .cm-codeblock-line": {
-    background: "var(--dx-cmCodeblock)",
+    background: "var(--color-cm-codeblock)",
     paddingInline: "1rem !important"
   },
   "& .cm-codeblock-start": {
@@ -4804,8 +4883,8 @@ var formattingStyles = EditorView21.theme({
   ".cm-table-head": {
     padding: "2px 16px 2px 0px",
     textAlign: "left",
-    borderBottom: "1px solid var(--dx-cmSeparator)",
-    color: "var(--dx-subdued)"
+    borderBottom: "1px solid var(--color-cm-separator)",
+    color: "var(--color-subdued)"
   },
   ".cm-table-cell": {
     padding: "2px 16px 2px 0px"
@@ -4945,7 +5024,7 @@ var TableWidget = class extends WidgetType6 {
 };
 
 // src/extensions/markdown/decorate.ts
-var __dxlog_file11 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/markdown/decorate.ts";
+var __dxlog_file12 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/markdown/decorate.ts";
 var Unicode = {
   emDash: "\u2014",
   bullet: "\u2022",
@@ -4968,7 +5047,6 @@ var LinkButton = class extends WidgetType7 {
   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, {
@@ -5081,8 +5159,8 @@ var buildDecorations2 = (view, options, focus2) => {
   const headerLevels = [];
   const getHeaderLevels = (node, level) => {
     invariant4(level > 0, void 0, {
-      F: __dxlog_file11,
-      L: 180,
+      F: __dxlog_file12,
+      L: 179,
       S: void 0,
       A: [
         "level > 0",
@@ -5120,8 +5198,8 @@ var buildDecorations2 = (view, options, focus2) => {
   };
   const getCurrentListLevel = () => {
     invariant4(listLevels.length, void 0, {
-      F: __dxlog_file11,
-      L: 202,
+      F: __dxlog_file12,
+      L: 201,
       S: void 0,
       A: [
         "listLevels.length",
@@ -5171,7 +5249,7 @@ var buildDecorations2 = (view, options, focus2) => {
                 from: mark.from,
                 to: mark.from + len,
                 deco: Decoration11.replace({
-                  widget: new TextWidget(num, markdownTheme.heading(level))
+                  widget: new TextWidget(num, markdownTheme.heading(level).className)
                 })
               });
             }
@@ -5438,7 +5516,7 @@ var buildDecorations2 = (view, options, focus2) => {
     atomicDeco: atomicDeco.finish()
   };
 };
-var forceUpdate = StateEffect7.define();
+var forceUpdate = StateEffect6.define();
 var decorateMarkdown = (options = {}) => {
   return [
     ViewPlugin14.fromClass(class {
@@ -5510,8 +5588,7 @@ var linkTooltip = (renderTooltip) => {
     return {
       pos: link.from,
       end: link.to,
-      // NOTE: Forcing above causes the tooltip to flicker.
-      // above: true,
+      above: true,
       create: () => {
         const el = document.createElement("div");
         el.className = tooltipContent({});
@@ -5527,16 +5604,13 @@ var linkTooltip = (renderTooltip) => {
         };
       }
     };
-  }, {
-    // NOTE: 0 = default of 300ms.
-    hoverTime: 1
   });
 };
 
 // src/extensions/mention.ts
 import { autocompletion } from "@codemirror/autocomplete";
-import { log as log8 } from "@dxos/log";
-var __dxlog_file12 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/mention.ts";
+import { log as log9 } from "@dxos/log";
+var __dxlog_file13 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/mention.ts";
 var mention = ({ debug, onSearch }) => {
   return autocompletion({
     // TODO(burdon): Not working.
@@ -5548,10 +5622,10 @@ var mention = ({ debug, onSearch }) => {
     icons: false,
     override: [
       (context) => {
-        log8.info("completion context", {
+        log9.info("completion context", {
           context
         }, {
-          F: __dxlog_file12,
+          F: __dxlog_file13,
           L: 27,
           S: void 0,
           C: (f, a) => f(...a)
@@ -5572,8 +5646,8 @@ var mention = ({ debug, onSearch }) => {
 };
 
 // src/extensions/modal.ts
-import { StateEffect as StateEffect8, StateField as StateField9 } from "@codemirror/state";
-var modalStateEffect = StateEffect8.define();
+import { StateEffect as StateEffect7, StateField as StateField9 } from "@codemirror/state";
+var modalStateEffect = StateEffect7.define();
 var modalStateField = StateField9.define({
   create: () => false,
   update: (value, tr) => {
@@ -5634,7 +5708,7 @@ import { syntaxTree as syntaxTree9 } from "@codemirror/language";
 import { StateField as StateField10 } from "@codemirror/state";
 import { Facet as Facet2 } from "@codemirror/state";
 import { invariant as invariant5 } from "@dxos/invariant";
-var __dxlog_file13 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/outliner/tree.ts";
+var __dxlog_file14 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/outliner/tree.ts";
 var itemToJSON = ({ type, index, level, lineRange, contentRange, children }) => {
   return {
     type,
@@ -5789,7 +5863,7 @@ var outlinerTree = (_options = {}) => {
           }
           case "BulletList": {
             invariant5(current, void 0, {
-              F: __dxlog_file13,
+              F: __dxlog_file14,
               L: 219,
               S: void 0,
               A: [
@@ -5806,7 +5880,7 @@ var outlinerTree = (_options = {}) => {
           }
           case "ListItem": {
             invariant5(parent, void 0, {
-              F: __dxlog_file13,
+              F: __dxlog_file14,
               L: 228,
               S: void 0,
               A: [
@@ -5848,7 +5922,7 @@ var outlinerTree = (_options = {}) => {
           }
           case "ListMark": {
             invariant5(current, void 0, {
-              F: __dxlog_file13,
+              F: __dxlog_file14,
               L: 272,
               S: void 0,
               A: [
@@ -5862,7 +5936,7 @@ var outlinerTree = (_options = {}) => {
           }
           case "Task": {
             invariant5(current, void 0, {
-              F: __dxlog_file13,
+              F: __dxlog_file14,
               L: 278,
               S: void 0,
               A: [
@@ -5875,7 +5949,7 @@ var outlinerTree = (_options = {}) => {
           }
           case "TaskMarker": {
             invariant5(current, void 0, {
-              F: __dxlog_file13,
+              F: __dxlog_file14,
               L: 283,
               S: void 0,
               A: [
@@ -5891,7 +5965,7 @@ var outlinerTree = (_options = {}) => {
       leave: (node) => {
         if (node.name === "BulletList") {
           invariant5(parent, void 0, {
-            F: __dxlog_file13,
+            F: __dxlog_file14,
             L: 291,
             S: void 0,
             A: [
@@ -5905,7 +5979,7 @@ var outlinerTree = (_options = {}) => {
       }
     });
     invariant5(tree, void 0, {
-      F: __dxlog_file13,
+      F: __dxlog_file14,
       L: 298,
       S: void 0,
       A: [
@@ -6203,8 +6277,8 @@ import { mx as mx7 } from "@dxos/ui-theme";
 // src/extensions/outliner/editor.ts
 import { EditorSelection as EditorSelection4, EditorState as EditorState2 } from "@codemirror/state";
 import { ViewPlugin as ViewPlugin15 } from "@codemirror/view";
-import { log as log9 } from "@dxos/log";
-var __dxlog_file14 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/outliner/editor.ts";
+import { log as log10 } from "@dxos/log";
+var __dxlog_file15 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/outliner/editor.ts";
 var LIST_ITEM_REGEX = /^\s*- (\[ \]|\[x\])? /;
 var initialize = () => {
   return ViewPlugin15.fromClass(class {
@@ -6336,7 +6410,7 @@ var editor = () => [
           cancel = true;
           return;
         }
-        log9("change", {
+        log10("change", {
           item,
           line: {
             from: line.from,
@@ -6355,7 +6429,7 @@ var editor = () => [
             length: insert.length
           }
         }, {
-          F: __dxlog_file14,
+          F: __dxlog_file15,
           L: 164,
           S: void 0,
           C: (f, a) => f(...a)
@@ -6363,10 +6437,10 @@ var editor = () => [
       }
     });
     if (changes.length > 0) {
-      log9("modified,", {
+      log10("modified,", {
         changes
       }, {
-        F: __dxlog_file14,
+        F: __dxlog_file15,
         L: 175,
         S: void 0,
         C: (f, a) => f(...a)
@@ -6377,8 +6451,8 @@ var editor = () => [
         }
       ];
     } else if (cancel) {
-      log9("cancel", void 0, {
-        F: __dxlog_file14,
+      log10("cancel", void 0, {
+        F: __dxlog_file15,
         L: 178,
         S: void 0,
         C: (f, a) => f(...a)
@@ -6391,7 +6465,7 @@ var editor = () => [
 
 // src/extensions/outliner/menu.ts
 import { EditorView as EditorView24, ViewPlugin as ViewPlugin16 } from "@codemirror/view";
-import { addEventListener } from "@dxos/async";
+import { addEventListener as addEventListener2 } from "@dxos/async";
 var menu = (options = {}) => [
   ViewPlugin16.fromClass(class {
     view;
@@ -6413,7 +6487,7 @@ var menu = (options = {}) => [
       }
       container.appendChild(this.tag);
       const handler = () => this.scheduleUpdate();
-      this.cleanup = addEventListener(container, "scroll", handler);
+      this.cleanup = addEventListener2(container, "scroll", handler);
       this.scheduleUpdate();
     }
     destroy() {
@@ -6492,7 +6566,7 @@ var outliner = (_options = {}) => [
   }),
   // Researve space for menu.
   EditorView25.contentAttributes.of({
-    class: "is-full !mr-[3rem]"
+    class: "w-full !mr-[3rem]"
   })
 ];
 var decorations = () => [
@@ -6556,10 +6630,10 @@ var decorations = () => [
       marginBottom: "2px"
     },
     ".cm-list-item-focused": {
-      borderColor: "var(--dx-neutralFocusIndicator)"
+      borderColor: "var(--color-neutral-focus-indicator)"
     },
     "&:focus-within .cm-list-item-selected": {
-      borderColor: "var(--dx-separator)"
+      borderColor: "var(--color-separator)"
     }
   }))
 ];
@@ -6631,13 +6705,13 @@ var getLinkRef = (state, node) => {
   const mark = node.getChildren("LinkMark");
   const urlNode = node.getChild("URL");
   if (mark && urlNode) {
-    const url = state.sliceDoc(urlNode.from, urlNode.to);
-    if (url.startsWith("dxn:")) {
+    const dxn = state.sliceDoc(urlNode.from, urlNode.to);
+    if (dxn.startsWith("dxn:")) {
       const label = state.sliceDoc(mark[0].to, mark[1].from);
       return {
         block: state.sliceDoc(mark[0].from, mark[0].from + 1) === "!",
         label,
-        ref: url
+        dxn
       };
     }
   }
@@ -6652,13 +6726,13 @@ var PreviewInlineWidget = class extends WidgetType8 {
   //   return false;
   // }
   eq(other) {
-    return this._link.ref === other._link.ref && this._link.label === other._link.label;
+    return this._link.dxn === other._link.dxn && this._link.label === other._link.label;
   }
   toDOM(_view) {
     const root = document.createElement("dx-anchor");
     root.classList.add("dx-tag--anchor");
     root.textContent = this._link.label;
-    root.setAttribute("refId", this._link.ref);
+    root.setAttribute("dxn", this._link.dxn);
     return root;
   }
 };
@@ -6672,11 +6746,11 @@ var PreviewBlockWidget = class extends WidgetType8 {
   //   return true;
   // }
   eq(other) {
-    return this._link.ref === other._link.ref;
+    return this._link.dxn === other._link.dxn;
   }
   toDOM(_view) {
     const root = document.createElement("div");
-    root.classList.add("cm-preview-block", "density-fine");
+    root.classList.add("cm-preview-block", "dx-density-fine");
     this._options.addBlockContainer?.({
       link: this._link,
       el: root
@@ -6891,7 +6965,7 @@ var mixedParser = (registry) => {
 };
 
 // src/extensions/tags/streamer.ts
-import { StateEffect as StateEffect9, StateField as StateField12 } from "@codemirror/state";
+import { StateEffect as StateEffect8, StateField as StateField12 } from "@codemirror/state";
 import { Decoration as Decoration14, EditorView as EditorView28, ViewPlugin as ViewPlugin18, WidgetType as WidgetType9 } from "@codemirror/view";
 import { Domino as Domino3 } from "@dxos/ui";
 import { isTruthy as isTruthy4 } from "@dxos/util";
@@ -6903,7 +6977,7 @@ var streamer = (options = {}) => {
   ].filter(isTruthy4);
 };
 var cursor = () => {
-  const hideCursor = StateEffect9.define();
+  const hideCursor = StateEffect8.define();
   const showCursor = StateField12.define({
     create: () => true,
     update: (value, tr) => {
@@ -6973,9 +7047,9 @@ var CursorWidget = class extends WidgetType9 {
 };
 var fadeIn = (options = {}) => {
   const FADE_IN_DURATION = 1e3;
-  const DEFAULT_REMOVAL_DELAY = 5e3;
+  const DEFAULT_REMOVAL_DELAY = 3e3;
   const removalDelay = options.removalDelay ?? DEFAULT_REMOVAL_DELAY;
-  const removeDecoration = StateEffect9.define();
+  const removeDecoration = StateEffect8.define();
   const fadeField = StateField12.define({
     create: () => Decoration14.none,
     update: (decorations2, tr) => {
@@ -7085,17 +7159,17 @@ var fadeIn = (options = {}) => {
 
 // src/extensions/tags/xml-tags.ts
 import { syntaxTree as syntaxTree11 } from "@codemirror/language";
-import { Prec as Prec7, RangeSetBuilder as RangeSetBuilder7, StateEffect as StateEffect10, StateField as StateField13 } from "@codemirror/state";
+import { Prec as Prec7, RangeSetBuilder as RangeSetBuilder7, StateEffect as StateEffect9, StateField as StateField13 } from "@codemirror/state";
 import { Decoration as Decoration15, EditorView as EditorView29, ViewPlugin as ViewPlugin19, WidgetType as WidgetType10, keymap as keymap13 } from "@codemirror/view";
 import { invariant as invariant7 } from "@dxos/invariant";
-import { log as log10 } from "@dxos/log";
+import { log as log11 } from "@dxos/log";
 
 // src/extensions/tags/xml-util.ts
 import { invariant as invariant6 } from "@dxos/invariant";
-var __dxlog_file15 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/tags/xml-util.ts";
+var __dxlog_file16 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/tags/xml-util.ts";
 var nodeToJson = (state, node) => {
   invariant6(node.type.name === "Element", "Node is not an Element", {
-    F: __dxlog_file15,
+    F: __dxlog_file16,
     L: 18,
     S: void 0,
     A: [
@@ -7159,16 +7233,16 @@ var nodeToJson = (state, node) => {
 };
 
 // src/extensions/tags/xml-tags.ts
-var __dxlog_file16 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/tags/xml-tags.ts";
-var navigatePreviousEffect = StateEffect10.define();
-var navigateNextEffect = StateEffect10.define();
+var __dxlog_file17 = "/__w/dxos/dxos/packages/ui/ui-editor/src/extensions/tags/xml-tags.ts";
+var navigatePreviousEffect = StateEffect9.define();
+var navigateNextEffect = StateEffect9.define();
 var getXmlTextChild = (children) => {
   const child = children?.[0];
   return typeof child === "string" ? child : null;
 };
-var xmlTagContextEffect = StateEffect10.define();
-var xmlTagResetEffect = StateEffect10.define();
-var xmlTagUpdateEffect = StateEffect10.define();
+var xmlTagContextEffect = StateEffect9.define();
+var xmlTagResetEffect = StateEffect9.define();
+var xmlTagUpdateEffect = StateEffect9.define();
 var widgetContextStateField = StateField13.define({
   create: () => void 0,
   update: (value, tr) => {
@@ -7189,11 +7263,11 @@ var widgetStateMapStateField = StateField13.define({
       }
       if (effect.is(xmlTagUpdateEffect)) {
         const { id, value } = effect.value;
-        log10("widget updated", {
+        log11("widget updated", {
           id,
           value
         }, {
-          F: __dxlog_file16,
+          F: __dxlog_file17,
           L: 153,
           S: void 0,
           C: (f, a) => f(...a)
@@ -7224,11 +7298,11 @@ var createWidgetMap = (setWidgets) => {
   const widgets = /* @__PURE__ */ new Map();
   const notifier = {
     mounted: (state) => {
-      log10("widget mounted", {
+      log11("widget mounted", {
         id: state.id,
         tag: state.props._tag
       }, {
-        F: __dxlog_file16,
+        F: __dxlog_file17,
         L: 206,
         S: void 0,
         C: (f, a) => f(...a)
@@ -7240,11 +7314,11 @@ var createWidgetMap = (setWidgets) => {
     },
     unmounted: (id) => {
       const state = widgets.get(id);
-      log10("widget unmounted", {
+      log11("widget unmounted", {
         id,
         tag: state?.props._tag
       }, {
-        F: __dxlog_file16,
+        F: __dxlog_file17,
         L: 212,
         S: void 0,
         C: (f, a) => f(...a)
@@ -7306,11 +7380,9 @@ var createNavigationEffectPlugin = (widgetDecorationsField, bookmarks2) => {
               anchor: line.from,
               head: line.from
             },
-            effects: scrollToLineEffect.of({
-              line: line.number,
-              options: {
-                offset: -16
-              }
+            effects: scrollerLineEffect.of({
+              line: line.number - 1,
+              offset: -16
             })
           });
           continue;
@@ -7341,11 +7413,9 @@ var createNavigationEffectPlugin = (widgetDecorationsField, bookmarks2) => {
                 anchor: line.to,
                 head: line.to
               },
-              effects: scrollToLineEffect.of({
-                line: line.number,
-                options: {
-                  offset: -16
-                }
+              effects: scrollerLineEffect.of({
+                line: line.number - 1,
+                offset: -16
               })
             });
           } else {
@@ -7355,11 +7425,9 @@ var createNavigationEffectPlugin = (widgetDecorationsField, bookmarks2) => {
                 anchor: line.to,
                 head: line.to
               },
-              effects: scrollToLineEffect.of({
-                line: line.number,
-                options: {
-                  position: "end"
-                }
+              effects: scrollerLineEffect.of({
+                line: line.number - 1,
+                position: "end"
               })
             });
           }
@@ -7406,6 +7474,12 @@ var createWidgetDecorationsField = (registry = {}, notifier) => StateField13.def
   update: ({ from, decorations: decorations2 }, tr) => {
     for (const effect of tr.effects) {
       if (effect.is(xmlTagResetEffect)) {
+        if (tr.docChanged) {
+          return buildDecorations4(tr.state, {
+            from: 0,
+            to: tr.state.doc.length
+          }, registry, notifier);
+        }
         return {
           from: 0,
           decorations: Decoration15.none
@@ -7416,12 +7490,12 @@ var createWidgetDecorationsField = (registry = {}, notifier) => StateField13.def
       const { state } = tr;
       const reset = tr.changes.touchesRange(0, from);
       if (reset) {
-        log10("document reset", {
+        log11("document reset", {
           from,
           to: state.doc.length
         }, {
-          F: __dxlog_file16,
-          L: 371,
+          F: __dxlog_file17,
+          L: 374,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -7502,9 +7576,9 @@ var buildDecorations4 = (state, range, registry, notifier) => {
               }
             }
           } catch (err) {
-            log10.catch(err, void 0, {
-              F: __dxlog_file16,
-              L: 456,
+            log11.catch(err, void 0, {
+              F: __dxlog_file17,
+              L: 459,
               S: void 0,
               C: (f, a) => f(...a)
             });
@@ -7528,8 +7602,8 @@ var PlaceholderWidget2 = class extends WidgetType10 {
   constructor(id, Component, props, notifier) {
     super(), this.id = id, this.Component = Component, this.props = props, this.notifier = notifier;
     invariant7(id, void 0, {
-      F: __dxlog_file16,
-      L: 482,
+      F: __dxlog_file17,
+      L: 485,
       S: this,
       A: [
         "id",
@@ -7658,6 +7732,7 @@ export {
   convertTreeToJson,
   createBasicExtensions,
   createComment,
+  createCrawler,
   createDataExtensions,
   createEditorStateStore,
   createEditorStateTransaction,
@@ -7738,9 +7813,10 @@ export {
   removeStyle,
   replacer,
   scrollThreadIntoView,
-  scrollToBottomEffect,
   scrollToLine,
-  scrollToLineEffect,
+  scroller,
+  scrollerCrawlEffect,
+  scrollerLineEffect,
   selectionState,
   setBlockquote,
   setComments,
@@ -7748,7 +7824,6 @@ export {
   setSelection,
   setStyle,
   singleValueFacet,
-  smoothScroll,
   stackItemContentEditorClassNames,
   staticCompletion,
   streamer,