@dxos/react-ui-editor 0.3.10-main.f916973 → 0.3.10-next.5353ed8

package/dist/lib/browser/index.mjs

@@ -54,66 +54,8 @@ var basicBundle = ({ themeMode, placeholder: _placeholder }) => [
   themeMode === "dark" ? syntaxHighlighting(oneDarkHighlightStyle) : syntaxHighlighting(defaultHighlightStyle)
 ].filter(Boolean);
 
-// packages/ui/react-ui-editor/src/components/TextEditor/extensions/demo.ts
-import { keymap as keymap2 } from "@codemirror/view";
-var defaultItems = [
-  "hello world!",
-  "this is a test.",
-  "this is [DXOS](https://dxos.org)"
-];
-var demo = ({ delay = 75, items = defaultItems } = {}) => {
-  let t;
-  let idx = 0;
-  return [
-    keymap2.of([
-      {
-        // Reset.
-        key: "alt-meta-'",
-        run: (view) => {
-          clearTimeout(t);
-          idx = 0;
-          return true;
-        }
-      },
-      {
-        // Next prompt.
-        // TODO(burdon): Press 1-9 to select prompt?
-        key: "shift-meta-'",
-        run: (view) => {
-          clearTimeout(t);
-          const text = items[idx++];
-          if (idx === items?.length) {
-            idx = 0;
-          }
-          let i = 0;
-          const insert = (d = 0) => {
-            t = setTimeout(() => {
-              const pos = view.state.selection.main.head;
-              view.dispatch({
-                changes: {
-                  from: pos,
-                  insert: text[i++]
-                },
-                selection: {
-                  anchor: pos + 1
-                }
-              });
-              if (i < text.length) {
-                insert(Math.random() * delay * (text[i] === " " ? 2 : 1));
-              }
-            }, d);
-          };
-          insert();
-          return true;
-        }
-      }
-    ])
-  ];
-};
-
 // packages/ui/react-ui-editor/src/components/TextEditor/extensions/comments.ts
