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

package/dist/types/src/extensions/automerge/automerge.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"automerge.stories.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/automerge/automerge.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,uBAAuB,CAAC;AAC/B,OAAO,KAA8B,MAAM,OAAO,CAAC;AAKnD,OAAO,EACL,WAAW,EAMX,KAAK,KAAK,EACX,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAe,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAgBrE,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;;;wDAEsD,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyDnE,wBAME;AAsBF,eAAO,MAAM,OAAO,IAAK,CAAC;AAE1B,eAAO,MAAM,QAAQ;;;CAmBpB,CAAC"}
+{"version":3,"file":"automerge.stories.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/automerge/automerge.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,uBAAuB,CAAC;AAM/B,OAAO,EACL,WAAW,EAMX,KAAK,KAAK,EACX,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAe,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAgBrE,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;;;wDAEsD,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyDnE,wBAME;AAsBF,eAAO,MAAM,OAAO,IAAK,CAAC;AAE1B,eAAO,MAAM,QAAQ;;;CAmBpB,CAAC"}

package/dist/types/src/extensions/factories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factories.d.ts","sourceRoot":"","sources":["../../../../src/extensions/factories.ts"],"names":[],"mappings":"AAQA,OAAO,EAAe,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAkBhE,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAOhD,OAAO,EAAE,KAAK,WAAW,EAAgB,MAAM,WAAW,CAAC;AAM3D,eAAO,MAAM,cAAc,WAA4E,CAAC;AAExG;;;;GAIG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,IAAI,GAAG,SAAS,GAAG,UAAU,CAAC;IACvC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAsBF,eAAO,MAAM,qBAAqB,YAAa,sBAAsB,KAAG,SAuCvE,CAAC;AAMF,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,KAAK,CAAC,EAAE;QACN,MAAM,CAAC,EAAE;YACP,SAAS,CAAC,EAAE,MAAM,CAAC;SACpB,CAAC;QACF,OAAO,CAAC,EAAE;YACR,SAAS,CAAC,EAAE,MAAM,CAAC;SACpB,CAAC;KACH,CAAC;CACH,CAAC;AAQF;;GAEG;AACH,eAAO,MAAM,qBAAqB,oFAK/B,sBAAsB,KAAQ,SAWhC,CAAC;AAMF,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACtB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,QAAQ,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;CAC5B,CAAC;AAGF,eAAO,MAAM,oBAAoB,GAAI,CAAC,iCAAiC,mBAAmB,CAAC,CAAC,CAAC,KAAG,SAAS,EA4BxG,CAAC"}
+{"version":3,"file":"factories.d.ts","sourceRoot":"","sources":["../../../../src/extensions/factories.ts"],"names":[],"mappings":"AAQA,OAAO,EAAe,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAkBhE,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAOhD,OAAO,EAAE,KAAK,WAAW,EAAgB,MAAM,WAAW,CAAC;AAM3D,eAAO,MAAM,cAAc,WAA4E,CAAC;AAExG;;;;GAIG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,IAAI,GAAG,SAAS,GAAG,UAAU,CAAC;IACvC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAsBF,eAAO,MAAM,qBAAqB,YAAa,sBAAsB,KAAG,SA8CvE,CAAC;AAMF,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,KAAK,CAAC,EAAE;QACN,MAAM,CAAC,EAAE;YACP,SAAS,CAAC,EAAE,MAAM,CAAC;SACpB,CAAC;QACF,OAAO,CAAC,EAAE;YACR,SAAS,CAAC,EAAE,MAAM,CAAC;SACpB,CAAC;KACH,CAAC;CACH,CAAC;AAQF;;GAEG;AACH,eAAO,MAAM,qBAAqB,oFAK/B,sBAAsB,KAAQ,SAWhC,CAAC;AAMF,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACtB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,QAAQ,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;CAC5B,CAAC;AAGF,eAAO,MAAM,oBAAoB,GAAI,CAAC,iCAAiC,mBAAmB,CAAC,CAAC,CAAC,KAAG,SAAS,EA2BxG,CAAC"}

