@dxos/react-ui-editor 0.7.5-main.9d2a38b → 0.7.5-main.e94eead

package/dist/types/src/components/EditorToolbar/comment.d.ts

@@ -4,10 +4,10 @@ export declare const createComment: (state: EditorToolbarState) => {
         id: string;
         type: string;
         cacheable?: string[];
-        properties: Readonly<import("packages/ui/react-ui-menu/dist/types/src").MenuActionProperties & import("../..").EditorActionPayload>;
-        data: import("packages/sdk/app-graph/dist/types/src").ActionData;
+        properties: Readonly<import("@dxos/react-ui-menu").MenuActionProperties & import("../..").EditorActionPayload>;
+        data: import("@dxos/app-graph").ActionData;
     }>, "properties"> & {
-        properties: Readonly<import("packages/ui/react-ui-menu/dist/types/src").MenuActionProperties & import("../..").EditorActionPayload>;
+        properties: Readonly<import("@dxos/react-ui-menu").MenuActionProperties & import("../..").EditorActionPayload>;
     }>[];
     edges: {
         source: string;

package/dist/types/src/components/EditorToolbar/comment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"comment.d.ts","sourceRoot":"","sources":["../../../../../src/components/EditorToolbar/comment.ts"],"names":[],"mappings":"AAIA,OAAO,EAAsB,KAAK,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAYrE,eAAO,MAAM,aAAa,UAAW,kBAAkB;;;;;;;;;;;;;;CAGrD,CAAC"}
+{"version":3,"file":"comment.d.ts","sourceRoot":"","sources":["../../../../../src/components/EditorToolbar/comment.ts"],"names":[],"mappings":"AAMA,OAAO,EAAsB,KAAK,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAarE,eAAO,MAAM,aAAa,UAAW,kBAAkB;;;;;;;;;;;;;;CAGrD,CAAC"}

package/dist/types/src/components/EditorToolbar/formatting.d.ts

