@casualoffice/sheets 0.13.0 → 0.14.0

package/src/chrome/MenuBar.tsx

@@ -1,52 +1,708 @@
 /**
  * MenuBar — the built-in dropdown menu row for `<CasualSheets chrome>`.
  *
- * Office-style horizontal menu strip (no logo, no title — the host frames the
- * editor with its own bar): Edit · Insert · Format · Data. Each button opens a
- * dropdown of items that dispatch a single verified Univer command through
- * `CasualSheetsAPI.executeCommand`, then close the menu.
+ * Office / Google-Sheets-style horizontal menu strip (no logo, no title — the
+ * host frames the editor with its own bar): File · Edit · View · Insert ·
+ * Format · Data · Help. Each top-level button opens a dropdown of items that
+ * either dispatch a verified Univer command / facade call through the
+ * `CasualSheetsAPI` (no app context), or — for actions that need a dialog the
+ * SDK doesn't ship — route through the optional `onDialogRequest` host hook.
+ *
+ * This mirrors `apps/web/src/shell/MenuBar.tsx`, but reimplements every action
+ * INLINE against `api` / `api.univer` (the FUniver facade) + `api.executeCommand`.
+ * The command ids + facade logic are copied verbatim from
+ * `apps/web/src/shell/home-tab-actions.ts` + `tab-actions.ts` so behaviour
+ * matches the real app exactly.
+ *
+ * Feature flags: pass `features` to hide a control or whole menu group when its
+ * feature is disabled. Defaults to all-enabled. A control whose feature is
+ * `false` does not render. An entire top-level menu that ends up with no
+ * runnable items is dropped.
+ *
+ * Dialog routing: items marked `dialog: '<kind>'` (Format Cells, Insert Chart,
+ * PivotTable, Find & Replace, Insert/Delete cells, Sparkline, Name Manager,
+ * Goal Seek, Data Validation, Conditional Formatting, …) call
+ * `onDialogRequest(kind, context)` so the host renders its own UI. When
+ * `onDialogRequest` is not provided, those items are omitted (the SDK never
+ * fakes a dialog).
  *
  * Self-contained: only one menu is open at a time; Escape and an outside
- * pointerdown close it. Every command id below was verified against the fork
- * (`vendor/univer-revamp/packages`); items whose command can't be verified are
- * omitted rather than dispatched blindly.
+ * pointerdown close it.
  */
 
-import { useEffect, useRef, useState, type CSSProperties } from 'react';
+import { useEffect, useRef, useState, type CSSProperties, type ReactNode } from 'react';
+import { BorderStyleTypes, BorderType } from '@univerjs/core';
+import type { FUniver } from '@univerjs/core/facade';
 import type { CasualSheetsAPI } from '../sheets/api';
+import { ensurePluginByName } from '../univer';
 import { Icon } from './Icon';
 import { ensureChromeFonts } from './fonts';
 
-type MenuId = 'edit' | 'insert' | 'format' | 'data' | 'view';
+type MenuId = 'file' | 'edit' | 'view' | 'insert' | 'format' | 'data' | 'help';
 
-interface MenuItem {
-  /** Stable id — drives the per-item testid `cs-menuitem-<id>`. */
-  id: string;
-  label: string;
-  command: string;
-  icon?: string;
-  params?: object;
-}
+/**
+ * Dialog kinds the host can choose to render via `onDialogRequest`. These are
+ * the actions the SDK chrome can't fulfil on its own (no built-in modal). The
+ * string is passed straight to the host hook; the `context` (when present)
+ * carries the pre-resolved A1 selection so the host doesn't have to re-read it.
+ */
+export type MenuDialogKind =
+  | 'format-cells'
+  | 'find-replace'
+  | 'insert-cells'
+  | 'delete-cells'
+  | 'paste-special'
+  | 'insert-chart'
+  | 'insert-pivot'
+  | 'insert-sparkline'
+  | 'insert-function'
+  | 'name-manager'
+  | 'goal-seek'
+  | 'data-validation'
+  | 'conditional-formatting'
+  | 'custom-sort'
+  | 'properties'
+  | 'about'
+  | 'keyboard-shortcuts';
 