package/dist/types/src/styles/theme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"theme.d.ts","sourceRoot":"","sources":["../../../../src/styles/theme.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAI3C,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAEpD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,eAAO,MAAM,YAAY,EAAE,WA+M1B,CAAC"}
+{"version":3,"file":"theme.d.ts","sourceRoot":"","sources":["../../../../src/styles/theme.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAI3C,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAEpD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,eAAO,MAAM,YAAY,EAAE,WA8M1B,CAAC"}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@dxos/react-ui-editor",
-  "version": "0.7.5-main.ff8607b",
+  "version": "0.7.5-staging.b81e783",
   "description": "Document editing experience within a DXOS shell.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
+  "type": "module",
   "exports": {
     ".": {
       "types": "./dist/types/src/index.d.ts",
@@ -50,20 +51,20 @@
     "lodash.merge": "^4.6.2",
     "lodash.sortby": "^4.7.0",
     "style-mod": "^4.1.0",
-    "@dxos/app-graph": "0.7.5-main.ff8607b",
-    "@dxos/async": "0.7.5-main.ff8607b",
-    "@dxos/automerge": "0.7.5-main.ff8607b",
-    "@dxos/context": "0.7.5-main.ff8607b",
-    "@dxos/debug": "0.7.5-main.ff8607b",
-    "@dxos/echo-schema": "0.7.5-main.ff8607b",
-    "@dxos/display-name": "0.7.5-main.ff8607b",
-    "@dxos/invariant": "0.7.5-main.ff8607b",
-    "@dxos/react-hooks": "0.7.5-main.ff8607b",
-    "@dxos/log": "0.7.5-main.ff8607b",
-    "@dxos/protocols": "0.7.5-main.ff8607b",
-    "@dxos/react-ui-menu": "0.7.5-main.ff8607b",
-    "@dxos/util": "0.7.5-main.ff8607b",
-    "@dxos/live-object": "0.7.5-main.ff8607b"
+    "@dxos/app-graph": "0.7.5-staging.b81e783",
+    "@dxos/async": "0.7.5-staging.b81e783",
+    "@dxos/context": "0.7.5-staging.b81e783",
+    "@dxos/debug": "0.7.5-staging.b81e783",
+    "@dxos/automerge": "0.7.5-staging.b81e783",
+    "@dxos/display-name": "0.7.5-staging.b81e783",
+    "@dxos/echo-schema": "0.7.5-staging.b81e783",
+    "@dxos/invariant": "0.7.5-staging.b81e783",
+    "@dxos/live-object": "0.7.5-staging.b81e783",
+    "@dxos/log": "0.7.5-staging.b81e783",
+    "@dxos/react-hooks": "0.7.5-staging.b81e783",
+    "@dxos/react-ui-menu": "0.7.5-staging.b81e783",
+    "@dxos/protocols": "0.7.5-staging.b81e783",
+    "@dxos/util": "0.7.5-staging.b81e783"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -87,23 +88,23 @@
     "vite": "5.4.7",
     "vite-plugin-top-level-await": "^1.4.1",
     "vite-plugin-wasm": "^3.3.0",
-    "@dxos/config": "0.7.5-main.ff8607b",
-    "@dxos/keyboard": "0.7.5-main.ff8607b",
-    "@dxos/echo-signals": "0.7.5-main.ff8607b",
-    "@dxos/random": "0.7.5-main.ff8607b",
-    "@dxos/automerge": "0.7.5-main.ff8607b",
-    "@dxos/react-client": "0.7.5-main.ff8607b",
-    "@dxos/react-ui-theme": "0.7.5-main.ff8607b",
-    "@dxos/react-ui": "0.7.5-main.ff8607b",
-    "@dxos/storybook-utils": "0.7.5-main.ff8607b"
+    "@dxos/automerge": "0.7.5-staging.b81e783",
+    "@dxos/keyboard": "0.7.5-staging.b81e783",
+    "@dxos/echo-signals": "0.7.5-staging.b81e783",
+    "@dxos/random": "0.7.5-staging.b81e783",
+    "@dxos/config": "0.7.5-staging.b81e783",
+    "@dxos/react-client": "0.7.5-staging.b81e783",
+    "@dxos/react-ui-theme": "0.7.5-staging.b81e783",
+    "@dxos/storybook-utils": "0.7.5-staging.b81e783",
+    "@dxos/react-ui": "0.7.5-staging.b81e783"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.7.5-main.ff8607b",
-    "@dxos/react-client": "0.7.5-main.ff8607b",
-    "@dxos/react-ui-theme": "0.7.5-main.ff8607b"
+    "@dxos/react-client": "0.7.5-staging.b81e783",
+    "@dxos/react-ui": "0.7.5-staging.b81e783",
+    "@dxos/react-ui-theme": "0.7.5-staging.b81e783"
   },
   "publishConfig": {
     "access": "public"

package/src/extensions/comments.ts

@@ -27,7 +27,7 @@ import { useEffect, useMemo } from 'react';
 import { debounce, type UnsubscribeCallback } from '@dxos/async';
 import { type ReactiveObject } from '@dxos/live-object';
 import { log } from '@dxos/log';
-import { nonNullable } from '@dxos/util';
+import { isNonNullable } from '@dxos/util';
 
 import { documentId } from './selection';
 import { type EditorToolbarState } from '../components';
@@ -87,7 +87,7 @@ export const commentsState = StateField.define<CommentsState>({
             const range = Cursor.getRangeFromCursor(tr.state, comment.cursor);
             return range && { comment, range };
           })
-          .filter(nonNullable);
+          .filter(isNonNullable);
 
         return { ...value, comments: commentStates };
       }
@@ -151,7 +151,7 @@ const commentsDecorations = EditorView.decorations.compute([commentsState], (sta
       const mark = createCommentMark(comment.comment.id, comment.comment.id === current);
       return mark.range(range.from, range.to);
     })
-    .filter(nonNullable);
+    .filter(isNonNullable);
 
   return Decoration.set(decorations);
 });
