@dxos/react-ui-editor 0.7.5-main.9d26e3a → 0.7.5-main.e9bb01b

package/dist/lib/node/index.cjs

@@ -32,6 +32,7 @@ __export(node_exports, {
   EditorInputMode: () => EditorInputMode,
   EditorInputModes: () => EditorInputModes,
   EditorState: () => import_state.EditorState,
+  EditorToolbar: () => EditorToolbar,
   EditorView: () => import_view.EditorView,
   EditorViewMode: () => EditorViewMode,
   EditorViewModes: () => EditorViewModes,
@@ -41,7 +42,6 @@ __export(node_exports, {
   RemoteSelectionsDecorator: () => RemoteSelectionsDecorator,
   SpaceAwarenessProvider: () => SpaceAwarenessProvider,
   TextKind: () => import_text.TextKind,
-  Toolbar: () => Toolbar,
   addBlockquote: () => addBlockquote,
   addCodeblock: () => addCodeblock,
   addLink: () => addLink,
@@ -60,8 +60,10 @@ __export(node_exports, {
   commentsState: () => commentsState,
   convertTreeToJson: () => convertTreeToJson,
   createBasicExtensions: () => createBasicExtensions,
-  createComment: () => createComment,
+  createComment: () => createComment2,
   createDataExtensions: () => createDataExtensions,
+  createEditorAction: () => createEditorAction,
+  createEditorActionGroup: () => createEditorActionGroup,
   createEditorStateStore: () => createEditorStateStore,
   createEditorStateTransaction: () => createEditorStateTransaction,
   createElement: () => createElement,
@@ -100,7 +102,7 @@ __export(node_exports, {
   mention: () => mention,
   overlap: () => overlap,
   preventNewline: () => preventNewline,
-  processAction: () => processAction,
+  processEditorPayload: () => processEditorPayload,
   removeBlockquote: () => removeBlockquote,
   removeCodeblock: () => removeCodeblock,
   removeLink: () => removeLink,
@@ -116,6 +118,8 @@ __export(node_exports, {
   setSelection: () => setSelection,
   setStyle: () => setStyle,
   singleValueFacet: () => singleValueFacet,
+  stackItemContentEditorClassNames: () => stackItemContentEditorClassNames,
+  stackItemContentToolbarClassNames: () => stackItemContentToolbarClassNames,
   table: () => table,
   tags: () => import_highlight.tags,
   textRange: () => textRange,
@@ -133,9 +137,9 @@ __export(node_exports, {
   useCommentClickListener: () => useCommentClickListener,
   useCommentState: () => useCommentState,
   useComments: () => useComments,
+  useEditorToolbarState: () => useEditorToolbarState,
   useFormattingState: () => useFormattingState,
   useTextEditor: () => useTextEditor,
-  useToolbarContext: () => useToolbarContext,
   wrapWithCatch: () => wrapWithCatch
 });
 module.exports = __toCommonJS(node_exports);
@@ -143,26 +147,33 @@ var import_state = require("@codemirror/state");
 var import_view = require("@codemirror/view");
 var import_highlight = require("@lezer/highlight");
 var import_text = require("@dxos/protocols/proto/dxos/echo/model/text");
-var import_react = require("@phosphor-icons/react");
-var import_react_context = require("@radix-ui/react-context");
-var import_react2 = __toESM(require("react"));
-var import_react_dropzone = require("react-dropzone");
+var import_react = __toESM(require("react"));
 var import_react_ui = require("@dxos/react-ui");
+var import_react_ui_menu = require("@dxos/react-ui-menu");
 var import_react_ui_theme = require("@dxos/react-ui-theme");
-var import_state2 = require("@codemirror/state");
+var import_react2 = require("react");
+var import_live_object = require("@dxos/live-object");
+var import_react_ui_menu2 = require("@dxos/react-ui-menu");
+var import_react_ui_theme2 = require("@dxos/react-ui-theme");
 var import_view2 = require("@codemirror/view");
+var import_react_ui_theme3 = require("@dxos/react-ui-theme");
+var import_react_ui_theme4 = require("@dxos/react-ui-theme");
+var import_lodash = __toESM(require("lodash.get"));
+var import_react_ui_theme5 = require("@dxos/react-ui-theme");
+var import_state2 = require("@codemirror/state");
+var import_view3 = require("@codemirror/view");
 var import_util = require("@dxos/util");
 var import_state3 = require("@codemirror/state");
 var import_log = require("@dxos/log");
 var import_react3 = __toESM(require("react"));
 var import_client = require("react-dom/client");
 var import_react_ui2 = require("@dxos/react-ui");
-var import_react_ui_theme2 = require("@dxos/react-ui-theme");
+var import_react_ui_theme6 = require("@dxos/react-ui-theme");
 var import_autocomplete = require("@codemirror/autocomplete");
 var import_lang_markdown = require("@codemirror/lang-markdown");
-var import_view3 = require("@codemirror/view");
-var import_state4 = require("@codemirror/state");
 var import_view4 = require("@codemirror/view");
+var import_state4 = require("@codemirror/state");
+var import_view5 = require("@codemirror/view");
 var import_automerge = require("@dxos/automerge/automerge");
 var import_log2 = require("@dxos/log");
 var import_echo = require("@dxos/react-client/echo");
@@ -171,64 +182,61 @@ var import_automerge2 = require("@dxos/automerge/automerge");
 var import_automerge3 = require("@dxos/automerge/automerge");
 var import_state6 = require("@codemirror/state");
 var import_state7 = require("@codemirror/state");
-var import_view5 = require("@codemirror/view");
+var import_view6 = require("@codemirror/view");
 var import_async = require("@dxos/async");
 var import_context = require("@dxos/context");
 var import_async2 = require("@dxos/async");
 var import_context2 = require("@dxos/context");
 var import_invariant = require("@dxos/invariant");
 var import_log3 = require("@dxos/log");
-var import_view6 = require("@codemirror/view");
-var import_lodash = __toESM(require("lodash.defaultsdeep"));
-var import_invariant2 = require("@dxos/invariant");
 var import_view7 = require("@codemirror/view");
-var import_state8 = require("@codemirror/state");
+var import_lodash2 = __toESM(require("lodash.defaultsdeep"));
+var import_invariant2 = require("@dxos/invariant");
 var import_view8 = require("@codemirror/view");
-var import_state9 = require("@codemirror/state");
+var import_state8 = require("@codemirror/state");
 var import_view9 = require("@codemirror/view");
+var import_state9 = require("@codemirror/state");
+var import_view10 = require("@codemirror/view");
 var import_commands = require("@codemirror/commands");
 var import_state10 = require("@codemirror/state");
-var import_view10 = require("@codemirror/view");
-var import_lodash2 = __toESM(require("lodash.sortby"));
+var import_view11 = require("@codemirror/view");
+var import_lodash3 = __toESM(require("lodash.sortby"));
 var import_react4 = require("react");
 var import_async3 = require("@dxos/async");
 var import_log4 = require("@dxos/log");
 var import_util2 = require("@dxos/util");
 var import_state11 = require("@codemirror/state");
-var import_view11 = require("@codemirror/view");
+var import_view12 = require("@codemirror/view");
 var import_async4 = require("@dxos/async");
 var import_invariant3 = require("@dxos/invariant");
 var import_util3 = require("@dxos/util");
 var import_language = require("@codemirror/language");
 var import_state12 = require("@codemirror/state");
-var import_view12 = require("@codemirror/view");
+var import_view13 = require("@codemirror/view");
 var import_autocomplete2 = require("@codemirror/autocomplete");
 var import_commands2 = require("@codemirror/commands");
 var import_language2 = require("@codemirror/language");
 var import_search = require("@codemirror/search");
 var import_state13 = require("@codemirror/state");
 var import_theme_one_dark = require("@codemirror/theme-one-dark");
-var import_view13 = require("@codemirror/view");
-var import_lodash3 = __toESM(require("lodash.defaultsdeep"));
-var import_lodash4 = __toESM(require("lodash.merge"));
+var import_view14 = require("@codemirror/view");
+var import_lodash4 = __toESM(require("lodash.defaultsdeep"));
+var import_lodash5 = __toESM(require("lodash.merge"));
 var import_display_name = require("@dxos/display-name");
 var import_log5 = require("@dxos/log");
-var import_react_ui_theme3 = require("@dxos/react-ui-theme");
+var import_react_ui_theme7 = require("@dxos/react-ui-theme");
 var import_util4 = require("@dxos/util");
 var import_state14 = require("@codemirror/state");
-var import_view14 = require("@codemirror/view");
-var import_react_ui_theme4 = require("@dxos/react-ui-theme");
-var import_lodash5 = __toESM(require("lodash.get"));
-var import_react_ui_theme5 = require("@dxos/react-ui-theme");
-var import_language3 = require("@codemirror/language");
 var import_view15 = require("@codemirror/view");
+var import_language3 = require("@codemirror/language");
+var import_view16 = require("@codemirror/view");
 var import_react5 = __toESM(require("react"));
 var import_react_ui3 = require("@dxos/react-ui");
-var import_view16 = require("@codemirror/view");
+var import_view17 = require("@codemirror/view");
 var import_autocomplete3 = require("@codemirror/autocomplete");
 var import_language4 = require("@codemirror/language");
 var import_state15 = require("@codemirror/state");
-var import_view17 = require("@codemirror/view");
+var import_view18 = require("@codemirror/view");
 var import_react6 = require("react");
 var import_autocomplete4 = require("@codemirror/autocomplete");
 var import_commands3 = require("@codemirror/commands");
@@ -236,7 +244,7 @@ var import_lang_markdown2 = require("@codemirror/lang-markdown");
 var import_language5 = require("@codemirror/language");
 var import_language_data = require("@codemirror/language-data");
 var import_lint = require("@codemirror/lint");
-var import_view18 = require("@codemirror/view");
+var import_view19 = require("@codemirror/view");
 var import_lang_markdown3 = require("@codemirror/lang-markdown");
 var import_language6 = require("@codemirror/language");
 var import_highlight2 = require("@lezer/highlight");
@@ -245,35 +253,34 @@ var import_language7 = require("@codemirror/language");
 var import_state16 = require("@codemirror/state");
 var import_language8 = require("@codemirror/language");
 var import_state17 = require("@codemirror/state");
-var import_view19 = require("@codemirror/view");
+var import_view20 = require("@codemirror/view");
 var import_invariant4 = require("@dxos/invariant");
-var import_react_ui_theme6 = require("@dxos/react-ui-theme");
+var import_react_ui_theme8 = require("@dxos/react-ui-theme");
 var import_language9 = require("@codemirror/language");
 var import_state18 = require("@codemirror/state");
-var import_view20 = require("@codemirror/view");
+var import_view21 = require("@codemirror/view");
 var import_language10 = require("@codemirror/language");
 var import_state19 = require("@codemirror/state");
-var import_view21 = require("@codemirror/view");
 var import_view22 = require("@codemirror/view");
+var import_view23 = require("@codemirror/view");
 var import_language11 = require("@codemirror/language");
 var import_state20 = require("@codemirror/state");
-var import_view23 = require("@codemirror/view");
-var import_language12 = require("@codemirror/language");
 var import_view24 = require("@codemirror/view");
-var import_react_ui_theme7 = require("@dxos/react-ui-theme");
+var import_language12 = require("@codemirror/language");
+var import_view25 = require("@codemirror/view");
+var import_react_ui_theme9 = require("@dxos/react-ui-theme");
 var import_autocomplete5 = require("@codemirror/autocomplete");
 var import_log6 = require("@dxos/log");
-var import_view25 = require("@codemirror/view");
+var import_view26 = require("@codemirror/view");
 var import_codemirror_vim = require("@replit/codemirror-vim");
 var import_codemirror_vscode_keymap = require("@replit/codemirror-vscode-keymap");
 var import_echo_schema = require("@dxos/echo-schema");
-var import_view26 = require("@codemirror/view");
 var import_view27 = require("@codemirror/view");
-var import_react_ui_theme8 = require("@dxos/react-ui-theme");
+var import_react7 = require("react");
 var import_state21 = require("@codemirror/state");
 var import_view28 = require("@codemirror/view");
 var import_react_tabster = require("@fluentui/react-tabster");
-var import_react7 = require("react");
+var import_react8 = require("react");
 var import_log7 = require("@dxos/log");
 var import_util5 = require("@dxos/util");
 var translationKey = "react-ui-editor";
@@ -309,211 +316,778 @@ var translations_default = [
     }
   }
 ];
-var singleValueFacet = (defaultValue) => import_state3.Facet.define({
-  // Called immediately.
-  combine: (providers) => {
-    return providers[0] ?? defaultValue;
+var useEditorToolbarState = (initialState = {}) => {
+  return (0, import_react2.useMemo)(() => (0, import_live_object.create)(initialState), []);
+};
+var createEditorAction = (payload, icon, label = [
+  `${payload.type} label`,
+  {
+    ns: translationKey
   }
+], id = payload.type) => (0, import_react_ui_menu2.createMenuAction)(id, {
+  icon,
+  label,
+  ...payload
 });
-var overlap = (a, b) => a.from <= b.to && a.to >= b.from;
-var defaultCursorConverter = {
-  toCursor: (position) => position.toString(),
-  fromCursor: (cursor) => parseInt(cursor)
+var createEditorActionGroup = (id, props, icon) => (0, import_react_ui_menu2.createMenuItemGroup)(id, {
+  icon,
+  iconOnly: true,
+  ...props
+});
+var editorToolbarSearch = createEditorAction({
+  type: "search"
+}, "ph--magnifying-glass--regular");
+var createBlockGroupAction = (value) => createEditorActionGroup("block", {
+  variant: "toggleGroup",
+  selectCardinality: "single",
+  value
+});
+var createBlockActions = (value, blankLine) => Object.entries({
+  blockquote: "ph--quotes--regular",
+  codeblock: "ph--code-block--regular",
+  table: "ph--table--regular"
+}).map(([type, icon]) => {
+  return createEditorAction({
+    type,
+    checked: type === value,
+    ...type === "table" && {
+      disabled: !!blankLine
+    }
+  }, icon);
+});
+var createBlocks = (state) => {
+  const value = state?.blockQuote ? "blockquote" : state.blockType ?? "";
+  const blockGroupAction = createBlockGroupAction(value);
+  const blockActions = createBlockActions(value, state.blankLine);
+  return {
+    nodes: [
+      blockGroupAction,
+      ...blockActions
+    ],
+    edges: [
+      {
+        source: "root",
+        target: "block"
+      },
+      ...blockActions.map(({ id }) => ({
+        source: blockGroupAction.id,
+        target: id
+      }))
+    ]
+  };
 };
-var Cursor = class _Cursor {
-  static {
-    this.converter = singleValueFacet(defaultCursorConverter);
-  }
-  static {
-    this.getCursorFromRange = (state, range) => {
-      const cursorConverter2 = state.facet(_Cursor.converter);
-      const from = cursorConverter2.toCursor(range.from);
-      const to = cursorConverter2.toCursor(range.to, -1);
-      return [
-        from,
-        to
-      ].join(":");
-    };
-  }
-  static {
-    this.getRangeFromCursor = (state, cursor) => {
-      const cursorConverter2 = state.facet(_Cursor.converter);
-      const parts = cursor.split(":");
-      const from = cursorConverter2.fromCursor(parts[0]);
-      const to = cursorConverter2.fromCursor(parts[1]);
-      return from !== void 0 && to !== void 0 ? {
-        from,
-        to
-      } : void 0;
-    };
-  }
+var commentLabel = (comment, selection) => comment ? "selection overlaps existing comment label" : selection === false ? "select text to comment label" : "comment label";
+var createCommentAction = (label) => createEditorAction({
+  type: "comment",
+  testId: "editor.toolbar.comment"
+}, "ph--chat-text--regular", label);
+var createComment = (state) => ({
+  nodes: [
+    createCommentAction([
+      commentLabel(state.comment, state.selection),
+      {
+        ns: translationKey
+      }
+    ])
+  ],
+  edges: [
+    {
+      source: "root",
+      target: "comment"
+    }
+  ]
+});
+var formats = {
+  strong: "ph--text-b--regular",
+  emphasis: "ph--text-italic--regular",
+  strikethrough: "ph--text-strikethrough--regular",
+  code: "ph--code--regular",
+  link: "ph--link--regular"
+};
+var createFormattingGroup = (formatting) => createEditorActionGroup("formatting", {
+  variant: "toggleGroup",
+  selectCardinality: "multiple",
+  value: Object.keys(formats).filter((key) => !!formatting[key])
+});
+var createFormattingActions = (formatting) => Object.entries(formats).map(([type, icon]) => createEditorAction({
+  type,
+  checked: !!formatting[type]
+}, icon));
+var createFormatting = (state) => {
+  const formattingGroupAction = createFormattingGroup(state);
+  const formattingActions = createFormattingActions(state);
+  return {
+    nodes: [
+      formattingGroupAction,
+      ...formattingActions
+    ],
+    edges: [
+      {
+        source: "root",
+        target: "formatting"
+      },
+      ...formattingActions.map(({ id }) => ({
+        source: formattingGroupAction.id,
+        target: id
+      }))
+    ]
+  };
 };
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/util/debug.ts";
-var wrapWithCatch = (fn) => {
-  return (...args) => {
-    try {
-      return fn(...args);
-    } catch (err) {
-      import_log.log.catch(err, void 0, {
-        F: __dxlog_file,
-        L: 15,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
+var createHeadingGroupAction = (value) => createEditorActionGroup("heading", {
+  variant: "dropdownMenu",
+  applyActive: true,
+  selectCardinality: "single",
+  value
+}, "ph--text-h--regular");
+var createHeadingActions = (value) => Object.entries({
+  "0": "ph--paragraph--regular",
+  "1": "ph--text-h-one--regular",
+  "2": "ph--text-h-two--regular",
+  "3": "ph--text-h-three--regular",
+  "4": "ph--text-h-four--regular",
+  "5": "ph--text-h-five--regular",
+  "6": "ph--text-h-six--regular"
+}).map(([levelStr, icon]) => {
+  const level = parseInt(levelStr);
+  return createEditorAction({
+    type: "heading",
+    data: level,
+    checked: value === levelStr
+  }, icon, [
+    "heading level label",
+    {
+      count: level,
+      ns: translationKey
     }
+  ], `heading--${levelStr}`);
+});
+var computeHeadingValue = (state) => {
+  const blockType = state ? state.blockType : "paragraph";
+  const header = blockType && /heading(\d)/.exec(blockType);
+  return header ? header[1] : blockType === "paragraph" || !blockType ? "0" : "";
+};
+var createHeadings = (state) => {
+  const headingValue = computeHeadingValue(state);
+  const headingGroupAction = createHeadingGroupAction(headingValue);
+  const headingActions = createHeadingActions(headingValue);
+  return {
+    nodes: [
+      headingGroupAction,
+      ...headingActions
+    ],
+    edges: [
+      {
+        source: "root",
+        target: "heading"
+      },
+      ...headingActions.map(({ id }) => ({
+        source: headingGroupAction.id,
+        target: id
+      }))
+    ]
   };
 };
-var callbackWrapper = (fn) => (...args) => {
-  try {
-    return fn(...args);
-  } catch (err) {
-    import_log.log.catch(err, void 0, {
-      F: __dxlog_file,
-      L: 29,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
-  }
+var listStyles = {
+  bullet: "ph--list-bullets--regular",
+  ordered: "ph--list-numbers--regular",
+  task: "ph--list-checks--regular"
 };
-var debugDispatcher = (trs, view) => {
-  logChanges(trs);
-  view.update(trs);
+var createListGroupAction = (value) => createEditorActionGroup("list", {
+  variant: "toggleGroup",
+  selectCardinality: "single",
+  value
+});
+var createListActions = (value) => Object.entries(listStyles).map(([listStyle, icon]) => createEditorAction({
+  type: `list-${listStyle}`,
+  checked: value === listStyle
+}, icon));
+var createLists = (state) => {
+  const value = state.listStyle ?? "";
+  const listGroupAction = createListGroupAction(value);
+  const listActionsMap = createListActions(value);
+  return {
+    nodes: [
+      listGroupAction,
+      ...listActionsMap
+    ],
+    edges: [
+      {
+        source: "root",
+        target: "list"
+      },
+      ...listActionsMap.map(({ id }) => ({
+        source: listGroupAction.id,
+        target: id
+      }))
+    ]
+  };
 };
-var logChanges = (trs) => {
-  const changes = trs.flatMap((tr) => {
-    if (tr.changes.empty) {
-      return void 0;
+var createViewModeGroupAction = (value) => createEditorActionGroup("viewMode", {
+  variant: "dropdownMenu",
+  applyActive: true,
+  selectCardinality: "single",
+  value
+}, "ph--eye--regular");
+var createViewModeActions = (value) => Object.entries({
+  preview: "ph--eye--regular",
+  source: "ph--pencil-simple--regular",
+  readonly: "ph--pencil-slash--regular"
+}).map(([viewMode, icon]) => {
+  return createEditorAction({
+    type: "view-mode",
+    data: viewMode,
+    checked: viewMode === value
+  }, icon, [
+    `${viewMode} mode label`,
+    {
+      ns: translationKey
     }
-    const changes2 = [];
-    tr.changes.iterChanges((fromA, toA, fromB, toB, inserted) => changes2.push(JSON.stringify({
-      fromA,
-      toA,
-      fromB,
-      toB,
-      inserted: inserted.toString()
-    })));
-    return changes2;
-  }).filter(Boolean);
-  if (changes.length) {
-    import_log.log.info("changes", {
-      changes
-    }, {
-      F: __dxlog_file,
-      L: 62,
-      S: void 0,
-      C: (f, a) => f(...a)
+  ], `view-mode--${viewMode}`);
+});
+var createViewMode = (state) => {
+  const value = state.viewMode ?? "source";
+  const viewModeGroupAction = createViewModeGroupAction(value);
+  const viewModeActions = createViewModeActions(value);
+  return {
+    nodes: [
+      viewModeGroupAction,
+      ...viewModeActions
+    ],
+    edges: [
+      {
+        source: "root",
+        target: "viewMode"
+      },
+      ...viewModeActions.map(({ id }) => ({
+        source: viewModeGroupAction.id,
+        target: id
+      }))
+    ]
+  };
+};
+var stackItemContentEditorClassNames = (role) => (0, import_react_ui_theme2.mx)("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");
+var stackItemContentToolbarClassNames = (role) => (0, import_react_ui_theme2.mx)("attention-surface is-full border-be !border-separator", role === "section" && "sticky block-start-0 z-[1] -mbe-px min-is-0");
+var createToolbar = ({ state, customActions, ...features }) => {
+  const nodes = [];
+  const edges = [];
+  if (features.headings ?? true) {
+    const headings2 = createHeadings(state);
+    nodes.push(...headings2.nodes);
+    edges.push(...headings2.edges);
+  }
+  if (features.formatting ?? true) {
+    const formatting = createFormatting(state);
+    nodes.push(...formatting.nodes);
+    edges.push(...formatting.edges);
+  }
+  if (features.lists ?? true) {
+    const lists = createLists(state);
+    nodes.push(...lists.nodes);
+    edges.push(...lists.edges);
+  }
+  if (features.blocks ?? true) {
+    const blocks = createBlocks(state);
+    nodes.push(...blocks.nodes);
+    edges.push(...blocks.edges);
+  }
+  if (customActions) {
+    const custom = customActions();
+    nodes.push(...custom.nodes);
+    edges.push(...custom.edges);
+  }
+  const editorToolbarGap = (0, import_react_ui_menu.createGapSeparator)();
+  nodes.push(...editorToolbarGap.nodes);
+  edges.push(...editorToolbarGap.edges);
+  if (features.comment ?? true) {
+    const comment = createComment(state);
+    nodes.push(...comment.nodes);
+    edges.push(...comment.edges);
+  }
+  if (features.search ?? true) {
+    nodes.push(editorToolbarSearch);
+    edges.push({
+      source: "root",
+      target: editorToolbarSearch.id
     });
   }
+  if (features.viewMode ?? true) {
+    const viewMode = createViewMode(state);
+    nodes.push(...viewMode.nodes);
+    edges.push(...viewMode.edges);
+  }
+  return {
+    nodes,
+    edges
+  };
 };
-var flattenRect = (rect, left) => {
-  const x = left ? rect.left : rect.right;
+var useEditorToolbarActionGraph = ({ onAction, ...props }) => {
+  const menuCreator = (0, import_react.useCallback)(() => createToolbar(props), [
+    props
+  ]);
+  const { resolveGroupItems } = (0, import_react_ui_menu.useMenuActions)(menuCreator);
   return {
-    left: x,
-    right: x,
-    top: rect.top,
-    bottom: rect.bottom
+    resolveGroupItems,
+    onAction
   };
 };
-var scratchRange;
-var textRange = (node, from, to = from) => {
-  const range = scratchRange || (scratchRange = document.createRange());
-  range.setEnd(node, to);
-  range.setStart(node, from);
-  return range;
+var EditorToolbar = ({ classNames, attendableId, role, ...props }) => {
+  const menuProps = useEditorToolbarActionGraph(props);
+  return /* @__PURE__ */ import_react.default.createElement("div", {
+    role: "none",
+    className: stackItemContentToolbarClassNames(role)
+  }, /* @__PURE__ */ import_react.default.createElement(import_react_ui.ElevationProvider, {
+    elevation: role === "section" ? "positioned" : "base"
+  }, /* @__PURE__ */ import_react.default.createElement(import_react_ui_menu.MenuProvider, {
+    ...menuProps,
+    attendableId
+  }, /* @__PURE__ */ import_react.default.createElement(import_react_ui_menu.ToolbarMenu, {
+    classNames: [
+      import_react_ui_theme.textBlockWidth,
+      "!bg-transparent",
+      classNames
+    ]
+  }))));
 };
-var clientRectsFor = (dom) => {
-  if (dom.nodeType === 3) {
-    return textRange(dom, 0, dom.nodeValue.length).getClientRects();
-  } else if (dom.nodeType === 1) {
-    return dom.getClientRects();
-  } else {
-    return [];
-  }
+var headings = {
+  1: "text-4xl",
+  2: "text-3xl",
+  3: "text-2xl",
+  4: "text-xl",
+  5: "text-lg",
+  6: ""
 };
-var createElement = (tag, options, children) => {
-  const el = document.createElement(tag);
-  if (options?.className) {
-    el.className = options.className;
-  }
-  if (children) {
-    el.append(...Array.isArray(children) ? children : [
-      children
-    ]);
+var theme = {
+  code: "font-mono !no-underline text-neutral-700 dark:text-neutral-300",
+  codeMark: "font-mono text-primary-500",
+  mark: "opacity-50",
+  heading: (level) => {
+    return (0, import_react_ui_theme4.mx)(headings[level], "dark:text-primary-400");
   }
-  return el;
 };
-var renderRoot = (root, node) => {
-  (0, import_client.createRoot)(root).render(/* @__PURE__ */ import_react3.default.createElement(import_react_ui2.ThemeProvider, {
-    tx: import_react_ui_theme2.defaultTx
-  }, node));
-  return root;
+var getToken = (path, defaultValue) => {
+  const value = (0, import_lodash.default)(import_react_ui_theme5.tokens, path, defaultValue);
+  return value?.toString() ?? "";
 };
-var annotationMark = import_view2.Decoration.mark({
-  class: "cm-annotation"
-});
-var annotations = (options = {}) => {
-  const match = (state) => {
-    const annotations2 = [];
-    const text = state.doc.toString();
-    if (options.match) {
-      const matches = text.matchAll(options.match);
-      for (const match2 of matches) {
-        const from = match2.index;
-        const to = from + match2[0].length;
-        const cursor = Cursor.getCursorFromRange(state, {
-          from,
-          to
-        });
-        annotations2.push({
-          cursor
-        });
-      }
-    }
-    return annotations2;
-  };
-  const annotationsState = import_state2.StateField.define({
-    create: (state) => {
-      return match(state);
+var fontBody = getToken("fontFamily.body");
+var fontMono = getToken("fontFamily.mono");
+var defaultTheme = {
+  "&": {},
+  "&.cm-focused": {
+    outline: "none"
+  },
+  /**
+  * Scroller
+  */
+  ".cm-scroller": {
+    overflowY: "auto"
+  },
+  /**
+  * Content
+  * NOTE: Apply margins to content so that scrollbar is at the edge of the container.
+  */
+  ".cm-content": {
+    padding: "unset",
+    fontFamily: fontBody,
+    // NOTE: Base font size (otherwise defined by HTML tag, which might be different for storybook).
+    fontSize: "16px",
+    lineHeight: 1.5,
+    color: "unset"
+  },
+  /**
+  * 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"
+  },
+  ".cm-gutter": {},
+  ".cm-gutter.cm-lineNumbers .cm-gutterElement": {
+    minWidth: "40px",
+    alignContent: "center"
+  },
+  /**
+  * Height is set to match the corresponding line.
+  */
+  ".cm-gutterElement": {
+    alignItems: "center",
+    fontSize: "16px"
+  },
+  /**
+  * Line.
+  */
+  ".cm-line": {
+    paddingInline: 0
+  },
+  ".cm-activeLine": {
+    background: "var(--dx-cmActiveLine)"
+  },
+  /**
+  * Cursor (layer).
+  */
+  ".cm-cursor, .cm-dropCursor": {
+    borderLeft: "2px solid var(--dx-cmCursor)"
+  },
+  ".cm-placeholder": {
+    color: "var(--dx-subdued)"
+  },
+  /**
+  * Selection (layer).
+  */
+  ".cm-selectionBackground": {
+    background: "var(--dx-cmSelection)"
+  },
+  /**
+  * Search.
+  * NOTE: Matches comment.
+  */
+  ".cm-searchMatch": {
+    margin: "0 -3px",
+    padding: "3px",
+    borderRadius: "3px",
+    background: "var(--dx-cmHighlightSurface)",
+    color: "var(--dx-cmHighlight)"
+  },
+  ".cm-searchMatch-selected": {
+    textDecoration: "underline"
+  },
+  /**
+  * Link.
+  */
+  ".cm-link": {
+    textDecorationLine: "underline",
+    textDecorationThickness: "1px",
+    textUnderlineOffset: "2px",
+    borderRadius: ".125rem"
+  },
+  ".cm-link > span": {
+    color: "var(--dx-accentText)"
+  },
+  /**
+  * Tooltip.
+  */
+  ".cm-tooltip": {
+    background: "var(--dx-baseSurface)"
+  },
+  ".cm-tooltip-below": {},
+  /**
+  * Autocomplete.
+  * https://github.com/codemirror/autocomplete/blob/main/src/completion.ts
+  */
+  ".cm-tooltip.cm-tooltip-autocomplete": {
+    marginTop: "4px",
+    marginLeft: "-3px"
+  },
+  ".cm-tooltip.cm-tooltip-autocomplete > ul": {
+    maxHeight: "20em"
+  },
+  ".cm-tooltip.cm-tooltip-autocomplete > ul > li": {},
+  ".cm-tooltip.cm-tooltip-autocomplete > ul > li[aria-selected]": {},
+  ".cm-tooltip.cm-tooltip-autocomplete > ul > completion-section": {
+    paddingLeft: "4px !important",
+    borderBottom: "none !important",
+    color: "var(--dx-accentText)"
+  },
+  ".cm-tooltip.cm-completionInfo": {
+    width: "360px !important",
+    margin: "-10px 1px 0 1px",
+    padding: "8px !important",
+    borderColor: "var(--dx-separator)"
+  },
+  ".cm-completionIcon": {
+    display: "none"
+  },
+  ".cm-completionLabel": {
+    fontFamily: fontBody
+  },
+  ".cm-completionMatchedText": {
+    textDecoration: "none !important",
+    opacity: 0.5
+  },
+  /**
+  * Panels
+  * https://github.com/codemirror/search/blob/main/src/search.ts#L745
+  *
+  * Find/replace panel.
+  * <div class="cm-announced">...</div>
+  * <div class="cm-scroller">...</div>
+  * <div class="cm-panels cm-panels-bottom">
+  *   <div class="cm-search cm-panel">
+  *     <input class="cm-textfield" />
+  *     <button class="cm-button">...</button>
+  *     <label><input type="checkbox" />...</label>
+  *   </div>
+  * </div
+  */
+  // TODO(burdon): Implement custom panel (with icon buttons).
+  ".cm-panels": {},
+  ".cm-panel": {
+    fontFamily: fontBody,
+    backgroundColor: "var(--surface-bg)"
+  },
+  ".cm-panel input, .cm-panel button, .cm-panel label": {
+    color: "var(--dx-subdued)",
+    fontFamily: fontBody,
+    fontSize: "14px",
+    all: "unset",
+    margin: "3px !important",
+    padding: "2px 6px !important",
+    outline: "1px solid transparent"
+  },
+  ".cm-panel input, .cm-panel button": {
+    backgroundColor: "var(--dx-input)"
+  },
+  ".cm-panel input:focus, .cm-panel button:focus": {
+    outline: "1px solid var(--dx-accentFocusIndicator)"
+  },
+  ".cm-panel label": {
+    display: "inline-flex",
+    alignItems: "center",
+    cursor: "pointer"
+  },
+  ".cm-panel input.cm-textfield": {},
+  ".cm-panel input[type=checkbox]": {
+    width: "8px",
+    height: "8px",
+    marginRight: "6px !important",
+    padding: "2px !important",
+    color: "var(--dx-accentFocusIndicator)"
+  },
+  ".cm-panel button": {
+    "&:hover": {
+      backgroundColor: "var(--dx-accentSurfaceHover) !important"
     },
-    update: (value, tr) => {
-      if (!tr.changes.empty) {
-        return match(tr.state);
-      }
-      return value;
+    "&:active": {
+      backgroundColor: "var(--dx-accentSurfaceHover)"
     }
-  });
-  return [
-    annotationsState,
-    import_view2.EditorView.decorations.compute([
-      annotationsState
-    ], (state) => {
-      const annotations2 = state.field(annotationsState);
-      const decorations = annotations2.map((annotation) => {
-        const range = Cursor.getRangeFromCursor(state, annotation.cursor);
-        return range && annotationMark.range(range.from, range.to);
-      }).filter(import_util.isNotFalsy);
-      return import_view2.Decoration.set(decorations);
-    }),
-    styles
-  ];
+  },
+  ".cm-panel.cm-search": {
+    padding: "4px",
+    borderTop: "1px solid var(--dx-separator)"
+  }
 };
-var styles = import_view2.EditorView.theme({
-  ".cm-annotation": {
-    textDecoration: "underline",
-    textDecorationStyle: "wavy",
-    textDecorationColor: "var(--dx-error)"
+var margin = "!mt-[1rem]";
+var editorContent = (0, import_react_ui_theme3.mx)(margin, "!mli-auto w-full max-w-[min(50rem,100%-2rem)]");
+var editorFullWidth = (0, import_react_ui_theme3.mx)(margin);
+var editorWithToolbarLayout = "grid grid-cols-1 grid-rows-[min-content_1fr] data-[toolbar=disabled]:grid-rows-[1fr] justify-center content-start overflow-hidden";
+var editorGutter = import_view2.EditorView.theme({
+  // Match margin from content.
+  ".cm-gutters": {
+    marginTop: "16px",
+    paddingRight: "1rem"
   }
 });
-var autocomplete = ({ debug, activateOnTyping, override, onSearch } = {}) => {
-  const extensions = [
-    // https://codemirror.net/docs/ref/#view.keymap
-    // https://discuss.codemirror.net/t/how-can-i-replace-the-default-autocompletion-keymap-v6/3322
-    // TODO(burdon): Set custom keymap.
-    import_view3.keymap.of(import_autocomplete.completionKeymap),
-    // https://codemirror.net/examples/autocompletion
-    // https://codemirror.net/docs/ref/#autocomplete.autocompletion
-    (0, import_autocomplete.autocompletion)({
-      activateOnTyping,
+var editorMonospace = import_view2.EditorView.theme({
+  ".cm-content": {
+    fontFamily: fontMono
+  }
+});
+var singleValueFacet = (defaultValue) => import_state3.Facet.define({
+  // Called immediately.
+  combine: (providers) => {
+    return providers[0] ?? defaultValue;
+  }
+});
+var overlap = (a, b) => a.from <= b.to && a.to >= b.from;
+var defaultCursorConverter = {
+  toCursor: (position) => position.toString(),
+  fromCursor: (cursor) => parseInt(cursor)
+};
+var Cursor = class _Cursor {
+  static {
+    this.converter = singleValueFacet(defaultCursorConverter);
+  }
+  static {
+    this.getCursorFromRange = (state, range) => {
+      const cursorConverter2 = state.facet(_Cursor.converter);
+      const from = cursorConverter2.toCursor(range.from);
+      const to = cursorConverter2.toCursor(range.to, -1);
+      return [
+        from,
+        to
+      ].join(":");
+    };
+  }
+  static {
+    this.getRangeFromCursor = (state, cursor) => {
+      const cursorConverter2 = state.facet(_Cursor.converter);
+      const parts = cursor.split(":");
+      const from = cursorConverter2.fromCursor(parts[0]);
+      const to = cursorConverter2.fromCursor(parts[1]);
+      return from !== void 0 && to !== void 0 ? {
+        from,
+        to
+      } : void 0;
+    };
+  }
+};
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/util/debug.ts";
+var wrapWithCatch = (fn) => {
+  return (...args) => {
+    try {
+      return fn(...args);
+    } catch (err) {
+      import_log.log.catch(err, void 0, {
+        F: __dxlog_file,
+        L: 15,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+    }
+  };
+};
+var callbackWrapper = (fn) => (...args) => {
+  try {
+    return fn(...args);
+  } catch (err) {
+    import_log.log.catch(err, void 0, {
+      F: __dxlog_file,
+      L: 29,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+  }
+};
+var debugDispatcher = (trs, view) => {
+  logChanges(trs);
+  view.update(trs);
+};
+var logChanges = (trs) => {
+  const changes = trs.flatMap((tr) => {
+    if (tr.changes.empty) {
+      return void 0;
+    }
+    const changes2 = [];
+    tr.changes.iterChanges((fromA, toA, fromB, toB, inserted) => changes2.push(JSON.stringify({
+      fromA,
+      toA,
+      fromB,
+      toB,
+      inserted: inserted.toString()
+    })));
+    return changes2;
+  }).filter(Boolean);
+  if (changes.length) {
+    import_log.log.info("changes", {
+      changes
+    }, {
+      F: __dxlog_file,
+      L: 62,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+  }
+};
+var flattenRect = (rect, left) => {
+  const x = left ? rect.left : rect.right;
+  return {
+    left: x,
+    right: x,
+    top: rect.top,
+    bottom: rect.bottom
+  };
+};
+var scratchRange;
+var textRange = (node, from, to = from) => {
+  const range = scratchRange || (scratchRange = document.createRange());
+  range.setEnd(node, to);
+  range.setStart(node, from);
+  return range;
+};
+var clientRectsFor = (dom) => {
+  if (dom.nodeType === 3) {
+    return textRange(dom, 0, dom.nodeValue.length).getClientRects();
+  } else if (dom.nodeType === 1) {
+    return dom.getClientRects();
+  } else {
+    return [];
+  }
+};
+var createElement = (tag, options, children) => {
+  const el = document.createElement(tag);
+  if (options?.className) {
+    el.className = options.className;
+  }
+  if (children) {
+    el.append(...Array.isArray(children) ? children : [
+      children
+    ]);
+  }
+  return el;
+};
+var renderRoot = (root, node) => {
+  (0, import_client.createRoot)(root).render(/* @__PURE__ */ import_react3.default.createElement(import_react_ui2.ThemeProvider, {
+    tx: import_react_ui_theme6.defaultTx
+  }, node));
+  return root;
+};
+var annotationMark = import_view3.Decoration.mark({
+  class: "cm-annotation"
+});
+var annotations = (options = {}) => {
+  const match = (state) => {
+    const annotations2 = [];
+    const text = state.doc.toString();
+    if (options.match) {
+      const matches = text.matchAll(options.match);
+      for (const match2 of matches) {
+        const from = match2.index;
+        const to = from + match2[0].length;
+        const cursor = Cursor.getCursorFromRange(state, {
+          from,
+          to
+        });
+        annotations2.push({
+          cursor
+        });
+      }
+    }
+    return annotations2;
+  };
+  const annotationsState = import_state2.StateField.define({
+    create: (state) => {
+      return match(state);
+    },
+    update: (value, tr) => {
+      if (!tr.changes.empty) {
+        return match(tr.state);
+      }
+      return value;
+    }
+  });
+  return [
+    annotationsState,
+    import_view3.EditorView.decorations.compute([
+      annotationsState
+    ], (state) => {
+      const annotations2 = state.field(annotationsState);
+      const decorations = annotations2.map((annotation) => {
+        const range = Cursor.getRangeFromCursor(state, annotation.cursor);
+        return range && annotationMark.range(range.from, range.to);
+      }).filter(import_util.isNotFalsy);
+      return import_view3.Decoration.set(decorations);
+    }),
+    styles
+  ];
+};
+var styles = import_view3.EditorView.theme({
+  ".cm-annotation": {
+    textDecoration: "underline",
+    textDecorationStyle: "wavy",
+    textDecorationColor: "var(--dx-error)"
+  }
+});
+var autocomplete = ({ debug, activateOnTyping, override, onSearch } = {}) => {
+  const extensions = [
+    // https://codemirror.net/docs/ref/#view.keymap
+    // https://discuss.codemirror.net/t/how-can-i-replace-the-default-autocompletion-keymap-v6/3322
+    // TODO(burdon): Set custom keymap.
+    import_view4.keymap.of(import_autocomplete.completionKeymap),
+    // https://codemirror.net/examples/autocompletion
+    // https://codemirror.net/docs/ref/#autocomplete.autocompletion
+    (0, import_autocomplete.autocompletion)({
+      activateOnTyping,
       override,
       closeOnBlur: !debug,
       tooltipClass: () => "shadow rounded"
@@ -787,7 +1361,7 @@ var automerge = (accessor) => {
     // Track heads.
     syncState,
     // Reconcile external updates.
-    import_view4.ViewPlugin.fromClass(class {
+    import_view5.ViewPlugin.fromClass(class {
       constructor(_view) {
         this._view = _view;
         this._handleChange = () => {
@@ -800,7 +1374,7 @@ var automerge = (accessor) => {
       }
     }),
     // Reconcile local updates.
-    import_view4.EditorView.updateListener.of(({ view, changes }) => {
+    import_view5.EditorView.updateListener.of(({ view, changes }) => {
       if (!changes.empty) {
         syncer.reconcile(view, true);
       }
@@ -823,7 +1397,7 @@ var RemoteSelectionChangedAnnotation = import_state7.Annotation.define();
 var awareness = (provider = dummyProvider) => {
   return [
     awarenessProvider.of(provider),
-    import_view5.ViewPlugin.fromClass(RemoteSelectionsDecorator, {
+    import_view6.ViewPlugin.fromClass(RemoteSelectionsDecorator, {
       decorations: (value) => value.decorations
     }),
     styles2
@@ -887,7 +1461,7 @@ var RemoteSelectionsDecorator = class {
         decorations.push({
           from: start,
           to: end,
-          value: import_view5.Decoration.mark({
+          value: import_view6.Decoration.mark({
             attributes: {
               style: `background-color: ${lightColor}`
             },
@@ -898,7 +1472,7 @@ var RemoteSelectionsDecorator = class {
         decorations.push({
           from: start,
           to: startLine.from + startLine.length,
-          value: import_view5.Decoration.mark({
+          value: import_view6.Decoration.mark({
             attributes: {
               style: `background-color: ${lightColor}`
             },
@@ -908,7 +1482,7 @@ var RemoteSelectionsDecorator = class {
         decorations.push({
           from: endLine.from,
           to: end,
-          value: import_view5.Decoration.mark({
+          value: import_view6.Decoration.mark({
             attributes: {
               style: `background-color: ${lightColor}`
             },
@@ -920,7 +1494,7 @@ var RemoteSelectionsDecorator = class {
           decorations.push({
             from: linePos,
             to: linePos,
-            value: import_view5.Decoration.line({
+            value: import_view6.Decoration.line({
               attributes: {
                 style: `background-color: ${lightColor}`,
                 class: "cm-collab-selectionLine"
@@ -932,17 +1506,17 @@ var RemoteSelectionsDecorator = class {
       decorations.push({
         from: head,
         to: head,
-        value: import_view5.Decoration.widget({
+        value: import_view6.Decoration.widget({
           side: head - anchor > 0 ? -1 : 1,
           block: false,
           widget: new RemoteCaretWidget(state.info.displayName ?? "Anonymous", darkColor)
         })
       });
     }
-    this.decorations = import_view5.Decoration.set(decorations, true);
+    this.decorations = import_view6.Decoration.set(decorations, true);
   }
 };
-var RemoteCaretWidget = class extends import_view5.WidgetType {
+var RemoteCaretWidget = class extends import_view6.WidgetType {
   constructor(_name, _color) {
     super();
     this._name = _name;
@@ -978,7 +1552,7 @@ var RemoteCaretWidget = class extends import_view5.WidgetType {
     return true;
   }
 };
-var styles2 = import_view5.EditorView.theme({
+var styles2 = import_view6.EditorView.theme({
   ".cm-collab-selection": {},
   ".cm-collab-selectionLine": {
     padding: 0,
@@ -1181,12 +1755,12 @@ var blast = (options = defaultOptions) => {
   };
   return [
     // Cursor moved.
-    import_view6.EditorView.updateListener.of((update2) => {
+    import_view7.EditorView.updateListener.of((update2) => {
       if (blaster?.node !== update2.view.scrollDOM) {
         if (blaster) {
           blaster.destroy();
         }
-        blaster = new Blaster(update2.view.scrollDOM, (0, import_lodash.default)({
+        blaster = new Blaster(update2.view.scrollDOM, (0, import_lodash2.default)({
           particleGravity: 0.2,
           particleShrinkRate: 0.995,
           color: () => [
@@ -1212,7 +1786,7 @@ var blast = (options = defaultOptions) => {
         }
       }
     }),
-    import_view6.keymap.of([
+    import_view7.keymap.of([
       {
         any: (_, event) => {
           if (blaster) {
@@ -1498,7 +2072,7 @@ var commandState = import_state9.StateField.define({
     return state;
   },
   provide: (field) => [
-    import_view9.showTooltip.from(field, (value) => value.tooltip ?? null)
+    import_view10.showTooltip.from(field, (value) => value.tooltip ?? null)
   ]
 });
 var openEffect = import_state9.StateEffect.define();
@@ -1538,7 +2112,7 @@ var commandKeyBindings = [
     run: closeCommand
   }
 ];
-var CommandHint = class extends import_view8.WidgetType {
+var CommandHint = class extends import_view9.WidgetType {
   constructor(content) {
     super();
     this.content = content;
@@ -1577,9 +2151,9 @@ var CommandHint = class extends import_view8.WidgetType {
     return false;
   }
 };
-var hintViewPlugin = ({ onHint }) => import_view8.ViewPlugin.fromClass(class {
+var hintViewPlugin = ({ onHint }) => import_view9.ViewPlugin.fromClass(class {
   constructor() {
-    this.deco = import_view8.Decoration.none;
+    this.deco = import_view9.Decoration.none;
   }
   update(update2) {
     const builder = new import_state8.RangeSetBuilder();
@@ -1590,7 +2164,7 @@ var hintViewPlugin = ({ onHint }) => import_view8.ViewPlugin.fromClass(class {
       if (selection.from === selection.to && line.from === line.to) {
         const hint = onHint();
         if (hint) {
-          builder.add(selection.from, selection.to, import_view8.Decoration.widget({
+          builder.add(selection.from, selection.to, import_view9.Decoration.widget({
             widget: new CommandHint(hint)
           }));
         }
@@ -1600,16 +2174,16 @@ var hintViewPlugin = ({ onHint }) => import_view8.ViewPlugin.fromClass(class {
   }
 }, {
   provide: (plugin) => [
-    import_view8.EditorView.decorations.of((view) => view.plugin(plugin)?.deco ?? import_view8.Decoration.none)
+    import_view9.EditorView.decorations.of((view) => view.plugin(plugin)?.deco ?? import_view9.Decoration.none)
   ]
 });
 var command = (options) => {
   return [
     commandConfig.of(options),
     commandState,
-    import_view7.keymap.of(commandKeyBindings),
+    import_view8.keymap.of(commandKeyBindings),
     hintViewPlugin(options),
-    import_view7.EditorView.focusChangeEffect.of((_, focusing) => {
+    import_view8.EditorView.focusChangeEffect.of((_, focusing) => {
       return focusing ? closeEffect.of(null) : null;
     })
   ];
@@ -1621,7 +2195,7 @@ var createEditorStateTransaction = ({ scrollTo, selection }) => {
   return {
     selection,
     scrollIntoView: !scrollTo,
-    effects: scrollTo ? import_view11.EditorView.scrollIntoView(scrollTo, {
+    effects: scrollTo ? import_view12.EditorView.scrollIntoView(scrollTo, {
       yMargin: 96
     }) : void 0,
     annotations: import_state11.Transaction.userEvent.of(stateRestoreAnnotation)
@@ -1663,7 +2237,7 @@ var selectionState = ({ getState, setState } = {}) => {
     //     setStateDebounced(id, {});
     //   },
     // }),
-    import_view11.EditorView.updateListener.of(({ view, transactions }) => {
+    import_view12.EditorView.updateListener.of(({ view, transactions }) => {
       const id = view.state.facet(documentId);
       if (!id || transactions.some((tr) => tr.isUserEvent(stateRestoreAnnotation))) {
         return;
@@ -1686,7 +2260,7 @@ var selectionState = ({ getState, setState } = {}) => {
         }
       }
     }),
-    getState && import_view11.keymap.of([
+    getState && import_view12.keymap.of([
       {
         key: "ctrl-r",
         run: (view) => {
@@ -1742,7 +2316,7 @@ var commentsState = import_state10.StateField.define({
     return value;
   }
 });
-var styles3 = import_view10.EditorView.theme({
+var styles3 = import_view11.EditorView.theme({
   ".cm-comment, .cm-comment-current": {
     margin: "0 -3px",
     padding: "3px",
@@ -1755,23 +2329,23 @@ var styles3 = import_view10.EditorView.theme({
     textDecoration: "underline"
   }
 });
-var createCommentMark = (id, isCurrent) => import_view10.Decoration.mark({
+var createCommentMark = (id, isCurrent) => import_view11.Decoration.mark({
   class: isCurrent ? "cm-comment-current" : "cm-comment",
   attributes: {
     "data-testid": "cm-comment",
     "data-comment-id": id
   }
 });
-var commentsDecorations = import_view10.EditorView.decorations.compute([
+var commentsDecorations = import_view11.EditorView.decorations.compute([
   commentsState
 ], (state) => {
   const { selection: { current }, comments: comments2 } = state.field(commentsState);
-  const decorations = (0, import_lodash2.default)(comments2 ?? [], (range) => range.range.from)?.flatMap((comment) => {
+  const decorations = (0, import_lodash3.default)(comments2 ?? [], (range) => range.range.from)?.flatMap((comment) => {
     const range = comment.range;
     if (!range) {
       import_log4.log.warn("Invalid range:", range, {
         F: __dxlog_file7,
-        L: 142,
+        L: 144,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -1782,10 +2356,10 @@ var commentsDecorations = import_view10.EditorView.decorations.compute([
     const mark = createCommentMark(comment.comment.id, comment.comment.id === current);
     return mark.range(range.from, range.to);
   }).filter(import_util2.nonNullable);
-  return import_view10.Decoration.set(decorations);
+  return import_view11.Decoration.set(decorations);
 });
 var commentClickedEffect = import_state10.StateEffect.define();
-var handleCommentClick = import_view10.EditorView.domEventHandlers({
+var handleCommentClick = import_view11.EditorView.domEventHandlers({
   click: (event, view) => {
     let target = event.target;
     const editorRoot = view.dom;
@@ -1824,7 +2398,7 @@ var trackPastedComments = (onUpdate) => {
     }
   };
   return [
-    import_view10.EditorView.domEventHandlers({
+    import_view11.EditorView.domEventHandlers({
       cut: handleTrack,
       copy: handleTrack
     }),
@@ -1846,7 +2420,7 @@ var trackPastedComments = (onUpdate) => {
       return effects;
     }),
     // Handle paste or the undo of comment deletion.
-    import_view10.EditorView.updateListener.of((update2) => {
+    import_view11.EditorView.updateListener.of((update2) => {
       const restore = [];
       for (let i = 0; i < update2.transactions.length; i++) {
         const tr = update2.transactions[i];
@@ -1905,7 +2479,7 @@ var mapTrackedComment = (comment, changes) => ({
 var restoreCommentEffect = import_state10.StateEffect.define({
   map: mapTrackedComment
 });
-var createComment = (view) => {
+var createComment2 = (view) => {
   const options = view.state.facet(optionsFacet);
   const { from, to } = view.state.selection.main;
   if (from === to) {
@@ -1947,17 +2521,17 @@ var comments = (options = {}) => {
     //
     // Keymap.
     //
-    options.onCreate && import_view10.keymap.of([
+    options.onCreate && import_view11.keymap.of([
       {
         key: shortcut,
-        run: callbackWrapper(createComment)
+        run: callbackWrapper(createComment2)
       }
     ]),
     //
     // Hover tooltip (for key shortcut hints, etc.)
     // TODO(burdon): Factor out to generic hints extension for current selection/line.
     //
-    options.onHover && (0, import_view10.hoverTooltip)((view, pos) => {
+    options.onHover && (0, import_view11.hoverTooltip)((view, pos) => {
       const selection = view.state.selection.main;
       if (selection && pos >= selection.from && pos <= selection.to) {
         return {
@@ -1986,7 +2560,7 @@ var comments = (options = {}) => {
     //
     // Track deleted ranges and update ranges for decorations.
     //
-    import_view10.EditorView.updateListener.of(({ view, state, changes }) => {
+    import_view11.EditorView.updateListener.of(({ view, state, changes }) => {
       let mod = false;
       const { comments: comments2, ...value } = state.field(commentsState);
       changes.iterChanges((from, to, from2, to2) => {
@@ -2018,7 +2592,7 @@ var comments = (options = {}) => {
     //
     // Track selection/proximity.
     //
-    import_view10.EditorView.updateListener.of(({ view, state }) => {
+    import_view11.EditorView.updateListener.of(({ view, state }) => {
       let min = Infinity;
       const { selection: { current, closest }, comments: comments2 } = state.field(commentsState);
       const { head } = state.selection.main;
@@ -2048,414 +2622,187 @@ var comments = (options = {}) => {
             range,
             location: view.coordsAtPos(range.from)
           }))
-        });
-      }
-    }),
-    options.onUpdate && trackPastedComments(options.onUpdate)
-  ].filter(import_util2.nonNullable);
-};
-var scrollThreadIntoView = (view, id, center = true) => {
-  const comment = view.state.field(commentsState).comments.find((range2) => range2.comment.id === id);
-  if (!comment?.comment.cursor) {
-    return;
-  }
-  const range = Cursor.getRangeFromCursor(view.state, comment.comment.cursor);
-  if (range) {
-    const currentSelection = view.state.selection.main;
-    const currentScrollPosition = view.scrollDOM.scrollTop;
-    const targetScrollPosition = view.coordsAtPos(range.from)?.top;
-    const needsScroll = targetScrollPosition !== void 0 && (targetScrollPosition < currentScrollPosition || targetScrollPosition > currentScrollPosition + view.scrollDOM.clientHeight);
-    const needsSelectionUpdate = currentSelection.from !== range.from || currentSelection.to !== range.from;
-    if (needsScroll || needsSelectionUpdate) {
-      view.dispatch({
-        selection: needsSelectionUpdate ? {
-          anchor: range.from
-        } : void 0,
-        effects: [
-          needsScroll ? import_view10.EditorView.scrollIntoView(range.from, center ? {
-            y: "center"
-          } : void 0) : [],
-          needsSelectionUpdate ? setSelection.of({
-            current: id
-          }) : []
-        ].flat()
-      });
-    }
-  }
-};
-var selectionOverlapsComment = (state) => {
-  const commentState = state.field(commentsState, false);
-  if (commentState === void 0) {
-    return false;
-  }
-  const { selection } = state;
-  for (const range of selection.ranges) {
-    if (commentState.comments.some(({ range: commentRange }) => overlap(commentRange, range))) {
-      return true;
-    }
-  }
-  return false;
-};
-var hasActiveSelection = (state) => {
-  return state.selection.ranges.some((range) => !range.empty);
-};
-var ExternalCommentSync = class {
-  constructor(view, id, subscribe, getComments) {
-    this.destroy = () => {
-      this.unsubscribe();
-    };
-    const updateComments = () => {
-      const comments2 = getComments();
-      if (id === view.state.facet(documentId)) {
-        queueMicrotask(() => view.dispatch({
-          effects: setComments.of({
-            id,
-            comments: comments2
-          })
-        }));
-      }
-    };
-    this.unsubscribe = subscribe(updateComments);
-  }
-};
-var createExternalCommentSync = (id, subscribe, getComments) => import_view10.ViewPlugin.fromClass(class {
-  constructor(view) {
-    return new ExternalCommentSync(view, id, subscribe, getComments);
-  }
-});
-var useCommentState = () => {
-  const [state, setState] = (0, import_react4.useState)({
-    comment: false,
-    selection: false
-  });
-  const observer = (0, import_react4.useMemo)(() => import_view10.EditorView.updateListener.of((update2) => {
-    if (update2.docChanged || update2.selectionSet) {
-      setState({
-        comment: selectionOverlapsComment(update2.state),
-        selection: hasActiveSelection(update2.state)
-      });
-    }
-  }), []);
-  return [
-    state,
-    observer
-  ];
-};
-var useComments = (view, id, comments2) => {
-  (0, import_react4.useEffect)(() => {
-    if (view) {
-      if (id === view.state.facet(documentId)) {
-        view.dispatch({
-          effects: setComments.of({
-            id,
-            comments: comments2 ?? []
-          })
-        });
-      }
-    }
-  });
-};
-var useCommentClickListener = (onCommentClick) => {
-  return (0, import_react4.useMemo)(() => import_view10.EditorView.updateListener.of((update2) => {
-    update2.transactions.forEach((transaction) => {
-      transaction.effects.forEach((effect) => {
-        if (effect.is(commentClickedEffect)) {
-          onCommentClick(effect.value);
-        }
-      });
-    });
-  }), [
-    onCommentClick
-  ]);
-};
-var debugNodeLogger = (log8 = console.log) => {
-  const logTokens = (state) => (0, import_language.syntaxTree)(state).iterate({
-    enter: (node) => log8(node.type)
-  });
-  return import_state12.StateField.define({
-    create: (state) => logTokens(state),
-    update: (_, tr) => logTokens(tr.state)
-  });
-};
-var styles4 = import_view12.EditorView.theme({
-  ".cm-dropCursor": {
-    borderLeft: "2px solid var(--dx-accentText)",
-    color: "var(--dx-accentText)",
-    padding: "0 4px"
-  },
-  ".cm-dropCursor:after": {
-    content: '"\u2190"'
-  }
-});
-var dropFile = (options = {}) => {
-  return [
-    styles4,
-    (0, import_view12.dropCursor)(),
-    import_view12.EditorView.domEventHandlers({
-      drop: (event, view) => {
-        event.preventDefault();
-        const files = event.dataTransfer?.files;
-        const pos = view.posAtCoords(event);
-        if (files?.length && pos !== null) {
-          view.dispatch({
-            selection: {
-              anchor: pos
-            }
-          });
-          options.onDrop?.(view, {
-            files
-          });
-        }
-      }
-    })
-  ];
-};
-var focusEffect = import_state14.StateEffect.define();
-var focusField = import_state14.StateField.define({
-  create: () => false,
-  update: (value, tr) => {
-    for (const effect of tr.effects) {
-      if (effect.is(focusEffect)) {
-        return effect.value;
-      }
-    }
-    return value;
-  }
-});
-var focus = [
-  focusField,
-  import_view14.EditorView.domEventHandlers({
-    focus: (event, view) => {
-      setTimeout(() => view.dispatch({
-        effects: focusEffect.of(true)
-      }));
-    },
-    blur: (event, view) => {
-      setTimeout(() => view.dispatch({
-        effects: focusEffect.of(false)
-      }));
-    }
-  })
-];
-var headings = {
-  1: "text-4xl",
-  2: "text-3xl",
-  3: "text-2xl",
-  4: "text-xl",
-  5: "text-lg",
-  6: "text-md"
-};
-var theme = {
-  code: "font-mono !no-underline text-neutral-700 dark:text-neutral-300",
-  codeMark: "font-mono text-primary-500",
-  mark: "opacity-50",
-  heading: (level) => {
-    return (0, import_react_ui_theme4.mx)(headings[level], "dark:text-primary-400");
-  }
-};
-var getToken = (path, defaultValue) => {
-  const value = (0, import_lodash5.default)(import_react_ui_theme5.tokens, path, defaultValue);
-  return value?.toString() ?? "";
-};
-var fontBody = getToken("fontFamily.body");
-var fontMono = getToken("fontFamily.mono");
-var defaultTheme = {
-  "&": {},
-  "&.cm-focused": {
-    outline: "none"
-  },
-  /**
-  * Scroller
-  */
-  ".cm-scroller": {
-    overflowY: "auto"
-  },
-  /**
-  * Content
-  * NOTE: Apply margins to content so that scrollbar is at the edge of the container.
-  */
-  ".cm-content": {
-    padding: "unset",
-    fontFamily: fontBody,
-    // NOTE: Base font size (otherwise defined by HTML tag, which might be different for storybook).
-    fontSize: "16px",
-    lineHeight: 1.5,
-    color: "unset"
-  },
-  /**
-  * 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"
-  },
-  ".cm-gutter": {},
-  ".cm-gutter.cm-lineNumbers .cm-gutterElement": {
-    minWidth: "40px",
-    alignContent: "center"
-  },
-  /**
-  * Height is set to match the corresponding line.
-  */
-  ".cm-gutterElement": {
-    alignItems: "center",
-    fontSize: "16px"
-  },
-  /**
-  * Line.
-  */
-  ".cm-line": {
-    paddingInline: 0
-  },
-  ".cm-activeLine": {
-    background: "var(--dx-cmActiveLine)"
-  },
-  /**
-  * Cursor (layer).
-  */
-  ".cm-cursor, .cm-dropCursor": {
-    borderLeft: "2px solid var(--dx-cmCursor)"
-  },
-  ".cm-placeholder": {
-    color: "var(--dx-subdued)"
-  },
-  /**
-  * Selection (layer).
-  */
-  ".cm-selectionBackground": {
-    background: "var(--dx-cmSelection)"
-  },
-  /**
-  * Search.
-  * NOTE: Matches comment.
-  */
-  ".cm-searchMatch": {
-    margin: "0 -3px",
-    padding: "3px",
-    borderRadius: "3px",
-    background: "var(--dx-cmHighlightSurface)",
-    color: "var(--dx-cmHighlight)"
-  },
-  ".cm-searchMatch-selected": {
-    textDecoration: "underline"
-  },
-  /**
-  * Link.
-  */
-  ".cm-link": {
-    textDecorationLine: "underline",
-    textDecorationThickness: "1px",
-    textUnderlineOffset: "2px",
-    borderRadius: ".125rem"
-  },
-  ".cm-link > span": {
-    color: "var(--dx-accentText)"
-  },
-  /**
-  * Tooltip.
-  */
-  ".cm-tooltip": {
-    background: "var(--dx-base)"
-  },
-  ".cm-tooltip-below": {},
-  /**
-  * Autocomplete.
-  * https://github.com/codemirror/autocomplete/blob/main/src/completion.ts
-  */
-  ".cm-tooltip.cm-tooltip-autocomplete": {
-    marginTop: "4px",
-    marginLeft: "-3px"
-  },
-  ".cm-tooltip.cm-tooltip-autocomplete > ul": {
-    maxHeight: "20em"
-  },
-  ".cm-tooltip.cm-tooltip-autocomplete > ul > li": {},
-  ".cm-tooltip.cm-tooltip-autocomplete > ul > li[aria-selected]": {},
-  ".cm-tooltip.cm-tooltip-autocomplete > ul > completion-section": {
-    paddingLeft: "4px !important",
-    borderBottom: "none !important",
-    color: "var(--dx-accentText)"
-  },
-  ".cm-tooltip.cm-completionInfo": {
-    width: "360px !important",
-    margin: "-10px 1px 0 1px",
-    padding: "8px !important",
-    borderColor: "var(--dx-separator)"
-  },
-  ".cm-completionIcon": {
-    display: "none"
-  },
-  ".cm-completionLabel": {
-    fontFamily: fontBody
-  },
-  ".cm-completionMatchedText": {
-    textDecoration: "none !important",
-    opacity: 0.5
-  },
-  /**
-  * Panels
-  * https://github.com/codemirror/search/blob/main/src/search.ts#L745
-  *
-  * Find/replace panel.
-  * <div class="cm-announced">...</div>
-  * <div class="cm-scroller">...</div>
-  * <div class="cm-panels cm-panels-bottom">
-  *   <div class="cm-search cm-panel">
-  *     <input class="cm-textfield" />
-  *     <button class="cm-button">...</button>
-  *     <label><input type="checkbox" />...</label>
-  *   </div>
-  * </div
-  */
-  // TODO(burdon): Implement custom panel (with icon buttons).
-  ".cm-panels": {},
-  ".cm-panel": {
-    fontFamily: fontBody,
-    backgroundColor: "var(--surface-bg)"
-  },
-  ".cm-panel input, .cm-panel button, .cm-panel label": {
-    color: "var(--dx-subdued)",
-    fontFamily: fontBody,
-    fontSize: "14px",
-    all: "unset",
-    margin: "3px !important",
-    padding: "2px 6px !important",
-    outline: "1px solid transparent"
-  },
-  ".cm-panel input, .cm-panel button": {
-    backgroundColor: "var(--dx-input)"
-  },
-  ".cm-panel input:focus, .cm-panel button:focus": {
-    outline: "1px solid var(--dx-accentFocusIndicator)"
-  },
-  ".cm-panel label": {
-    display: "inline-flex",
-    alignItems: "center",
-    cursor: "pointer"
-  },
-  ".cm-panel input.cm-textfield": {},
-  ".cm-panel input[type=checkbox]": {
-    width: "8px",
-    height: "8px",
-    marginRight: "6px !important",
-    padding: "2px !important",
-    color: "var(--dx-accentFocusIndicator)"
-  },
-  ".cm-panel button": {
-    "&:hover": {
-      backgroundColor: "var(--dx-accentSurfaceHover) !important"
-    },
-    "&:active": {
-      backgroundColor: "var(--dx-accentSurfaceHover)"
+        });
+      }
+    }),
+    options.onUpdate && trackPastedComments(options.onUpdate)
+  ].filter(import_util2.nonNullable);
+};
+var scrollThreadIntoView = (view, id, center = true) => {
+  const comment = view.state.field(commentsState).comments.find((range2) => range2.comment.id === id);
+  if (!comment?.comment.cursor) {
+    return;
+  }
+  const range = Cursor.getRangeFromCursor(view.state, comment.comment.cursor);
+  if (range) {
+    const currentSelection = view.state.selection.main;
+    const currentScrollPosition = view.scrollDOM.scrollTop;
+    const targetScrollPosition = view.coordsAtPos(range.from)?.top;
+    const needsScroll = targetScrollPosition !== void 0 && (targetScrollPosition < currentScrollPosition || targetScrollPosition > currentScrollPosition + view.scrollDOM.clientHeight);
+    const needsSelectionUpdate = currentSelection.from !== range.from || currentSelection.to !== range.from;
+    if (needsScroll || needsSelectionUpdate) {
+      view.dispatch({
+        selection: needsSelectionUpdate ? {
+          anchor: range.from
+        } : void 0,
+        effects: [
+          needsScroll ? import_view11.EditorView.scrollIntoView(range.from, center ? {
+            y: "center"
+          } : void 0) : [],
+          needsSelectionUpdate ? setSelection.of({
+            current: id
+          }) : []
+        ].flat()
+      });
+    }
+  }
+};
+var selectionOverlapsComment = (state) => {
+  const commentState = state.field(commentsState, false);
+  if (commentState === void 0) {
+    return false;
+  }
+  const { selection } = state;
+  for (const range of selection.ranges) {
+    if (commentState.comments.some(({ range: commentRange }) => overlap(commentRange, range))) {
+      return true;
+    }
+  }
+  return false;
+};
+var hasActiveSelection = (state) => {
+  return state.selection.ranges.some((range) => !range.empty);
+};
+var ExternalCommentSync = class {
+  constructor(view, id, subscribe, getComments) {
+    this.destroy = () => {
+      this.unsubscribe();
+    };
+    const updateComments = () => {
+      const comments2 = getComments();
+      if (id === view.state.facet(documentId)) {
+        queueMicrotask(() => view.dispatch({
+          effects: setComments.of({
+            id,
+            comments: comments2
+          })
+        }));
+      }
+    };
+    this.unsubscribe = subscribe(updateComments);
+  }
+};
+var createExternalCommentSync = (id, subscribe, getComments) => import_view11.ViewPlugin.fromClass(class {
+  constructor(view) {
+    return new ExternalCommentSync(view, id, subscribe, getComments);
+  }
+});
+var useCommentState = (state) => {
+  return (0, import_react4.useMemo)(() => import_view11.EditorView.updateListener.of((update2) => {
+    if (update2.docChanged || update2.selectionSet) {
+      state.comment = selectionOverlapsComment(update2.state);
+      state.selection = hasActiveSelection(update2.state);
+    }
+  }), [
+    state
+  ]);
+};
+var useComments = (view, id, comments2) => {
+  (0, import_react4.useEffect)(() => {
+    if (view) {
+      if (id === view.state.facet(documentId)) {
+        view.dispatch({
+          effects: setComments.of({
+            id,
+            comments: comments2 ?? []
+          })
+        });
+      }
     }
+  });
+};
+var useCommentClickListener = (onCommentClick) => {
+  return (0, import_react4.useMemo)(() => import_view11.EditorView.updateListener.of((update2) => {
+    update2.transactions.forEach((transaction) => {
+      transaction.effects.forEach((effect) => {
+        if (effect.is(commentClickedEffect)) {
+          onCommentClick(effect.value);
+        }
+      });
+    });
+  }), [
+    onCommentClick
+  ]);
+};
+var debugNodeLogger = (log8 = console.log) => {
+  const logTokens = (state) => (0, import_language.syntaxTree)(state).iterate({
+    enter: (node) => log8(node.type)
+  });
+  return import_state12.StateField.define({
+    create: (state) => logTokens(state),
+    update: (_, tr) => logTokens(tr.state)
+  });
+};
+var styles4 = import_view13.EditorView.theme({
+  ".cm-dropCursor": {
+    borderLeft: "2px solid var(--dx-accentText)",
+    color: "var(--dx-accentText)",
+    padding: "0 4px"
   },
-  ".cm-panel.cm-search": {
-    padding: "4px",
-    borderTop: "1px solid var(--dx-separator)"
+  ".cm-dropCursor:after": {
+    content: '"\u2190"'
   }
+});
+var dropFile = (options = {}) => {
+  return [
+    styles4,
+    (0, import_view13.dropCursor)(),
+    import_view13.EditorView.domEventHandlers({
+      drop: (event, view) => {
+        event.preventDefault();
+        const files = event.dataTransfer?.files;
+        const pos = view.posAtCoords(event);
+        if (files?.length && pos !== null) {
+          view.dispatch({
+            selection: {
+              anchor: pos
+            }
+          });
+          options.onDrop?.(view, {
+            files
+          });
+        }
+      }
+    })
+  ];
 };
+var focusEffect = import_state14.StateEffect.define();
+var focusField = import_state14.StateField.define({
+  create: () => false,
+  update: (value, tr) => {
+    for (const effect of tr.effects) {
+      if (effect.is(focusEffect)) {
+        return effect.value;
+      }
+    }
+    return value;
+  }
+});
+var focus = [
+  focusField,
+  import_view15.EditorView.domEventHandlers({
+    focus: (event, view) => {
+      setTimeout(() => view.dispatch({
+        effects: focusEffect.of(true)
+      }));
+    },
+    blur: (event, view) => {
+      setTimeout(() => view.dispatch({
+        effects: focusEffect.of(false)
+      }));
+    }
+  })
+];
 var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/extensions/factories.ts";
 var preventNewline = import_state13.EditorState.transactionFilter.of((tr) => tr.newDoc.lines > 1 ? [] : tr);
 var defaultBasicOptions = {
@@ -2477,10 +2824,10 @@ var keymaps = {
   default: import_commands2.defaultKeymap
 };
 var createBasicExtensions = (_props) => {
-  const props = (0, import_lodash3.default)({}, _props, defaultBasicOptions);
+  const props = (0, import_lodash4.default)({}, _props, defaultBasicOptions);
   return [
     // NOTE: Doesn't catch errors in keymap functions.
-    import_view13.EditorView.exceptionSink.of((err) => {
+    import_view14.EditorView.exceptionSink.of((err) => {
       import_log5.log.catch(err, void 0, {
         F: __dxlog_file8,
         L: 96,
@@ -2491,24 +2838,24 @@ var createBasicExtensions = (_props) => {
     props.allowMultipleSelections && import_state13.EditorState.allowMultipleSelections.of(true),
     props.bracketMatching && (0, import_language2.bracketMatching)(),
     props.closeBrackets && (0, import_autocomplete2.closeBrackets)(),
-    props.dropCursor && (0, import_view13.dropCursor)(),
-    props.drawSelection && (0, import_view13.drawSelection)({
+    props.dropCursor && (0, import_view14.dropCursor)(),
+    props.drawSelection && (0, import_view14.drawSelection)({
       cursorBlinkRate: 1200
     }),
     props.focus && focus,
-    props.highlightActiveLine && (0, import_view13.highlightActiveLine)(),
+    props.highlightActiveLine && (0, import_view14.highlightActiveLine)(),
     props.history && (0, import_commands2.history)(),
-    props.lineNumbers && (0, import_view13.lineNumbers)(),
-    props.lineWrapping && import_view13.EditorView.lineWrapping,
-    props.placeholder && (0, import_view13.placeholder)(props.placeholder),
+    props.lineNumbers && (0, import_view14.lineNumbers)(),
+    props.lineWrapping && import_view14.EditorView.lineWrapping,
+    props.placeholder && (0, import_view14.placeholder)(props.placeholder),
     props.readonly && [
       import_state13.EditorState.readOnly.of(true),
-      import_view13.EditorView.editable.of(false)
+      import_view14.EditorView.editable.of(false)
     ],
-    props.scrollPastEnd && (0, import_view13.scrollPastEnd)(),
+    props.scrollPastEnd && (0, import_view14.scrollPastEnd)(),
     props.tabSize && import_state13.EditorState.tabSize.of(props.tabSize),
     // https://codemirror.net/docs/ref/#view.KeyBinding
-    import_view13.keymap.of([
+    import_view14.keymap.of([
       ...(props.keymap && keymaps[props.keymap]) ?? [],
       // NOTE: Tabs are also configured by markdown extension.
       // https://codemirror.net/docs/ref/#commands.indentWithTab
@@ -2530,16 +2877,16 @@ var defaultThemeSlots = {
   }
 };
 var createThemeExtensions = ({ themeMode, styles: styles5, syntaxHighlighting: _syntaxHighlighting, slots: _slots } = {}) => {
-  const slots = (0, import_lodash3.default)({}, _slots, defaultThemeSlots);
+  const slots = (0, import_lodash4.default)({}, _slots, defaultThemeSlots);
   return [
-    import_view13.EditorView.darkTheme.of(themeMode === "dark"),
-    import_view13.EditorView.baseTheme(styles5 ? (0, import_lodash4.default)({}, defaultTheme, styles5) : defaultTheme),
+    import_view14.EditorView.darkTheme.of(themeMode === "dark"),
+    import_view14.EditorView.baseTheme(styles5 ? (0, import_lodash5.default)({}, defaultTheme, styles5) : defaultTheme),
     // https://github.com/codemirror/theme-one-dark
     _syntaxHighlighting && (themeMode === "dark" ? (0, import_language2.syntaxHighlighting)(import_theme_one_dark.oneDarkHighlightStyle) : (0, import_language2.syntaxHighlighting)(import_language2.defaultHighlightStyle)),
-    slots.editor?.className && import_view13.EditorView.editorAttributes.of({
+    slots.editor?.className && import_view14.EditorView.editorAttributes.of({
       class: slots.editor.className
     }),
-    slots.content?.className && import_view13.EditorView.contentAttributes.of({
+    slots.content?.className && import_view14.EditorView.contentAttributes.of({
       class: slots.content.className
     })
   ].filter(import_util4.isNotFalsy);
@@ -2551,7 +2898,7 @@ var createDataExtensions = ({ id, text, space, identity }) => {
   }
   if (space && identity) {
     const peerId = identity?.identityKey.toHex();
-    const { cursorLightValue, cursorDarkValue } = import_react_ui_theme3.hueTokens[identity?.profile?.data?.hue ?? (0, import_util4.hexToHue)(peerId ?? "0")];
+    const { cursorLightValue, cursorDarkValue } = import_react_ui_theme7.hueTokens[identity?.profile?.data?.hue ?? (0, import_util4.hexToHue)(peerId ?? "0")];
     extensions.push(awareness(new SpaceAwarenessProvider({
       space,
       channel: `awareness.${id}`,
@@ -2586,7 +2933,7 @@ var folding = (_props = {}) => [
       }));
     }
   }),
-  import_view15.EditorView.theme({
+  import_view16.EditorView.theme({
     ".cm-foldGutter": {
       opacity: 0.3,
       transition: "opacity 0.3s",
@@ -2599,11 +2946,11 @@ var folding = (_props = {}) => [
 ];
 var listener = ({ onFocus, onChange }) => {
   const extensions = [];
-  onFocus && extensions.push(import_view16.EditorView.focusChangeEffect.of((_, focusing) => {
+  onFocus && extensions.push(import_view17.EditorView.focusChangeEffect.of((_, focusing) => {
     onFocus(focusing);
     return null;
   }));
-  onChange && extensions.push(import_view16.EditorView.updateListener.of((update2) => {
+  onChange && extensions.push(import_view17.EditorView.updateListener.of((update2) => {
     onChange(update2.state.doc.toString(), update2.state.facet(documentId));
   }));
   return extensions;
@@ -3494,7 +3841,7 @@ var toggleCodeblock = (target) => {
 };
 var formattingKeymap = (_options = {}) => {
   return [
-    import_view17.keymap.of([
+    import_view18.keymap.of([
       {
         key: "meta-b",
         run: toggleStrong
@@ -3694,63 +4041,54 @@ var getFormatting = (state) => {
     listStyle: listStyle || null
   };
 };
-var useFormattingState = () => {
-  const [state, setState] = (0, import_react6.useState)();
-  const observer = (0, import_react6.useMemo)(() => import_view17.EditorView.updateListener.of((update2) => {
+var useFormattingState = (state) => {
+  return (0, import_react6.useMemo)(() => import_view18.EditorView.updateListener.of((update2) => {
     if (update2.docChanged || update2.selectionSet) {
-      setState((prevState) => {
-        const newState = getFormatting(update2.state);
-        if (!prevState || !formattingEquals(prevState, newState)) {
-          return newState;
-        }
-        return prevState;
+      Object.entries(getFormatting(update2.state)).forEach(([key, active]) => {
+        state[key] = active;
       });
     }
   }), []);
-  return [
-    state,
-    observer
-  ];
 };
-var processAction = (view, action) => {
+var processEditorPayload = (view, { type, data }) => {
   let inlineType, listType;
-  switch (action.type) {
+  switch (type) {
     case "heading":
-      setHeading(parseInt(action.data))(view);
+      setHeading(parseInt(data))(view);
       break;
     case "strong":
     case "emphasis":
     case "strikethrough":
     case "code":
-      inlineType = action.type === "strong" ? Inline.Strong : action.type === "emphasis" ? Inline.Emphasis : action.type === "strikethrough" ? Inline.Strikethrough : Inline.Code;
-      (typeof action.data === "boolean" ? setStyle(inlineType, action.data) : toggleStyle(inlineType))(view);
+      inlineType = type === "strong" ? Inline.Strong : type === "emphasis" ? Inline.Emphasis : type === "strikethrough" ? Inline.Strikethrough : Inline.Code;
+      (typeof data === "boolean" ? setStyle(inlineType, data) : toggleStyle(inlineType))(view);
       break;
     case "list-ordered":
     case "list-bullet":
     case "list-task":
-      listType = action.type === "list-ordered" ? List.Ordered : action.type === "list-bullet" ? List.Bullet : List.Task;
-      (action.data === false ? removeList(listType) : action.data === true ? addList(listType) : toggleList(listType))(view);
+      listType = type === "list-ordered" ? List.Ordered : type === "list-bullet" ? List.Bullet : List.Task;
+      (data === false ? removeList(listType) : data === true ? addList(listType) : toggleList(listType))(view);
       break;
     case "blockquote":
-      (action.data === false ? removeBlockquote : action.data === true ? addBlockquote : toggleBlockquote)(view);
+      (data === false ? removeBlockquote : data === true ? addBlockquote : toggleBlockquote)(view);
       break;
     case "codeblock":
-      (action.data === false ? removeCodeblock : addCodeblock)(view);
+      (data === false ? removeCodeblock : addCodeblock)(view);
       break;
     case "table":
       insertTable(view);
       break;
     case "link":
-      (action.data === false ? removeLink : addLink())(view);
+      (data === false ? removeLink : addLink())(view);
       break;
     case "image":
       addLink({
-        url: action.data,
+        url: data,
         image: true
       })(view);
       break;
     case "comment":
-      createComment(view);
+      createComment2(view);
       break;
   }
   requestAnimationFrame(() => {
@@ -3956,7 +4294,7 @@ var createMarkdownExtensions = ({ themeMode } = {}) => {
     }),
     // Custom styles.
     (0, import_language5.syntaxHighlighting)(markdownHighlightStyle()),
-    import_view18.keymap.of([
+    import_view19.keymap.of([
       // https://codemirror.net/docs/ref/#commands.indentWithTab
       import_commands3.indentWithTab,
       // https://codemirror.net/docs/ref/#commands.defaultKeymap
@@ -3990,7 +4328,7 @@ var convertTreeToJson = (state) => {
   return treeToJson((0, import_language7.syntaxTree)(state).cursor());
 };
 var adjustChanges = () => {
-  return import_view20.ViewPlugin.fromClass(class {
+  return import_view21.ViewPlugin.fromClass(class {
     update(update2) {
       const tree = (0, import_language9.syntaxTree)(update2.state);
       const adjustments = [];
@@ -4132,7 +4470,7 @@ var image = (_options = {}) => {
   return [
     import_state19.StateField.define({
       create: (state) => {
-        return import_view21.Decoration.set(buildDecorations(0, state.doc.length, state));
+        return import_view22.Decoration.set(buildDecorations(0, state.doc.length, state));
       },
       update: (value, tr) => {
         if (!tr.docChanged && !tr.selection) {
@@ -4155,7 +4493,7 @@ var image = (_options = {}) => {
           add: buildDecorations(from, to, tr.state)
         });
       },
-      provide: (field) => import_view21.EditorView.decorations.from(field)
+      provide: (field) => import_view22.EditorView.decorations.from(field)
     })
   ];
 };
@@ -4181,7 +4519,7 @@ var buildDecorations = (from, to, state) => {
             return;
           }
           preloadImage(url);
-          decorations.push(import_view21.Decoration.replace({
+          decorations.push(import_view22.Decoration.replace({
             block: true,
             widget: new ImageWidget(url)
           }).range(hide2 ? node.from : node.to, node.to));
@@ -4193,7 +4531,7 @@ var buildDecorations = (from, to, state) => {
   });
   return decorations;
 };
-var ImageWidget = class extends import_view21.WidgetType {
+var ImageWidget = class extends import_view22.WidgetType {
   constructor(_url) {
     super();
     this._url = _url;
@@ -4215,7 +4553,7 @@ var ImageWidget = class extends import_view21.WidgetType {
 };
 var bulletListIndentationWidth = 24;
 var orderedListIndentationWidth = 36;
-var formattingStyles = import_view22.EditorView.theme({
+var formattingStyles = import_view23.EditorView.theme({
   /**
   * Horizontal rule.
   */
@@ -4309,13 +4647,34 @@ var formattingStyles = import_view22.EditorView.theme({
     height: "auto",
     borderTop: "0.5rem solid transparent",
     borderBottom: "0.5rem solid transparent"
+  },
+  ".cm-image-with-loader": {
+    display: "block",
+    opacity: "0",
+    transitionDuration: "350ms",
+    transitionProperty: "opacity"
+  },
+  ".cm-image-with-loader.cm-loaded-image": {
+    opacity: "1"
+  },
+  ".cm-image-wrapper": {
+    "grid-template-columns": "1fr",
+    display: "grid",
+    margin: "0.5rem 0",
+    overflow: "hidden",
+    transitionDuration: "350ms",
+    transitionProperty: "height",
+    "& > *": {
+      "grid-row-start": 1,
+      "grid-column-start": 1
+    }
   }
 });
 var table = (options = {}) => {
   return import_state20.StateField.define({
     create: (state) => update(state, options),
     update: (_, tr) => update(tr.state, options),
-    provide: (field) => import_view23.EditorView.decorations.from(field)
+    provide: (field) => import_view24.EditorView.decorations.from(field)
   });
 };
 var update = (state, _options) => {
@@ -4360,19 +4719,19 @@ var update = (state, _options) => {
   tables.forEach((table2) => {
     const replace = state.readOnly || cursor < table2.from || cursor > table2.to;
     if (replace) {
-      builder.add(table2.from, table2.to, import_view23.Decoration.replace({
+      builder.add(table2.from, table2.to, import_view24.Decoration.replace({
         block: true,
         widget: new TableWidget(table2)
       }));
     } else {
-      builder.add(table2.from, table2.to, import_view23.Decoration.mark({
+      builder.add(table2.from, table2.to, import_view24.Decoration.mark({
         class: "cm-table"
       }));
     }
   });
   return builder.finish();
 };
-var TableWidget = class extends import_view23.WidgetType {
+var TableWidget = class extends import_view24.WidgetType {
   constructor(_table) {
     super();
     this._table = _table;
@@ -4412,14 +4771,14 @@ var Unicode = {
   bulletSmall: "\u2219",
   bulletSquare: "\u2B1D"
 };
-var HorizontalRuleWidget = class extends import_view19.WidgetType {
+var HorizontalRuleWidget = class extends import_view20.WidgetType {
   toDOM() {
     const el = document.createElement("span");
     el.className = "cm-hr";
     return el;
   }
 };
-var LinkButton = class extends import_view19.WidgetType {
+var LinkButton = class extends import_view20.WidgetType {
   constructor(url, render) {
     super();
     this.url = url;
@@ -4435,7 +4794,7 @@ var LinkButton = class extends import_view19.WidgetType {
     return el;
   }
 };
-var CheckboxWidget = class extends import_view19.WidgetType {
+var CheckboxWidget = class extends import_view20.WidgetType {
   constructor(_checked) {
     super();
     this._checked = _checked;
@@ -4445,7 +4804,7 @@ var CheckboxWidget = class extends import_view19.WidgetType {
   }
   toDOM(view) {
     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;
@@ -4480,7 +4839,7 @@ var CheckboxWidget = class extends import_view19.WidgetType {
     return false;
   }
 };
-var TextWidget = class extends import_view19.WidgetType {
+var TextWidget = class extends import_view20.WidgetType {
   constructor(text, className) {
     super();
     this.text = text;
@@ -4495,29 +4854,29 @@ var TextWidget = class extends import_view19.WidgetType {
     return el;
   }
 };
-var hide = import_view19.Decoration.replace({});
-var blockQuote = import_view19.Decoration.line({
-  class: (0, import_react_ui_theme6.mx)("cm-blockquote")
+var hide = import_view20.Decoration.replace({});
+var blockQuote = import_view20.Decoration.line({
+  class: (0, import_react_ui_theme8.mx)("cm-blockquote")
 });
-var fencedCodeLine = import_view19.Decoration.line({
-  class: (0, import_react_ui_theme6.mx)("cm-code cm-codeblock-line")
+var fencedCodeLine = import_view20.Decoration.line({
+  class: (0, import_react_ui_theme8.mx)("cm-code cm-codeblock-line")
 });
-var fencedCodeLineFirst = import_view19.Decoration.line({
-  class: (0, import_react_ui_theme6.mx)("cm-code cm-codeblock-line", "cm-codeblock-first")
+var fencedCodeLineFirst = import_view20.Decoration.line({
+  class: (0, import_react_ui_theme8.mx)("cm-code cm-codeblock-line", "cm-codeblock-first")
 });
-var fencedCodeLineLast = import_view19.Decoration.line({
-  class: (0, import_react_ui_theme6.mx)("cm-code cm-codeblock-line", "cm-codeblock-last")
+var fencedCodeLineLast = import_view20.Decoration.line({
+  class: (0, import_react_ui_theme8.mx)("cm-code cm-codeblock-line", "cm-codeblock-last")
 });
 var commentBlockLine = fencedCodeLine;
 var commentBlockLineFirst = fencedCodeLineFirst;
 var commentBlockLineLast = fencedCodeLineLast;
-var horizontalRule = import_view19.Decoration.replace({
+var horizontalRule = import_view20.Decoration.replace({
   widget: new HorizontalRuleWidget()
 });
-var checkedTask = import_view19.Decoration.replace({
+var checkedTask = import_view20.Decoration.replace({
   widget: new CheckboxWidget(true)
 });
-var uncheckedTask = import_view19.Decoration.replace({
+var uncheckedTask = import_view20.Decoration.replace({
   widget: new CheckboxWidget(false)
 });
 var editingRange = (state, range, focus2) => {
@@ -4618,7 +4977,7 @@ var buildDecorations2 = (view, options, focus2) => {
           } else {
             const num = headers.slice(from - 1).map((level2) => level2?.number ?? 0).join(".") + " ";
             if (num.length) {
-              atomicDeco.add(mark.from, mark.from + len, import_view19.Decoration.replace({
+              atomicDeco.add(mark.from, mark.from + len, import_view20.Decoration.replace({
                 widget: new TextWidget(num, theme.heading(level))
               }));
             }
@@ -4643,7 +5002,7 @@ var buildDecorations2 = (view, options, focus2) => {
         if (node.from === line.to - 1) {
           return false;
         }
-        deco.add(line.from, line.from, import_view19.Decoration.line({
+        deco.add(line.from, line.from, import_view20.Decoration.line({
           class: "cm-list-item",
           attributes: {
             style: `padding-left: ${offset}px; text-indent: -${width}px;`
@@ -4660,7 +5019,7 @@ var buildDecorations2 = (view, options, focus2) => {
         const label = list.type === "OrderedList" ? `${++list.number}.` : Unicode.bulletSmall;
         const line = state.doc.lineAt(node.from);
         const to = state.doc.sliceString(node.to, node.to + 1) === " " ? node.to + 1 : node.to;
-        atomicDeco.add(line.from, to, import_view19.Decoration.replace({
+        atomicDeco.add(line.from, to, import_view20.Decoration.replace({
           widget: new TextWidget(label, list.type === "OrderedList" ? "cm-list-mark cm-list-mark-ordered" : "cm-list-mark cm-list-mark-bullet")
         }));
         break;
@@ -4747,7 +5106,7 @@ var buildDecorations2 = (view, options, focus2) => {
           if (!editing) {
             atomicDeco.add(node.from, marks[0].to, hide);
           }
-          deco.add(marks[0].to, marks[1].from, import_view19.Decoration.mark({
+          deco.add(marks[0].to, marks[1].from, import_view20.Decoration.mark({
             tagName: "a",
             attributes: {
               class: "cm-link",
@@ -4757,7 +5116,7 @@ var buildDecorations2 = (view, options, focus2) => {
             }
           }));
           if (!editing) {
-            atomicDeco.add(marks[1].from, node.to, options.renderLinkButton ? import_view19.Decoration.replace({
+            atomicDeco.add(marks[1].from, node.to, options.renderLinkButton ? import_view20.Decoration.replace({
               widget: new LinkButton(url, options.renderLinkButton)
             }) : hide);
           }
@@ -4815,7 +5174,7 @@ var buildDecorations2 = (view, options, focus2) => {
 var forceUpdate = import_state17.StateEffect.define();
 var decorateMarkdown = (options = {}) => {
   return [
-    import_view19.ViewPlugin.fromClass(class {
+    import_view20.ViewPlugin.fromClass(class {
       constructor(view) {
         ({ deco: this.deco, atomicDeco: this.atomicDeco } = buildDecorations2(view, options, view.hasFocus));
       }
@@ -4847,9 +5206,9 @@ var decorateMarkdown = (options = {}) => {
       }
     }, {
       provide: (plugin) => [
-        import_view19.EditorView.atomicRanges.of((view) => view.plugin(plugin)?.atomicDeco ?? import_view19.Decoration.none),
-        import_view19.EditorView.decorations.of((view) => view.plugin(plugin)?.atomicDeco ?? import_view19.Decoration.none),
-        import_view19.EditorView.decorations.of((view) => view.plugin(plugin)?.deco ?? import_view19.Decoration.none)
+        import_view20.EditorView.atomicRanges.of((view) => view.plugin(plugin)?.atomicDeco ?? import_view20.Decoration.none),
+        import_view20.EditorView.decorations.of((view) => view.plugin(plugin)?.atomicDeco ?? import_view20.Decoration.none),
+        import_view20.EditorView.decorations.of((view) => view.plugin(plugin)?.deco ?? import_view20.Decoration.none)
       ]
     }),
     image(),
@@ -4859,7 +5218,7 @@ var decorateMarkdown = (options = {}) => {
   ];
 };
 var linkTooltip = (render) => {
-  return (0, import_view24.hoverTooltip)((view, pos, side) => {
+  return (0, import_view25.hoverTooltip)((view, pos, side) => {
     const syntax = (0, import_language12.syntaxTree)(view.state).resolveInner(pos, side);
     let link = null;
     for (let i = 0, node = syntax; !link && node && i < 5; node = node.parent, i++) {
@@ -4876,7 +5235,7 @@ var linkTooltip = (render) => {
       above: true,
       create: () => {
         const el = document.createElement("div");
-        el.className = (0, import_react_ui_theme7.tooltipContent)({}, "pli-2 plb-1");
+        el.className = (0, import_react_ui_theme9.tooltipContent)({}, "pli-2 plb-1");
         render(el, urlText);
         return {
           dom: el,
@@ -4943,7 +5302,7 @@ var InputModeExtensions = {
     editorInputMode.of({
       type: "vscode"
     }),
-    import_view25.keymap.of(import_codemirror_vscode_keymap.vscodeKeymap)
+    import_view26.keymap.of(import_codemirror_vscode_keymap.vscodeKeymap)
   ],
   vim: [
     // https://github.com/replit/codemirror-vim
@@ -4952,7 +5311,7 @@ var InputModeExtensions = {
       type: "vim",
       noTabster: true
     }),
-    import_view25.keymap.of([
+    import_view26.keymap.of([
       {
         key: "Alt-Escape",
         run: (view) => {
@@ -4972,7 +5331,7 @@ var typewriter = ({ delay = 75, items = defaultItems } = {}) => {
   let t;
   let idx = 0;
   return [
-    import_view26.keymap.of([
+    import_view27.keymap.of([
       {
         // Reset.
         key: "alt-meta-'",
@@ -5017,413 +5376,19 @@ var typewriter = ({ delay = 75, items = defaultItems } = {}) => {
     ])
   ];
 };
-var iconStyles = (0, import_react_ui_theme.getSize)(5);
-var buttonStyles = "min-bs-0 p-1";
-var tooltipProps = {
-  side: "top",
-  classNames: "z-10"
-};
-var ToolbarSeparator = () => /* @__PURE__ */ import_react2.default.createElement("div", {
-  role: "separator",
-  className: "grow"
-});
-var [ToolbarContextProvider, useToolbarContext] = (0, import_react_context.createContext)("Toolbar");
-var ToolbarRoot = ({ children, onAction, classNames, state }) => {
-  return /* @__PURE__ */ import_react2.default.createElement(ToolbarContextProvider, {
-    onAction,
-    state
-  }, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.ElevationProvider, {
-    elevation: "positioned"
-  }, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Toolbar.Root, {
-    classNames: [
-      "p-1 is-full shrink-0 overflow-x-auto overflow-y-hidden",
-      classNames
-    ],
-    style: {
-      contain: "layout"
-    }
-  }, children)));
-};
-var ToolbarToggleButton = ({ Icon: Icon2, children, ...props }) => {
-  return /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Tooltip.Root, null, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Tooltip.Trigger, {
-    asChild: true
-  }, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Toolbar.ToggleGroupItem, {
-    variant: "ghost",
-    ...props,
-    classNames: buttonStyles
-  }, /* @__PURE__ */ import_react2.default.createElement(Icon2, {
-    className: iconStyles
-  }), /* @__PURE__ */ import_react2.default.createElement("span", {
-    className: "sr-only"
-  }, children))), /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Tooltip.Portal, null, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Tooltip.Content, tooltipProps, children, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Tooltip.Arrow, null))));
-};
-var ToolbarButton = ({ Icon: Icon2, children, ...props }) => {
-  return /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Tooltip.Root, null, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Tooltip.Trigger, {
-    asChild: true
-  }, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Toolbar.Button, {
-    variant: "ghost",
-    ...props,
-    classNames: buttonStyles
-  }, /* @__PURE__ */ import_react2.default.createElement(Icon2, {
-    className: iconStyles
-  }), /* @__PURE__ */ import_react2.default.createElement("span", {
-    className: "sr-only"
-  }, children))), /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Tooltip.Portal, null, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Tooltip.Content, tooltipProps, children, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Tooltip.Arrow, null))));
-};
-var HeadingIcons = {
-  "0": import_react.Paragraph,
-  "1": import_react.TextHOne,
-  "2": import_react.TextHTwo,
-  "3": import_react.TextHThree,
-  "4": import_react.TextHFour,
-  "5": import_react.TextHFive,
-  "6": import_react.TextHSix
-};
-var MarkdownHeading = () => {
-  const { t } = (0, import_react_ui.useTranslation)(translationKey);
-  const { onAction, state } = useToolbarContext("MarkdownFormatting");
-  const blockType = state ? state.blockType : "paragraph";
-  const header = blockType && /heading(\d)/.exec(blockType);
-  const value = header ? header[1] : blockType === "paragraph" || !blockType ? "0" : void 0;
-  const HeadingIcon = HeadingIcons[value ?? "0"];
-  const suppressNextTooltip = (0, import_react2.useRef)(false);
-  const [tooltipOpen, setTooltipOpen] = (0, import_react2.useState)(false);
-  const [selectOpen, setSelectOpen] = (0, import_react2.useState)(false);
-  return /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Tooltip.Root, {
-    open: tooltipOpen,
-    onOpenChange: (nextOpen) => {
-      if (nextOpen && suppressNextTooltip.current) {
-        suppressNextTooltip.current = false;
-        return setTooltipOpen(false);
-      } else {
-        return setTooltipOpen(nextOpen);
-      }
-    }
-  }, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.DropdownMenu.Root, {
-    open: selectOpen,
-    onOpenChange: (nextOpen) => {
-      if (!nextOpen) {
-        suppressNextTooltip.current = true;
-      }
-      return setSelectOpen(nextOpen);
-    }
-  }, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Tooltip.Trigger, {
-    asChild: true
-  }, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Toolbar.Button, {
-    asChild: true
-  }, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.DropdownMenu.Trigger, {
-    asChild: true
-  }, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Button, {
-    variant: "ghost",
-    classNames: buttonStyles,
-    disabled: value === null
-  }, /* @__PURE__ */ import_react2.default.createElement("span", {
-    className: "sr-only"
-  }, t("heading label")), /* @__PURE__ */ import_react2.default.createElement(HeadingIcon, {
-    className: iconStyles
-  }), /* @__PURE__ */ import_react2.default.createElement(import_react.CaretDown, null))))), /* @__PURE__ */ import_react2.default.createElement(import_react_ui.DropdownMenu.Portal, null, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.DropdownMenu.Content, {
-    classNames: "is-min md:is-min",
-    onCloseAutoFocus: (e) => e.preventDefault()
-  }, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.DropdownMenu.Viewport, null, Object.keys(HeadingIcons).map((level) => {
-    const Icon2 = HeadingIcons[level];
-    return /* @__PURE__ */ import_react2.default.createElement(import_react_ui.DropdownMenu.CheckboxItem, {
-      key: level,
-      checked: value === level,
-      onClick: () => onAction?.({
-        type: "heading",
-        data: level
-      })
-    }, /* @__PURE__ */ import_react2.default.createElement("span", {
-      className: "sr-only"
-    }, t("heading level label", {
-      count: parseInt(level)
-    })), /* @__PURE__ */ import_react2.default.createElement(Icon2, {
-      className: iconStyles
-    }), /* @__PURE__ */ import_react2.default.createElement(import_react_ui.DropdownMenu.ItemIndicator, null, /* @__PURE__ */ import_react2.default.createElement(import_react.Check, null)));
-  })), /* @__PURE__ */ import_react2.default.createElement(import_react_ui.DropdownMenu.Arrow, null)))), /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Tooltip.Portal, null, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Tooltip.Content, tooltipProps, t("heading label"), /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Tooltip.Arrow, null))));
-};
-var markdownStyles = [
-  {
-    type: "strong",
-    Icon: import_react.TextB,
-    getState: (state) => !!state?.strong
-  },
-  {
-    type: "emphasis",
-    Icon: import_react.TextItalic,
-    getState: (state) => !!state?.emphasis
-  },
-  {
-    type: "strikethrough",
-    Icon: import_react.TextStrikethrough,
-    getState: (state) => !!state?.strikethrough
-  },
-  {
-    type: "code",
-    Icon: import_react.Code,
-    getState: (state) => !!state?.code
-  },
-  {
-    type: "link",
-    Icon: import_react.Link,
-    getState: (state) => !!state?.link
-  }
-];
-var MarkdownStyles = () => {
-  const { onAction, state } = useToolbarContext("MarkdownStyles");
-  const { t } = (0, import_react_ui.useTranslation)(translationKey);
-  return /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Toolbar.ToggleGroup, {
-    type: "multiple",
-    value: markdownStyles.filter(({ getState }) => state && getState(state)).map(({ type }) => type)
-  }, markdownStyles.map(({ type, getState, Icon: Icon2 }) => /* @__PURE__ */ import_react2.default.createElement(ToolbarToggleButton, {
-    key: type,
-    value: type,
-    Icon: Icon2,
-    disabled: state?.blockType === "codeblock",
-    onClick: state ? () => onAction?.({
-      type,
-      data: !getState(state)
-    }) : void 0
-  }, t(`${type} label`))));
-};
-var markdownLists = [
-  {
-    type: "list-bullet",
-    Icon: import_react.ListBullets,
-    getState: (state) => state.listStyle === "bullet"
-  },
-  {
-    type: "list-ordered",
-    Icon: import_react.ListNumbers,
-    getState: (state) => state.listStyle === "ordered"
-  },
-  {
-    type: "list-task",
-    Icon: import_react.ListChecks,
-    getState: (state) => state.listStyle === "task"
-  }
-];
-var MarkdownLists = () => {
-  const { onAction, state } = useToolbarContext("MarkdownStyles");
-  const { t } = (0, import_react_ui.useTranslation)(translationKey);
-  return /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Toolbar.ToggleGroup, {
-    type: "single",
-    value: state?.listStyle ? `list-${state.listStyle}` : ""
-  }, markdownLists.map(({ type, getState, Icon: Icon2 }) => /* @__PURE__ */ import_react2.default.createElement(ToolbarToggleButton, {
-    key: type,
-    value: type,
-    Icon: Icon2,
-    onClick: state ? () => onAction?.({
-      type,
-      data: !getState(state)
-    }) : void 0
-  }, t(`${type} label`))));
-};
-var markdownBlocks = [
-  {
-    type: "blockquote",
-    Icon: import_react.Quotes,
-    getState: (state) => !!state?.blockQuote
-  },
-  {
-    type: "codeblock",
-    Icon: import_react.CodeBlock,
-    getState: (state) => state.blockType === "codeblock"
-  },
-  {
-    type: "table",
-    Icon: import_react.Table,
-    getState: (state) => state.blockType === "tablecell",
-    disabled: (state) => !state.blankLine
-  }
-];
-var MarkdownBlocks = () => {
-  const { onAction, state } = useToolbarContext("MarkdownStyles");
-  const { t } = (0, import_react_ui.useTranslation)(translationKey);
-  const value = markdownBlocks.find(({ getState }) => state && getState(state));
-  return /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Toolbar.ToggleGroup, {
-    type: "single",
-    value: value?.type ?? ""
-  }, markdownBlocks.map(({ type, disabled, getState, Icon: Icon2 }) => /* @__PURE__ */ import_react2.default.createElement(ToolbarToggleButton, {
-    key: type,
-    value: type,
-    Icon: Icon2,
-    disabled: !state || disabled?.(state),
-    onClick: state ? () => onAction?.({
-      type,
-      data: !getState(state)
-    }) : void 0
-  }, t(`${type} label`))));
-};
-var MarkdownStandard = () => /* @__PURE__ */ import_react2.default.createElement(import_react2.default.Fragment, null, /* @__PURE__ */ import_react2.default.createElement(MarkdownHeading, null), /* @__PURE__ */ import_react2.default.createElement(MarkdownStyles, null), /* @__PURE__ */ import_react2.default.createElement(MarkdownLists, null), /* @__PURE__ */ import_react2.default.createElement(MarkdownBlocks, null));
-var MarkdownCustom = ({ onUpload } = {}) => {
-  const { onAction } = useToolbarContext("MarkdownStyles");
-  const { t } = (0, import_react_ui.useTranslation)(translationKey);
-  const { acceptedFiles, getInputProps, open } = (0, import_react_dropzone.useDropzone)({
-    multiple: false,
-    noDrag: true,
-    accept: {
-      "image/*": [
-        ".jpg",
-        ".jpeg",
-        ".png",
-        ".gif"
-      ]
-    }
-  });
-  (0, import_react2.useEffect)(() => {
-    if (onUpload && acceptedFiles.length) {
-      requestAnimationFrame(async () => {
-        const f = acceptedFiles[0];
-        const file = new File([
-          f
-        ], f.name, {
-          type: f.type,
-          lastModified: f.lastModified
-        });
-        const info = await onUpload(file);
-        if (info) {
-          onAction?.({
-            type: "image",
-            data: info.url
-          });
-        }
-      });
-    }
-  }, [
-    acceptedFiles
-  ]);
-  return /* @__PURE__ */ import_react2.default.createElement(import_react2.default.Fragment, null, /* @__PURE__ */ import_react2.default.createElement("input", getInputProps()), /* @__PURE__ */ import_react2.default.createElement(ToolbarButton, {
-    value: "image",
-    Icon: import_react.Image,
-    onClick: () => open()
-  }, t("image label")));
-};
-var ViewModeIcons = {
-  preview: import_react.PencilSimple,
-  readonly: import_react.PencilSimpleSlash,
-  source: import_react.MarkdownLogo
-};
-var MarkdownView = ({ mode }) => {
-  const { t } = (0, import_react_ui.useTranslation)(translationKey);
-  const { onAction } = useToolbarContext("ViewMode");
-  const ModeIcon = ViewModeIcons[mode ?? "preview"];
-  const suppressNextTooltip = (0, import_react2.useRef)(false);
-  const [tooltipOpen, setTooltipOpen] = (0, import_react2.useState)(false);
-  const [selectOpen, setSelectOpen] = (0, import_react2.useState)(false);
-  return /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Tooltip.Root, {
-    open: tooltipOpen,
-    onOpenChange: (nextOpen) => {
-      if (nextOpen && suppressNextTooltip.current) {
-        suppressNextTooltip.current = false;
-        return setTooltipOpen(false);
-      } else {
-        return setTooltipOpen(nextOpen);
-      }
-    }
-  }, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.DropdownMenu.Root, {
-    open: selectOpen,
-    onOpenChange: (nextOpen) => {
-      if (!nextOpen) {
-        suppressNextTooltip.current = true;
-      }
-      return setSelectOpen(nextOpen);
-    }
-  }, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Tooltip.Trigger, {
-    asChild: true
-  }, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Toolbar.Button, {
-    asChild: true
-  }, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.DropdownMenu.Trigger, {
-    asChild: true
-  }, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Button, {
-    variant: "ghost",
-    classNames: buttonStyles
-  }, /* @__PURE__ */ import_react2.default.createElement("span", {
-    className: "sr-only"
-  }, t("mode label")), /* @__PURE__ */ import_react2.default.createElement(ModeIcon, {
-    className: iconStyles
-  }), /* @__PURE__ */ import_react2.default.createElement(import_react.CaretDown, null))))), /* @__PURE__ */ import_react2.default.createElement(import_react_ui.DropdownMenu.Portal, null, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.DropdownMenu.Content, {
-    classNames: "is-min md:is-min",
-    onCloseAutoFocus: (e) => e.preventDefault()
-  }, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.DropdownMenu.Viewport, null, EditorViewModes.map((value) => {
-    const Icon2 = ViewModeIcons[value];
-    return /* @__PURE__ */ import_react2.default.createElement(import_react_ui.DropdownMenu.CheckboxItem, {
-      key: value,
-      checked: value === mode,
-      onClick: () => onAction?.({
-        type: "view-mode",
-        data: value
-      })
-    }, /* @__PURE__ */ import_react2.default.createElement(Icon2, {
-      className: iconStyles
-    }), /* @__PURE__ */ import_react2.default.createElement("span", {
-      className: "whitespace-nowrap grow"
-    }, t(`${value} mode label`)), /* @__PURE__ */ import_react2.default.createElement(import_react.Check, {
-      className: value === mode ? "visible" : "invisible"
-    }));
-  })), /* @__PURE__ */ import_react2.default.createElement(import_react_ui.DropdownMenu.Arrow, null)))), /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Tooltip.Portal, null, /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Tooltip.Content, tooltipProps, t("view mode label"), /* @__PURE__ */ import_react2.default.createElement(import_react_ui.Tooltip.Arrow, null))));
-};
-var MarkdownActions = () => {
-  const { onAction, state } = useToolbarContext("MarkdownActions");
-  const { t } = (0, import_react_ui.useTranslation)(translationKey);
-  let commentToolTipKey = "comment label";
-  if (state?.comment) {
-    commentToolTipKey = "selection overlaps existing comment label";
-  } else if (state?.selection === false) {
-    commentToolTipKey = "select text to comment label";
-  }
-  return /* @__PURE__ */ import_react2.default.createElement(import_react2.default.Fragment, null, /* @__PURE__ */ import_react2.default.createElement(ToolbarButton, {
-    value: "search",
-    Icon: import_react.MagnifyingGlass,
-    onClick: () => onAction?.({
-      type: "search"
-    })
-  }, t("search label")), /* @__PURE__ */ import_react2.default.createElement(ToolbarButton, {
-    value: "comment",
-    Icon: import_react.ChatText,
-    "data-testid": "editor.toolbar.comment",
-    onClick: () => onAction?.({
-      type: "comment"
-    }),
-    disabled: !state || state.comment || !state.selection
-  }, t(commentToolTipKey)));
-};
-var Toolbar = {
-  Root: ToolbarRoot,
-  Button: ToolbarToggleButton,
-  Separator: ToolbarSeparator,
-  View: MarkdownView,
-  Markdown: MarkdownStandard,
-  Custom: MarkdownCustom,
-  Actions: MarkdownActions
-};
-var margin = "!mt-[1rem]";
-var editorContent = (0, import_react_ui_theme8.mx)(margin, "!mli-auto w-full max-w-[min(50rem,100%-2rem)]");
-var editorFullWidth = (0, import_react_ui_theme8.mx)(margin);
-var editorWithToolbarLayout = "grid grid-cols-1 grid-rows-[min-content_1fr] data-[toolbar=disabled]:grid-rows-[1fr] justify-center content-start overflow-hidden";
-var editorGutter = import_view27.EditorView.theme({
-  // Match margin from content.
-  ".cm-gutters": {
-    marginTop: "16px",
-    paddingRight: "1rem"
-  }
-});
-var editorMonospace = import_view27.EditorView.theme({
-  ".cm-content": {
-    fontFamily: fontMono
-  }
-});
 var useActionHandler = (view) => {
-  return (action) => view && processAction(view, action);
+  return (0, import_react7.useCallback)((action) => view && processEditorPayload(view, action.properties), [
+    view
+  ]);
 };
 var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-editor/src/hooks/useTextEditor.ts";
 var instanceCount = 0;
 var useTextEditor = (props = {}, deps = []) => {
-  const { id, initialValue, extensions, autoFocus, scrollTo, selection, moveToEndOfLine, debug } = (0, import_react7.useMemo)(() => (0, import_util5.getProviderValue)(props), deps ?? []);
-  const [instanceId] = (0, import_react7.useState)(() => `text-editor-${++instanceCount}`);
-  const [view, setView] = (0, import_react7.useState)();
-  const parentRef = (0, import_react7.useRef)(null);
-  (0, import_react7.useEffect)(() => {
+  const { id, initialValue, extensions, autoFocus, scrollTo, selection, moveToEndOfLine, debug } = (0, import_react8.useMemo)(() => (0, import_util5.getProviderValue)(props), deps ?? []);
+  const [instanceId] = (0, import_react8.useState)(() => `text-editor-${++instanceCount}`);
+  const [view, setView] = (0, import_react8.useState)();
+  const parentRef = (0, import_react8.useRef)(null);
+  (0, import_react8.useEffect)(() => {
     let view2;
     if (parentRef.current) {
       (0, import_log7.log)("create", {
@@ -5497,7 +5462,7 @@ var useTextEditor = (props = {}, deps = []) => {
       view2?.destroy();
     };
   }, deps);
-  (0, import_react7.useEffect)(() => {
+  (0, import_react8.useEffect)(() => {
     if (view) {
       if (scrollTo || selection) {
         if (selection && selection.anchor > view.state.doc.length) {
@@ -5524,7 +5489,7 @@ var useTextEditor = (props = {}, deps = []) => {
     scrollTo,
     selection
   ]);
-  (0, import_react7.useEffect)(() => {
+  (0, import_react8.useEffect)(() => {
     if (view && autoFocus) {
       view.focus();
     }
@@ -5538,7 +5503,7 @@ var useTextEditor = (props = {}, deps = []) => {
       Escape: view?.state.facet(editorInputMode).noTabster
     }
   });
-  const handleKeyUp = (0, import_react7.useCallback)((event) => {
+  const handleKeyUp = (0, import_react8.useCallback)((event) => {
     const { key, target, currentTarget } = event;
     if (target === currentTarget) {
       switch (key) {
@@ -5568,6 +5533,7 @@ var useTextEditor = (props = {}, deps = []) => {
   EditorInputMode,
   EditorInputModes,
   EditorState,
+  EditorToolbar,
   EditorView,
   EditorViewMode,
   EditorViewModes,
@@ -5577,7 +5543,6 @@ var useTextEditor = (props = {}, deps = []) => {
   RemoteSelectionsDecorator,
   SpaceAwarenessProvider,
   TextKind,
-  Toolbar,
   addBlockquote,
   addCodeblock,
   addLink,
@@ -5598,6 +5563,8 @@ var useTextEditor = (props = {}, deps = []) => {
   createBasicExtensions,
   createComment,
   createDataExtensions,
+  createEditorAction,
+  createEditorActionGroup,
   createEditorStateStore,
   createEditorStateTransaction,
   createElement,
@@ -5636,7 +5603,7 @@ var useTextEditor = (props = {}, deps = []) => {
   mention,
   overlap,
   preventNewline,
-  processAction,
+  processEditorPayload,
   removeBlockquote,
   removeCodeblock,
   removeLink,
@@ -5652,6 +5619,8 @@ var useTextEditor = (props = {}, deps = []) => {
   setSelection,
   setStyle,
   singleValueFacet,
+  stackItemContentEditorClassNames,
+  stackItemContentToolbarClassNames,
   table,
   tags,
   textRange,
@@ -5669,9 +5638,9 @@ var useTextEditor = (props = {}, deps = []) => {
   useCommentClickListener,
   useCommentState,
   useComments,
+  useEditorToolbarState,
   useFormattingState,
   useTextEditor,
-  useToolbarContext,
   wrapWithCatch
 });
 //# sourceMappingURL=index.cjs.map