@dxos/react-ui-editor 0.8.4-main.74a063c4e0 → 0.8.4-main.765dc60934

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-editor",
-  "version": "0.8.4-main.74a063c4e0",
+  "version": "0.8.4-main.765dc60934",
   "description": "Text editor components.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,28 +8,34 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": false,
   "type": "module",
+  "imports": {
+    "#translations": "./src/translations.ts"
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "browser": "./dist/lib/browser/translations.mjs",
+      "node": "./dist/lib/node-esm/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.2.3",
+    "@automerge/automerge": "3.2.6",
     "@codemirror/autocomplete": "^6.19.0",
     "@codemirror/commands": "^6.8.1",
     "@codemirror/lang-html": "^6.4.11",
@@ -44,7 +50,7 @@
     "@codemirror/search": "^6.5.11",
     "@codemirror/state": "^6.5.2",
     "@codemirror/theme-one-dark": "^6.1.3",
-    "@codemirror/view": "^6.38.4",
+    "@codemirror/view": "^6.38.5",
     "@fluentui/react-tabster": "9.26.11",
     "@lezer/common": "^1.2.2",
     "@lezer/generator": "^1.7.1",
@@ -63,31 +69,33 @@
     "lodash.merge": "^4.6.2",
     "lodash.sortby": "^4.7.0",
     "style-mod": "^4.1.0",
-    "@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"
+    "@dxos/app-graph": "0.8.4-main.765dc60934",
+    "@dxos/client": "0.8.4-main.765dc60934",
+    "@dxos/async": "0.8.4-main.765dc60934",
+    "@dxos/display-name": "0.8.4-main.765dc60934",
+    "@dxos/echo": "0.8.4-main.765dc60934",
+    "@dxos/echo-db": "0.8.4-main.765dc60934",
+    "@dxos/debug": "0.8.4-main.765dc60934",
+    "@dxos/invariant": "0.8.4-main.765dc60934",
+    "@dxos/log": "0.8.4-main.765dc60934",
+    "@dxos/effect": "0.8.4-main.765dc60934",
+    "@dxos/lit-ui": "0.8.4-main.765dc60934",
+    "@dxos/protocols": "0.8.4-main.765dc60934",
+    "@dxos/react-hooks": "0.8.4-main.765dc60934",
+    "@dxos/context": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-menu": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-mosaic": "0.8.4-main.765dc60934",
+    "@dxos/ui": "0.8.4-main.765dc60934",
+    "@dxos/util": "0.8.4-main.765dc60934",
+    "@dxos/ui-editor": "0.8.4-main.765dc60934",
+    "@dxos/ui-theme": "0.8.4-main.765dc60934"
   },
   "devDependencies": {
-    "@automerge/automerge": "3.2.3",
-    "@automerge/automerge-repo": "2.5.1",
-    "@automerge/automerge-repo-network-broadcastchannel": "2.5.1",
+    "@automerge/automerge": "3.2.6",
+    "@automerge/automerge-repo": "2.6.0-subduction.17",
+    "@automerge/automerge-repo-network-broadcastchannel": "2.6.0-subduction.17",
     "@effect-atom/atom-react": "^0.5.0",
+    "@effect/ai": "0.33.2",
     "@effect/platform": "0.94.4",
     "@types/chai": "^4.2.15",
     "@types/chai-dom": "^1.11.0",
@@ -106,22 +114,23 @@
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
     "react-test-renderer": "~19.2.0",
-    "vite": "^7.1.11",
+    "vite": "^8.0.13",
     "vite-plugin-top-level-await": "^1.6.0",
-    "vite-plugin-wasm": "^3.5.0",
-    "@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"
+    "vite-plugin-wasm": "^3.6.0",
+    "@dxos/ai": "0.8.4-main.765dc60934",
+    "@dxos/config": "0.8.4-main.765dc60934",
+    "@dxos/keyboard": "0.8.4-main.765dc60934",
+    "@dxos/echo": "0.8.4-main.765dc60934",
+    "@dxos/echo-atom": "0.8.4-main.765dc60934",
+    "@dxos/random": "0.8.4-main.765dc60934",
+    "@dxos/react-client": "0.8.4-main.765dc60934",
+    "@dxos/react-ui": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.765dc60934",
+    "@dxos/schema": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-attention": "0.8.4-main.765dc60934",
+    "@dxos/storybook-utils": "0.8.4-main.765dc60934",
+    "@dxos/ui-theme": "0.8.4-main.765dc60934",
+    "@dxos/ui-types": "0.8.4-main.765dc60934"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -129,9 +138,9 @@
     "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"
+    "@dxos/react-client": "0.8.4-main.765dc60934",
+    "@dxos/react-ui": "0.8.4-main.765dc60934",
+    "@dxos/ui-theme": "0.8.4-main.765dc60934"
   },
   "publishConfig": {
     "access": "public"

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

@@ -20,11 +20,7 @@ import {
 } 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.
+import { Editor, type EditorViewProps } from './Editor';
 
 random.seed(1234);
 
@@ -32,8 +28,7 @@ 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<EditorContentProps> = (Story, { args }) => {
+const withExtensions: Decorator<EditorViewProps> = (Story, { args }) => {
   const { themeMode } = useThemeContext();
   const extensions = useMemo(
     () => [
@@ -51,7 +46,7 @@ const withExtensions: Decorator<EditorContentProps> = (Story, { args }) => {
 
 const meta = {
   title: 'ui/react-ui-editor/Editor',
-  component: Editor.Content,
+  component: Editor.View,
   decorators: [withExtensions, withTheme(), withLayout({ layout: 'column' }), withAttention()],
   parameters: {
     layout: 'fullscreen',
@@ -59,16 +54,16 @@ const meta = {
   args: {
     initialValue,
   },
-} satisfies Meta<typeof Editor.Content>;
+} satisfies Meta<typeof Editor.View>;
 
 export default meta;
 
-type Story = StoryObj<EditorContentProps>;
+type Story = StoryObj<EditorViewProps>;
 
 export const Default: Story = {
   render: (args) => (
     <Editor.Root>
-      <Editor.Content {...args} />
+      <Editor.View {...args} />
     </Editor.Root>
   ),
 };
@@ -77,7 +72,7 @@ export const WithToolbar: Story = {
   render: (args) => (
     <Editor.Root>
       <Editor.Toolbar />
-      <Editor.Content {...args} />
+      <Editor.View {...args} />
     </Editor.Root>
   ),
 };
@@ -85,10 +80,10 @@ export const WithToolbar: Story = {
 export const WithPopover: Story = {
   render: (args) => (
     <Editor.Root trigger={['@']} getMenu={({ text }) => [createMenuGroup({ items, filter: text })]}>
-      <Editor.Viewport>
+      <Editor.Content>
         <Editor.Toolbar />
-        <Editor.Content {...args} />
-      </Editor.Viewport>
+        <Editor.View {...args} />
+      </Editor.Content>
     </Editor.Root>
   ),
 };

package/src/components/Editor/Editor.tsx

@@ -3,6 +3,7 @@
 //
 
 import { type Extension } from '@codemirror/state';
+import { Atom } from '@effect-atom/atom-react';
 import { createContext } from '@radix-ui/react-context';
 import React, { type PropsWithChildren, forwardRef, useCallback, useImperativeHandle, useMemo, useState } from 'react';
 
@@ -12,18 +13,23 @@ import { mx } from '@dxos/ui-theme';
 import { isNonNullable } from '@dxos/util';
 
 import {
-  type EditorController,
-  EditorContent as NaturalEditorContent,
-  type EditorContentProps as NaturalEditorContentProps,
-  noopController,
-} from '../EditorContent';
-import { EditorMenuProvider, type UseEditorMenuProps, useEditorMenu } from '../EditorMenuProvider';
+  EditorMenuProvider,
+  type EditorMenuProviderProps,
+  type UseEditorMenuProps,
+  useEditorMenu,
+} from '../EditorMenuProvider';
 import {
   type EditorToolbarState,
   EditorToolbar as NaturalEditorToolbar,
   type EditorToolbarProps as NaturalEditorToolbarProps,
-  useEditorToolbar,
 } from '../EditorToolbar';
+import {
+  type EditorController,
+  EditorView as NaturalEditorContent,
+  type EditorViewProps as NaturalEditorContentProps,
+  createEditorController,
+  noopController,
+} from './EditorView';
 
 //
 // Context
@@ -33,16 +39,26 @@ type EditorContextValue = {
   controller?: EditorController;
   setController: (controller: EditorController) => void;
   extensions?: Extension[];
-} & Pick<NaturalEditorToolbarProps, 'state'>;
+  state: Atom.Writable<EditorToolbarState>;
+};
 
 const [EditorContextProvider, useEditorContext] = createContext<EditorContextValue>('Editor');
 
+/**
+ * Access the editor context. Must be used within `Editor.Root`.
+ */
+export { useEditorContext };
+
 //
 // Root
 //
 
 type EditorRootProps = PropsWithChildren<
-  Pick<EditorContextValue, 'extensions'> & Omit<UseEditorMenuProps, 'viewRef'> & Pick<EditorToolbarState, 'viewMode'>
+  Pick<EditorContextValue, 'extensions'> &
+    Omit<UseEditorMenuProps, 'viewRef'> &
+    Pick<EditorMenuProviderProps, 'numItems'> & {
+      viewMode?: EditorToolbarState['viewMode'];
+    }
 >;
 
 /**
@@ -50,11 +66,9 @@ type EditorRootProps = PropsWithChildren<
  * Provides context for all child components and manages the editor controller state.
  */
 const EditorRoot = forwardRef<EditorController | null, EditorRootProps>(
-  ({ children, extensions: extensionsProp, viewMode, ...props }, forwardedRef) => {
-    const state = useEditorToolbar({ viewMode });
-
-    const [controller, setController] = useState<EditorController>();
-    useImperativeHandle(forwardedRef, () => controller ?? noopController, [controller]);
+  ({ children, extensions: extensionsProp, viewMode, numItems, ...props }, forwardedRef) => {
+    // TODO(wittjosiah): Including initialState in the deps causes reactivity issues.
+    const state = useMemo(() => Atom.make<EditorToolbarState>({ viewMode }), [viewMode]);
 
     // TODO(burdon): Consider lighter-weight approach if EditorMenuProvider is not needed.
     const { groupsRef, extension, ...menuProps } = useEditorMenu(props);
@@ -63,6 +77,10 @@ const EditorRoot = forwardRef<EditorController | null, EditorRootProps>(
       [extension, extensionsProp],
     );
 
+    // External controller.
+    const [controller, setController] = useState<EditorController>(noopController);
+    useImperativeHandle(forwardedRef, () => controller, [controller]);
+
     return (
       <EditorContextProvider
         controller={controller}
@@ -70,7 +88,7 @@ const EditorRoot = forwardRef<EditorController | null, EditorRootProps>(
         extensions={extensions}
         state={state}
       >
-        <EditorMenuProvider view={controller?.view} groups={groupsRef.current} {...menuProps}>
+        <EditorMenuProvider view={controller?.view} groups={groupsRef.current} numItems={numItems} {...menuProps}>
           {children}
         </EditorMenuProvider>
       </EditorContextProvider>
@@ -81,41 +99,36 @@ const EditorRoot = forwardRef<EditorController | null, EditorRootProps>(
 EditorRoot.displayName = 'Editor.Root';
 
 //
-// Viewport
+// Content
 //
 
-const EDITOR_VIEWPORT_NAME = 'Editor.Viewport';
+const EDITOR_CONTENT_NAME = 'Editor.Content';
 
-type EditorViewportProps = ThemedClassName<PropsWithChildren<{}>>;
+type EditorContentProps = ThemedClassName<PropsWithChildren<{}>>;
 
 /**
- * Viewport component that wraps the toolbar and editor content area.
+ * Content component that wraps the toolbar and editor view area.
  */
-const EditorViewport = ({ classNames, children }: EditorViewportProps) => {
-  return (
-    <div role='none' className={mx('grid grid-rows-[min-content_1fr] h-full overflow-hidden', classNames)}>
-      {children}
-    </div>
-  );
+const EditorContent = ({ classNames, children }: EditorContentProps) => {
+  return <div className={mx('grid grid-rows-[min-content_1fr] h-full overflow-hidden', classNames)}>{children}</div>;
 };
 
-EditorViewport.displayName = EDITOR_VIEWPORT_NAME;
+EditorContent.displayName = EDITOR_CONTENT_NAME;
 
 //
-// Content
+// View
 //
 
-const EDITOR_CONTENT_NAME = 'Editor.Content';
+const EDITOR_VIEW_NAME = 'Editor.View';
 
-type EditorContentProps = Omit<NaturalEditorContentProps, 'ref'>;
+type EditorViewProps = Omit<NaturalEditorContentProps, 'ref'>;
 
 /**
- * Content component that renders the actual CodeMirror editor.
+ * View component that renders the actual CodeMirror editor.
  * Automatically registers the editor controller with the context.
  */
-const EditorContent = ({ extensions: providedExtensions, ...props }: EditorContentProps) => {
-  const { extensions: additionalExtensions = [], setController } = useEditorContext(EDITOR_CONTENT_NAME);
-
+const EditorView = ({ extensions: providedExtensions, ...props }: EditorViewProps) => {
+  const { extensions: additionalExtensions = [], setController } = useEditorContext(EDITOR_VIEW_NAME);
   const extensions = useMemo(
     () => [additionalExtensions, providedExtensions].filter(isNonNullable).flat(),
     [providedExtensions, additionalExtensions],
@@ -124,7 +137,7 @@ const EditorContent = ({ extensions: providedExtensions, ...props }: EditorConte
   return <NaturalEditorContent {...props} extensions={extensions} ref={setController} />;
 };
 
-EditorContent.displayName = EDITOR_CONTENT_NAME;
+EditorView.displayName = EDITOR_VIEW_NAME;
 
 //
 // Toolbar
@@ -140,8 +153,6 @@ type EditorToolbarProps = Omit<NaturalEditorToolbarProps, 'getView' | 'state'>;
  */
 const EditorToolbar = (props: EditorToolbarProps) => {
   const { controller, state } = useEditorContext(EDITOR_TOOLBAR_NAME);
-
-  // TODO(burdon): Fix invariant.
   const getView = useCallback(() => {
     invariant(controller?.view);
     return controller?.view;
@@ -156,30 +167,20 @@ EditorToolbar.displayName = EDITOR_TOOLBAR_NAME;
 // Editor
 //
 
-/**
- * Compound editor component following the Radix UI pattern.
- *
- * @example
- * ```tsx
- * EditorMenuGroup.Root>
- *   EditorMenuGroup.Toolbar />
- *   EditorMenuGroup.Viewport>
- *     EditorMenuGroup.Content extensions={[...]} />
- *   </Editor.Viewport>
- * </Editor.Root>
- * ```
- */
 export const Editor = {
   Root: EditorRoot,
-  Viewport: EditorViewport,
-  Content: EditorContent,
   Toolbar: EditorToolbar,
+  Content: EditorContent,
+  View: EditorView,
 };
 
 export type {
   EditorController,
   EditorRootProps,
-  EditorViewportProps,
   EditorContentProps,
-  // EditorToolbarProps, // TODO(burdon): Restore once removed deprecated props.
+  EditorViewProps,
+  EditorToolbarProps,
+  EditorToolbarState,
 };
+
+export { createEditorController };

package/src/components/Editor/EditorView.tsx

@@ -0,0 +1,102 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Transaction } from '@codemirror/state';
+import { EditorView as NaturalEditorView } from '@codemirror/view';
+import React, { forwardRef, useEffect, useImperativeHandle, useRef } from 'react';
+
+import { type ThemedClassName } from '@dxos/react-ui';
+import { initialSync } from '@dxos/ui-editor';
+import { mx } from '@dxos/ui-theme';
+
+import { type UseTextEditorProps, useTextEditor } from '../../hooks';
+import { type EditorController, createEditorController, noopController } from './controller';
+
+export type EditorViewProps = ThemedClassName<
+  {
+    focusable?: boolean;
+    value?: string;
+    onChange?: (value: string) => void;
+  } & UseTextEditorProps
+>;
+
+/**
+ * Minimal text editor.
+ * NOTE: This shouold not be used with the automerge extension.
+ */
+// TODO(burdon): Move controller to Root component, then make composable.
+export const EditorView = forwardRef<EditorController, EditorViewProps>(
+  ({ classNames, id, extensions, selectionEnd, focusable = true, value, onChange, ...props }, forwardedRef) => {
+    // Hold the latest onChange in a ref so callers may pass an inline callback
+    // without forcing the underlying editor to be destroyed and recreated on
+    // every render — which would blur the focused input on each keystroke.
+    const onChangeRef = useRef(onChange);
+    onChangeRef.current = onChange;
+
+    const { parentRef, focusAttributes, view } = useTextEditor(
+      () => ({
+        id,
+        initialValue: value,
+        selectionEnd,
+        extensions: [
+          extensions ?? [],
+          NaturalEditorView.updateListener.of(({ view, docChanged, transactions }) => {
+            const isInitialSync = transactions.some((tr) => tr.annotation(Transaction.userEvent) === initialSync.value);
+            if (!isInitialSync && docChanged) {
+              onChangeRef.current?.(view.state.doc.toString());
+            }
+          }),
+        ],
+        ...props,
+      }),
+      [id, extensions, selectionEnd],
+    );
+
+    // External controller.
+    useImperativeHandle(forwardedRef, () => {
+      return createEditorController(view);
+    }, [id, view]);
+
+    // Sync the editor doc to the controlled `value` prop, but only when they
+    // disagree. After internal typing the prop will already match the editor's
+    // doc, and dispatching anyway would race fast keystrokes — a stale rAF
+    // closure can replace doc content with an older value, dropping characters.
+    useEffect(() => {
+      if (!view) {
+        return;
+      }
+      const next = value ?? '';
+      if (view.state.doc.toString() === next) {
+        return;
+      }
+      requestAnimationFrame(() => {
+        if (view.state.doc.toString() === next) {
+          return;
+        }
+        view.dispatch({
+          annotations: initialSync,
+          changes: [{ from: 0, to: view.state.doc.length, insert: next }],
+          selection: selectionEnd ? { anchor: next.length } : undefined,
+        });
+
+        if (selectionEnd) {
+          view.focus();
+        }
+      });
+    }, [view, value, selectionEnd]);
+
+    return (
+      <div
+        className={mx(
+          'w-full outline-hidden focus:border-accent-surface focus-within:border-focus-ring-subtle',
+          classNames,
+        )}
+        {...(focusable ? focusAttributes : {})}
+        ref={parentRef}
+      />
+    );
+  },
+);
+
+export { type EditorController, createEditorController, noopController };

package/src/components/EditorMenuProvider/EditorMenuProvider.tsx

@@ -137,7 +137,7 @@ export const EditorMenuProvider = ({
       </Popover.Portal>
 
       {/* Content */}
-      <div role='none' className='contents' ref={setRoot}>
+      <div className='contents' ref={setRoot}>
         {children}
       </div>
     </Popover.Root>

package/src/components/EditorMenuProvider/popover.ts

@@ -13,7 +13,8 @@ import {
   keymap,
 } from '@codemirror/view';
 
-import { type PlaceholderOptions, type Range, modalStateField, placeholder } from '@dxos/ui-editor';
+import { type PlaceholderOptions, modalStateField, placeholder } from '@dxos/ui-editor';
+import { type Range } from '@dxos/ui-editor/types';
 import { isNonNullable, isTruthy } from '@dxos/util';
 
 const DELIMITERS = [' ', ':'];
@@ -52,6 +53,7 @@ export const popover = (options: PopoverOptions = {}): Extension => {
       placeholder({
         // TODO(burdon): Translations.
         content: `Press '${Array.isArray(options.trigger) ? options.trigger[0] : options.trigger}' for commands`,
+        focusOnly: true,
         ...options.placeholder,
       }),
   ].filter(isTruthy);

package/src/components/EditorPreviewProvider/EditorPreviewProvider.tsx

@@ -68,7 +68,7 @@ export const EditorPreviewProvider = ({ children, onLookup }: EditorPreviewProvi
     <EditorPreviewContextProvider pending={value.pending} link={value.link} target={value.target}>
       <Popover.Root open={open} onOpenChange={setOpen}>
         <Popover.VirtualTrigger virtualRef={triggerRef as unknown as RefObject<HTMLButtonElement>} />
-        <div role='none' className='contents' ref={setRoot}>
+        <div className='contents' ref={setRoot}>
           {children}
         </div>
       </Popover.Root>

package/src/components/EditorToolbar/EditorToolbar.tsx

@@ -9,7 +9,7 @@ import React, { memo, useMemo } from 'react';
 import { type Node } from '@dxos/app-graph';
 import { ElevationProvider, type ThemedClassName } from '@dxos/react-ui';
 import { type ActionGraphProps, Menu, type MenuAction, MenuBuilder, useMenuActions } from '@dxos/react-ui-menu';
-import { type EditorViewMode } from '@dxos/ui-editor';
+import { type EditorViewMode } from '@dxos/ui-editor/types';
 
 import { addBlocks } from './blocks';
 import { addFormatting } from './formatting';
@@ -17,9 +17,11 @@ import { addHeadings } from './headings';
 import { addImageUpload } from './image';
 import { addLists } from './lists';
 import { addSearch } from './search';
-import { type EditorToolbarState } from './useEditorToolbar';
+import { type EditorToolbarState } from './types';
 import { addViewMode } from './view-mode';
 
+// TODO(burdon): Enable toolbar variants (e.g., markdown, code).
+
 export type EditorToolbarFeatureFlags = Partial<{
   showHeadings: boolean;
   showFormatting: boolean;
@@ -49,7 +51,7 @@ export type EditorToolbarProps = ThemedClassName<
 >;
 
 export const EditorToolbar = memo(({ classNames, role, attendableId, onAction, ...props }: EditorToolbarProps) => {
-  const menuActions = useEditorToolbarActionGraph(props);
+  const menuActions = useMarkdownMenuActions(props);
 
   return (
     <ElevationProvider elevation={role === 'section' ? 'positioned' : 'base'}>
@@ -63,13 +65,13 @@ export const EditorToolbar = memo(({ classNames, role, attendableId, onAction, .
 type ToolbarActionsProps = Pick<EditorToolbarActionGraphProps, 'state' | 'getView' | 'customActions'> &
   EditorToolbarFeatureFlags;
 
+// TODO(burdon): Some actions should toggle the state (e.g., toggle bullets on/off depending on the current state).
 // TODO(wittjosiah): Toolbar re-rendering is causing this graph to be recreated and breaking reactivity in some cases.
 //   E.g. for toolbar dropdowns which use active icon, the icon is not updated when the active item changes.
 //   This is currently only happening in the markdown plugin usage and should be reproduced in an editor story.
-// TODO(burdon): Some actions should toggle the state (e.g., toggle bullets on/off depending on the current state).
-const useEditorToolbarActionGraph = ({ state, getView, customActions, ...features }: ToolbarActionsProps) => {
+const useMarkdownMenuActions = ({ state, getView, customActions, ...features }: ToolbarActionsProps) => {
   const menuCreator = useMemo(
-    () => createToolbarActions({ state, getView, customActions, ...features }),
+    () => createMarkdownActions({ state, getView, customActions, ...features }),
     [
       state,
       getView,
@@ -87,7 +89,7 @@ const useEditorToolbarActionGraph = ({ state, getView, customActions, ...feature
   return useMenuActions(menuCreator);
 };
 
-const createToolbarActions = ({
+const createMarkdownActions = ({
   state,
   getView,
   customActions,

package/src/components/EditorToolbar/blocks.ts

@@ -7,8 +7,9 @@ import { type EditorView } from '@codemirror/view';
 import { type ActionGroupBuilderFn, type ToolbarMenuActionGroupProperties } from '@dxos/react-ui-menu';
 import { addBlockquote, addCodeblock, insertTable, removeBlockquote, removeCodeblock } from '@dxos/ui-editor';
 
-import { translationKey } from '../../translations';
-import { type EditorToolbarState } from './useEditorToolbar';
+import { translationKey } from '#translations';
+
+import { type EditorToolbarState } from './types';
 
 const blockTypes = {
   blockquote: 'ph--quotes--regular',