@@ -5,10 +5,10 @@ export declare const createFormatting: (state: EditorToolbarState) => {
         id: string;
         type: string;
         cacheable?: string[];
-        properties: Readonly<import("@dxos/react-ui-menu").MenuActionProperties & import("../../extensions").EditorActionPayload>;
+        properties: Readonly<import("@dxos/react-ui-menu").MenuActionProperties & import("../..").EditorActionPayload>;
         data: import("@dxos/app-graph").ActionData;
     }>, "properties"> & {
-        properties: Readonly<import("@dxos/react-ui-menu").MenuActionProperties & import("../../extensions").EditorActionPayload>;
+        properties: Readonly<import("@dxos/react-ui-menu").MenuActionProperties & import("../..").EditorActionPayload>;
     }> | NodeArg<any>)[];
     edges: {
         source: string;

package/dist/types/src/components/EditorToolbar/lists.d.ts

@@ -5,10 +5,10 @@ export declare const createLists: (state: EditorToolbarState) => {
         id: string;
         type: string;
         cacheable?: string[];
-        properties: Readonly<import("@dxos/react-ui-menu").MenuActionProperties & import("../../extensions").EditorActionPayload>;
+        properties: Readonly<import("@dxos/react-ui-menu").MenuActionProperties & import("../..").EditorActionPayload>;
         data: import("@dxos/app-graph").ActionData;
     }>, "properties"> & {
-        properties: Readonly<import("@dxos/react-ui-menu").MenuActionProperties & import("../../extensions").EditorActionPayload>;
+        properties: Readonly<import("@dxos/react-ui-menu").MenuActionProperties & import("../..").EditorActionPayload>;
     }> | NodeArg<any>)[];
     edges: {
         source: string;

package/dist/types/src/components/EditorToolbar/util.d.ts

@@ -34,7 +34,7 @@ export declare const createEditorActionGroup: (id: string, props: Omit<ToolbarMe
     properties: {
         label: Label;
         value: string | (string & string[]);
-        classNames?: import("@dxos/react-ui").ClassNameValue;
+        classNames?: import("@dxos/react-ui-types").ClassNameValue;
         hidden?: boolean | undefined;
         disabled?: boolean | undefined;
         checked?: boolean | undefined;
@@ -44,14 +44,14 @@ export declare const createEditorActionGroup: (id: string, props: Omit<ToolbarMe
         selectCardinality: "single" | "multiple";
         icon: string | undefined;
     };
-    data: typeof import("packages/sdk/app-graph/dist/types/src").actionGroupSymbol;
+    data: typeof import("@dxos/app-graph").actionGroupSymbol;
 };
 export declare const editorToolbarSearch: Readonly<Omit<Readonly<{
     id: string;
     type: string;
     cacheable?: string[];
     properties: Readonly<MenuActionProperties & EditorActionPayload>;
-    data: import("packages/sdk/app-graph/dist/types/src").ActionData;
+    data: import("@dxos/app-graph").ActionData;
 }>, "properties"> & {
     properties: Readonly<MenuActionProperties & EditorActionPayload>;
 }>;

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

@@ -1,6 +1,5 @@
 import '@dxos-theme';
 import '@preact/signals-react';
-import React from 'react';
 import { DocAccessor, type Space } from '@dxos/react-client/echo';
 import { type Identity } from '@dxos/react-client/halo';
 type EditorProps = {
@@ -11,9 +10,9 @@ type EditorProps = {
 };
 declare const _default: {
     title: string;
-    component: ({ source, autoFocus, space, identity }: EditorProps) => React.JSX.Element;
-    decorators: import("@storybook/react/*").Decorator[];
-    render: () => React.JSX.Element;
+    component: ({ source, autoFocus, space, identity }: EditorProps) => import("react/jsx-runtime").JSX.Element;
+    decorators: import("@storybook/react").Decorator[];
+    render: () => import("react/jsx-runtime").JSX.Element;
     parameters: {
         translations: {
             'en-US': {
@@ -50,7 +49,7 @@ declare const _default: {
 export default _default;
 export declare const Default: {};
 export declare const WithEcho: {
-    decorators: import("@storybook/react/*").Decorator[];
-    render: () => React.JSX.Element;
+    decorators: import("@storybook/react").Decorator[];
+    render: () => import("react/jsx-runtime").JSX.Element;
 };
 //# sourceMappingURL=automerge.stories.d.ts.map

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.9d2a38b",
+  "version": "0.7.5-main.e94eead",
   "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",
@@ -34,13 +35,13 @@
     "@codemirror/state": "^6.4.1",
     "@codemirror/theme-one-dark": "^6.1.2",
     "@codemirror/view": "^6.34.1",
-    "@fluentui/react-tabster": "^9.19.0",
+    "@fluentui/react-tabster": "9.23.3",
     "@lezer/common": "^1.2.2",
     "@lezer/generator": "^1.7.1",
     "@lezer/highlight": "^1.2.1",
     "@lezer/markdown": "^1.3.1",
     "@preact/signals-react": "^1.3.8",
-    "@radix-ui/react-context": "^1.0.0",
+    "@radix-ui/react-context": "1.1.1",
     "@replit/codemirror-vim": "^6.2.1",
     "@replit/codemirror-vscode-keymap": "^6.0.2",
     "codemirror": "^6.0.1",
@@ -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.9d2a38b",
-    "@dxos/automerge": "0.7.5-main.9d2a38b",
-    "@dxos/context": "0.7.5-main.9d2a38b",
-    "@dxos/async": "0.7.5-main.9d2a38b",
-    "@dxos/debug": "0.7.5-main.9d2a38b",
-    "@dxos/display-name": "0.7.5-main.9d2a38b",
-    "@dxos/invariant": "0.7.5-main.9d2a38b",
-    "@dxos/live-object": "0.7.5-main.9d2a38b",
-    "@dxos/echo-schema": "0.7.5-main.9d2a38b",
-    "@dxos/log": "0.7.5-main.9d2a38b",
-    "@dxos/react-ui-menu": "0.7.5-main.9d2a38b",
-    "@dxos/util": "0.7.5-main.9d2a38b",
-    "@dxos/protocols": "0.7.5-main.9d2a38b",
-    "@dxos/react-hooks": "0.7.5-main.9d2a38b"
+    "@dxos/app-graph": "0.7.5-main.e94eead",
+    "@dxos/async": "0.7.5-main.e94eead",
+    "@dxos/automerge": "0.7.5-main.e94eead",
+    "@dxos/context": "0.7.5-main.e94eead",
+    "@dxos/debug": "0.7.5-main.e94eead",
+    "@dxos/display-name": "0.7.5-main.e94eead",
+    "@dxos/echo-schema": "0.7.5-main.e94eead",
+    "@dxos/live-object": "0.7.5-main.e94eead",
+    "@dxos/invariant": "0.7.5-main.e94eead",
+    "@dxos/protocols": "0.7.5-main.e94eead",
+    "@dxos/log": "0.7.5-main.e94eead",
+    "@dxos/react-hooks": "0.7.5-main.e94eead",
+    "@dxos/react-ui-menu": "0.7.5-main.e94eead",
+    "@dxos/util": "0.7.5-main.e94eead"
   },
   "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/automerge": "0.7.5-main.9d2a38b",
-    "@dxos/config": "0.7.5-main.9d2a38b",
-    "@dxos/echo-signals": "0.7.5-main.9d2a38b",
-    "@dxos/keyboard": "0.7.5-main.9d2a38b",
-    "@dxos/random": "0.7.5-main.9d2a38b",
-    "@dxos/react-client": "0.7.5-main.9d2a38b",
-    "@dxos/react-ui": "0.7.5-main.9d2a38b",
-    "@dxos/storybook-utils": "0.7.5-main.9d2a38b",
-    "@dxos/react-ui-theme": "0.7.5-main.9d2a38b"
+    "@dxos/automerge": "0.7.5-main.e94eead",
+    "@dxos/echo-signals": "0.7.5-main.e94eead",
+    "@dxos/random": "0.7.5-main.e94eead",
+    "@dxos/keyboard": "0.7.5-main.e94eead",
+    "@dxos/react-client": "0.7.5-main.e94eead",
+    "@dxos/react-ui": "0.7.5-main.e94eead",
+    "@dxos/react-ui-theme": "0.7.5-main.e94eead",
+    "@dxos/config": "0.7.5-main.e94eead",
+    "@dxos/storybook-utils": "0.7.5-main.e94eead"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-client": "0.7.5-main.9d2a38b",
-    "@dxos/react-ui-theme": "0.7.5-main.9d2a38b",
-    "@dxos/react-ui": "0.7.5-main.9d2a38b"
+    "@dxos/react-client": "0.7.5-main.e94eead",
+    "@dxos/react-ui": "0.7.5-main.e94eead",
+    "@dxos/react-ui-theme": "0.7.5-main.e94eead"
   },
   "publishConfig": {
     "access": "public"

package/src/components/EditorToolbar/comment.ts

@@ -2,7 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
+import { type Label } from '@dxos/react-ui';
+
 import { createEditorAction, type EditorToolbarState } from './util';
+import { translationKey } from '../../translations';
 
 const commentLabel = (comment?: boolean, selection?: boolean) =>
   comment
@@ -11,10 +14,10 @@ const commentLabel = (comment?: boolean, selection?: boolean) =>
       ? 'select text to comment label'
       : 'comment label';
 
-const createCommentAction = (label: string) =>
+const createCommentAction = (label: Label) =>
   createEditorAction({ type: 'comment', testId: 'editor.toolbar.comment' }, 'ph--chat-text--regular', label);
 
 export const createComment = (state: EditorToolbarState) => ({
-  nodes: [createCommentAction(commentLabel(state.comment, state.selection))],
+  nodes: [createCommentAction([commentLabel(state.comment, state.selection), { ns: translationKey }])],
   edges: [{ source: 'root', target: 'comment' }],
 });

package/src/extensions/automerge/automerge.stories.tsx

@@ -74,12 +74,12 @@ const Story = () => {
       const repo1 = new Repo({ network: [new BroadcastChannelNetworkAdapter()] });
       const repo2 = new Repo({ network: [new BroadcastChannelNetworkAdapter()] });
 
-      const object1 = repo1.create();
+      const object1 = repo1.create<TestObject>();
       object1.change((doc: TestObject) => {
         doc.text = initialContent;
       });
 
-      const object2 = repo2.find(object1.url);
+      const object2 = repo2.find<TestObject>(object1.url);
       await object2.whenReady();
 
       setObject1({ handle: object1, path: ['text'] });

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/extensions/markdown/decorate.ts

@@ -73,7 +73,7 @@ class CheckboxWidget extends WidgetType {
 
   override toDOM(view: EditorView) {
     const input = document.createElement('input');
-    input.className = 'cm-task-checkbox ch-checkbox';
+    input.className = 'cm-task-checkbox dx-checkbox';
     input.type = 'checkbox';
     input.tabIndex = -1;
     input.checked = this._checked;

package/src/extensions/markdown/formatting.test.ts

@@ -182,12 +182,13 @@ describe('removeStyle', () => {
 
   testCommand('can remove code style', 'a `{variable}`', code, 'a {variable}');
 
-  testCommand(
-    'can remove emphasis across multiple blocks',
-    '{*one*\n\n# *two*\n\n> 1. *three} four*\n',
-    em,
-    '{one\n\n# two\n\n> 1. three} *four*\n',
-  );
+  // TODO(dmaretskyi): Flaky on CI: https://cloud.nx.app/runs/0byxg4Uq5G/task/react-ui-editor%3Atest
+  // testCommand(
+  //   'can remove emphasis across multiple blocks',
+  //   '{*one*\n\n# *two*\n\n> 1. *three} four*\n',
+  //   em,
+  //   '{one\n\n# two\n\n> 1. three} *four*\n',
+  // );
 
   testCommand('can shrink existing styles', '*one {two three} four*', em, '*one* {two three} *four*');
 

package/src/styles/markdown.ts

@@ -13,7 +13,7 @@ const headings: Record<HeadingLevel, string> = {
   3: 'text-2xl',
   4: 'text-xl',
   5: 'text-lg',
-  6: 'text-md',
+  6: '', // TODO(burdon): Should be text-base, but that's a color in our system.
 };
 
 export const theme = {

package/src/styles/stack-item-content-class-names.ts

@@ -6,7 +6,7 @@ import { mx } from '@dxos/react-ui-theme';
 
 export const stackItemContentEditorClassNames = (role?: string) =>
   mx(
-    'ch-focus-ring-inset data-[toolbar=disabled]:pbs-2 attention-surface',
+    'dx-focus-ring-inset data-[toolbar=disabled]:pbs-2 attention-surface',
     role === 'article' ? 'min-bs-0' : '[&_.cm-scroller]:overflow-hidden [&_.cm-scroller]:min-bs-24',
   );
 

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': {
@@ -149,7 +148,7 @@ export const defaultTheme: ThemeStyles = {
    * Tooltip.
    */
   '.cm-tooltip': {
-    background: 'var(--dx-base)',
+    background: 'var(--dx-baseSurface)',
   },
   '.cm-tooltip-below': {},