-import { keymap as keymap3, Decoration, EditorView as EditorView2, MatchDecorator, ViewPlugin, WidgetType } from "@codemirror/view";
-import { debounce } from "@dxos/async";
+import { Decoration, EditorView as EditorView2, keymap as keymap2, MatchDecorator, ViewPlugin, WidgetType } from "@codemirror/view";
 import { invariant } from "@dxos/invariant";
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/components/TextEditor/extensions/comments.ts";
 var BookmarkWidget = class extends WidgetType {
@@ -123,7 +65,7 @@ var BookmarkWidget = class extends WidgetType {
     this._id = _id;
     invariant(this._id, void 0, {
       F: __dxlog_file,
-      L: 41,
+      L: 40,
       S: this,
       A: [
         "this._id",
@@ -134,6 +76,7 @@ var BookmarkWidget = class extends WidgetType {
   eq(other) {
     return this._id === other._id;
   }
+  // TODO(burdon): Click to select.
   toDOM() {
     const span = document.createElement("span");
     span.className = "cm-bookmark";
@@ -147,13 +90,9 @@ var styles = EditorView2.baseTheme({
     margin: "4px",
     padding: "4px",
     backgroundColor: "yellow"
-  },
-  "& .cm-bookmark-selected": {
-    backgroundColor: "orange"
   }
 });
 var comments = (options = {}) => {
-  let active;
   const bookmarkMatcher = new MatchDecorator({
     regexp: /\[\^(\w+)\]/g,
     decoration: (match, view, pos) => {
@@ -177,13 +116,10 @@ var comments = (options = {}) => {
       return view.plugin(plugin)?.bookmarks || Decoration.none;
     })
   });
-  const doUpdate = debounce((data) => {
-    options.onUpdate?.(data);
-  }, 200);
   return [
-    keymap3.of([
+    keymap2.of([
       {
-        key: options?.key ?? "shift-meta-c",
+        key: options?.key ?? "alt-meta-c",
         run: (view) => {
           const id = options.onCreate?.();
           if (id) {
@@ -207,40 +143,30 @@ var comments = (options = {}) => {
     bookmarks,
     // Monitor cursor movement.
     EditorView2.updateListener.of((update2) => {
-      active = void 0;
-      if (!options.onUpdate) {
-        return;
-      }
       const view = update2.view;
       const pos = view.state.selection.main.head;
       const decorations = [];
       const rangeSet = view.plugin(bookmarks)?.bookmarks;
-      let closest = Infinity;
-      const { from, to } = view.visibleRanges?.[0] ?? {
-        from: 0,
-        to: view.state.doc.length
-      };
-      rangeSet?.between(from, to, (from2, to2, value) => {
-        decorations.push({
-          from: from2,
-          to: to2,
-          value
-        });
-        const d = Math.min(Math.abs(pos - from2), Math.abs(pos - to2));
-        if (d < closest) {
-          active = value.spec.id;
-          closest = d;
+      rangeSet?.between(pos, pos + 1, (from, to, value) => {
+        if (value.spec.widget) {
+          decorations.push({
+            from,
+            to,
+            value
+          });
         }
       });
       if (decorations.length) {
-        doUpdate({
-          active,
-          items: decorations.map(({ from: from2, value: { spec: { id } } }) => ({
-            id,
-            pos: from2,
-            location: view.coordsAtPos(from2)
-          }))
-        });
+        const { from, value: { spec: { id } } } = decorations[0];
+        const location = view.coordsAtPos(from);
+        if (location) {
+          options.onUpdate?.({
+            items: decorations.map(({ value: { spec: { id: id2 } } }) => id2),
+            active: id,
+            pos,
+            location
+          });
+        }
       }
     }),
     styles
@@ -336,7 +262,7 @@ var link = (options = {}) => {
 
 // packages/ui/react-ui-editor/src/components/TextEditor/extensions/listener.ts
 import { StateField as StateField2 } from "@codemirror/state";
-var listener = ({ onChange }) => StateField2.define({
+var listener = (onChange) => StateField2.define({
   create: () => null,
   update: (_value, transaction) => {
     if (transaction.docChanged && onChange) {
@@ -355,7 +281,7 @@ import { languages } from "@codemirror/language-data";
 import { highlightSelectionMatches, searchKeymap } from "@codemirror/search";
 import { EditorState } from "@codemirror/state";
 import { oneDarkHighlightStyle as oneDarkHighlightStyle2 } from "@codemirror/theme-one-dark";
-import { crosshairCursor, drawSelection, dropCursor, EditorView as EditorView4, highlightActiveLine, highlightActiveLineGutter, highlightSpecialChars, keymap as keymap4, placeholder as placeholder2, rectangularSelection } from "@codemirror/view";
+import { crosshairCursor, drawSelection, dropCursor, EditorView as EditorView4, highlightActiveLine, highlightActiveLineGutter, highlightSpecialChars, keymap as keymap3, placeholder as placeholder2, rectangularSelection } from "@codemirror/view";
 
 // packages/ui/react-ui-editor/src/components/TextEditor/extensions/markdown/highlight.ts
 import { markdownLanguage } from "@codemirror/lang-markdown";
@@ -565,7 +491,7 @@ var markdownBundle = ({ themeMode, placeholder: _placeholder }) => {
     indentOnInput(),
     rectangularSelection(),
     // TODO(burdon): Review.
-    keymap4.of([
+    keymap3.of([
       ...closeBracketsKeymap,
       ...defaultKeymap,
       // ...foldKeymap,
@@ -1000,15 +926,6 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, extensions = [], slots
     onKeyUp: handleKeyUp
   });
 });
-var maybeDebug = () => {
-  const items = localStorage.getItem("dxos.composer.demo");
-  if (items) {
-    return demo({
-      items: items.split(",")
-    });
-  }
-  return [];
-};
 var TextEditor = /* @__PURE__ */ forwardRef(({ extensions = [], slots: _slots, ...props }, forwardedRef) => {
   const { themeMode } = useThemeContext();
   const slots = defaultsDeep({}, _slots, defaultTextSlots);
@@ -1019,7 +936,6 @@ var TextEditor = /* @__PURE__ */ forwardRef(({ extensions = [], slots: _slots, .
         themeMode,
         placeholder: slots?.editor?.placeholder
       }),
-      maybeDebug(),
       ...extensions
     ],
     slots,
@@ -1036,7 +952,6 @@ var MarkdownEditor = /* @__PURE__ */ forwardRef(({ extensions = [], slots: _slot
         themeMode,
         placeholder: slots?.editor?.placeholder
       }),
-      maybeDebug(),
       ...extensions
     ],
     slots,
@@ -1550,7 +1465,6 @@ export {
   defaultSlots,
   defaultTextSlots,
   defaultTheme,
-  demo,
   link,
   listener,
   markdownBundle,