@dxos/react-ui-editor 0.4.7-main.dca306f → 0.4.7-main.ea67fec

package/dist/lib/browser/index.mjs

@@ -596,7 +596,7 @@ var RemoteSelectionsDecorator = class {
           to: startLine.from + startLine.length,
           value: Decoration2.mark({
             attributes: {
-              style: `background-color: ${color}`
+              style: `background-color: ${lightColor}`
             },
             class: "cm-collab-selection"
           })
@@ -606,7 +606,7 @@ var RemoteSelectionsDecorator = class {
           to: end,
           value: Decoration2.mark({
             attributes: {
-              style: `background-color: ${color}`
+              style: `background-color: ${lightColor}`
             },
             class: "cm-collab-selection"
           })
@@ -618,7 +618,7 @@ var RemoteSelectionsDecorator = class {
             to: linePos,
             value: Decoration2.line({
               attributes: {
-                style: `background-color: ${color}`,
+                style: `background-color: ${lightColor}`,
                 class: "cm-collab-selectionLine"
               }
             })
@@ -1072,44 +1072,6 @@ import { useEffect } from "react";
 import { debounce } from "@dxos/async";
 import { nonNullable } from "@dxos/util";
 
-// packages/ui/react-ui-editor/src/styles/cursors.ts
-import * as random2 from "lib0/random";
-var cursorColors = [
-  {
-    color: "#30bced",
-    light: "#30bced33"
-  },
-  {
-    color: "#6eeb83",
-    light: "#6eeb8333"
-  },
-  {
-    color: "#ffbc42",
-    light: "#ffbc4233"
-  },
-  {
-    color: "#ecd444",
-    light: "#ecd44433"
-  },
-  {
-    color: "#ee6352",
-    light: "#ee635233"
-  },
-  {
-    color: "#9ac2c9",
-    light: "#9ac2c933"
-  },
-  {
-    color: "#8acb88",
-    light: "#8acb8833"
-  },
-  {
-    color: "#1be7ff",
-    light: "#1be7ff33"
-  }
-];
-var cursorColor = cursorColors[random2.uint32() % cursorColors.length];
-
 // packages/ui/react-ui-editor/src/styles/markdown.ts
 import { mx } from "@dxos/react-ui-theme";
 var headings = {
@@ -1980,7 +1942,7 @@ var uncheckedTask = Decoration4.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",
@@ -4580,11 +4542,15 @@ import { generateName } from "@dxos/display-name";
 import { getRawDoc } from "@dxos/echo-schema";
 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_file7 = "/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")];
   if (space && identity) {
     const awarenessProvider2 = new SpaceAwarenessProvider({
       space,
@@ -4592,8 +4558,8 @@ var useTextExtensions = ({ id, text, space, identity }) => {
       peerId: identity.identityKey.toHex(),
       info: {
         displayName: identity.profile?.displayName ?? generateName(identity.identityKey.toHex()),
-        color: cursorColor.color,
-        lightColor: cursorColor.light
+        color: cursorDarkValue,
+        lightColor: cursorLightValue
       }
     });
     extensions.push(awareness(awarenessProvider2));
@@ -4616,7 +4582,7 @@ var createModel = ({ space, identity, text }) => {
   }
   invariant3(isAutomergeObject(text), void 0, {
     F: __dxlog_file7,
-    L: 83,
+    L: 87,
     S: void 0,
     A: [
       "isAutomergeObject(text)",
@@ -4627,13 +4593,15 @@ var createModel = ({ space, identity, text }) => {
   const doc = getRawDoc(obj, [
     obj.field
   ]);
+  const peerId = identity?.identityKey.toHex();
+  const { cursorLightValue, cursorDarkValue } = hueTokens[hexToHue(peerId ?? "0")];
   const awarenessProvider2 = space && new SpaceAwarenessProvider({
     space,
     channel: `automerge.awareness.${obj.id}`,
     info: {
       displayName: identity ? identity.profile?.displayName ?? generateName(identity.identityKey.toHex()) : void 0,
-      color: cursorColor.color,
-      lightColor: cursorColor.light
+      color: cursorLightValue,
+      lightColor: cursorDarkValue
     },
     peerId: identity?.identityKey.toHex() ?? "Anonymous"
   });