-interface Menu {
+type RunFn = (api: CasualSheetsAPI) => void;
+
+type MenuItemDef =
+  | {
+      kind: 'item';
+      id: string;
+      label: string;
+      icon?: string;
+      shortcut?: string;
+      /** Dispatch a command / facade call directly. */
+      run?: RunFn;
+      /** Route through the host's `onDialogRequest`. Omitted if no host hook. */
+      dialog?: MenuDialogKind;
+      /** Feature gate — item hidden when `features[feature] === false`. */
+      feature?: string;
+    }
+  | { kind: 'separator'; id: string; feature?: string }
+  | {
+      kind: 'submenu';
+      id: string;
+      label: string;
+      icon?: string;
+      items: MenuItemDef[];
+      feature?: string;
+    };
+
+interface MenuDef {
   id: MenuId;
   label: string;
-  items: MenuItem[];
+  /** Feature gate for the whole menu. */
+  feature?: string;
+  items: MenuItemDef[];
+}
+
+/**
+ * Pretty-print a `Ctrl+Shift+X` shortcut for the current platform. The SDK
+ * doesn't import the app's `formatShortcut`, so this is a compact inline
+ * equivalent: on macOS, swap Ctrl→⌘, Alt→⌥, Shift→⇧ and drop the `+`.
+ */
+function fmtShortcut(shortcut: string): string {
+  const isMac =
+    typeof navigator !== 'undefined' && /Mac|iPhone|iPad/i.test(navigator.platform || '');
+  if (!isMac) return shortcut;
+  return shortcut
+    .split('+')
+    .map((part) => {
+      switch (part) {
+        case 'Ctrl':
+          return '⌘';
+        case 'Alt':
+          return '⌥';
+        case 'Shift':
+          return '⇧';
+        default:
+          return part;
+      }
+    })
+    .join('');
+}
+
+/* ───────────────────────── inline action helpers ─────────────────────────
+ * Every helper below is a faithful port of the corresponding function in
+ * apps/web/src/shell/home-tab-actions.ts + tab-actions.ts, reimplemented over
+ * the SDK's `api` (CasualSheetsAPI) / `api.univer` (FUniver) so the chrome
+ * never imports app context. Command ids are identical to the app's.
+ */
+
+function fu(api: CasualSheetsAPI): FUniver {
+  return api.univer;
+}
+
+function activeRange(api: CasualSheetsAPI) {
+  return fu(api).getActiveWorkbook()?.getActiveSheet()?.getActiveRange() ?? null;
+}
+
+function activeSheet(api: CasualSheetsAPI) {
+  return fu(api).getActiveWorkbook()?.getActiveSheet() ?? null;
+}
+
+/** Selection as A1 (e.g. `B2:D10`), or null. Used to seed dialog context. */
+function selectionA1(api: CasualSheetsAPI): string | null {
+  const range = activeRange(api);
+  if (!range) return null;
+  try {
+    return range.getA1Notation();
+  } catch {
+    return null;
+  }
+}
+
+/* ── Edit ─────────────────────────────────────────────────────────────── */
+
+const undo: RunFn = (api) => void api.executeCommand('univer.command.undo');
+const redo: RunFn = (api) => void api.executeCommand('univer.command.redo');
+const cut: RunFn = (api) => void api.executeCommand('univer.command.cut');
+const copy: RunFn = (api) => void api.executeCommand('univer.command.copy');
+const paste: RunFn = (api) => void api.executeCommand('univer.command.paste');
+const pasteFormattingOnly: RunFn = (api) => void api.executeCommand('sheet.command.paste-format');
+
+/* ── Insert (facade-driven; mirror tab-actions.ts) ─────────────────────── */
+
+const insertRowAbove: RunFn = (api) => {
+  const range = activeRange(api);
+  const sheet = activeSheet(api);
+  if (!range || !sheet) return;
+  sheet.insertRowBefore(range.getRow());
+};
+
+const insertRowBelow: RunFn = (api) => {
+  const range = activeRange(api);
+  const sheet = activeSheet(api);
+  if (!range || !sheet) return;
+  sheet.insertRowAfter(range.getRow() + range.getHeight() - 1);
+};
+
+const insertColumnLeft: RunFn = (api) => {
+  const range = activeRange(api);
+  const sheet = activeSheet(api);
+  if (!range || !sheet) return;
+  sheet.insertColumnBefore(range.getColumn());
+};
+
+const insertColumnRight: RunFn = (api) => {
+  const range = activeRange(api);
+  const sheet = activeSheet(api);
+  if (!range || !sheet) return;
+  sheet.insertColumnAfter(range.getColumn() + range.getWidth() - 1);
+};
+
+const deleteSelectedRow: RunFn = (api) => {
+  const range = activeRange(api);
+  const sheet = activeSheet(api);
+  if (!range || !sheet) return;
+  sheet.deleteRows(range.getRow(), range.getHeight());
+};
+
+const deleteSelectedColumn: RunFn = (api) => {
+  const range = activeRange(api);
+  const sheet = activeSheet(api);
+  if (!range || !sheet) return;
+  sheet.deleteColumns(range.getColumn(), range.getWidth());
+};
+
+const insertNewSheet: RunFn = (api) => {
+  fu(api).getActiveWorkbook()?.insertSheet();
+};
+
+const insertImage: RunFn = (api) => void api.executeCommand('sheet.command.insert-float-image');
+
+const insertHyperlink: RunFn = (api) =>
+  void api.executeCommand('sheet.operation.insert-hyper-link');
+
+const insertComment: RunFn = (api) => void api.executeCommand('sheet.operation.show-comment-modal');
+
+const insertTodayDate: RunFn = (api) => {
+  const range = activeRange(api);
+  if (!range) return;
+  const today = new Date();
+  const pad = (n: number) => n.toString().padStart(2, '0');
+  const v = `${today.getFullYear()}-${pad(today.getMonth() + 1)}-${pad(today.getDate())}`;
+  range.setValue({ v });
+};
+
+const insertCurrentTime: RunFn = (api) => {
+  const range = activeRange(api);
+  if (!range) return;
+  const now = new Date();
+  const pad = (n: number) => n.toString().padStart(2, '0');
+  const v = `${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}`;
+  range.setValue({ v });
+};
+
+const insertTable: RunFn = (api) => {
+  void (async () => {
+    const range = activeRange(api);
+    const sheet = activeSheet(api);
+    const wb = fu(api).getActiveWorkbook();
+    if (!range || !sheet || !wb) return;
+    await ensurePluginByName('table');
+    await api.executeCommand('sheet.command.add-table', {
+      unitId: wb.getId(),
+      subUnitId: sheet.getSheetId(),
+      range: {
+        startRow: range.getRow(),
+        startColumn: range.getColumn(),
+        endRow: range.getRow() + range.getHeight() - 1,
+        endColumn: range.getColumn() + range.getWidth() - 1,
+      },
+    });
+  })();
+};
+
+const autoFitColumns: RunFn = (api) => {
+  const range = activeRange(api);
+  const sheet = activeSheet(api);
+  if (!range || !sheet) return;
+  const withAutoWidth = sheet as unknown as {
+    setColumnAutoWidth?: (col: number, n: number) => unknown;
+  };
+  withAutoWidth.setColumnAutoWidth?.(range.getColumn(), range.getWidth());
+};
+
+const AUTO_FIT_ROW_CAP = 500;
+const autoFitRows: RunFn = (api) => {
+  const range = activeRange(api);
+  const sheet = activeSheet(api);
+  if (!range || !sheet) return;
+  const start = range.getRow();
+  const count = Math.min(range.getHeight(), AUTO_FIT_ROW_CAP);
+  for (let r = 0; r < count; r++) sheet.autoFitRow(start + r);
+};
+
+/* ── Format ───────────────────────────────────────────────────────────── */
+
+// Patterns copied from home-tab-actions.ts NUMBER_FORMAT_PATTERNS.
+const NUMBER_FORMAT_PATTERNS = {
+  general: '',
+  number: '#,##0.00',
+  integer: '#,##0',
+  currency: '"$"#,##0.00',
+  accounting: '_("$"* #,##0.00_);_("$"* (#,##0.00);_("$"* "-"??_);_(@_)',
+  percent: '0.00%',
+  date: 'yyyy-mm-dd',
+  time: 'hh:mm:ss',
+  scientific: '0.00E+00',
+  text: '@',
+} as const;
+type NumberFormatKey = keyof typeof NUMBER_FORMAT_PATTERNS;
+
+const NUM_FORMAT_ORDER: NumberFormatKey[] = [
+  'general',
+  'number',
+  'integer',
+  'currency',
+  'accounting',
+  'percent',
+  'date',
+  'time',
+  'scientific',
+  'text',
+];
+
+const NUM_FORMAT_SHORTCUT: Partial<Record<NumberFormatKey, string>> = {
+  number: 'Ctrl+Shift+1',
+  time: 'Ctrl+Shift+2',
+  date: 'Ctrl+Shift+3',
+  currency: 'Ctrl+Shift+4',
+  percent: 'Ctrl+Shift+5',
+  scientific: 'Ctrl+Shift+6',
+};
+
+function setNumberFormatByKey(api: CasualSheetsAPI, key: NumberFormatKey) {
+  // setNumberFormat lives on the sheets-numfmt facade extension (runtime cast).
+  const range = activeRange(api) as unknown as { setNumberFormat?: (p: string) => unknown } | null;
+  range?.setNumberFormat?.(NUMBER_FORMAT_PATTERNS[key]);
+}
+
+const increaseDecimal: RunFn = (api) =>
+  void api.executeCommand('sheet.command.numfmt.add.decimal.command');
+const decreaseDecimal: RunFn = (api) =>
+  void api.executeCommand('sheet.command.numfmt.subtract.decimal.command');
+const clearFormat: RunFn = (api) => void api.executeCommand('sheet.command.clear-selection-format');
+
+function applyBorders(api: CasualSheetsAPI, choice: 'all' | 'outside' | 'none') {
+  const range = activeRange(api);
+  if (!range) return;
+  const type =
+    choice === 'all' ? BorderType.ALL : choice === 'outside' ? BorderType.OUTSIDE : BorderType.NONE;
+  const style = choice === 'none' ? BorderStyleTypes.NONE : BorderStyleTypes.THIN;
+  range.setBorder(type, style, '#000000');
+}
+
+/* ── Format → Visibility (command-driven; mirror tab-actions.ts) ───────── */
+
+function rowSpan(api: CasualSheetsAPI) {
+  const wb = fu(api).getActiveWorkbook();
+  const sheet = activeSheet(api);
+  const range = activeRange(api);
+  if (!wb || !sheet || !range) return null;
+  const startRow = range.getRow();
+  const endRow = startRow + range.getHeight() - 1;
+  const maxCol = (sheet as unknown as { getMaxColumns?: () => number }).getMaxColumns?.() ?? 1;
+  return { wb, sheet, startRow, endRow, maxCol };
+}
+
+function colSpan(api: CasualSheetsAPI) {
+  const wb = fu(api).getActiveWorkbook();
+  const sheet = activeSheet(api);
+  const range = activeRange(api);
+  if (!wb || !sheet || !range) return null;
+  const startColumn = range.getColumn();
+  const endColumn = startColumn + range.getWidth() - 1;
+  const maxRow = (sheet as unknown as { getMaxRows?: () => number }).getMaxRows?.() ?? 1;
+  return { wb, sheet, startColumn, endColumn, maxRow };
+}
+
+const hideSelectedRows: RunFn = (api) => {
+  const s = rowSpan(api);
+  if (!s) return;
+  void api.executeCommand('sheet.command.set-rows-hidden', {
+    unitId: s.wb.getId(),
+    subUnitId: s.sheet.getSheetId(),
+    ranges: [
+      {
+        startRow: s.startRow,
+        endRow: s.endRow,
+        startColumn: 0,
+        endColumn: Math.max(0, s.maxCol - 1),
+        rangeType: 1,
+      },
+    ],
+  });
+};
+
+const unhideSelectedRows: RunFn = (api) => {
+  const s = rowSpan(api);
+  if (!s) return;
+  void api.executeCommand('sheet.command.set-specific-rows-visible', {
+    unitId: s.wb.getId(),
+    subUnitId: s.sheet.getSheetId(),
+    ranges: [
+      {
+        startRow: s.startRow,
+        endRow: s.endRow,
+        startColumn: 0,
+        endColumn: Math.max(0, s.maxCol - 1),
+        rangeType: 1,
+      },
+    ],
+  });
+};
+
+const hideSelectedColumns: RunFn = (api) => {
+  const s = colSpan(api);
+  if (!s) return;
+  void api.executeCommand('sheet.command.set-col-hidden', {
+    unitId: s.wb.getId(),
+    subUnitId: s.sheet.getSheetId(),
+    ranges: [
+      {
+        startRow: 0,
+        endRow: Math.max(0, s.maxRow - 1),
+        startColumn: s.startColumn,
+        endColumn: s.endColumn,
+        rangeType: 2,
+      },
+    ],
+  });
+};
+
+const unhideSelectedColumns: RunFn = (api) => {
+  const s = colSpan(api);
+  if (!s) return;
+  // Univer's "show specific cols" id is asymmetric with the row variant.
+  void api.executeCommand('sheet.command.set-col-visible-on-cols', {
+    unitId: s.wb.getId(),
+    subUnitId: s.sheet.getSheetId(),
+    ranges: [
+      {
+        startRow: 0,
+        endRow: Math.max(0, s.maxRow - 1),
+        startColumn: s.startColumn,
+        endColumn: s.endColumn,
+        rangeType: 2,
+      },
+    ],
+  });
+};
+
+/* ── View ─────────────────────────────────────────────────────────────── */
+
+type FreezeCapableSheet = {
+  setFrozenRows: (n: number) => unknown;
+  setFrozenColumns: (n: number) => unknown;
+};
+
+const freezeFirstRow: RunFn = (api) => {
+  (activeSheet(api) as unknown as FreezeCapableSheet | null)?.setFrozenRows(1);
+};
+const freezeFirstColumn: RunFn = (api) => {
+  (activeSheet(api) as unknown as FreezeCapableSheet | null)?.setFrozenColumns(1);
+};
+const freezeAtSelection: RunFn = (api) =>
+  void api.executeCommand('sheet.command.set-selection-frozen');
+const unfreezePanes: RunFn = (api) => void api.executeCommand('sheet.command.cancel-frozen');
+
+const toggleGridlines: RunFn = (api) => {
+  const wb = fu(api).getActiveWorkbook();
+  const sheet = activeSheet(api);
+  if (!wb || !sheet) return;
+  // BooleanNumber: 0 = hide, 1 = show. The app reads current state; without a
+  // reactive UI store here we hide (matches the app's default click path).
+  void api.executeCommand('sheet.command.toggle-gridlines', {
+    unitId: wb.getId(),
+    subUnitId: sheet.getSheetId(),
+    showGridlines: 0,
+  });
+};
+
+const toggleCommentPanel: RunFn = (api) =>
+  void api.executeCommand('sheet.operation.toggle-comment-panel');
+
+const jumpToFirstCell: RunFn = (api) => {
+  activeSheet(api)?.getRange(0, 0).activate();
+};
+
+const switchToPreviousSheet: RunFn = (api) => switchSheetByDelta(api, -1);
+const switchToNextSheet: RunFn = (api) => switchSheetByDelta(api, +1);
+
+function switchSheetByDelta(api: CasualSheetsAPI, delta: -1 | 1) {
+  const wb = fu(api).getActiveWorkbook();
+  const active = wb?.getActiveSheet();
+  if (!wb || !active) return;
+  const sheets = wb.getSheets();
+  const activeId = active.getSheetId();
+  const idx = sheets.findIndex((s) => s.getSheetId() === activeId);
+  if (idx < 0) return;
+  const nextIdx = idx + delta;
+  if (nextIdx < 0 || nextIdx >= sheets.length) return;
+  wb.setActiveSheet(sheets[nextIdx]);
 }
 
-// All command ids below verified via:
-//   grep -rhoE "id: '(sheet\.command\.[a-z.-]+)'" vendor/univer-revamp/packages | sort -u
-//   (undo/redo: univer.command.undo / .redo in packages/core undoredo)
-const MENUS: Menu[] = [
+const showFormulas: RunFn = (api) => void api.executeCommand('sheet.command.set-show-formula', {});
+
+/* ── Data ─────────────────────────────────────────────────────────────── */
+
+const sortAsc: RunFn = (api) => sortRange(api, true);
+const sortDesc: RunFn = (api) => sortRange(api, false);
+
+function sortRange(api: CasualSheetsAPI, ascending: boolean) {
+  const range = activeRange(api);
+  if (!range) return;
+  // sort() comes from the sheets-sort facade extension (runtime cast).
+  const withSort = range as unknown as {
+    sort?: (spec: { column: number; ascending: boolean }) => unknown;
+  };
+  withSort.sort?.({ column: range.getColumn(), ascending });
+}
+
+const toggleFilter: RunFn = (api) => {
+  void (async () => {
+    await ensurePluginByName('filter');
+    const wb = fu(api).getActiveWorkbook();
+    const sheet = activeSheet(api);
+    const range = activeRange(api);
+    if (!wb || !sheet || !range) return;
+    const sheetWithFilter = sheet as unknown as { getFilter?: () => unknown };
+    if (sheetWithFilter.getFilter?.()) {
+      await api.executeCommand('sheet.command.remove-sheet-filter', {
+        unitId: wb.getId(),
+        subUnitId: sheet.getSheetId(),
+      });
+      return;
+    }
+    await api.executeCommand('sheet.command.set-filter-range', {
+      unitId: wb.getId(),
+      subUnitId: sheet.getSheetId(),
+      range: {
+        startRow: range.getRow(),
+        startColumn: range.getColumn(),
+        endRow: range.getRow() + range.getHeight() - 1,
+        endColumn: range.getColumn() + range.getWidth() - 1,
+      },
+    });
+  })();
+};
+
+const splitTextToColumns: RunFn = (api) =>
+  void api.executeCommand('sheet.command.split-text-to-columns');
+
+const forceRecalculate: RunFn = (api) =>
+  void api.executeCommand('formula.mutation.set-formula-calculation-start', {
+    forceCalculation: true,
+  });
+
+/* ───────────────────────────── menu structure ─────────────────────────── */
+
+// Mirrors the app's menu order. Dialog items resolve `dialog` against
+// `onDialogRequest`; non-dialog items dispatch via the inline helpers above.
+const MENUS: MenuDef[] = [
+  {
+    id: 'file',
+    label: 'File',
+    feature: 'file',
+    items: [
+      { kind: 'item', id: 'properties', label: 'Properties…', icon: 'info', dialog: 'properties' },
+      {
+        kind: 'item',
+        id: 'about',
+        label: 'About casual sheets',
+        icon: 'help_outline',
+        dialog: 'about',
+      },
+    ],
+  },
   {
     id: 'edit',
     label: 'Edit',
     items: [
-      { id: 'undo', label: 'Undo', command: 'univer.command.undo', icon: 'undo' },
-      { id: 'redo', label: 'Redo', command: 'univer.command.redo', icon: 'redo' },
-      { id: 'cut', label: 'Cut', command: 'univer.command.cut', icon: 'content_cut' },
-      { id: 'copy', label: 'Copy', command: 'univer.command.copy', icon: 'content_copy' },
-      { id: 'paste', label: 'Paste', command: 'univer.command.paste', icon: 'content_paste' },
+      { kind: 'item', id: 'undo', label: 'Undo', icon: 'undo', shortcut: 'Ctrl+Z', run: undo },
+      { kind: 'item', id: 'redo', label: 'Redo', icon: 'redo', shortcut: 'Ctrl+Y', run: redo },
+      { kind: 'separator', id: 'sep-clip' },
+      { kind: 'item', id: 'cut', label: 'Cut', icon: 'content_cut', shortcut: 'Ctrl+X', run: cut },
+      {
+        kind: 'item',
+        id: 'copy',
+        label: 'Copy',
+        icon: 'content_copy',
+        shortcut: 'Ctrl+C',
+        run: copy,
+      },
+      {
+        kind: 'item',
+        id: 'paste',
+        label: 'Paste',
+        icon: 'content_paste',
+        shortcut: 'Ctrl+V',
+        run: paste,
+      },
+      {
+        kind: 'item',
+        id: 'paste-format',
+        label: 'Paste formatting only',
+        icon: 'content_paste',
+        shortcut: 'Ctrl+Shift+V',
+        run: pasteFormattingOnly,
+      },
+      {
+        kind: 'item',
+        id: 'paste-special',
+        label: 'Paste Special…',
+        icon: 'content_paste_go',
+        shortcut: 'Ctrl+Alt+V',
+        dialog: 'paste-special',
+      },
+      { kind: 'separator', id: 'sep-find' },
+      {
+        kind: 'item',
+        id: 'find-replace',
+        label: 'Find & Replace…',
+        icon: 'search',
+        shortcut: 'Ctrl+F',
+        dialog: 'find-replace',
+      },
+      { kind: 'separator', id: 'sep-cells' },
+      {
+        kind: 'item',
+        id: 'edit-insert-cells',
+        label: 'Insert cells…',
+        icon: 'add_box',
+        shortcut: 'Ctrl++',
+        dialog: 'insert-cells',
+      },
+      {
+        kind: 'item',
+        id: 'edit-delete-cells',
+        label: 'Delete cells…',
+        icon: 'indeterminate_check_box',
+        shortcut: 'Ctrl+-',
+        dialog: 'delete-cells',
+      },
+    ],
+  },
+  {
+    id: 'view',
+    label: 'View',
+    items: [
+      {
+        kind: 'item',
+        id: 'show-formulas',
+        label: 'Show formulas',
+        icon: 'description',
+        shortcut: 'Ctrl+`',
+        run: showFormulas,
+      },
+      {
+        kind: 'item',
+        id: 'toggle-gridlines',
+        label: 'Toggle gridlines',
+        icon: 'grid_on',
+        run: toggleGridlines,
+      },
+      { kind: 'separator', id: 'sep-freeze' },
+      {
+        kind: 'item',
+        id: 'freeze-row',
+        label: 'Freeze top row',
+        icon: 'border_horizontal',
+        run: freezeFirstRow,
+      },
+      {
+        kind: 'item',
+        id: 'freeze-col',
+        label: 'Freeze first column',
+        icon: 'border_vertical',
+        run: freezeFirstColumn,
+      },
+      {
+        kind: 'item',
+        id: 'freeze-selection',
+        label: 'Freeze panes (at selection)',
+        icon: 'grid_4x4',
+        run: freezeAtSelection,
+      },
+      { kind: 'item', id: 'unfreeze', label: 'Unfreeze', icon: 'grid_off', run: unfreezePanes },
+      { kind: 'separator', id: 'sep-nav' },
+      {
+        kind: 'item',
+        id: 'jump-home',
+        label: 'Jump to A1',
+        icon: 'home',
+        shortcut: 'Ctrl+Home',
+        run: jumpToFirstCell,
+      },
+      {
+        kind: 'item',
+        id: 'prev-sheet',
+        label: 'Previous sheet',
+        icon: 'navigate_before',
+        shortcut: 'Ctrl+PageUp',
+        run: switchToPreviousSheet,
+      },
+      {
+        kind: 'item',
+        id: 'next-sheet',
+        label: 'Next sheet',
+        icon: 'navigate_next',
+        shortcut: 'Ctrl+PageDown',
+        run: switchToNextSheet,
+      },
+      { kind: 'separator', id: 'sep-panels' },
+      {
+        kind: 'item',
+        id: 'comments-panel',
+        label: 'Comments panel',
+        icon: 'forum',
+        run: toggleCommentPanel,
+      },
     ],
   },
   {
@@ -54,28 +710,140 @@ const MENUS: Menu[] = [
     label: 'Insert',
     items: [
       {
-        id: 'insert-row',
-        label: 'Insert row above',
-        command: 'sheet.command.insert-row-before',
-        icon: 'add_row_above',
+        kind: 'item',
+        id: 'new-sheet',
+        label: 'New sheet',
+        icon: 'add_box',
+        shortcut: 'Shift+F11',
+        run: insertNewSheet,
       },
       {
-        id: 'insert-col',
-        label: 'Insert column left',
-        command: 'sheet.command.insert-col-before',
-        icon: 'add_column_left',
+        kind: 'item',
+        id: 'insert-table',
+        label: 'Table',
+        icon: 'table_rows',
+        shortcut: 'Ctrl+L',
+        run: insertTable,
+        feature: 'tables',
       },
       {
-        id: 'delete-row',
-        label: 'Delete row',
-        command: 'sheet.command.remove-row',
-        icon: 'delete',
+        kind: 'item',
+        id: 'insert-chart',
+        label: 'Chart…',
+        icon: 'bar_chart',
+        dialog: 'insert-chart',
+        feature: 'charts',
       },
       {
-        id: 'delete-col',
-        label: 'Delete column',
-        command: 'sheet.command.remove-col',
-        icon: 'delete',
+        kind: 'item',
+        id: 'insert-sparkline',
+        label: 'Sparkline…',
+        icon: 'show_chart',
+        dialog: 'insert-sparkline',
+        feature: 'sparklines',
+      },
+      {
+        kind: 'item',
+        id: 'insert-pivot',
+        label: 'PivotTable…',
+        icon: 'pivot_table_chart',
+        dialog: 'insert-pivot',
+        feature: 'pivots',
+      },
+      { kind: 'separator', id: 'sep-objects' },
+      { kind: 'item', id: 'insert-image', label: 'Image…', icon: 'image', run: insertImage },
+      {
+        kind: 'item',
+        id: 'insert-function',
+        label: 'Function…',
+        icon: 'functions',
+        shortcut: 'Shift+F3',
+        dialog: 'insert-function',
+      },
+      {
+        kind: 'item',
+        id: 'insert-link',
+        label: 'Hyperlink…',
+        icon: 'link',
+        shortcut: 'Ctrl+K',
+        run: insertHyperlink,
+      },
+      {
+        kind: 'item',
+        id: 'insert-comment',
+        label: 'Comment',
+        icon: 'comment',
+        shortcut: 'Shift+F2',
+        run: insertComment,
+      },
+      { kind: 'separator', id: 'sep-rowcol' },
+      {
+        kind: 'submenu',
+        id: 'insert-rowcol',
+        label: 'Rows & columns',
+        icon: 'grid_on',
+        items: [
+          {
+            kind: 'item',
+            id: 'insert-row-above',
+            label: 'Row above',
+            icon: 'vertical_align_top',
+            run: insertRowAbove,
+          },
+          {
+            kind: 'item',
+            id: 'insert-row-below',
+            label: 'Row below',
+            icon: 'vertical_align_bottom',
+            run: insertRowBelow,
+          },
+          {
+            kind: 'item',
+            id: 'insert-col-left',
+            label: 'Column left',
+            icon: 'keyboard_tab_rtl',
+            run: insertColumnLeft,
+          },
+          {
+            kind: 'item',
+            id: 'insert-col-right',
+            label: 'Column right',
+            icon: 'keyboard_tab',
+            run: insertColumnRight,
+          },
+        ],
+      },
+      { kind: 'separator', id: 'sep-autofit' },
+      {
+        kind: 'item',
+        id: 'autofit-col',
+        label: 'Auto-fit column width',
+        icon: 'settings_ethernet',
+        run: autoFitColumns,
+      },
+      {
+        kind: 'item',
+        id: 'autofit-row',
+        label: 'Auto-fit row height',
+        icon: 'height',
+        run: autoFitRows,
+      },
+      { kind: 'separator', id: 'sep-date' },
+      {
+        kind: 'item',
+        id: 'insert-today',
+        label: "Today's date",
+        icon: 'today',
+        shortcut: 'Ctrl+;',
+        run: insertTodayDate,
+      },
+      {
+        kind: 'item',
+        id: 'insert-time',
+        label: 'Current time',
+        icon: 'schedule',
+        shortcut: 'Ctrl+Shift+:',
+        run: insertCurrentTime,
       },
     ],
   },
@@ -83,30 +851,177 @@ const MENUS: Menu[] = [
     id: 'format',
     label: 'Format',
     items: [
-      { id: 'bold', label: 'Bold', command: 'sheet.command.set-range-bold', icon: 'format_bold' },
       {
+        kind: 'item',
+        id: 'format-cells',
+        label: 'Format cells…',
+        icon: 'format_shapes',
+        shortcut: 'Ctrl+1',
+        dialog: 'format-cells',
+      },
+      { kind: 'separator', id: 'sep-format-cells' },
+      {
+        kind: 'item',
+        id: 'bold',
+        label: 'Bold',
+        icon: 'format_bold',
+        shortcut: 'Ctrl+B',
+        run: (api) => void api.executeCommand('sheet.command.set-range-bold'),
+      },
+      {
+        kind: 'item',
         id: 'italic',
         label: 'Italic',
-        command: 'sheet.command.set-range-italic',
         icon: 'format_italic',
+        shortcut: 'Ctrl+I',
+        run: (api) => void api.executeCommand('sheet.command.set-range-italic'),
       },
       {
+        kind: 'item',
         id: 'underline',
         label: 'Underline',
-        command: 'sheet.command.set-range-underline',
         icon: 'format_underlined',
+        shortcut: 'Ctrl+U',
+        run: (api) => void api.executeCommand('sheet.command.set-range-underline'),
       },
       {
+        kind: 'item',
         id: 'wrap-text',
         label: 'Wrap text',
-        command: 'sheet.command.set-text-wrap',
         icon: 'wrap_text',
+        run: (api) => void api.executeCommand('sheet.command.set-text-wrap', { value: 3 }),
+      },
+      { kind: 'separator', id: 'sep-numfmt' },
+      {
+        kind: 'submenu',
+        id: 'num-format',
+        label: 'Number format',
+        icon: 'looks_one',
+        items: NUM_FORMAT_ORDER.map<MenuItemDef>((k) => ({
+          kind: 'item',
+          id: `num-${k}`,
+          label: k[0]!.toUpperCase() + k.slice(1),
+          icon: 'looks_one',
+          shortcut: NUM_FORMAT_SHORTCUT[k],
+          run: (api) => setNumberFormatByKey(api, k),
+        })),
+      },
+      {
+        kind: 'item',
+        id: 'decimal-up',
+        label: 'Increase decimals',
+        icon: 'decimal_increase',
+        run: increaseDecimal,
+      },
+      {
+        kind: 'item',
+        id: 'decimal-down',
+        label: 'Decrease decimals',
+        icon: 'decimal_decrease',
+        run: decreaseDecimal,
+      },
+      { kind: 'separator', id: 'sep-borders' },
+      {
+        kind: 'submenu',
+        id: 'borders',
+        label: 'Borders',
+        icon: 'border_all',
+        items: [
+          {
+            kind: 'item',
+            id: 'border-all',
+            label: 'All borders',
+            icon: 'border_all',
+            run: (api) => applyBorders(api, 'all'),
+          },
+          {
+            kind: 'item',
+            id: 'border-outside',
+            label: 'Outside borders',
+            icon: 'border_outer',
+            run: (api) => applyBorders(api, 'outside'),
+          },
+          {
+            kind: 'item',
+            id: 'border-none',
+            label: 'No border',
+            icon: 'border_clear',
+            run: (api) => applyBorders(api, 'none'),
+          },
+        ],
+      },
+      { kind: 'separator', id: 'sep-cond' },
+      {
+        kind: 'item',
+        id: 'conditional-formatting',
+        label: 'Conditional formatting…',
+        icon: 'palette',
+        dialog: 'conditional-formatting',
+        feature: 'conditionalFormatting',
+      },
+      { kind: 'separator', id: 'sep-visibility' },
+      {
+        kind: 'submenu',
+        id: 'visibility',
+        label: 'Visibility',
+        icon: 'visibility',
+        items: [
+          {
+            kind: 'item',
+            id: 'hide-row',
+            label: 'Hide row',
+            icon: 'visibility_off',
+            shortcut: 'Ctrl+9',
+            run: hideSelectedRows,
+          },
+          {
+            kind: 'item',
+            id: 'unhide-row',
+            label: 'Unhide row',
+            icon: 'visibility',
+            shortcut: 'Ctrl+Shift+9',
+            run: unhideSelectedRows,
+          },
+          {
+            kind: 'item',
+            id: 'hide-col',
+            label: 'Hide column',
+            icon: 'visibility_off',
+            shortcut: 'Ctrl+0',
+            run: hideSelectedColumns,
+          },
+          {
+            kind: 'item',
+            id: 'unhide-col',
+            label: 'Unhide column',
+            icon: 'visibility',
+            shortcut: 'Ctrl+Shift+0',
+            run: unhideSelectedColumns,
+          },
+        ],
       },
+      { kind: 'separator', id: 'sep-clear' },
       {
+        kind: 'item',
         id: 'clear-format',
         label: 'Clear formatting',
-        command: 'sheet.command.clear-selection-format',
         icon: 'format_clear',
+        run: clearFormat,
+      },
+      { kind: 'separator', id: 'sep-delete' },
+      {
+        kind: 'item',
+        id: 'delete-row',
+        label: 'Delete row',
+        icon: 'delete_sweep',
+        run: deleteSelectedRow,
+      },
+      {
+        kind: 'item',
+        id: 'delete-col',
+        label: 'Delete column',
+        icon: 'folder_delete',
+        run: deleteSelectedColumn,
       },
     ],
   },
@@ -115,51 +1030,104 @@ const MENUS: Menu[] = [
     label: 'Data',
     items: [
       {
+        kind: 'item',
         id: 'sort-asc',
         label: 'Sort ascending',
-        command: 'sheet.command.sort-range-asc',
         icon: 'arrow_upward',
+        run: sortAsc,
       },
       {
+        kind: 'item',
         id: 'sort-desc',
         label: 'Sort descending',
-        command: 'sheet.command.sort-range-desc',
         icon: 'arrow_downward',
+        run: sortDesc,
       },
       {
+        kind: 'item',
+        id: 'sort-custom',
+        label: 'Sort range…',
+        icon: 'sort',
+        dialog: 'custom-sort',
+      },
+      {
+        kind: 'item',
         id: 'toggle-filter',
         label: 'Toggle filter',
-        command: 'sheet.command.smart-toggle-filter',
         icon: 'filter_alt',
+        shortcut: 'Ctrl+Shift+L',
+        run: toggleFilter,
+        feature: 'filter',
+      },
+      { kind: 'separator', id: 'sep-tools' },
+      {
+        kind: 'item',
+        id: 'data-validation',
+        label: 'Data validation…',
+        icon: 'rule',
+        dialog: 'data-validation',
+        feature: 'dataValidation',
+      },
+      {
+        kind: 'item',
+        id: 'name-manager',
+        label: 'Name Manager…',
+        icon: 'bookmark_add',
+        shortcut: 'Ctrl+F3',
+        dialog: 'name-manager',
+      },
+      {
+        kind: 'item',
+        id: 'goal-seek',
+        label: 'Goal Seek…',
+        icon: 'analytics',
+        dialog: 'goal-seek',
+      },
+      { kind: 'separator', id: 'sep-clean' },
+      {
+        kind: 'item',
+        id: 'text-to-columns',
+        label: 'Text to Columns',
+        icon: 'splitscreen',
+        run: splitTextToColumns,
+      },
+      {
+        kind: 'item',
+        id: 'recalculate',
+        label: 'Recalculate',
+        icon: 'autorenew',
+        shortcut: 'F9',
+        run: forceRecalculate,
       },
     ],
   },
   {
-    id: 'view',
-    label: 'View',
+    id: 'help',
+    label: 'Help',
     items: [
       {
-        id: 'freeze',
-        label: 'Freeze panes',
-        command: 'sheet.command.set-selection-frozen',
-        icon: 'table_view',
+        kind: 'item',
+        id: 'keyboard-shortcuts',
+        label: 'Keyboard shortcuts',
+        icon: 'info',
+        shortcut: 'Ctrl+/',
+        dialog: 'keyboard-shortcuts',
       },
+      { kind: 'separator', id: 'sep-help' },
+      { kind: 'item', id: 'about', label: 'About casual sheets', icon: 'info', dialog: 'about' },
       {
-        id: 'unfreeze',
-        label: 'Unfreeze panes',
-        command: 'sheet.command.cancel-frozen',
-        icon: 'grid_off',
-      },
-      {
-        id: 'toggle-gridlines',
-        label: 'Toggle gridlines',
-        command: 'sheet.command.toggle-gridlines',
-        icon: 'grid_on',
+        kind: 'item',
+        id: 'github',
+        label: 'View on GitHub',
+        icon: 'open_in_new',
+        run: () => window.open('https://github.com/CasualOffice/sheets', '_blank'),
       },
     ],
   },
 ];
 
+/* ───────────────────────────── styling ────────────────────────────────── */
+
 const BAR_STYLE: CSSProperties = {
   position: 'relative',
   display: 'flex',
@@ -191,7 +1159,7 @@ const MENU_BTN_STYLE: CSSProperties = {
 const DROPDOWN_STYLE: CSSProperties = {
   position: 'absolute',
   top: '100%',
-  minWidth: 200,
+  minWidth: 220,
   marginTop: 2,
   padding: 4,
   display: 'flex',
@@ -220,13 +1188,108 @@ const ITEM_STYLE: CSSProperties = {
   textAlign: 'left',
 };
 
+const SEPARATOR_STYLE: CSSProperties = {
+  height: 1,
+  margin: '4px 6px',
+  background: 'var(--cs-chrome-border, #e6e9ee)',
+};
+
+const SHORTCUT_STYLE: CSSProperties = {
+  marginLeft: 'auto',
+  paddingLeft: 16,
+  fontSize: 11,
+  color: 'var(--cs-chrome-muted, #6b7280)',
+};
+
+const SUBMENU_PANEL_STYLE: CSSProperties = {
+  position: 'absolute',
+  top: -4,
+  left: '100%',
+  minWidth: 200,
+  marginLeft: 2,
+  padding: 4,
+  display: 'flex',
+  flexDirection: 'column',
+  border: '1px solid var(--cs-chrome-border, #e6e9ee)',
+  borderRadius: 8,
+  background: 'var(--cs-chrome-input-bg, #fff)',
+  boxShadow: '0 6px 20px rgba(0,0,0,0.16)',
+  zIndex: 1001,
+};
+
+/* ───────────────────────────── filtering ──────────────────────────────── */
+
+/** True when the feature gate (if any) is enabled (default: enabled). */
+function featureOn(feature: string | undefined, features: Record<string, boolean>): boolean {
+  if (!feature) return true;
+  return features[feature] !== false;
+}
+
+/**
+ * Keep an item if its feature is on AND — for a dialog item — the host provides
+ * a dialog handler. Dialog items with no host hook are dropped (the SDK never
+ * fakes a dialog). Submenus are filtered recursively and dropped when empty.
+ */
+function keepItem(
+  item: MenuItemDef,
+  features: Record<string, boolean>,
+  hasDialogHost: boolean,
+): MenuItemDef | null {
+  if (!featureOn(item.feature, features)) return null;
+  if (item.kind === 'separator') return item;
+  if (item.kind === 'submenu') {
+    const items = filterItems(item.items, features, hasDialogHost);
+    if (items.length === 0) return null;
+    return { ...item, items };
+  }
+  if (item.dialog && !hasDialogHost) return null;
+  return item;
+}
+
+/** Filter a list and collapse leading/trailing/double separators. */
+function filterItems(
+  items: MenuItemDef[],
+  features: Record<string, boolean>,
+  hasDialogHost: boolean,
+): MenuItemDef[] {
+  const kept = items
+    .map((i) => keepItem(i, features, hasDialogHost))
+    .filter((i): i is MenuItemDef => i !== null);
+  // Collapse separators: drop leading, trailing, and runs.
+  const out: MenuItemDef[] = [];
+  for (const item of kept) {
+    if (item.kind === 'separator') {
+      if (out.length === 0) continue;
+      if (out[out.length - 1].kind === 'separator') continue;
+    }
+    out.push(item);
+  }
+  while (out.length > 0 && out[out.length - 1].kind === 'separator') out.pop();
+  return out;
+}
+
+/* ───────────────────────────── component ──────────────────────────────── */
+
 export interface MenuBarProps {
   /** Live API, or `null` until the editor is ready. */
   api: CasualSheetsAPI | null;
+  /**
+   * Per-feature toggles. A control / menu whose `feature` key is `false` is not
+   * rendered. Unknown / omitted keys default to enabled.
+   */
+  features?: Record<string, boolean>;
+  /**
+   * Host hook for actions the SDK can't render itself (Format Cells, Insert
+   * Chart, PivotTable, Find & Replace, Insert/Delete cells, …). Called with the
+   * dialog `kind` and an optional `context` (the active selection in A1 for
+   * range-seeded dialogs). When omitted, those items are not rendered.
+   */
+  onDialogRequest?: (kind: MenuDialogKind, context?: unknown) => void;
 }
 
-export function MenuBar({ api }: MenuBarProps) {
+export function MenuBar({ api, features = {}, onDialogRequest }: MenuBarProps) {
   const [open, setOpen] = useState<MenuId | null>(null);
+  const [openSubmenu, setOpenSubmenu] = useState<string | null>(null);
   const rootRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
@@ -237,10 +1300,16 @@ export function MenuBar({ api }: MenuBarProps) {
   useEffect(() => {
     if (open === null) return;
     const onKey = (e: KeyboardEvent) => {
-      if (e.key === 'Escape') setOpen(null);
+      if (e.key === 'Escape') {
+        setOpen(null);
+        setOpenSubmenu(null);
+      }
     };
     const onDown = (e: PointerEvent) => {
-      if (!rootRef.current?.contains(e.target as Node)) setOpen(null);
+      if (!rootRef.current?.contains(e.target as Node)) {
+        setOpen(null);
+        setOpenSubmenu(null);
+      }
     };
     document.addEventListener('keydown', onKey);
     document.addEventListener('pointerdown', onDown, true);
@@ -250,11 +1319,106 @@ export function MenuBar({ api }: MenuBarProps) {
     };
   }, [open]);
 
-  const run = (item: MenuItem) => {
+  const close = () => {
     setOpen(null);
-    void api?.executeCommand(item.command, item.params);
+    setOpenSubmenu(null);
+  };
+
+  const runItem = (item: Extract<MenuItemDef, { kind: 'item' }>) => {
+    close();
+    if (!api) return;
+    if (item.dialog) {
+      // Range-seeded dialogs get the current selection in A1 as context.
+      const seeded =
+        item.dialog === 'insert-chart' ||
+        item.dialog === 'insert-pivot' ||
+        item.dialog === 'insert-sparkline' ||
+        item.dialog === 'insert-cells' ||
+        item.dialog === 'delete-cells';
+      onDialogRequest?.(item.dialog, seeded ? selectionA1(api) : undefined);
+      return;
+    }
+    item.run?.(api);
   };
 
+  // Compute the visible menus once per render (feature + dialog-host gating).
+  const hasDialogHost = !!onDialogRequest;
+  const visibleMenus = MENUS.map((menu) => ({
+    ...menu,
+    items: filterItems(menu.items, features, hasDialogHost),
+  })).filter((menu) => featureOn(menu.feature, features) && menu.items.length > 0);
+
+  const renderItems = (items: MenuItemDef[]): ReactNode =>
+    items.map((item) => {
+      if (item.kind === 'separator') {
+        return <div key={item.id} style={SEPARATOR_STYLE} role="separator" aria-hidden />;
+      }
+      if (item.kind === 'submenu') {
+        const isSubOpen = openSubmenu === item.id;
+        return (
+          <div
+            key={item.id}
+            style={{ position: 'relative' }}
+            onMouseEnter={() => setOpenSubmenu(item.id)}
+            onMouseLeave={() => setOpenSubmenu((cur) => (cur === item.id ? null : cur))}
+          >
+            <button
+              type="button"
+              role="menuitem"
+              data-testid={`cs-menuitem-${item.id}`}
+              aria-haspopup="menu"
+              aria-expanded={isSubOpen}
+              disabled={!api}
+              style={{ ...ITEM_STYLE, opacity: api ? 1 : 0.5 }}
+              onMouseDown={(e) => e.preventDefault()}
+            >
+              {item.icon ? (
+                <Icon name={item.icon} size={18} />
+              ) : (
+                <span style={{ width: 18 }} aria-hidden />
+              )}
+              <span>{item.label}</span>
+              <Icon name="chevron_right" size={18} style={{ marginLeft: 'auto' }} />
+            </button>
+            {isSubOpen && (
+              <div style={SUBMENU_PANEL_STYLE} role="menu" aria-label={item.label}>
+                {renderItems(item.items)}
+              </div>
+            )}
+          </div>
+        );
+      }
+      return (
+        <button
+          key={item.id}
+          type="button"
+          role="menuitem"
+          data-testid={`cs-menuitem-${item.id}`}
+          disabled={!api}
+          style={{ ...ITEM_STYLE, opacity: api ? 1 : 0.5 }}
+          onMouseDown={(e) => {
+            e.preventDefault();
+            runItem(item);
+          }}
+          onMouseEnter={(e) => {
+            setOpenSubmenu(null);
+            e.currentTarget.style.background = 'var(--cs-chrome-hover, rgba(0,0,0,0.06))';
+          }}
+          onMouseLeave={(e) => {
+            e.currentTarget.style.background = 'transparent';
+          }}
+        >
+          {item.icon ? (
+            <Icon name={item.icon} size={18} />
+          ) : (
+            <span style={{ width: 18 }} aria-hidden />
+          )}
+          <span>{item.label}</span>
+          {item.shortcut && <span style={SHORTCUT_STYLE}>{fmtShortcut(item.shortcut)}</span>}
+        </button>
+      );
+    });
+
   return (
     <div
       ref={rootRef}
@@ -263,13 +1427,14 @@ export function MenuBar({ api }: MenuBarProps) {
       role="menubar"
       aria-label="Menu bar"
     >
-      {MENUS.map((menu) => {
+      {visibleMenus.map((menu) => {
         const isOpen = open === menu.id;
         return (
           <div key={menu.id} style={{ position: 'relative' }}>
             <button
               type="button"
               data-menu={menu.id}
+              data-testid={`cs-menu-${menu.id}`}
               aria-haspopup="menu"
               aria-expanded={isOpen}
               style={{
@@ -281,12 +1446,15 @@ export function MenuBar({ api }: MenuBarProps) {
               // toggle the menu open/closed.
               onMouseDown={(e) => {
                 e.preventDefault();
+                setOpenSubmenu(null);
                 setOpen((cur) => (cur === menu.id ? null : menu.id));
               }}
               onMouseEnter={(e) => {
                 // Hover-to-switch once a menu is already open (Office behaviour).
-                if (open !== null && open !== menu.id) setOpen(menu.id);
-                else if (!isOpen)
+                if (open !== null && open !== menu.id) {
+                  setOpen(menu.id);
+                  setOpenSubmenu(null);
+                } else if (!isOpen)
                   e.currentTarget.style.background = 'var(--cs-chrome-hover, rgba(0,0,0,0.06))';
               }}
               onMouseLeave={(e) => {
@@ -299,33 +1467,7 @@ export function MenuBar({ api }: MenuBarProps) {
             </button>
             {isOpen && (
               <div style={DROPDOWN_STYLE} role="menu" aria-label={menu.label}>
-                {menu.items.map((item) => (
-                  <button
-                    key={item.id}
-                    type="button"
-                    role="menuitem"
-                    data-testid={`cs-menuitem-${item.id}`}
-                    disabled={!api}
-                    style={{ ...ITEM_STYLE, opacity: api ? 1 : 0.5 }}
-                    onMouseDown={(e) => {
-                      e.preventDefault();
-                      run(item);
-                    }}
-                    onMouseEnter={(e) => {
-                      e.currentTarget.style.background = 'var(--cs-chrome-hover, rgba(0,0,0,0.06))';
-                    }}
-                    onMouseLeave={(e) => {
-                      e.currentTarget.style.background = 'transparent';
-                    }}
-                  >
-                    {item.icon ? (
-                      <Icon name={item.icon} size={18} />
-                    ) : (
-                      <span style={{ width: 18 }} aria-hidden />
-                    )}
-                    <span>{item.label}</span>
-                  </button>
-                ))}
+                {renderItems(menu.items)}
               </div>
             )}
           </div>