@dxos/react-ui-editor 0.3.11-main.3f845e1 → 0.3.11-main.9bacd9f

package/dist/lib/browser/index.mjs

@@ -1099,7 +1099,7 @@ var BookmarkWidget = class extends WidgetType {
     this._handleClick = _handleClick;
     invariant3(this._id, void 0, {
       F: __dxlog_file5,
-      L: 150,
+      L: 151,
       S: this,
       A: [
         "this._id",
@@ -1125,7 +1125,7 @@ var comments = (options = {}) => {
   const createCommentThread = (view) => {
     invariant3(options.onCreate, void 0, {
       F: __dxlog_file5,
-      L: 204,
+      L: 205,
       S: void 0,
       A: [
         "options.onCreate",
@@ -1207,7 +1207,7 @@ var comments = (options = {}) => {
     options.onCreate ? keymap3.of([
       {
         key: options?.key ?? "meta-'",
-        run: createCommentThread
+        run: callbackWrapper(createCommentThread)
       }
     ]) : [],
     //
@@ -1251,7 +1251,7 @@ var comments = (options = {}) => {
         changes.iterChanges((from, to, from2, to2) => {
           invariant3(model, void 0, {
             F: __dxlog_file5,
-            L: 333,
+            L: 334,
             S: void 0,
             A: [
               "model",
@@ -1266,7 +1266,7 @@ var comments = (options = {}) => {
                   thread: range.id
                 }, {
                   F: __dxlog_file5,
-                  L: 339,
+                  L: 340,
                   S: void 0,
                   C: (f, a) => f(...a)
                 });
@@ -1422,13 +1422,64 @@ var ImageWidget = class extends WidgetType3 {
 // packages/ui/react-ui-editor/src/components/TextEditor/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 +1498,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 +1518,7 @@ var LinkText = class extends WidgetType4 {
       link2.onclick = () => {
         view.dispatch({
           selection: {
-            anchor: this._pos
+            anchor: view.posAtDOM(link2)
           }
         });
       };
@@ -1491,7 +1541,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) {
@@ -1507,17 +1557,17 @@ var update2 = (state, options) => {
 };
 
 // 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;
-    }
-  });
+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
@@ -1529,7 +1579,7 @@ 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
 import { markdownLanguage } from "@codemirror/lang-markdown";
@@ -1732,7 +1782,7 @@ var markdownBundle = ({ readonly, themeMode, placeholder: _placeholder }) => {
   return [
     EditorState.allowMultipleSelections.of(true),
     EditorState.tabSize.of(2),
-    EditorView8.lineWrapping,
+    EditorView9.lineWrapping,
     customKeymap(),
     bracketMatching2(),
     closeBrackets2(),
@@ -1810,13 +1860,13 @@ var mermaid = () => {
 
 // packages/ui/react-ui-editor/src/components/TextEditor/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) => {
@@ -1905,8 +1955,8 @@ 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({
+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 +2029,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,50 +2039,6 @@ 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
 import { keymap as keymap5 } from "@codemirror/view";
 var defaultItems = [
@@ -2364,7 +2370,7 @@ 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 { EditorView as EditorView12 } from "@codemirror/view";
 import { useFocusableGroup } from "@fluentui/react-tabster";
 import { vim } from "@replit/codemirror-vim";
 import defaultsDeep2 from "lodash.defaultsdeep";
@@ -2376,7 +2382,7 @@ 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 +2444,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 +2456,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 +2589,6 @@ export {
   tags2 as tags,
   tasklist,
   textTheme,
-  tooltip,
   typewriter,
   useTextModel
 };