@dxos/react-ui-editor 0.4.7-next.f4b92be → 0.4.7

package/dist/lib/browser/index.mjs

@@ -35,7 +35,7 @@ import { useFocusableGroup } from "@fluentui/react-tabster";
 import defaultsDeep3 from "lodash.defaultsdeep";
 import React, { forwardRef, useCallback, useEffect as useEffect3, useImperativeHandle, useRef as useRef3, useState as useState5, useMemo as useMemo3 } from "react";
 import { DocAccessor } from "@dxos/echo-schema";
-import { log as log5 } from "@dxos/log";
+import { log as log9 } from "@dxos/log";
 import { useThemeContext } from "@dxos/react-ui";
 import { focusRing } from "@dxos/react-ui-theme";
 import { isNotFalsy as isNotFalsy4 } from "@dxos/util";
@@ -1266,6 +1266,7 @@ import { hoverTooltip, keymap as keymap4, Decoration as Decoration4, EditorView
 import sortBy from "lodash.sortby";
 import { useEffect } from "react";
 import { debounce } from "@dxos/async";
+import { log as log3 } from "@dxos/log";
 import { nonNullable } from "@dxos/util";
 
 // packages/ui/react-ui-editor/src/styles/markdown.ts
@@ -1333,11 +1334,19 @@ var logChanges = (trs) => {
     return changes2;
   }).filter(Boolean);
   if (changes.length) {
-    console.log("changes", changes);
+    log2.info("changes", {
+      changes
+    }, {
+      F: __dxlog_file3,
+      L: 39,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
   }
 };
 
 // packages/ui/react-ui-editor/src/extensions/comments.ts
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/comments.ts";
 var documentId = Facet4.define({
   combine: (values) => values[0]
 });
@@ -1423,7 +1432,12 @@ var commentsDecorations = EditorView7.decorations.compute([
   const decorations = sortBy(comments2 ?? [], (range) => range.range.from)?.flatMap((comment) => {
     const range = comment.range;
     if (!range || range.from === range.to) {
-      console.warn("Invalid range:", range);
+      log3.warn("Invalid range:", range, {
+        F: __dxlog_file4,
+        L: 132,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
       return void 0;
     }
     if (comment.comment.id === current) {
@@ -1738,6 +1752,8 @@ var useComments = (view, id, comments2 = []) => {
 // packages/ui/react-ui-editor/src/extensions/cursor-line-margin.ts
 import { Facet as Facet5, Transaction } from "@codemirror/state";
 import { EditorView as EditorView8 } from "@codemirror/view";
+import { log as log4 } from "@dxos/log";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/cursor-line-margin.ts";
 var cursorLineMarginFacet = Facet5.define({
   combine: (input) => input[0] ?? 3
 });
@@ -1761,7 +1777,12 @@ var cursorLineMargin = EditorView8.updateListener.of(({ transactions, state, sel
   const needsScrollTop = false;
   const needsScrollBot = mainLine >= visBotLine - cursorLineMargin2;
   if (needsScrollTop && needsScrollBot) {
-    console.warn("is cursorScrollMargin too large for the editor size?");
+    log4.warn("is cursorScrollMargin too large for the editor size?", void 0, {
+      F: __dxlog_file5,
+      L: 66,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
     return;
   }
   if (!needsScrollTop && !needsScrollBot) {
@@ -1788,10 +1809,19 @@ var cursorLineMargin = EditorView8.updateListener.of(({ transactions, state, sel
 
 // packages/ui/react-ui-editor/src/extensions/dnd.ts
 import { EditorView as EditorView9 } from "@codemirror/view";
+import { log as log5 } from "@dxos/log";
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/dnd.ts";
 var dnd = () => {
   return EditorView9.domEventHandlers({
     drop: (event, view) => {
-      console.log(event);
+      log5.info("domEventHandlersDrop", {
+        event
+      }, {
+        F: __dxlog_file6,
+        L: 14,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
     }
   });
 };
@@ -2146,7 +2176,7 @@ var uncheckedTask = Decoration5.replace({
 });
 var editingRange = (state, range, focus) => {
   const { readOnly, selection: { main: { head } } } = state;
-  return focus && !readOnly && head >= range.from && head < range.to;
+  return focus && !readOnly && head >= range.from && head <= range.to;
 };
 var MarksByParent = /* @__PURE__ */ new Set([
   "CodeMark",
@@ -3632,6 +3662,8 @@ var TableWidget = class extends WidgetType5 {
 
 // packages/ui/react-ui-editor/src/extensions/mention.ts
 import { autocompletion as autocompletion2 } from "@codemirror/autocomplete";
+import { log as log6 } from "@dxos/log";
+var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/mention.ts";
 var mention = ({ onSearch }) => {
   return autocompletion2({
     // TODO(burdon): Not working.
@@ -3643,7 +3675,14 @@ var mention = ({ onSearch }) => {
     icons: false,
     override: [
       (context) => {
-        console.log(context);
+        log6.info("completion context", {
+          context
+        }, {
+          F: __dxlog_file7,
+          L: 26,
+          S: void 0,
+          C: (f, a) => f(...a)
+        });
         const match = context.matchBefore(/@(\w+)?/);
         if (!match || match.from === match.to && !context.explicit) {
           return null;
@@ -3754,8 +3793,8 @@ var typewriter = ({ delay = 75, items = defaultItems } = {}) => {
 import { DeferredTask, Event as Event2, sleep } from "@dxos/async";
 import { Context as Context2 } from "@dxos/context";
 import { invariant as invariant2 } from "@dxos/invariant";
-import { log as log3 } from "@dxos/log";
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/hooks/awareness-provider.ts";
+import { log as log7 } from "@dxos/log";
+var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/hooks/awareness-provider.ts";
 var DEBOUNCE_INTERVAL = 100;
 var SpaceAwarenessProvider = class {
   constructor(params) {
@@ -3792,10 +3831,10 @@ var SpaceAwarenessProvider = class {
     void this._space.postMessage(this._channel, {
       kind: "query"
     }).catch((err) => {
-      log3.debug("failed to query awareness", {
+      log7.debug("failed to query awareness", {
         err
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file8,
         L: 89,
         S: this,
         C: (f, a) => f(...a)
@@ -3812,7 +3851,7 @@ var SpaceAwarenessProvider = class {
   }
   update(position) {
     invariant2(this._postTask, void 0, {
-      F: __dxlog_file4,
+      F: __dxlog_file8,
       L: 104,
       S: this,
       A: [
@@ -3829,7 +3868,7 @@ var SpaceAwarenessProvider = class {
   }
   _handleQueryMessage() {
     invariant2(this._postTask, void 0, {
-      F: __dxlog_file4,
+      F: __dxlog_file8,
       L: 115,
       S: this,
       A: [
@@ -3841,7 +3880,7 @@ var SpaceAwarenessProvider = class {
   }
   _handlePostMessage(message) {
     invariant2(message.kind === "post", void 0, {
-      F: __dxlog_file4,
+      F: __dxlog_file8,
       L: 120,
       S: this,
       A: [
@@ -3930,7 +3969,7 @@ import { EditorSelection as EditorSelection2, EditorState as EditorState2 } from
 import { crosshairCursor, drawSelection as drawSelection2, dropCursor as dropCursor2, EditorView as EditorView16, highlightActiveLine, lineNumbers, placeholder as placeholder2, scrollPastEnd } from "@codemirror/view";
 import defaultsDeep2 from "lodash.defaultsdeep";
 import { useEffect as useEffect2, useRef as useRef2, useState as useState3 } from "react";
-import { log as log4 } from "@dxos/log";
+import { log as log8 } from "@dxos/log";
 import { isNotFalsy as isNotFalsy3 } from "@dxos/util";
 
 // packages/ui/react-ui-editor/src/themes/default.ts
@@ -4185,7 +4224,7 @@ var codeTheme = {
 };
 
 // packages/ui/react-ui-editor/src/hooks/useTextEditor.ts
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/hooks/useTextEditor.ts";
+var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/hooks/useTextEditor.ts";
 var useTextEditor = ({ autoFocus, scrollTo, debug, doc, selection, extensions } = {}, deps = []) => {
   const onUpdate = useRef2();
   const [view, setView] = useState3();
@@ -4199,8 +4238,8 @@ var useTextEditor = ({ autoFocus, scrollTo, debug, doc, selection, extensions }
         extensions: [
           // TODO(burdon): Doesn't catch errors in keymap functions.
           EditorView16.exceptionSink.of((err) => {
-            log4.catch(err, void 0, {
-              F: __dxlog_file5,
+            log8.catch(err, void 0, {
+              F: __dxlog_file9,
               L: 70,
               S: void 0,
               C: (f, a) => f(...a)
@@ -4276,8 +4315,8 @@ var createBasicExtensions = (_props) => {
   return [
     // TODO(burdon): Doesn't catch errors in keymap functions.
     EditorView16.exceptionSink.of((err) => {
-      log4.catch(err, void 0, {
-        F: __dxlog_file5,
+      log8.catch(err, void 0, {
+        F: __dxlog_file9,
         L: 167,
         S: void 0,
         C: (f, a) => f(...a)
@@ -4325,13 +4364,13 @@ import { invariant as invariant3 } from "@dxos/invariant";
 import { isAutomergeObject } from "@dxos/react-client/echo";
 import { hueTokens } from "@dxos/react-ui-theme";
 import { hexToHue } from "@dxos/util";
-var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/hooks/useTextModel.ts";
+var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/hooks/useTextModel.ts";
 var useTextExtensions = ({ id, text, space, identity }) => {
   const extensions = [
     automerge(text)
   ];
   const peerId = identity?.identityKey.toHex();
-  const { cursorLightValue, cursorDarkValue } = hueTokens[hexToHue(peerId ?? "0")];
+  const { cursorLightValue, cursorDarkValue } = hueTokens[identity?.profile?.data?.hue ?? hexToHue(peerId ?? "0")];
   if (space && identity) {
     const awarenessProvider2 = new SpaceAwarenessProvider({
       space,
@@ -4362,8 +4401,8 @@ var createModel = ({ space, identity, text }) => {
     return void 0;
   }
   invariant3(isAutomergeObject(text), void 0, {
-    F: __dxlog_file6,
-    L: 88,
+    F: __dxlog_file10,
+    L: 89,
     S: void 0,
     A: [
       "isAutomergeObject(text)",
@@ -4375,7 +4414,7 @@ var createModel = ({ space, identity, text }) => {
     obj.field
   ]);
   const peerId = identity?.identityKey.toHex();
-  const { cursorLightValue, cursorDarkValue } = hueTokens[hexToHue(peerId ?? "0")];
+  const { cursorLightValue, cursorDarkValue } = hueTokens[identity?.profile?.data?.hue ?? hexToHue(peerId ?? "0")];
   const awarenessProvider2 = space && new SpaceAwarenessProvider({
     space,
     channel: `automerge.awareness.${obj.id}`,
@@ -4404,7 +4443,7 @@ var createModel = ({ space, identity, text }) => {
 };
 
 // packages/ui/react-ui-editor/src/components/TextEditor/TextEditor.tsx
-var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/components/TextEditor/TextEditor.tsx";
+var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/components/TextEditor/TextEditor.tsx";
 var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, autoFocus, scrollTo = EditorView17.scrollIntoView(0), moveToEndOfLine, selection, theme, slots = defaultSlots, extensions = [], scrollPastEnd: _scrollPastEnd, debug }, forwardedRef) => {
   const tabsterDOMAttribute = useFocusableGroup({
     tabBehavior: "limited"
@@ -4433,8 +4472,8 @@ var BaseTextEditor = /* @__PURE__ */ forwardRef(({ model, readonly, autoFocus, s
       extensions: [
         // TODO(burdon): Doesn't catch errors in keymap functions.
         EditorView17.exceptionSink.of((err) => {
-          log5.catch(err, void 0, {
-            F: __dxlog_file7,
+          log9.catch(err, void 0, {
+            F: __dxlog_file11,
             L: 123,
             S: void 0,
             C: (f, a) => f(...a)