@dxos/react-ui-editor 0.3.11-main.a6c4a82 → 0.3.11-main.b4b98ab

package/dist/lib/browser/index.mjs

@@ -5,7 +5,18 @@ import { Doc, YText, YXmlFragment } from "@dxos/text-model";
 // packages/ui/react-ui-editor/src/components/TextEditor/index.ts
 import { tags as tags2 } from "@lezer/highlight";
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/autocomplete.ts
+// packages/ui/react-ui-editor/src/components/TextEditor/TextEditor.tsx
+import { EditorState as EditorState2 } from "@codemirror/state";
+import { EditorView as EditorView12 } from "@codemirror/view";
+import { useFocusableGroup } from "@fluentui/react-tabster";
+import { vim } from "@replit/codemirror-vim";
+import defaultsDeep2 from "lodash.defaultsdeep";
+import React, { forwardRef, useCallback, useEffect as useEffect2, useImperativeHandle, useState as useState2 } from "react";
+import { generateName } from "@dxos/display-name";
+import { useThemeContext } from "@dxos/react-ui";
+import { getColorForValue, inputSurface, mx as mx3 } from "@dxos/react-ui-theme";
+
+// packages/ui/react-ui-editor/src/extensions/autocomplete.ts
 import { autocompletion, completionKeymap } from "@codemirror/autocomplete";
 import { keymap } from "@codemirror/view";
 var autocomplete = ({ onSearch }) => {
@@ -38,7 +49,7 @@ var autocomplete = ({ onSearch }) => {
   ];
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/basic.ts
+// packages/ui/react-ui-editor/src/extensions/basic.ts
 import { closeBrackets } from "@codemirror/autocomplete";
 import { bracketMatching, defaultHighlightStyle, syntaxHighlighting } from "@codemirror/language";
 import { oneDarkHighlightStyle } from "@codemirror/theme-one-dark";
@@ -55,11 +66,11 @@ var basicBundle = ({ readonly, themeMode, placeholder: _placeholder }) => [
   themeMode === "dark" ? syntaxHighlighting(oneDarkHighlightStyle) : syntaxHighlighting(defaultHighlightStyle)
 ].filter(Boolean);
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/blast.ts
+// packages/ui/react-ui-editor/src/extensions/blast.ts
 import { EditorView as EditorView2, keymap as keymap2 } from "@codemirror/view";
 import defaultsDeep from "lodash.defaultsdeep";
 import { invariant } from "@dxos/invariant";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/components/TextEditor/extensions/blast.ts";
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/blast.ts";
 var defaultOptions = {
   effect: 2,
   maxParticles: 200,
@@ -365,7 +376,7 @@ var random = (min, max) => {
   return min + ~~(Math.random() * (max - min + 1));
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/code.ts
+// packages/ui/react-ui-editor/src/extensions/code.ts
 import { ViewPlugin, EditorView as EditorView3, Decoration } from "@codemirror/view";
 import get from "lodash.get";
 import { mx as mx2 } from "@dxos/react-ui-theme";
@@ -416,7 +427,7 @@ var blockquote = mx("pl-1 mr-1 border-is-4 border-primary-500/70 dark:border-pri
 import { tailwindConfig } from "@dxos/react-ui-theme";
 var tokens = tailwindConfig({}).theme;
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/code.ts
+// packages/ui/react-ui-editor/src/extensions/code.ts
 var CODE_REGEX = /```[\s\S]*?```/gs;
 var styles = EditorView3.baseTheme({
   "& .cm-codeblock": {
@@ -487,7 +498,7 @@ var code2 = () => {
   ];
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/comments.ts
+// packages/ui/react-ui-editor/src/extensions/comments.ts
 import { StateEffect as StateEffect2, StateField as StateField3 } from "@codemirror/state";
 import { hoverTooltip, keymap as keymap3, Decoration as Decoration2, EditorView as EditorView4, MatchDecorator, ViewPlugin as ViewPlugin3, WidgetType } from "@codemirror/view";
 import sortBy from "lodash.sortby";
@@ -496,9 +507,9 @@ import { invariant as invariant3 } from "@dxos/invariant";
 import { log as log3 } from "@dxos/log";
 import { nonNullable } from "@dxos/util";
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/util.ts
+// packages/ui/react-ui-editor/src/extensions/util.ts
 import { log } from "@dxos/log";
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/components/TextEditor/extensions/util.ts";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/util.ts";
 var callbackWrapper = (fn) => (...args) => {
   try {
     return fn(...args);
@@ -966,13 +977,22 @@ var createYjsModel = ({ identity, space, text }) => {
       ].join(":");
     },
     getRangeFromCursor: (cursor) => {
+      invariant2(text.doc, void 0, {
+        F: __dxlog_file4,
+        L: 113,
+        S: void 0,
+        A: [
+          "text.doc",
+          ""
+        ]
+      });
       const parts = cursor.split(":");
       const from = Y.createAbsolutePositionFromRelativePosition(Y.decodeRelativePosition(stringToArray(parts[0])), text.doc);
       const to = Y.createAbsolutePositionFromRelativePosition(Y.decodeRelativePosition(stringToArray(parts[1])), text.doc);
-      return {
+      return from && to ? {
         from: from.index,
         to: to.index
-      };
+      } : void 0;
     },
     extension: [
       yCollab(text.content, provider?.awareness),
@@ -1008,8 +1028,8 @@ var createAutomergeModel = ({ identity, text }) => {
   return model;
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/comments.ts
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/components/TextEditor/extensions/comments.ts";
+// packages/ui/react-ui-editor/src/extensions/comments.ts
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/comments.ts";
 var styles2 = EditorView4.baseTheme({
   "& .cm-bookmark": {
     cursor: "pointer",
@@ -1054,11 +1074,11 @@ var commentsStateField = StateField3.define({
         const { model, comments: comments2 } = effect.value;
         const ranges = comments2.map((comment) => {
           const range = model.getRangeFromCursor(comment.cursor);
-          return {
+          return range && {
             ...comment,
             ...range
           };
-        });
+        }).filter(nonNullable);
         return {
           ...value,
           ranges
@@ -1099,7 +1119,7 @@ var BookmarkWidget = class extends WidgetType {
     this._handleClick = _handleClick;
     invariant3(this._id, void 0, {
       F: __dxlog_file5,
-      L: 150,
+      L: 153,
       S: this,
       A: [
         "this._id",
@@ -1125,7 +1145,7 @@ var comments = (options = {}) => {
   const createCommentThread = (view) => {
     invariant3(options.onCreate, void 0, {
       F: __dxlog_file5,
-      L: 204,
+      L: 207,
       S: void 0,
       A: [
         "options.onCreate",
@@ -1207,7 +1227,7 @@ var comments = (options = {}) => {
     options.onCreate ? keymap3.of([
       {
         key: options?.key ?? "meta-'",
-        run: createCommentThread
+        run: callbackWrapper(createCommentThread)
       }
     ]) : [],
     //
@@ -1251,7 +1271,7 @@ var comments = (options = {}) => {
         changes.iterChanges((from, to, from2, to2) => {
           invariant3(model, void 0, {
             F: __dxlog_file5,
-            L: 333,
+            L: 336,
             S: void 0,
             A: [
               "model",
@@ -1261,12 +1281,12 @@ var comments = (options = {}) => {
           ranges.forEach((range) => {
             if (from2 === to2) {
               const newRange = model.getRangeFromCursor(range.cursor);
-              if (newRange.to - newRange.from === 0) {
+              if (!newRange || newRange.to - newRange.from === 0) {
                 log3.info("deleted comment", {
                   thread: range.id
                 }, {
                   F: __dxlog_file5,
-                  L: 339,
+                  L: 342,
                   S: void 0,
                   C: (f, a) => f(...a)
                 });
@@ -1323,7 +1343,7 @@ var comments = (options = {}) => {
   ];
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/hr.ts
+// packages/ui/react-ui-editor/src/extensions/hr.ts
 import { Decoration as Decoration3, EditorView as EditorView5, MatchDecorator as MatchDecorator2, ViewPlugin as ViewPlugin4, WidgetType as WidgetType2 } from "@codemirror/view";
 import get3 from "lodash.get";
 var styles3 = EditorView5.baseTheme({
@@ -1371,7 +1391,7 @@ var hr = () => [
   })
 ];
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/image.ts
+// packages/ui/react-ui-editor/src/extensions/image.ts
 import { syntaxTree } from "@codemirror/language";
 import { RangeSetBuilder, StateField as StateField4 } from "@codemirror/state";
 import { Decoration as Decoration4, EditorView as EditorView6, WidgetType as WidgetType3 } from "@codemirror/view";
@@ -1419,16 +1439,67 @@ var ImageWidget = class extends WidgetType3 {
   }
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/link.ts
+// packages/ui/react-ui-editor/src/extensions/link.ts
 import { syntaxTree as syntaxTree2 } from "@codemirror/language";
 import { RangeSetBuilder as RangeSetBuilder2, StateField as StateField5 } from "@codemirror/state";
-import { Decoration as Decoration5, EditorView as EditorView7, WidgetType as WidgetType4 } from "@codemirror/view";
+import { Decoration as Decoration5, EditorView as EditorView7, WidgetType as WidgetType4, hoverTooltip as hoverTooltip2 } from "@codemirror/view";
+import { tooltipContent } from "@dxos/react-ui-theme";
+var markdownLinkRegexp = /\[([^\]]+)]\(([^)]+)\)/;
 var link = (options = {}) => {
-  return StateField5.define({
-    create: (state) => update2(state, options),
-    update: (_, tr) => update2(tr.state, options),
-    provide: (field) => EditorView7.decorations.from(field)
-  });
+  const extensions = [
+    StateField5.define({
+      create: (state) => update2(state, options),
+      update: (_, tr) => update2(tr.state, options),
+      provide: (field) => EditorView7.decorations.from(field)
+    })
+  ];
+  if (options.onHover) {
+    extensions.push(
+      // https://codemirror.net/examples/tooltip
+      // https://codemirror.net/docs/ref/#view.hoverTooltip
+      // https://github.com/codemirror/view/blob/main/src/tooltip.ts
+      hoverTooltip2((view, pos) => {
+        const { from, text } = view.state.doc.lineAt(pos);
+        const p = pos - from;
+        let idx = 0;
+        let match;
+        do {
+          match = text.substring(idx).match(markdownLinkRegexp);
+          if (!match) {
+            match = void 0;
+            break;
+          }
+          idx = text.indexOf(match[0]);
+          if (p >= idx && p < idx + match[0].length) {
+            break;
+          }
+          idx += match[0].length;
+        } while (true);
+        if (!match) {
+          return null;
+        }
+        const [, , url] = match ?? [];
+        return {
+          pos: idx + from,
+          end: idx + from + match[0].length,
+          above: true,
+          create: () => {
+            const el = document.createElement("div");
+            el.className = tooltipContent({}, "pli-2 plb-1");
+            options.onHover(el, url);
+            return {
+              dom: el,
+              offset: {
+                x: 0,
+                y: 4
+              }
+            };
+          }
+        };
+      })
+    );
+  }
+  return extensions;
 };
 var LinkButton = class extends WidgetType4 {
   constructor(_pos, _url, _onAttach) {
@@ -1447,14 +1518,13 @@ var LinkButton = class extends WidgetType4 {
   }
 };
 var LinkText = class extends WidgetType4 {
-  constructor(_pos, _text, _url) {
+  constructor(_text, _url) {
     super();
-    this._pos = _pos;
     this._text = _text;
     this._url = _url;
   }
   eq(other) {
-    return this._pos === other._pos && this._url === other._url;
+    return this._url === other._url;
   }
   toDOM(view) {
     const link2 = document.createElement("a");
@@ -1468,7 +1538,7 @@ var LinkText = class extends WidgetType4 {
       link2.onclick = () => {
         view.dispatch({
           selection: {
-            anchor: this._pos
+            anchor: view.posAtDOM(link2)
           }
         });
       };
@@ -1491,7 +1561,7 @@ var update2 = (state, options) => {
         }
         if (state.readOnly || cursor < node.from || cursor > node.to) {
           builder.add(node.from, node.to, Decoration5.replace({
-            widget: new LinkText(node.from, text, options.link ? url : void 0)
+            widget: new LinkText(text, options.link ? url : void 0)
           }));
         }
         if (options.onRender) {
@@ -1506,21 +1576,21 @@ var update2 = (state, options) => {
   return builder.finish();
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/listener.ts
-import { StateField as StateField6 } from "@codemirror/state";
-var listener = ({ onChange }) => {
-  return StateField6.define({
-    create: () => null,
-    update: (_value, transaction) => {
-      if (transaction.docChanged && onChange) {
-        onChange(transaction.newDoc.toString());
-      }
-      return null;
-    }
-  });
+// packages/ui/react-ui-editor/src/extensions/listener.ts
+import { EditorView as EditorView8 } from "@codemirror/view";
+var listener = ({ onFocus, onChange }) => {
+  const extensions = [];
+  onFocus && extensions.push(EditorView8.focusChangeEffect.of((_, focused) => {
+    onFocus(focused);
+    return null;
+  }));
+  onChange && extensions.push(EditorView8.updateListener.of((update4) => {
+    onChange(update4.state.doc.toString());
+  }));
+  return extensions;
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/markdown/bundle.ts
+// packages/ui/react-ui-editor/src/extensions/markdown/bundle.ts
 import { closeBrackets as closeBrackets2, closeBracketsKeymap } from "@codemirror/autocomplete";
 import { history, historyKeymap, indentWithTab, standardKeymap } from "@codemirror/commands";
 import { markdownLanguage as markdownLanguage2, markdown } from "@codemirror/lang-markdown";
@@ -1529,9 +1599,9 @@ import { languages } from "@codemirror/language-data";
 import { searchKeymap } from "@codemirror/search";
 import { EditorState } from "@codemirror/state";
 import { oneDarkHighlightStyle as oneDarkHighlightStyle2 } from "@codemirror/theme-one-dark";
-import { crosshairCursor, drawSelection as drawSelection2, dropCursor, EditorView as EditorView8, highlightActiveLine, keymap as keymap4, placeholder as placeholder2 } from "@codemirror/view";
+import { crosshairCursor, drawSelection as drawSelection2, dropCursor, EditorView as EditorView9, highlightActiveLine, keymap as keymap4, placeholder as placeholder2 } from "@codemirror/view";
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/markdown/highlight.ts
+// packages/ui/react-ui-editor/src/extensions/markdown/highlight.ts
 import { markdownLanguage } from "@codemirror/lang-markdown";
 import { HighlightStyle } from "@codemirror/language";
 import { tags, styleTags, Tag } from "@lezer/highlight";
@@ -1727,12 +1797,12 @@ var markdownHighlightStyle = (readonly) => {
   });
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/markdown/bundle.ts
+// packages/ui/react-ui-editor/src/extensions/markdown/bundle.ts
 var markdownBundle = ({ readonly, themeMode, placeholder: _placeholder }) => {
   return [
     EditorState.allowMultipleSelections.of(true),
     EditorState.tabSize.of(2),
-    EditorView8.lineWrapping,
+    EditorView9.lineWrapping,
     customKeymap(),
     bracketMatching2(),
     closeBrackets2(),
@@ -1780,7 +1850,7 @@ var customKeymap = () => keymap4.of([
   ...searchKeymap
 ]);
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/mention.ts
+// packages/ui/react-ui-editor/src/extensions/mention.ts
 import { autocompletion as autocompletion2 } from "@codemirror/autocomplete";
 var mention = ({ onSearch }) => {
   return autocompletion2({
@@ -1803,20 +1873,20 @@ var mention = ({ onSearch }) => {
   });
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/mermaid.ts
+// packages/ui/react-ui-editor/src/extensions/mermaid.ts
 var mermaid = () => {
   return [];
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/table.ts
+// packages/ui/react-ui-editor/src/extensions/table.ts
 import { syntaxTree as syntaxTree3 } from "@codemirror/language";
-import { RangeSetBuilder as RangeSetBuilder3, StateField as StateField7 } from "@codemirror/state";
-import { Decoration as Decoration6, EditorView as EditorView9, WidgetType as WidgetType5 } from "@codemirror/view";
+import { RangeSetBuilder as RangeSetBuilder3, StateField as StateField6 } from "@codemirror/state";
+import { Decoration as Decoration6, EditorView as EditorView10, WidgetType as WidgetType5 } from "@codemirror/view";
 var table = (options = {}) => {
-  return StateField7.define({
+  return StateField6.define({
     create: (state) => update3(state, options),
     update: (_, tr) => update3(tr.state, options),
-    provide: (field) => EditorView9.decorations.from(field)
+    provide: (field) => EditorView10.decorations.from(field)
   });
 };
 var update3 = (state, options) => {
@@ -1904,9 +1974,9 @@ var TableWidget = class extends WidgetType5 {
   }
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/tasklist.ts
-import { EditorView as EditorView10, Decoration as Decoration7, WidgetType as WidgetType6, MatchDecorator as MatchDecorator3, ViewPlugin as ViewPlugin5 } from "@codemirror/view";
-var styles4 = EditorView10.baseTheme({
+// packages/ui/react-ui-editor/src/extensions/tasklist.ts
+import { EditorView as EditorView11, Decoration as Decoration7, WidgetType as WidgetType6, MatchDecorator as MatchDecorator3, ViewPlugin as ViewPlugin5 } from "@codemirror/view";
+var styles4 = EditorView11.baseTheme({
   "& .cm-task-item": {
     paddingLeft: "4px",
     paddingRight: "8px"
@@ -1979,7 +2049,7 @@ var tasklist = (options = {}) => {
     }
   }, {
     decorations: (value) => value.tasks,
-    provide: (plugin) => EditorView10.atomicRanges.of((view) => {
+    provide: (plugin) => EditorView11.atomicRanges.of((view) => {
       return view.plugin(plugin)?.tasks || Decoration7.none;
     })
   });
@@ -1989,51 +2059,7 @@ var tasklist = (options = {}) => {
   ];
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/tooltip.ts
-import { hoverTooltip as hoverTooltip2 } from "@codemirror/view";
-import { tooltipContent } from "@dxos/react-ui-theme";
-var markdownLinkRegexp = /\[([^\]]+)]\(([^)]+)\)/;
-var tooltip = ({ onHover, regexp = markdownLinkRegexp }) => hoverTooltip2((view, pos) => {
-  const { from, text } = view.state.doc.lineAt(pos);
-  const p = pos - from;
-  let idx = 0;
-  let match;
-  do {
-    match = text.substring(idx).match(regexp);
-    if (!match) {
-      match = void 0;
-      break;
-    }
-    idx = text.indexOf(match[0]);
-    if (p >= idx && p < idx + match[0].length) {
-      break;
-    }
-    idx += match[0].length;
-  } while (true);
-  if (!match) {
-    return null;
-  }
-  const [, , url] = match ?? [];
-  return {
-    pos: idx + from,
-    end: idx + from + match[0].length,
-    above: true,
-    create: () => {
-      const el = document.createElement("div");
-      el.className = tooltipContent({}, "pli-2 plb-1");
-      onHover(el, url);
-      return {
-        dom: el,
-        offset: {
-          x: 0,
-          y: 4
-        }
-      };
-    }
-  };
-});
-
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/typewriter.ts
+// packages/ui/react-ui-editor/src/extensions/typewriter.ts
 import { keymap as keymap5 } from "@codemirror/view";
 var defaultItems = [
   "hello world!",
@@ -2090,7 +2116,7 @@ var typewriter = ({ delay = 75, items = defaultItems } = {}) => {
   ];
 };
 
-// packages/ui/react-ui-editor/src/components/TextEditor/themes/default.ts
+// packages/ui/react-ui-editor/src/themes/default.ts
 import get5 from "lodash.get";
 var defaultTheme = {
   //
@@ -2363,20 +2389,11 @@ var codeTheme = {
 };
 
 // packages/ui/react-ui-editor/src/components/TextEditor/TextEditor.tsx
-import { EditorState as EditorState2 } from "@codemirror/state";
-import { EditorView as EditorView11 } from "@codemirror/view";
-import { useFocusableGroup } from "@fluentui/react-tabster";
-import { vim } from "@replit/codemirror-vim";
-import defaultsDeep2 from "lodash.defaultsdeep";
-import React, { forwardRef, useCallback, useEffect as useEffect2, useImperativeHandle, useState as useState2 } from "react";
-import { generateName } from "@dxos/display-name";
-import { useThemeContext } from "@dxos/react-ui";
-import { getColorForValue, inputSurface, mx as mx3 } from "@dxos/react-ui-theme";
 var EditorModes = [
   "default",
   "vim"
 ];
-var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, comments: comments2, readonly, editorMode, extensions = [], slots = defaultSlots }, forwardedRef) => {
+var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, comments: comments2, extensions = [], editorMode, slots = defaultSlots }, forwardedRef) => {
   const { themeMode } = useThemeContext();
   const tabsterDOMAttribute = useFocusableGroup({
     tabBehavior: "limited"
@@ -2438,9 +2455,9 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, comments: comments2, r
         editorMode === "vim" && vim(),
         // Theme.
         // TODO(burdon): Make theme configurable.
-        EditorView11.baseTheme(defaultTheme),
-        EditorView11.theme(slots?.editor?.theme ?? {}),
-        EditorView11.darkTheme.of(themeMode === "dark"),
+        EditorView12.baseTheme(defaultTheme),
+        EditorView12.theme(slots?.editor?.theme ?? {}),
+        EditorView12.darkTheme.of(themeMode === "dark"),
         // Storage and replication.
         model.extension,
         // Custom.
@@ -2450,7 +2467,7 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, comments: comments2, r
     view?.destroy();
     setEditor({
       state: state2,
-      view: new EditorView11({
+      view: new EditorView12({
         state: state2,
         parent: root
       })
@@ -2583,7 +2600,6 @@ export {
   tags2 as tags,
   tasklist,
   textTheme,
-  tooltip,
   typewriter,
   useTextModel
 };