@dxos/react-ui-editor 0.6.12-staging.e11e696 → 0.6.13-main.09887cd

package/dist/lib/node-esm/index.mjs

@@ -6,7 +6,7 @@ import {
   localStorageStateStoreAdapter,
   singleValueFacet,
   state
-} from "./chunk-RCIWLRIY.mjs";
+} from "./chunk-GP5RCZ3X.mjs";
 
 // packages/ui/react-ui-editor/src/translations.ts
 var translationKey = "react-ui-editor";
@@ -1238,6 +1238,51 @@ var clientRectsFor = (dom) => {
   }
 };
 
+// packages/ui/react-ui-editor/src/extensions/util/error.ts
+import { log as log3 } from "@dxos/log";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/util/error.ts";
+var wrapWithCatch = (fn) => {
+  return (...args) => {
+    try {
+      return fn(...args);
+    } catch (err) {
+      log3.catch(err, void 0, {
+        F: __dxlog_file5,
+        L: 12,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+    }
+  };
+};
+
+// packages/ui/react-ui-editor/src/extensions/util/overlap.ts
+var overlap = (a, b) => a.from <= b.to && a.to >= b.from;
+
+// packages/ui/react-ui-editor/src/extensions/util/react.tsx
+import React from "react";
+import { createRoot } from "react-dom/client";
+import { ThemeProvider } from "@dxos/react-ui";
+import { defaultTx } from "@dxos/react-ui-theme";
+var createElement = (tag, options, children) => {
+  const el = document.createElement(tag);
+  if (options?.className) {
+    el.className = options.className;
+  }
+  if (children) {
+    el.append(...Array.isArray(children) ? children : [
+      children
+    ]);
+  }
+  return el;
+};
+var renderRoot = (root, node) => {
+  createRoot(root).render(/* @__PURE__ */ React.createElement(ThemeProvider, {
+    tx: defaultTx
+  }, node));
+  return root;
+};
+
 // packages/ui/react-ui-editor/src/extensions/command/hint.ts
 var CommandHint = class extends WidgetType2 {
   constructor(content) {
@@ -1328,51 +1373,6 @@ import { debounce } from "@dxos/async";
 import { log as log5 } from "@dxos/log";
 import { nonNullable } from "@dxos/util";
 
-// packages/ui/react-ui-editor/src/extensions/util/error.ts
-import { log as log3 } from "@dxos/log";
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/util/error.ts";
-var wrapWithCatch = (fn) => {
-  return (...args) => {
-    try {
-      return fn(...args);
-    } catch (err) {
-      log3.catch(err, void 0, {
-        F: __dxlog_file5,
-        L: 12,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-    }
-  };
-};
-
-// packages/ui/react-ui-editor/src/extensions/util/overlap.ts
-var overlap = (a, b) => a.from <= b.to && a.to >= b.from;
-
-// packages/ui/react-ui-editor/src/extensions/util/react.tsx
-import React from "react";
-import { createRoot } from "react-dom/client";
-import { ThemeProvider } from "@dxos/react-ui";
-import { defaultTx } from "@dxos/react-ui-theme";
-var createElement = (tag, options, children) => {
-  const el = document.createElement(tag);
-  if (options?.className) {
-    el.className = options.className;
-  }
-  if (children) {
-    el.append(...Array.isArray(children) ? children : [
-      children
-    ]);
-  }
-  return el;
-};
-var renderRoot = (root, node) => {
-  createRoot(root).render(/* @__PURE__ */ React.createElement(ThemeProvider, {
-    tx: defaultTx
-  }, node));
-  return root;
-};
-
 // packages/ui/react-ui-editor/src/util.ts
 import { log as log4 } from "@dxos/log";
 var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/util.ts";
@@ -1382,12 +1382,16 @@ var callbackWrapper = (fn) => (...args) => {
   } catch (err) {
     log4.catch(err, void 0, {
       F: __dxlog_file6,
-      L: 18,
+      L: 19,
       S: void 0,
       C: (f, a) => f(...a)
     });
   }
 };
+var debugDispatcher = (trs, view) => {
+  logChanges(trs);
+  view.update(trs);
+};
 var logChanges = (trs) => {
   const changes = trs.flatMap((tr) => {
     if (tr.changes.empty) {
@@ -1408,7 +1412,7 @@ var logChanges = (trs) => {
       changes
     }, {
       F: __dxlog_file6,
-      L: 39,
+      L: 49,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -1800,8 +1804,11 @@ var scrollThreadIntoView = (view, id, center = true) => {
   }
 };
 var selectionOverlapsComment = (state2) => {
+  const commentState = state2.field(commentsState, false);
+  if (commentState === void 0) {
+    return false;
+  }
   const { selection } = state2;
-  const commentState = state2.field(commentsState);
   for (const range of selection.ranges) {
     if (commentState.comments.some(({ range: commentRange }) => overlap(commentRange, range))) {
       return true;
@@ -5233,7 +5240,6 @@ var instanceCount = 0;
 var useTextEditor = (props = {}, deps = []) => {
   const { id, initialValue, extensions, autoFocus, scrollTo, selection, moveToEndOfLine, debug } = useMemo3(() => getProviderValue(props), deps ?? []);
   const [instanceId] = useState4(() => `text-editor-${++instanceCount}`);
-  const onUpdate = useRef2();
   const [view, setView] = useState4();
   const parentRef = useRef2(null);
   useEffect3(() => {
@@ -5245,7 +5251,7 @@ var useTextEditor = (props = {}, deps = []) => {
         doc: initialValue?.length ?? 0
       }, {
         F: __dxlog_file11,
-        L: 78,
+        L: 76,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -5266,42 +5272,35 @@ var useTextEditor = (props = {}, deps = []) => {
         selection: initialSelection,
         extensions: [
           id && documentId.of(id),
-          // NOTE: Doesn't catch errors in keymap functions.
+          extensions,
+          // NOTE: This doesn't catch errors in keymap functions.
           EditorView18.exceptionSink.of((err) => {
             log8.catch(err, void 0, {
               F: __dxlog_file11,
-              L: 100,
+              L: 98,
               S: void 0,
               C: (f, a) => f(...a)
             });
-          }),
-          extensions,
-          EditorView18.updateListener.of(() => {
-            setTimeout(() => {
-              onUpdate.current?.();
-            });
           })
         ].filter(isNotFalsy3)
       });
       view2 = new EditorView18({
         parent: parentRef.current,
         state: state2,
-        // NOTE: Uncomment to debug/monitor all transactions.
-        // https://codemirror.net/docs/ref/#view.EditorView.dispatch
-        dispatchTransactions: (trs, view3) => {
-          if (debug) {
-            logChanges(trs);
-          }
-          view3.update(trs);
-        }
+        scrollTo: scrollTo ? EditorView18.scrollIntoView(scrollTo, {
+          yMargin: 96
+        }) : void 0,
+        dispatchTransactions: debug ? debugDispatcher : void 0
       });
-      if (!initialValue && moveToEndOfLine) {
+      if (moveToEndOfLine && !initialSelection) {
         const { to } = view2.state.doc.lineAt(0);
-        view2.dispatch({
-          selection: {
-            anchor: to
-          }
-        });
+        if (to) {
+          view2.dispatch({
+            selection: {
+              anchor: to
+            }
+          });
+        }
       }
       setView(view2);
     }
@@ -5319,21 +5318,20 @@ var useTextEditor = (props = {}, deps = []) => {
   }, deps);
   useEffect3(() => {
     if (view) {
-      onUpdate.current = () => {
-        onUpdate.current = void 0;
-        view.dispatch(createEditorStateTransaction({
+      if (view.state.facet(editorInputMode).noTabster) {
+        parentRef.current?.removeAttribute("data-tabster");
+      }
+      if (scrollTo || selection) {
+        view.dispatch(createEditorStateTransaction(view.state, {
           scrollTo,
           selection
         }));
-      };
-      if (view.state.facet(editorInputMode).noTabster) {
-        parentRef.current?.removeAttribute("data-tabster");
       }
     }
   }, [
     view,
-    selection,
-    scrollTo
+    scrollTo,
+    selection
   ]);
   useEffect3(() => {
     if (view && autoFocus) {
@@ -5404,6 +5402,7 @@ export {
   createExternalCommentSync,
   createMarkdownExtensions,
   createThemeExtensions,
+  debugDispatcher,
   debugNodeLogger,
   debugTree,
   decorateMarkdown,