@dxos/react-ui-editor 0.3.11-main.42059c4 → 0.3.11-main.4d95695

package/dist/lib/browser/index.mjs

@@ -595,7 +595,7 @@ var styles = EditorView.baseTheme({
     zIndex: 101,
     transition: "opacity .3s ease-in-out",
     backgroundColor: "inherit",
-    // these should be separate
+    // These should be separate.
     opacity: 0,
     transitionDelay: "0s",
     whiteSpace: "nowrap"
@@ -1059,20 +1059,18 @@ var getLineRange = (lines, from, to) => {
   ];
 };
 var code2 = () => {
-  const getDecorations = (view) => {
+  const buildDecorations4 = (view) => {
     const decorations = [];
-    if (!view.hasFocus || view.state.readOnly) {
-      const text = view.state.doc.sliceString(0);
-      const matches = text.matchAll(CODE_REGEX);
-      const blocks = view.viewportLineBlocks;
-      for (const match of matches) {
-        const range = getLineRange(blocks, match.index, match.index + match[0].length);
-        for (let i = range[0]; i <= range[1]; i++) {
-          const block = blocks[i];
-          decorations.push(Decoration2.line({
-            class: mx2("cm-codeblock", i === range[0] && "cm-codeblock-first", i === range[1] && "cm-codeblock-last")
-          }).range(block.from));
-        }
+    const text = view.state.doc.sliceString(0);
+    const matches = text.matchAll(CODE_REGEX);
+    const blocks = view.viewportLineBlocks;
+    for (const match of matches) {
+      const range = getLineRange(blocks, match.index, match.index + match[0].length);
+      for (let i = range[0]; i <= range[1]; i++) {
+        const block = blocks[i];
+        decorations.push(Decoration2.line({
+          class: mx2("cm-codeblock", i === range[0] && "cm-codeblock-first", i === range[1] && "cm-codeblock-last")
+        }).range(block.from));
       }
     }
     return Decoration2.set(decorations);
@@ -1081,7 +1079,7 @@ var code2 = () => {
     ViewPlugin3.fromClass(class {
       constructor(view) {
         this.hasFocus = false;
-        this.decorations = getDecorations(view);
+        this.decorations = buildDecorations4(view);
       }
       update(update2) {
         if (
@@ -1089,7 +1087,7 @@ var code2 = () => {
           this.hasFocus !== update2.view.hasFocus || update2.startState.readOnly !== update2.view.state.readOnly || update2.docChanged || update2.viewportChanged
         ) {
           this.hasFocus = update2.view.hasFocus;
-          this.decorations = getDecorations(update2.view);
+          this.decorations = buildDecorations4(update2.view);
         }
       }
     }, {
@@ -1172,7 +1170,7 @@ var commentsStateField = StateField2.define({
           ...effect.value
         };
       }
-      if (effect.is(setCommentRange) && effect.value.comments.length > 0) {
+      if (effect.is(setCommentRange)) {
         const { comments: comments2 } = effect.value;
         const ranges = comments2.map((comment) => {
           const range = Cursor.getRangeFromCursor(cursorConverter3, comment.cursor);
@@ -1279,7 +1277,7 @@ var comments = (options = {}) => {
     const cursorConverter3 = view.state.facet(Cursor.converter);
     invariant2(options.onCreate, void 0, {
       F: __dxlog_file3,
-      L: 262,
+      L: 264,
       S: void 0,
       A: [
         "options.onCreate",
@@ -1336,7 +1334,7 @@ var comments = (options = {}) => {
           above: true,
           create: () => {
             const el = document.createElement("div");
-            options.onHover?.(el, shortcut);
+            options.onHover(el, shortcut);
             return {
               dom: el,
               offset: {
@@ -1349,7 +1347,8 @@ var comments = (options = {}) => {
       }
       return null;
     }, {
-      hideOnChange: true,
+      // TODO(burdon): Hide on change triggered immediately?
+      // hideOnChange: true,
       hoverTime: 1e3
     }) : [],
     //
@@ -1445,7 +1444,8 @@ var HorizontalRuleWidget = class extends WidgetType2 {
   }
 };
 var placeholderMatcher = new MatchDecorator({
-  regexp: /^---$/g,
+  // regexp: /(?<=\n\n)---/gs,
+  regexp: /^---$/gs,
   decoration: (match, view, pos) => Decoration4.replace({
     widget: new HorizontalRuleWidget(pos)
   })
@@ -1460,11 +1460,7 @@ var hr = () => [
       this.rules = placeholderMatcher.updateDeco(update2, this.rules);
     }
   }, {
-    decorations: (instance) => instance.rules,
-    // TODO(burdon): Is this really atomic (cursor can move into ---).
-    provide: (plugin) => EditorView6.atomicRanges.of((view) => {
-      return view.plugin(plugin)?.rules || Decoration4.none;
-    })
+    decorations: (instance) => instance.rules
   })
 ];
 
@@ -1543,7 +1539,7 @@ var ImageWidget = class extends WidgetType3 {
 // packages/ui/react-ui-editor/src/extensions/link.ts
 import { syntaxTree as syntaxTree2 } from "@codemirror/language";
 import { RangeSetBuilder } from "@codemirror/state";
-import { Decoration as Decoration6, WidgetType as WidgetType4, hoverTooltip as hoverTooltip2, ViewPlugin as ViewPlugin5 } from "@codemirror/view";
+import { hoverTooltip as hoverTooltip2, Decoration as Decoration6, ViewPlugin as ViewPlugin5, WidgetType as WidgetType4 } from "@codemirror/view";
 import { tooltipContent } from "@dxos/react-ui-theme";
 var link = (options = {}) => {
   const extensions = [
@@ -2122,6 +2118,7 @@ var tasklist = (options = {}) => {
     }
   }, {
     decorations: (v) => v.decorations,
+    // TODO(burdon): Is this still required?
     provide: (plugin) => EditorView11.atomicRanges.of((view) => {
       return view.plugin(plugin)?.decorations || Decoration8.none;
     })