@dxos/react-ui-editor 0.7.5-main.ff8607b → 0.7.5-staging.b81e783

package/dist/lib/browser/index.mjs

@@ -459,11 +459,10 @@ var defaultTheme = {
   /**
   * Gutters
   * NOTE: Gutters should have the same top margin as the content.
-  * NOTE: They can't be transparent since the content needs to scroll below.
   */
   ".cm-gutters": {
-    background: "var(--surface-bg)",
-    borderRight: "none"
+    borderRight: "none",
+    background: "transparent"
   },
   ".cm-gutter": {},
   ".cm-gutter.cm-lineNumbers .cm-gutterElement": {
@@ -2047,7 +2046,7 @@ import sortBy from "lodash.sortby";
 import { useEffect, useMemo as useMemo2 } from "react";
 import { debounce as debounce2 } from "@dxos/async";
 import { log as log4 } from "@dxos/log";
-import { nonNullable } from "@dxos/util";
+import { isNonNullable } from "@dxos/util";
 
 // packages/ui/react-ui-editor/src/extensions/selection.ts
 import { Transaction } from "@codemirror/state";
@@ -2172,7 +2171,7 @@ var commentsState = StateField4.define({
             comment,
             range
           };
-        }).filter(nonNullable);
+        }).filter(isNonNullable);
         return {
           ...value,
           comments: commentStates
@@ -2224,7 +2223,7 @@ var commentsDecorations = EditorView9.decorations.compute([
     }
     const mark = createCommentMark(comment.comment.id, comment.comment.id === current);
     return mark.range(range.from, range.to);
-  }).filter(nonNullable);
+  }).filter(isNonNullable);
   return Decoration4.set(decorations);
 });
 var commentClickedEffect = StateEffect3.define();
@@ -2495,7 +2494,7 @@ var comments = (options = {}) => {
       }
     }),
     options.onUpdate && trackPastedComments(options.onUpdate)
-  ].filter(nonNullable);
+  ].filter(isNonNullable);
 };
 var scrollThreadIntoView = (view, id, center = true) => {
   const comment = view.state.field(commentsState).comments.find((range2) => range2.comment.id === id);
@@ -2665,7 +2664,6 @@ import defaultsDeep2 from "lodash.defaultsdeep";
 import merge from "lodash.merge";
 import { generateName } from "@dxos/display-name";
 import { log as log5 } from "@dxos/log";
-import { hueTokens } from "@dxos/react-ui-theme";
 import { hexToHue, isNotFalsy as isNotFalsy3 } from "@dxos/util";
 
 // packages/ui/react-ui-editor/src/extensions/focus.ts
@@ -2764,7 +2762,14 @@ var createBasicExtensions = (_props) => {
       // https://codemirror.net/docs/ref/#commands.historyKeymap
       ...props.history ? historyKeymap : [],
       // https://codemirror.net/docs/ref/#search.searchKeymap
-      ...props.search ? searchKeymap : []
+      ...props.search ? searchKeymap : [],
+      // Disable bindings that conflict with system shortcuts.
+      // TODO(burdon): Catalog global shortcuts.
+      {
+        key: "Mod-Shift-k",
+        preventDefault: true,
+        run: () => true
+      }
     ].filter(isNotFalsy3))
   ].filter(isNotFalsy3);
 };
@@ -2795,15 +2800,15 @@ var createDataExtensions = ({ id, text, space, identity }) => {
   }
   if (space && identity) {
     const peerId = identity?.identityKey.toHex();
-    const { cursorLightValue, cursorDarkValue } = hueTokens[identity?.profile?.data?.hue ?? hexToHue(peerId ?? "0")];
+    const hue = identity?.profile?.data?.hue ?? hexToHue(peerId ?? "0");
     extensions.push(awareness(new SpaceAwarenessProvider({
       space,
       channel: `awareness.${id}`,
       peerId: identity.identityKey.toHex(),
       info: {
         displayName: identity.profile?.displayName ?? generateName(identity.identityKey.toHex()),
-        darkColor: cursorDarkValue,
-        lightColor: cursorLightValue
+        darkColor: `var(--dx-${hue}Cursor)`,
+        lightColor: `var(--dx-${hue}Cursor)`
       }
     })));
   }