@@ -507,7 +507,7 @@ export const comments = (options: CommentsOptions = {}): Extension => {
     }),
 
     options.onUpdate && trackPastedComments(options.onUpdate),
-  ].filter(nonNullable);
+  ].filter(isNonNullable);
 };
 
 //

package/src/extensions/factories.ts

@@ -27,7 +27,7 @@ import { log } from '@dxos/log';
 import { type DocAccessor, type Space } from '@dxos/react-client/echo';
 import { type Identity } from '@dxos/react-client/halo';
 import { type ThemeMode } from '@dxos/react-ui';
-import { type HuePalette, hueTokens } from '@dxos/react-ui-theme';
+import { type HuePalette } from '@dxos/react-ui-theme';
 import { hexToHue, isNotFalsy } from '@dxos/util';
 
 import { automerge } from './automerge';
@@ -124,6 +124,13 @@ export const createBasicExtensions = (_props?: BasicExtensionsOptions): Extensio
         ...(props.history ? historyKeymap : []),
         // https://codemirror.net/docs/ref/#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(isNotFalsy),
     ),
   ].filter(isNotFalsy);
@@ -194,8 +201,7 @@ export const createDataExtensions = <T>({ id, text, space, identity }: DataExten
 
   if (space && identity) {
     const peerId = identity?.identityKey.toHex();
-    const { cursorLightValue, cursorDarkValue } =
-      hueTokens[(identity?.profile?.data?.hue as HuePalette | undefined) ?? hexToHue(peerId ?? '0')];
+    const hue = (identity?.profile?.data?.hue as HuePalette | undefined) ?? hexToHue(peerId ?? '0');
 
     extensions.push(
       awareness(
@@ -205,8 +211,8 @@ export const createDataExtensions = <T>({ id, text, space, identity }: DataExten
           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)`,
           },
         }),
       ),

package/src/styles/theme.ts

@@ -71,11 +71,10 @@ export const defaultTheme: ThemeStyles = {
   /**
    * 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',
+    background: 'transparent',
   },
   '.cm-gutter': {},
   '.cm-gutter.cm-lineNumbers .cm-gutterElement': {