@dxos/react-ui-editor 0.8.4-main.67995b8 → 0.8.4-main.a4bbb77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-editor",
-  "version": "0.8.4-main.67995b8",
+  "version": "0.8.4-main.a4bbb77",
   "description": "Document editing experience within a DXOS shell.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,22 +10,22 @@
   "type": "module",
   "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",
-      "source": "./src/index.ts"
+      "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",
-      "source": "./src/types/index.ts"
+      "node": "./dist/lib/node-esm/types/index.mjs"
     },
     "./testing": {
+      "source": "./src/testing/index.ts",
       "types": "./dist/types/src/testing/index.d.ts",
       "browser": "./dist/lib/browser/testing/index.mjs",
-      "node": "./dist/lib/node-esm/testing/index.mjs",
-      "source": "./src/testing/index.ts"
+      "node": "./dist/lib/node-esm/testing/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -37,27 +37,29 @@
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.1.1",
-    "@codemirror/autocomplete": "^6.18.1",
-    "@codemirror/commands": "^6.6.2",
-    "@codemirror/lang-javascript": "^6.2.2",
-    "@codemirror/lang-json": "^6.0.1",
-    "@codemirror/lang-markdown": "^6.3.0",
-    "@codemirror/language": "^6.10.3",
+    "@automerge/automerge": "3.1.2",
+    "@codemirror/autocomplete": "^6.19.0",
+    "@codemirror/commands": "^6.8.1",
+    "@codemirror/lang-javascript": "^6.2.4",
+    "@codemirror/lang-json": "^6.0.2",
+    "@codemirror/lang-markdown": "^6.3.4",
+    "@codemirror/lang-xml": "^6.1.0",
+    "@codemirror/language": "^6.11.3",
     "@codemirror/language-data": "^6.5.1",
-    "@codemirror/lint": "^6.8.2",
-    "@codemirror/search": "^6.5.6",
-    "@codemirror/state": "^6.4.1",
-    "@codemirror/theme-one-dark": "^6.1.2",
-    "@codemirror/view": "^6.34.1",
+    "@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",
     "@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.2.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",
     "ajv": "^8.17.1",
@@ -67,70 +69,72 @@
     "lodash.merge": "^4.6.2",
     "lodash.sortby": "^4.7.0",
     "style-mod": "^4.1.0",
-    "@dxos/app-graph": "0.8.4-main.67995b8",
-    "@dxos/async": "0.8.4-main.67995b8",
-    "@dxos/context": "0.8.4-main.67995b8",
-    "@dxos/debug": "0.8.4-main.67995b8",
-    "@dxos/display-name": "0.8.4-main.67995b8",
-    "@dxos/echo-schema": "0.8.4-main.67995b8",
-    "@dxos/invariant": "0.8.4-main.67995b8",
-    "@dxos/lit-ui": "0.8.4-main.67995b8",
-    "@dxos/live-object": "0.8.4-main.67995b8",
-    "@dxos/protocols": "0.8.4-main.67995b8",
-    "@dxos/log": "0.8.4-main.67995b8",
-    "@dxos/react-hooks": "0.8.4-main.67995b8",
-    "@dxos/react-ui-stack": "0.8.4-main.67995b8",
-    "@dxos/util": "0.8.4-main.67995b8",
-    "@dxos/react-ui-menu": "0.8.4-main.67995b8"
+    "@dxos/app-graph": "0.8.4-main.a4bbb77",
+    "@dxos/async": "0.8.4-main.a4bbb77",
+    "@dxos/context": "0.8.4-main.a4bbb77",
+    "@dxos/debug": "0.8.4-main.a4bbb77",
+    "@dxos/display-name": "0.8.4-main.a4bbb77",
+    "@dxos/echo-schema": "0.8.4-main.a4bbb77",
+    "@dxos/invariant": "0.8.4-main.a4bbb77",
+    "@dxos/lit-ui": "0.8.4-main.a4bbb77",
+    "@dxos/live-object": "0.8.4-main.a4bbb77",
+    "@dxos/log": "0.8.4-main.a4bbb77",
+    "@dxos/protocols": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-menu": "0.8.4-main.a4bbb77",
+    "@dxos/react-hooks": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-types": "0.8.4-main.a4bbb77",
+    "@dxos/util": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-stack": "0.8.4-main.a4bbb77"
   },
   "devDependencies": {
-    "@automerge/automerge": "3.1.1",
-    "@automerge/automerge-repo": "2.0.8",
-    "@automerge/automerge-repo-network-broadcastchannel": "2.0.8",
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.89.0",
+    "@automerge/automerge": "3.1.2",
+    "@automerge/automerge-repo": "2.3.1",
+    "@automerge/automerge-repo-network-broadcastchannel": "2.3.1",
+    "@effect-rx/rx-react": "0.42.4",
+    "@effect/platform": "0.92.1",
     "@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": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
+    "@types/react": "~19.2.0",
+    "@types/react-dom": "~19.2.0",
     "@types/react-test-renderer": "^17.0.2",
     "chai": "^4.4.1",
     "chai-dom": "^1.11.0",
-    "effect": "3.17.0",
+    "effect": "3.18.3",
     "happy-dom": "^13.3.1",
     "jsdom": "^24.0.0",
     "mocha": "^10.6.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "react-test-renderer": "~18.2.0",
-    "vite": "5.4.7",
-    "vite-plugin-top-level-await": "^1.4.1",
-    "vite-plugin-wasm": "^3.3.0",
-    "@dxos/config": "0.8.4-main.67995b8",
-    "@dxos/echo": "0.8.4-main.67995b8",
-    "@dxos/echo-signals": "0.8.4-main.67995b8",
-    "@dxos/keyboard": "0.8.4-main.67995b8",
-    "@dxos/random": "0.8.4-main.67995b8",
-    "@dxos/react-client": "0.8.4-main.67995b8",
-    "@dxos/react-ui": "0.8.4-main.67995b8",
-    "@dxos/react-ui-attention": "0.8.4-main.67995b8",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.67995b8",
-    "@dxos/react-ui-theme": "0.8.4-main.67995b8",
-    "@dxos/schema": "0.8.4-main.67995b8",
-    "@dxos/storybook-utils": "0.8.4-main.67995b8"
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "react-test-renderer": "~19.2.0",
+    "vite": "7.1.9",
+    "vite-plugin-top-level-await": "^1.6.0",
+    "vite-plugin-wasm": "^3.5.0",
+    "@dxos/echo": "0.8.4-main.a4bbb77",
+    "@dxos/echo-signals": "0.8.4-main.a4bbb77",
+    "@dxos/config": "0.8.4-main.a4bbb77",
+    "@dxos/react-client": "0.8.4-main.a4bbb77",
+    "@dxos/random": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui": "0.8.4-main.a4bbb77",
+    "@dxos/keyboard": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-attention": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-stack": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77",
+    "@dxos/schema": "0.8.4-main.a4bbb77",
+    "@dxos/storybook-utils": "0.8.4-main.a4bbb77"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
     "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-client": "0.8.4-main.67995b8",
-    "@dxos/react-ui": "0.8.4-main.67995b8",
-    "@dxos/react-ui-theme": "0.8.4-main.67995b8"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-client": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77"
   },
   "publishConfig": {
     "access": "public"

package/src/components/{Popover → CommandMenu}/CommandMenu.tsx

@@ -3,13 +3,25 @@
 //
 
 import { type EditorView } from '@codemirror/view';
-import React, { useCallback, useEffect, useRef } from 'react';
+import { useControllableState } from '@radix-ui/react-use-controllable-state';
+import React, { Fragment, type PropsWithChildren, useCallback, useEffect, useRef, useState } from 'react';
 
-import { Icon, type Label, Popover, toLocalizedString, useThemeContext, useTranslation } from '@dxos/react-ui';
+import { addEventListener } from '@dxos/async';
+import {
+  type DxAnchorActivate,
+  Icon,
+  type Label,
+  Popover,
+  toLocalizedString,
+  useThemeContext,
+  useTranslation,
+} from '@dxos/react-ui';
 import { type MaybePromise } from '@dxos/util';
 
 import { commandRangeEffect } from '../../extensions';
 
+// TODO(burdon): Rename ComboBox (and factor out to separate package).
+
 export type CommandMenuGroup = {
   id: string;
   label?: Label;
@@ -23,37 +35,94 @@ export type CommandMenuItem = {
   onSelect?: (view: EditorView, head: number) => MaybePromise<void>;
 };
 
-export type CommandMenuProps = {
+export type CommandMenuProps = PropsWithChildren<{
   groups: CommandMenuGroup[];
-  currentItem?: string;
   onSelect: (item: CommandMenuItem) => void;
-};
+  onActivate?: (event: DxAnchorActivate) => void;
+  currentItem?: string;
+  open?: boolean;
+  onOpenChange?: (nextOpen: boolean) => void;
+  defaultOpen?: boolean;
+}>;
 
 // NOTE: Not using DropdownMenu because the command menu needs to manage focus explicitly.
-export const CommandMenu = ({ groups, currentItem, onSelect }: CommandMenuProps) => {
+export const CommandMenuProvider = ({
+  groups,
+  onSelect,
+  onActivate,
+  currentItem,
+  children,
+  open: propsOpen,
+  onOpenChange,
+  defaultOpen,
+}: CommandMenuProps) => {
   const { tx } = useThemeContext();
   const groupsWithItems = groups.filter((group) => group.items.length > 0);
+  const trigger = useRef<HTMLButtonElement | null>(null);
+
+  const [open, setOpen] = useControllableState({
+    prop: propsOpen,
+    onChange: onOpenChange,
+    defaultProp: defaultOpen,
+  });
+
+  const handleDxAnchorActivate = useCallback(
+    (event: DxAnchorActivate) => {
+      const { trigger: dxTrigger, refId } = event;
+      // If this has a `refId`, then it’s probably a URL or DXN and out of scope for this component.
+      if (!refId) {
+        trigger.current = dxTrigger as HTMLButtonElement;
+        if (onActivate) {
+          onActivate(event);
+        } else {
+          queueMicrotask(() => setOpen(true));
+        }
+      }
+    },
+    [onActivate],
+  );
+
+  const [rootRef, setRootRef] = useState<HTMLDivElement | null>(null);
+
+  useEffect(() => {
+    if (!rootRef || !handleDxAnchorActivate) {
+      return;
+    }
+
+    return addEventListener(rootRef, 'dx-anchor-activate' as any, handleDxAnchorActivate, {
+      capture: true,
+      passive: false,
+    });
+  }, [rootRef, handleDxAnchorActivate]);
+
   return (
-    <Popover.Portal>
-      <Popover.Content
-        align='start'
-        onOpenAutoFocus={(event) => event.preventDefault()}
-        classNames={tx('menu.content', 'menu--exotic-unfocusable', { elevation: 'positioned' }, [
-          'max-h-[300px] overflow-y-auto',
-        ])}
-      >
-        <Popover.Viewport classNames={tx('menu.viewport', 'menu__viewport--exotic-unfocusable', {})}>
-          <ul>
-            {groupsWithItems.map((group, index) => (
-              <React.Fragment key={group.id}>
-                <CommandGroup group={group} currentItem={currentItem} onSelect={onSelect} />
-                {index < groupsWithItems.length - 1 && <div className={tx('menu.separator', 'menu__item', {})} />}
-              </React.Fragment>
-            ))}
-          </ul>
-        </Popover.Viewport>
-      </Popover.Content>
-    </Popover.Portal>
+    <Popover.Root modal={false} open={open} onOpenChange={setOpen}>
+      <Popover.Portal>
+        <Popover.Content
+          align='start'
+          onOpenAutoFocus={(event) => event.preventDefault()}
+          classNames={tx('menu.content', 'menu--exotic-unfocusable', { elevation: 'positioned' }, [
+            'max-bs-80 overflow-y-auto',
+          ])}
+        >
+          <Popover.Viewport classNames={tx('menu.viewport', 'menu__viewport--exotic-unfocusable', {})}>
+            <ul>
+              {groupsWithItems.map((group, index) => (
+                <Fragment key={group.id}>
+                  <CommandGroup group={group} currentItem={currentItem} onSelect={onSelect} />
+                  {index < groupsWithItems.length - 1 && <div className={tx('menu.separator', 'menu__item', {})} />}
+                </Fragment>
+              ))}
+            </ul>
+          </Popover.Viewport>
+          <Popover.Arrow />
+        </Popover.Content>
+      </Popover.Portal>
+      <Popover.VirtualTrigger virtualRef={trigger} />
+      <div role='none' className='contents' ref={setRootRef}>
+        {children}
+      </div>
+    </Popover.Root>
   );
 };
 

package/src/components/{Popover → CommandMenu}/index.ts

@@ -3,5 +3,3 @@
 //
 
 export * from './CommandMenu';
-export * from './RefPopover';
-export * from './RefDropdownMenu';

package/src/components/Editor/Editor.tsx

@@ -2,38 +2,73 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type EditorView } from '@codemirror/view';
-import React, { forwardRef, useImperativeHandle } from 'react';
+import { EditorView } from '@codemirror/view';
+import React, { forwardRef, useEffect, useImperativeHandle } from 'react';
 
-import { type ThemedClassName, useThemeContext } from '@dxos/react-ui';
+import { type ThemedClassName } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
-import { type DataType } from '@dxos/schema';
 
-import { useTextEditor, type UseTextEditorProps } from '../../hooks';
+import { type UseTextEditorProps, useTextEditor } from '../../hooks';
+
+export type EditorController = {
+  view: EditorView | null;
+  focus: () => void;
+};
 
 export type EditorProps = ThemedClassName<
   {
-    id: string;
-    text: DataType.Text;
-  } & Omit<UseTextEditorProps, 'id'>
+    value?: string;
+    moveToEnd?: boolean;
+    onChange?: (value: string) => void;
+  } & Omit<UseTextEditorProps, 'initialValue'>
 >;
 
 /**
  * Minimal text editor.
+ * NOTE: This shouold not be used with the automerge extension.
  */
-export const Editor = forwardRef<EditorView | undefined, EditorProps>(
-  ({ classNames, id, text, ...props }, forwardedRef) => {
-    const { themeMode } = useThemeContext();
+export const Editor = forwardRef<EditorController, EditorProps>(
+  ({ classNames, id, extensions = [], value, moveToEnd, onChange, ...props }, forwardedRef) => {
     const { parentRef, focusAttributes, view } = useTextEditor(
       () => ({
         id,
-        initialValue: text.content,
+        extensions: [
+          extensions,
+          EditorView.updateListener.of((update) => {
+            const startValue = update.startState.doc.toString();
+            const value = update.state.doc.toString();
+            if (startValue !== value) {
+              onChange?.(value);
+            }
+          }),
+        ],
         ...props,
       }),
-      [id, text, themeMode],
+      [id, extensions, onChange],
+    );
+
+    // External controller.
+    useImperativeHandle(
+      forwardedRef,
+      () => ({
+        view,
+        focus: () => view?.focus(),
+      }),
+      [view],
     );
 
-    useImperativeHandle(forwardedRef, () => view, [view]);
-    return <div ref={parentRef} className={mx(classNames)} {...focusAttributes} />;
+    // Update content.
+    useEffect(() => {
+      if (value !== view?.state.doc.toString()) {
+        requestAnimationFrame(() => {
+          view?.dispatch({
+            changes: { from: 0, to: view.state.doc.length, insert: value },
+            selection: moveToEnd ? { anchor: value?.length ?? 0 } : undefined,
+          });
+        });
+      }
+    }, [view, value, moveToEnd]);
+
+    return <div role='none' className={mx('is-full', classNames)} {...focusAttributes} ref={parentRef} />;
   },
 );

package/src/components/EditorToolbar/EditorToolbar.tsx

@@ -5,9 +5,15 @@
 import { Rx } from '@effect-rx/rx-react';
 import React, { memo, useMemo } from 'react';
 
-import { rxFromSignal, type NodeArg } from '@dxos/app-graph';
+import { rxFromSignal } from '@dxos/app-graph';
 import { ElevationProvider } from '@dxos/react-ui';
-import { MenuProvider, ToolbarMenu, createGapSeparator, useMenuActions } from '@dxos/react-ui-menu';
+import {
+  type ActionGraphProps,
+  MenuProvider,
+  ToolbarMenu,
+  createGapSeparator,
+  useMenuActions,
+} from '@dxos/react-ui-menu';
 
 import { createBlocks } from './blocks';
 import { createFormatting } from './formatting';
@@ -18,62 +24,66 @@ import { createSearch } from './search';
 import { type EditorToolbarActionGraphProps, type EditorToolbarFeatureFlags, type EditorToolbarProps } from './util';
 import { createViewMode } from './view-mode';
 
-const createToolbar = ({
+const createToolbarActions = ({
   getView,
   state,
   customActions,
   ...features
-}: EditorToolbarFeatureFlags & Pick<EditorToolbarActionGraphProps, 'getView' | 'state' | 'customActions'>): Rx.Rx<{
-  nodes: NodeArg<any>[];
-  edges: { source: string; target: string }[];
-}> => {
+}: EditorToolbarFeatureFlags &
+  Pick<EditorToolbarActionGraphProps, 'getView' | 'state' | 'customActions'>): Rx.Rx<ActionGraphProps> => {
   return Rx.make((get) => {
-    const nodes = [];
-    const edges = [];
+    const graph: ActionGraphProps = {
+      nodes: [],
+      edges: [],
+    };
+
     if (features.headings ?? true) {
       const headings = get(rxFromSignal(() => createHeadings(state, getView)));
-      nodes.push(...headings.nodes);
-      edges.push(...headings.edges);
+      graph.nodes.push(...headings.nodes);
+      graph.edges.push(...headings.edges);
     }
     if (features.formatting ?? true) {
       const formatting = get(rxFromSignal(() => createFormatting(state, getView)));
-      nodes.push(...formatting.nodes);
-      edges.push(...formatting.edges);
+      graph.nodes.push(...formatting.nodes);
+      graph.edges.push(...formatting.edges);
     }
     if (features.lists ?? true) {
       const lists = get(rxFromSignal(() => createLists(state, getView)));
-      nodes.push(...lists.nodes);
-      edges.push(...lists.edges);
+      graph.nodes.push(...lists.nodes);
+      graph.edges.push(...lists.edges);
     }
     if (features.blocks ?? true) {
       const blocks = get(rxFromSignal(() => createBlocks(state, getView)));
-      nodes.push(...blocks.nodes);
-      edges.push(...blocks.edges);
+      graph.nodes.push(...blocks.nodes);
+      graph.edges.push(...blocks.edges);
     }
     if (features.image) {
       const image = get(rxFromSignal(() => createImageUpload(features.image!)));
-      nodes.push(...image.nodes);
-      edges.push(...image.edges);
+      graph.nodes.push(...image.nodes);
+      graph.edges.push(...image.edges);
+    }
+    {
+      const gap = createGapSeparator();
+      graph.nodes.push(...gap.nodes);
+      graph.edges.push(...gap.edges);
     }
-    const editorToolbarGap = createGapSeparator();
-    nodes.push(...editorToolbarGap.nodes);
-    edges.push(...editorToolbarGap.edges);
     if (customActions) {
       const custom = get(customActions);
-      nodes.push(...custom.nodes);
-      edges.push(...custom.edges);
+      graph.nodes.push(...custom.nodes);
+      graph.edges.push(...custom.edges);
     }
     if (features.search ?? true) {
       const search = get(rxFromSignal(() => createSearch(getView)));
-      nodes.push(...search.nodes);
-      edges.push(...search.edges);
+      graph.nodes.push(...search.nodes);
+      graph.edges.push(...search.edges);
     }
     if (features.viewMode) {
       const viewMode = get(rxFromSignal(() => createViewMode(state, features.viewMode!)));
-      nodes.push(...viewMode.nodes);
-      edges.push(...viewMode.edges);
+      graph.nodes.push(...viewMode.nodes);
+      graph.edges.push(...viewMode.edges);
     }
-    return { nodes, edges };
+
+    return graph;
   });
 };
 
@@ -83,7 +93,7 @@ const createToolbar = ({
 const useEditorToolbarActionGraph = (props: EditorToolbarProps) => {
   const menuCreator = useMemo(
     () =>
-      createToolbar({
+      createToolbarActions({
         getView: props.getView,
         state: props.state,
         customActions: props.customActions,

package/src/components/EditorToolbar/blocks.ts

@@ -7,8 +7,9 @@ import { type EditorView } from '@codemirror/view';
 import { type NodeArg } from '@dxos/app-graph';
 import { type ToolbarMenuActionGroupProperties } from '@dxos/react-ui-menu';
 
-import { createEditorAction, createEditorActionGroup, type EditorToolbarState } from './util';
-import { removeBlockquote, addBlockquote, removeCodeblock, addCodeblock, insertTable } from '../../extensions';
+import { addBlockquote, addCodeblock, insertTable, removeBlockquote, removeCodeblock } from '../../extensions';
+
+import { type EditorToolbarState, createEditorAction, createEditorActionGroup } from './util';
 
 const createBlockGroupAction = (value: string) =>
   createEditorActionGroup('block', {
@@ -24,28 +25,24 @@ const createBlockActions = (value: string, getView: () => EditorView, blankLine?
     table: 'ph--table--regular',
   }).map(([type, icon]) => {
     const checked = type === value;
-    return createEditorAction(
-      type,
-      () => {
-        const view = getView();
-        if (!view) {
-          return;
-        }
-
-        switch (type) {
-          case 'blockquote':
-            checked ? removeBlockquote(view) : addBlockquote(view);
-            break;
-          case 'codeblock':
-            checked ? removeCodeblock(view) : addCodeblock(view);
-            break;
-          case 'table':
-            insertTable(view);
-            break;
-        }
-      },
-      { checked, ...(type === 'table' && { disabled: !!blankLine }), icon },
-    );
+    return createEditorAction(type, { checked, ...(type === 'table' && { disabled: !!blankLine }), icon }, () => {
+      const view = getView();
+      if (!view) {
+        return;
+      }
+
+      switch (type) {
+        case 'blockquote':
+          checked ? removeBlockquote(view) : addBlockquote(view);
+          break;
+        case 'codeblock':
+          checked ? removeCodeblock(view) : addCodeblock(view);
+          break;
+        case 'table':
+          insertTable(view);
+          break;
+      }
+    });
   });
 
 export const createBlocks = (state: EditorToolbarState, getView: () => EditorView) => {