@dxos/react-ui-editor 0.8.4-main.72ec0f3 → 0.8.4-main.74a063c4e0

package/package.json

@@ -1,12 +1,16 @@
 {
   "name": "@dxos/react-ui-editor",
-  "version": "0.8.4-main.72ec0f3",
-  "description": "Document editing experience within a DXOS shell.",
+  "version": "0.8.4-main.74a063c4e0",
+  "description": "Text editor components.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
-  "sideEffects": true,
+  "sideEffects": false,
   "type": "module",
   "exports": {
     ".": {
@@ -14,12 +18,6 @@
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
-    },
-    "./types": {
-      "source": "./src/types/index.ts",
-      "types": "./dist/types/src/types/index.d.ts",
-      "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -31,108 +29,109 @@
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.1.2",
+    "@automerge/automerge": "3.2.3",
     "@codemirror/autocomplete": "^6.19.0",
     "@codemirror/commands": "^6.8.1",
     "@codemirror/lang-html": "^6.4.11",
     "@codemirror/lang-javascript": "^6.2.4",
     "@codemirror/lang-json": "^6.0.2",
-    "@codemirror/lang-markdown": "^6.3.4",
+    "@codemirror/lang-markdown": "6.3.4",
     "@codemirror/lang-xml": "^6.1.0",
     "@codemirror/lang-yaml": "^6.1.2",
     "@codemirror/language": "^6.11.3",
     "@codemirror/language-data": "^6.5.1",
-    "@codemirror/lint": "^6.8.5",
+    "@codemirror/lint": "6.8.5",
     "@codemirror/search": "^6.5.11",
     "@codemirror/state": "^6.5.2",
     "@codemirror/theme-one-dark": "^6.1.3",
     "@codemirror/view": "^6.38.4",
-    "@fluentui/react-tabster": "^9.24.2",
+    "@fluentui/react-tabster": "9.26.11",
     "@lezer/common": "^1.2.2",
     "@lezer/generator": "^1.7.1",
     "@lezer/highlight": "^1.2.1",
     "@lezer/markdown": "^1.3.1",
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-react": "^3.3.0",
     "@radix-ui/react-context": "1.1.1",
     "@radix-ui/react-use-controllable-state": "1.1.0",
     "@replit/codemirror-vim": "^6.2.1",
     "@replit/codemirror-vscode-keymap": "^6.0.2",
     "@uiw/codemirror-theme-vscode": "^4.25.2",
-    "ajv": "^8.17.1",
+    "ajv": "^8.18.0",
+    "bind-event-listener": "^3.0.0",
     "codemirror": "^6.0.1",
     "lib0": "^0.2.65",
     "lodash.defaultsdeep": "^4.6.1",
     "lodash.merge": "^4.6.2",
     "lodash.sortby": "^4.7.0",
     "style-mod": "^4.1.0",
-    "@dxos/app-graph": "0.8.4-main.72ec0f3",
-    "@dxos/context": "0.8.4-main.72ec0f3",
-    "@dxos/debug": "0.8.4-main.72ec0f3",
-    "@dxos/display-name": "0.8.4-main.72ec0f3",
-    "@dxos/client": "0.8.4-main.72ec0f3",
-    "@dxos/echo": "0.8.4-main.72ec0f3",
-    "@dxos/invariant": "0.8.4-main.72ec0f3",
-    "@dxos/lit-ui": "0.8.4-main.72ec0f3",
-    "@dxos/async": "0.8.4-main.72ec0f3",
-    "@dxos/log": "0.8.4-main.72ec0f3",
-    "@dxos/protocols": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-menu": "0.8.4-main.72ec0f3",
-    "@dxos/react-hooks": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-stack": "0.8.4-main.72ec0f3",
-    "@dxos/util": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-types": "0.8.4-main.72ec0f3",
-    "@dxos/live-object": "0.8.4-main.72ec0f3"
+    "@dxos/app-graph": "0.8.4-main.74a063c4e0",
+    "@dxos/client": "0.8.4-main.74a063c4e0",
+    "@dxos/context": "0.8.4-main.74a063c4e0",
+    "@dxos/debug": "0.8.4-main.74a063c4e0",
+    "@dxos/async": "0.8.4-main.74a063c4e0",
+    "@dxos/display-name": "0.8.4-main.74a063c4e0",
+    "@dxos/echo-db": "0.8.4-main.74a063c4e0",
+    "@dxos/invariant": "0.8.4-main.74a063c4e0",
+    "@dxos/echo": "0.8.4-main.74a063c4e0",
+    "@dxos/lit-ui": "0.8.4-main.74a063c4e0",
+    "@dxos/protocols": "0.8.4-main.74a063c4e0",
+    "@dxos/react-hooks": "0.8.4-main.74a063c4e0",
+    "@dxos/log": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-mosaic": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-menu": "0.8.4-main.74a063c4e0",
+    "@dxos/ui-editor": "0.8.4-main.74a063c4e0",
+    "@dxos/ui": "0.8.4-main.74a063c4e0",
+    "@dxos/ui-theme": "0.8.4-main.74a063c4e0",
+    "@dxos/util": "0.8.4-main.74a063c4e0"
   },
   "devDependencies": {
-    "@automerge/automerge": "3.1.2",
-    "@automerge/automerge-repo": "2.4.0",
-    "@automerge/automerge-repo-network-broadcastchannel": "2.4.0",
-    "@effect-atom/atom-react": "^0.3.4",
-    "@effect/platform": "0.92.1",
+    "@automerge/automerge": "3.2.3",
+    "@automerge/automerge-repo": "2.5.1",
+    "@automerge/automerge-repo-network-broadcastchannel": "2.5.1",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
     "@types/chai": "^4.2.15",
     "@types/chai-dom": "^1.11.0",
     "@types/lodash.defaultsdeep": "^4.6.6",
     "@types/lodash.merge": "^4.6.6",
     "@types/lodash.sortby": "^4.7.7",
-    "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.2",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
     "@types/react-test-renderer": "^17.0.2",
     "chai": "^4.4.1",
     "chai-dom": "^1.11.0",
-    "effect": "3.18.3",
-    "happy-dom": "^13.3.1",
+    "effect": "3.20.0",
+    "happy-dom": "^20.0.0",
     "jsdom": "^27.0.0",
     "mocha": "^10.6.0",
-    "react": "~19.2.0",
-    "react-dom": "~19.2.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
     "react-test-renderer": "~19.2.0",
-    "vite": "7.1.9",
+    "vite": "^7.1.11",
     "vite-plugin-top-level-await": "^1.6.0",
     "vite-plugin-wasm": "^3.5.0",
-    "@dxos/config": "0.8.4-main.72ec0f3",
-    "@dxos/echo-signals": "0.8.4-main.72ec0f3",
-    "@dxos/keyboard": "0.8.4-main.72ec0f3",
-    "@dxos/random": "0.8.4-main.72ec0f3",
-    "@dxos/react-client": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/echo": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-attention": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-stack": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.72ec0f3",
-    "@dxos/storybook-utils": "0.8.4-main.72ec0f3",
-    "@dxos/schema": "0.8.4-main.72ec0f3"
+    "@dxos/config": "0.8.4-main.74a063c4e0",
+    "@dxos/echo": "0.8.4-main.74a063c4e0",
+    "@dxos/echo-atom": "0.8.4-main.74a063c4e0",
+    "@dxos/random": "0.8.4-main.74a063c4e0",
+    "@dxos/keyboard": "0.8.4-main.74a063c4e0",
+    "@dxos/react-client": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-attention": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui": "0.8.4-main.74a063c4e0",
+    "@dxos/schema": "0.8.4-main.74a063c4e0",
+    "@dxos/storybook-utils": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.74a063c4e0",
+    "@dxos/ui-theme": "0.8.4-main.74a063c4e0",
+    "@dxos/ui-types": "0.8.4-main.74a063c4e0"
   },
   "peerDependencies": {
-    "@effect-atom/atom-react": "^0.3.4",
-    "@effect/platform": "^0.80.12",
-    "effect": "^3.13.3",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/react-client": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.74a063c4e0",
+    "@dxos/ui-theme": "0.8.4-main.74a063c4e0",
+    "@dxos/react-client": "0.8.4-main.74a063c4e0"
   },
   "publishConfig": {
     "access": "public"

package/src/components/Editor/Editor.stories.tsx

@@ -5,53 +5,60 @@
 import { type Decorator, type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useMemo } from 'react';
 
-import { faker } from '@dxos/random';
+import { createDocAccessor, createObject } from '@dxos/echo-db';
+import { random } from '@dxos/random';
 import { useThemeContext } from '@dxos/react-ui';
-import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { withAttention } from '@dxos/react-ui-attention/testing';
-
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+import { Text } from '@dxos/schema';
 import {
+  automerge,
   createBasicExtensions,
   createMarkdownExtensions,
   createThemeExtensions,
   decorateMarkdown,
-} from '../../extensions';
-import { createMenuGroup } from '../EditorMenuProvider';
+} from '@dxos/ui-editor';
 
+import { createMenuGroup } from '../EditorMenuProvider';
 import { Editor, type EditorContentProps } from './Editor';
 
 // TODO(burdon): PreviewPopoverProvider (MarkdownStream, Preview story).
 // TODO(burdon): Adapt Markdown plugin to use new Editor (plan first to check fit).
 // TODO(burdon): Remove redundant hooks and simplify props.
 
-faker.seed(1234);
+random.seed(1234);
 
 const initialValue = ['# Blue Monday', '', 'How does it **feel**?', ''].join('\n');
 
+const items = random.helpers.multiple(random.commerce.productName, { count: 10 }).sort();
+
 // TODO(burdon): Adapter other tests in react-ui-editor/stories to use this pattern.
-const withExtensions: Decorator = (Story, { args }) => {
+const withExtensions: Decorator<EditorContentProps> = (Story, { args }) => {
   const { themeMode } = useThemeContext();
   const extensions = useMemo(
     () => [
-      // Basic extensions.
       createBasicExtensions(),
       createThemeExtensions({ themeMode }),
       createMarkdownExtensions(),
       decorateMarkdown(),
+      automerge(createDocAccessor(createObject(Text.make({ content: args.initialValue })), ['content'])),
     ],
     [themeMode],
   );
 
-  return <Story args={{ ...args, extensions, initialValue }} />;
+  return <Story args={{ ...args, extensions }} />;
 };
 
 const meta = {
   title: 'ui/react-ui-editor/Editor',
   component: Editor.Content,
-  decorators: [withExtensions, withTheme, withLayout({ container: 'column' }), withAttention],
+  decorators: [withExtensions, withTheme(), withLayout({ layout: 'column' }), withAttention()],
   parameters: {
     layout: 'fullscreen',
   },
+  args: {
+    initialValue,
+  },
 } satisfies Meta<typeof Editor.Content>;
 
 export default meta;
@@ -75,8 +82,6 @@ export const WithToolbar: Story = {
   ),
 };
 
-const items = faker.helpers.multiple(faker.commerce.productName, { count: 10 }).sort();
-
 export const WithPopover: Story = {
   render: (args) => (
     <Editor.Root trigger={['@']} getMenu={({ text }) => [createMenuGroup({ items, filter: text })]}>

package/src/components/Editor/Editor.tsx

@@ -8,7 +8,7 @@ import React, { type PropsWithChildren, forwardRef, useCallback, useImperativeHa
 
 import { invariant } from '@dxos/invariant';
 import { type ThemedClassName } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { mx } from '@dxos/ui-theme';
 import { isNonNullable } from '@dxos/util';
 
 import {
@@ -41,14 +41,16 @@ const [EditorContextProvider, useEditorContext] = createContext<EditorContextVal
 // Root
 //
 
-type EditorRootProps = PropsWithChildren<Omit<UseEditorMenuProps, 'viewRef'> & Pick<EditorToolbarState, 'viewMode'>>;
+type EditorRootProps = PropsWithChildren<
+  Pick<EditorContextValue, 'extensions'> & Omit<UseEditorMenuProps, 'viewRef'> & Pick<EditorToolbarState, 'viewMode'>
+>;
 
 /**
  * Root component for the Editor compound component.
  * Provides context for all child components and manages the editor controller state.
  */
 const EditorRoot = forwardRef<EditorController | null, EditorRootProps>(
-  ({ children, viewMode, ...props }, forwardedRef) => {
+  ({ children, extensions: extensionsProp, viewMode, ...props }, forwardedRef) => {
     const state = useEditorToolbar({ viewMode });
 
     const [controller, setController] = useState<EditorController>();
@@ -56,7 +58,10 @@ const EditorRoot = forwardRef<EditorController | null, EditorRootProps>(
 
     // TODO(burdon): Consider lighter-weight approach if EditorMenuProvider is not needed.
     const { groupsRef, extension, ...menuProps } = useEditorMenu(props);
-    const extensions = useMemo(() => [extension], [extension]);
+    const extensions = useMemo(
+      () => [extension, extensionsProp].filter(isNonNullable).flat(),
+      [extension, extensionsProp],
+    );
 
     return (
       <EditorContextProvider
@@ -79,6 +84,8 @@ EditorRoot.displayName = 'Editor.Root';
 // Viewport
 //
 
+const EDITOR_VIEWPORT_NAME = 'Editor.Viewport';
+
 type EditorViewportProps = ThemedClassName<PropsWithChildren<{}>>;
 
 /**
@@ -86,18 +93,20 @@ type EditorViewportProps = ThemedClassName<PropsWithChildren<{}>>;
  */
 const EditorViewport = ({ classNames, children }: EditorViewportProps) => {
   return (
-    <div role='none' className={mx('grid grid-rows-[min-content_1fr] bs-full overflow-hidden', classNames)}>
+    <div role='none' className={mx('grid grid-rows-[min-content_1fr] h-full overflow-hidden', classNames)}>
       {children}
     </div>
   );
 };
 
-EditorViewport.displayName = 'Editor.Viewport';
+EditorViewport.displayName = EDITOR_VIEWPORT_NAME;
 
 //
 // Content
 //
 
+const EDITOR_CONTENT_NAME = 'Editor.Content';
+
 type EditorContentProps = Omit<NaturalEditorContentProps, 'ref'>;
 
 /**
@@ -105,7 +114,7 @@ type EditorContentProps = Omit<NaturalEditorContentProps, 'ref'>;
  * Automatically registers the editor controller with the context.
  */
 const EditorContent = ({ extensions: providedExtensions, ...props }: EditorContentProps) => {
-  const { extensions: additionalExtensions = [], setController } = useEditorContext(EditorContent.displayName);
+  const { extensions: additionalExtensions = [], setController } = useEditorContext(EDITOR_CONTENT_NAME);
 
   const extensions = useMemo(
     () => [additionalExtensions, providedExtensions].filter(isNonNullable).flat(),
@@ -115,12 +124,14 @@ const EditorContent = ({ extensions: providedExtensions, ...props }: EditorConte
   return <NaturalEditorContent {...props} extensions={extensions} ref={setController} />;
 };
 
-EditorContent.displayName = 'Editor.Content';
+EditorContent.displayName = EDITOR_CONTENT_NAME;
 
 //
 // Toolbar
 //
 
+const EDITOR_TOOLBAR_NAME = 'Editor.Toolbar';
+
 type EditorToolbarProps = Omit<NaturalEditorToolbarProps, 'getView' | 'state'>;
 
 /**
@@ -128,7 +139,7 @@ type EditorToolbarProps = Omit<NaturalEditorToolbarProps, 'getView' | 'state'>;
  * Automatically connects to the editor view through context.
  */
 const EditorToolbar = (props: EditorToolbarProps) => {
-  const { controller, state } = useEditorContext(EditorToolbar.displayName);
+  const { controller, state } = useEditorContext(EDITOR_TOOLBAR_NAME);
 
   // TODO(burdon): Fix invariant.
   const getView = useCallback(() => {
@@ -139,7 +150,7 @@ const EditorToolbar = (props: EditorToolbarProps) => {
   return <NaturalEditorToolbar {...props} getView={getView} state={state} />;
 };
 
-EditorToolbar.displayName = 'Editor.Toolbar';
+EditorToolbar.displayName = EDITOR_TOOLBAR_NAME;
 
 //
 // Editor

package/src/components/EditorContent/EditorContent.tsx

@@ -7,15 +7,15 @@ import { EditorView } from '@codemirror/view';
 import React, { forwardRef, useEffect, useImperativeHandle } from 'react';
 
 import { type ThemedClassName } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { initialSync } from '@dxos/ui-editor';
+import { mx } from '@dxos/ui-theme';
 
-import { initialSync } from '../../extensions';
 import { type UseTextEditorProps, useTextEditor } from '../../hooks';
-
 import { type EditorController, createEditorController } from './controller';
 
 export type EditorContentProps = ThemedClassName<
   {
+    focusable?: boolean;
     value?: string;
     onChange?: (value: string) => void;
   } & UseTextEditorProps
@@ -27,7 +27,7 @@ export type EditorContentProps = ThemedClassName<
  * @deprecated Use Editor.Content
  */
 export const EditorContent = forwardRef<EditorController, EditorContentProps>(
-  ({ classNames, id, extensions, selectionEnd, value, onChange, ...props }, forwardedRef) => {
+  ({ classNames, id, extensions, selectionEnd, focusable = true, value, onChange, ...props }, forwardedRef) => {
     const { parentRef, focusAttributes, view } = useTextEditor(
       () => ({
         id,
@@ -44,7 +44,7 @@ export const EditorContent = forwardRef<EditorController, EditorContentProps>(
         ],
         ...props,
       }),
-      [id, extensions, onChange, selectionEnd],
+      [id, extensions, selectionEnd, onChange],
     );
 
     // External controller.
@@ -61,10 +61,22 @@ export const EditorContent = forwardRef<EditorController, EditorContentProps>(
           selection: selectionEnd ? { anchor: view?.state.doc.length ?? 0 } : undefined,
         });
 
-        view?.focus();
+        if (selectionEnd) {
+          view?.focus();
+        }
       });
     }, [view, value, selectionEnd]);
 
-    return <div role='none' className={mx('is-full', classNames)} {...focusAttributes} ref={parentRef} />;
+    return (
+      <div
+        role='none'
+        className={mx(
+          'w-full outline-hidden focus:border-accent-surface focus-within:border-neutral-focus-indicator',
+          classNames,
+        )}
+        ref={parentRef}
+        {...(focusable ? focusAttributes : {})}
+      />
+    );
   },
 );

package/src/components/EditorMenuProvider/EditorMenuProvider.tsx

@@ -13,6 +13,7 @@ import {
   type DxAnchorActivate,
   Icon,
   Popover,
+  ScrollArea,
   toLocalizedString,
   useDynamicRef,
   useThemeContext,
@@ -35,9 +36,7 @@ export type EditorMenuProviderProps = PropsWithChildren<{
 }>;
 
 /**
- * Implements the Popover and listens for the `dx-anchor-activate` event from the
- * `popover` extension's decoration.
- *
+ * Implements the Popover and listens for the `dx-anchor-activate` event from the `popover` extension's decoration.
  * NOTE: We don't use DropdownMenu because the command menu needs to manage focus explicitly.
  * I.e., focus must remain in the editor while displaying the menu (for type-ahead).
  */
@@ -46,7 +45,7 @@ export const EditorMenuProvider = ({
   view,
   groups,
   currentItem,
-  open: openParam,
+  open: openProp,
   defaultOpen,
   numItems = 8,
   onOpenChange,
@@ -59,7 +58,7 @@ export const EditorMenuProvider = ({
 
   const viewRef = useDynamicRef(view);
   const [open, setOpen] = useControllableState({
-    prop: openParam,
+    prop: openProp,
     defaultProp: defaultOpen,
     onChange: (open) => {
       invariant(viewRef.current);
@@ -78,10 +77,8 @@ export const EditorMenuProvider = ({
       root,
       DX_ANCHOR_ACTIVATE as any,
       (event: DxAnchorActivate) => {
-        const { trigger, refId } = event;
-
-        // If this has a `refId`, then it’s probably a URL or DXN and out of scope for this component.
-        if (!refId) {
+        const { trigger, dxn } = event;
+        if (!dxn) {
           triggerRef.current = trigger as HTMLButtonElement;
           if (onActivate) {
             onActivate({ view: viewRef.current!, trigger: trigger.getAttribute('data-trigger') ?? undefined });
@@ -115,32 +112,32 @@ export const EditorMenuProvider = ({
       <Popover.Portal>
         <Popover.Content
           align='start'
-          classNames={tx('menu.content', 'menu--exotic-unfocusable', { elevation: 'positioned' }, [
-            'overflow-y-auto',
-            !menuGroups.length && 'hidden',
-          ])}
+          classNames={['flex flex-col', !menuGroups.length && 'hidden']}
           style={{
             maxBlockSize: 36 * numItems + 10,
           }}
-          /**
-           * NOTE: We keep the focus in the editor, but Radix routes escape key.
-           */
+          // NOTE: We keep the focus in the editor, but Radix routes escape key.
           onEscapeKeyDown={() => {
-            // NOTE: Able to cancel if not in valid state.
-            // event.preventDefault();
-            onCancel?.({ view: view! });
+            const currentView = viewRef.current;
+            if (currentView) {
+              onCancel?.({ view: currentView });
+            }
           }}
           onOpenAutoFocus={(event) => event.preventDefault()}
         >
-          <Popover.Viewport classNames={tx('menu.viewport', 'menu__viewport--exotic-unfocusable', {})}>
-            <Menu groups={menuGroups} currentItem={currentItem} onSelect={handleSelect} />
+          <Popover.Viewport asChild classNames='dx-container'>
+            <ScrollArea.Root thin>
+              <ScrollArea.Viewport>
+                <Menu groups={menuGroups} currentItem={currentItem} onSelect={handleSelect} />
+              </ScrollArea.Viewport>
+            </ScrollArea.Root>
           </Popover.Viewport>
           <Popover.Arrow />
         </Popover.Content>
       </Popover.Portal>
 
       {/* Content */}
-      <div ref={setRoot} role='none' className='contents'>
+      <div role='none' className='contents' ref={setRoot}>
         {children}
       </div>
     </Popover.Root>
@@ -162,7 +159,7 @@ const Menu = ({ groups, currentItem, onSelect }: MenuProps) => {
       {groups.map((group, index) => (
         <Fragment key={group.id}>
           <MenuGroup group={group} currentItem={currentItem} onSelect={onSelect} />
-          {index < groups.length - 1 && <div className={tx('menu.separator', 'menu__item', {})} />}
+          {index < groups.length - 1 && <div className={tx('menu.separator', {})} />}
         </Fragment>
       ))}
     </ul>
@@ -185,7 +182,7 @@ const MenuGroup = ({ group, currentItem, onSelect }: MenuGroupProps) => {
   return (
     <>
       {group.label && (
-        <div className={tx('menu.groupLabel', 'menu__group__label', {})}>
+        <div className={tx('menu.groupLabel', {})}>
           <span>{toLocalizedString(group.label, t)}</span>
         </div>
       )}
@@ -221,12 +218,8 @@ const MenuItem = ({ item, current, onSelect }: MenuItemProps) => {
   const handleSelect = useCallback(() => onSelect?.(item), [item, onSelect]);
 
   return (
-    <li
-      ref={listRef}
-      className={tx('menu.item', 'menu__item--exotic-unfocusable', {}, [current && 'bg-hoverSurface'])}
-      onClick={handleSelect}
-    >
-      {item.icon && <Icon icon={item.icon} size={5} />}
+    <li ref={listRef} className={tx('menu.item', {}, [current && 'bg-hover-surface'])} onClick={handleSelect}>
+      {item.icon && <Icon icon={item.icon} />}
       <span className='grow truncate'>{toLocalizedString(item.label, t)}</span>
     </li>
   );

package/src/components/EditorMenuProvider/index.ts

@@ -5,7 +5,6 @@
 export * from './menu';
 export * from './menu-presets';
 export * from './popover';
-export * from './util';
 
 export * from './EditorMenuProvider';
 export * from './useEditorMenu';

package/src/components/EditorMenuProvider/menu-presets.ts

@@ -2,9 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
+import { insertAtLineStart } from '@dxos/ui-editor';
+
 import { type EditorMenuGroup } from './menu';
 import { popoverRangeEffect } from './popover';
-import { insertAtLineStart } from './util';
 
 export const formattingCommands: EditorMenuGroup = {
   id: 'markdown',
@@ -109,6 +110,7 @@ export const linkSlashCommands: EditorMenuGroup = {
       label: 'Block embed',
       icon: 'ph--lego--regular',
       onSelect: ({ view, head }) => {
+        // Seed the same query shape as typing "@@" manually.
         view.dispatch({
           changes: { from: head, insert: '@@' },
           selection: { anchor: head + 2, head: head + 2 },

package/src/components/EditorMenuProvider/menu.ts

@@ -5,10 +5,9 @@
 import { type EditorView } from '@codemirror/view';
 
 import { type Label } from '@dxos/react-ui';
+import { insertAtCursor } from '@dxos/ui-editor';
 import { type MaybePromise } from '@dxos/util';
 
-import { insertAtCursor } from './util';
-
 export type EditorMenuGroup = {
   id: string;
   label?: Label;

package/src/components/EditorMenuProvider/popover.ts

@@ -13,11 +13,9 @@ import {
   keymap,
 } from '@codemirror/view';
 
+import { type PlaceholderOptions, type Range, modalStateField, placeholder } from '@dxos/ui-editor';
 import { isNonNullable, isTruthy } from '@dxos/util';
 
-import { type PlaceholderOptions, modalStateField, placeholder } from '../../extensions';
-import { type Range } from '../../types';
-
 const DELIMITERS = [' ', ':'];
 
 export type PopoverOptions = {