@opensumi/ide-menu-bar 2.23.4 → 2.23.5-rc-1681807382.0

package/lib/browser/menu-bar.contribution.d.ts

@@ -1,7 +1,13 @@
-import { ToolBarActionContribution, IToolbarRegistry } from '@opensumi/ide-core-browser';
+import { ToolBarActionContribution, IToolbarRegistry, Disposable } from '@opensumi/ide-core-browser';
 import { ComponentContribution, ComponentRegistry } from '@opensumi/ide-core-browser/lib/layout';
-export declare class MenuBarContribution implements ComponentContribution, ToolBarActionContribution {
+export declare class MenuBarContribution extends Disposable implements ComponentContribution, ToolBarActionContribution {
     private readonly appConfig;
+    private readonly menubarStore;
+    private readonly menuRegistry;
+    private readonly preferenceService;
+    constructor();
+    private unregisterMenusBarByCompact;
+    private registerMenusBarByCompact;
     registerComponent(registry: ComponentRegistry): void;
     registerToolbarActions(registry: IToolbarRegistry): void;
 }

package/lib/browser/menu-bar.contribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"menu-bar.contribution.d.ts","sourceRoot":"","sources":["../../src/browser/menu-bar.contribution.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAa,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACpG,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAOjG,qBACa,mBAAoB,YAAW,qBAAqB,EAAE,yBAAyB;IAE1F,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IAEtC,iBAAiB,CAAC,QAAQ,EAAE,iBAAiB;IAoB7C,sBAAsB,CAAC,QAAQ,EAAE,gBAAgB;CAMlD"}
+{"version":3,"file":"menu-bar.contribution.d.ts","sourceRoot":"","sources":["../../src/browser/menu-bar.contribution.ts"],"names":[],"mappings":"AACA,OAAO,EACL,yBAAyB,EAEzB,gBAAgB,EAEhB,UAAU,EAGX,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAcjG,qBACa,mBAAoB,SAAQ,UAAW,YAAW,qBAAqB,EAAE,yBAAyB;IAE7G,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IAGtC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAG5C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAG7C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;;IA0BtD,OAAO,CAAC,2BAA2B;IASnC,OAAO,CAAC,yBAAyB;IAoBjC,iBAAiB,CAAC,QAAQ,EAAE,iBAAiB;IAoB7C,sBAAsB,CAAC,QAAQ,EAAE,gBAAgB;CAMlD"}

package/lib/browser/menu-bar.contribution.js

@@ -5,10 +5,48 @@ const tslib_1 = require("tslib");
 const di_1 = require("@opensumi/di");
 const ide_core_browser_1 = require("@opensumi/ide-core-browser");
 const layout_1 = require("@opensumi/ide-core-browser/lib/layout");
+const next_1 = require("@opensumi/ide-core-browser/lib/menu/next");
 const di_helper_1 = require("@opensumi/ide-core-common/lib/di-helper");
+const menu_bar_store_1 = require("./menu-bar.store");
 const menu_bar_view_1 = require("./menu-bar.view");
 const toolbar_action_view_1 = require("./toolbar-action.view");
-let MenuBarContribution = class MenuBarContribution {
+let MenuBarContribution = class MenuBarContribution extends ide_core_browser_1.Disposable {
+    constructor() {
+        super();
+        this.addDispose(this.menubarStore.onDidMenuBarChange((menubarItems) => {
+            const isCompact = this.preferenceService.getValid("menubar.compactMode" /* MenubarSettingId.CompactMode */);
+            if (isCompact) {
+                this.registerMenusBarByCompact(menubarItems);
+            }
+        }));
+        this.addDispose(this.preferenceService.onSpecificPreferenceChange("menubar.compactMode" /* MenubarSettingId.CompactMode */, ({ newValue }) => {
+            if (newValue) {
+                this.registerMenusBarByCompact();
+            }
+            else {
+                this.unregisterMenusBarByCompact();
+            }
+        }));
+    }
+    unregisterMenusBarByCompact() {
+        const preMenu = this.menuRegistry.getMenuItems(next_1.MenuId.MenubarCompactMenu);
+        preMenu.forEach((c) => {
+            this.menuRegistry.unregisterMenuItem(next_1.MenuId.MenubarCompactMenu, c.submenu);
+        });
+        this.menuRegistry.unregisterMenuItem(next_1.MenuId.ActivityBarTopExtra, next_1.MenuId.MenubarCompactMenu);
+    }
+    registerMenusBarByCompact(menubarItems = this.menubarStore.menubarItems) {
+        this.menuRegistry.registerMenuItem(next_1.MenuId.ActivityBarTopExtra, {
+            submenu: next_1.MenuId.MenubarCompactMenu,
+            iconClass: (0, ide_core_browser_1.getExternalIcon)('menu'),
+            order: 1,
+            group: 'navigation',
+        });
+        this.menuRegistry.registerMenuItems(next_1.MenuId.MenubarCompactMenu, menubarItems.map((item) => ({
+            label: item.label,
+            submenu: item.id,
+        })));
+    }
     registerComponent(registry) {
         registry.register('@opensumi/ide-menu-bar', {
             id: 'ide-menu-bar',
@@ -34,8 +72,21 @@ tslib_1.__decorate([
     (0, di_1.Autowired)(ide_core_browser_1.AppConfig),
     tslib_1.__metadata("design:type", Object)
 ], MenuBarContribution.prototype, "appConfig", void 0);
+tslib_1.__decorate([
+    (0, di_1.Autowired)(menu_bar_store_1.MenubarStore),
+    tslib_1.__metadata("design:type", menu_bar_store_1.MenubarStore)
+], MenuBarContribution.prototype, "menubarStore", void 0);
+tslib_1.__decorate([
+    (0, di_1.Autowired)(next_1.IMenuRegistry),
+    tslib_1.__metadata("design:type", next_1.IMenuRegistry)
+], MenuBarContribution.prototype, "menuRegistry", void 0);
+tslib_1.__decorate([
+    (0, di_1.Autowired)(ide_core_browser_1.PreferenceService),
+    tslib_1.__metadata("design:type", Object)
+], MenuBarContribution.prototype, "preferenceService", void 0);
 MenuBarContribution = tslib_1.__decorate([
-    (0, di_helper_1.Domain)(layout_1.ComponentContribution, ide_core_browser_1.ToolBarActionContribution)
+    (0, di_helper_1.Domain)(layout_1.ComponentContribution, ide_core_browser_1.ToolBarActionContribution),
+    tslib_1.__metadata("design:paramtypes", [])
 ], MenuBarContribution);
 exports.MenuBarContribution = MenuBarContribution;
 //# sourceMappingURL=menu-bar.contribution.js.map

package/lib/browser/menu-bar.contribution.js.map

@@ -1 +1 @@
-{"version":3,"file":"menu-bar.contribution.js","sourceRoot":"","sources":["../../src/browser/menu-bar.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAyC;AACzC,iEAAoG;AACpG,kEAAiG;AACjG,uEAAiE;AAEjE,mDAA0D;AAC1D,+DAAsD;AAI/C,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAI9B,iBAAiB,CAAC,QAA2B;QAC3C,QAAQ,CAAC,QAAQ,CACf,wBAAwB,EACxB;YACE,EAAE,EAAE,cAAc;YAClB,SAAS,EAAE,uCAAuB;SACnC,EACD;YACE,IAAI,EAAE,EAAE;SACT,CACF,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,kBAAkB,EAAE;YACtC,QAAQ,CAAC,QAAQ,CAAC,8BAA8B,EAAE;gBAChD,EAAE,EAAE,oBAAoB;gBACxB,SAAS,EAAE,mCAAa;aACzB,CAAC,CAAC;SACJ;IACH,CAAC;IAED,sBAAsB,CAAC,QAA0B;QAC/C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,kBAAkB,EAAE;YACtC,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YACnC,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;SACnC;IACH,CAAC;CACF,CAAA;AA7BC;IAAC,IAAA,cAAS,EAAC,4BAAS,CAAC;;sDACiB;AAF3B,mBAAmB;IAD/B,IAAA,kBAAM,EAAC,8BAAqB,EAAE,4CAAyB,CAAC;GAC5C,mBAAmB,CA8B/B;AA9BY,kDAAmB"}
+{"version":3,"file":"menu-bar.contribution.js","sourceRoot":"","sources":["../../src/browser/menu-bar.contribution.ts"],"names":[],"mappings":"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"}

package/lib/browser/menu-bar.store.d.ts

@@ -1,4 +1,4 @@
-import { Disposable } from '@opensumi/ide-core-browser';
+import { Disposable, Event } from '@opensumi/ide-core-browser';
 import { IMenubarItem, MenuNode } from '@opensumi/ide-core-browser/lib/menu/next';
 export declare abstract class AbstractMenubarStore extends Disposable {
     menubarItems: IMenubarItem[];
@@ -8,7 +8,10 @@ export declare class MenubarStore extends Disposable implements AbstractMenubarS
     private readonly menubarService;
     menubarItems: import("mobx").IObservableArray<IMenubarItem>;
     menuItems: import("mobx").ObservableMap<string, MenuNode[]>;
+    private readonly _onDidMenuBarChange;
+    get onDidMenuBarChange(): Event<IMenubarItem[]>;
     constructor();
+    private getMenubarSubItems;
     private updateMenuNodes;
     private build;
     private handleMenuChanged;

package/lib/browser/menu-bar.store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"menu-bar.store.d.ts","sourceRoot":"","sources":["../../src/browser/menu-bar.store.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAA0B,YAAY,EAAE,QAAQ,EAAE,MAAM,0CAA0C,CAAC;AAE1G,8BAAsB,oBAAqB,SAAQ,UAAU;IAC3D,YAAY,EAAE,YAAY,EAAE,CAAC;IAC7B,QAAQ,CAAC,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAClD;AAED,qBACa,YAAa,SAAQ,UAAW,YAAW,oBAAoB;IAE1E,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAyB;IAGjD,YAAY,gDAAsC;IAGlD,SAAS,mDAAwC;;IAWxD,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,KAAK;IAQb,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,oBAAoB;IAMrB,kBAAkB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAMjD;CACH"}
+{"version":3,"file":"menu-bar.store.d.ts","sourceRoot":"","sources":["../../src/browser/menu-bar.store.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAW,KAAK,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAA0B,YAAY,EAAE,QAAQ,EAAE,MAAM,0CAA0C,CAAC;AAE1G,8BAAsB,oBAAqB,SAAQ,UAAU;IAC3D,YAAY,EAAE,YAAY,EAAE,CAAC;IAC7B,QAAQ,CAAC,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAClD;AAED,qBACa,YAAa,SAAQ,UAAW,YAAW,oBAAoB;IAE1E,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAyB;IAGjD,YAAY,gDAAsC;IAGlD,SAAS,mDAAwC;IAExD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAiC;IACrE,IAAW,kBAAkB,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC,CAErD;;IAUD,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,eAAe;IAKvB,OAAO,CAAC,KAAK;IASb,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,oBAAoB;IAOrB,kBAAkB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAMjD;CACH"}

package/lib/browser/menu-bar.store.js

@@ -11,10 +11,14 @@ class AbstractMenubarStore extends ide_core_browser_1.Disposable {
 }
 exports.AbstractMenubarStore = AbstractMenubarStore;
 let MenubarStore = class MenubarStore extends ide_core_browser_1.Disposable {
+    get onDidMenuBarChange() {
+        return this._onDidMenuBarChange.event;
+    }
     constructor() {
         super();
         this.menubarItems = mobx_1.observable.array([]);
         this.menuItems = mobx_1.observable.map();
+        this._onDidMenuBarChange = new ide_core_browser_1.Emitter();
         this.handleMenubarClick = (0, debounce_1.default)((menuId) => {
             this.updateMenuNodes(menuId);
         }, 500, { leading: true, trailing: true });
@@ -22,9 +26,12 @@ let MenubarStore = class MenubarStore extends ide_core_browser_1.Disposable {
         this.registerDispose(this.menubarService.onDidMenubarChange(this.handleMenubarChanged, this, this.disposables));
         this.registerDispose(this.menubarService.onDidMenuChange(this.handleMenuChanged, this, this.disposables));
     }
-    updateMenuNodes(menuId) {
+    getMenubarSubItems(menuId) {
         this.menubarService.rebuildMenuNodes(menuId);
-        const menuItems = this.menubarService.getMenuNodes(menuId) || [];
+        return this.menubarService.getMenuNodes(menuId) || [];
+    }
+    updateMenuNodes(menuId) {
+        const menuItems = this.getMenubarSubItems(menuId);
         this.menuItems.set(menuId, menuItems);
     }
     build() {
@@ -33,6 +40,7 @@ let MenubarStore = class MenubarStore extends ide_core_browser_1.Disposable {
         menubarItems.forEach(({ id: menuId }) => {
             this.updateMenuNodes(menuId);
         });
+        this._onDidMenuBarChange.fire(this.menubarItems);
     }
     handleMenuChanged(menuId) {
         this.updateMenuNodes(menuId);
@@ -40,6 +48,7 @@ let MenubarStore = class MenubarStore extends ide_core_browser_1.Disposable {
     handleMenubarChanged() {
         const menubarItems = this.menubarService.getMenubarItems();
         this.menubarItems.replace(menubarItems);
+        this._onDidMenuBarChange.fire(this.menubarItems);
     }
 };
 tslib_1.__decorate([

package/lib/browser/menu-bar.store.js.map

@@ -1 +1 @@
-{"version":3,"file":"menu-bar.store.js","sourceRoot":"","sources":["../../src/browser/menu-bar.store.ts"],"names":[],"mappings":";;;;AAAA,uEAAuC;AACvC,+BAA0C;AAE1C,qCAAqD;AACrD,iEAAwD;AACxD,mEAA0G;AAE1G,MAAsB,oBAAqB,SAAQ,6BAAU;CAG5D;AAHD,oDAGC;AAGM,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,6BAAU;IAU1C;QACE,KAAK,EAAE,CAAC;QANH,iBAAY,GAAG,iBAAU,CAAC,KAAK,CAAe,EAAE,CAAC,CAAC;QAGlD,cAAS,GAAG,iBAAU,CAAC,GAAG,EAAsB,CAAC;QAmCjD,uBAAkB,GAA6B,IAAA,kBAAQ,EAC5D,CAAC,MAAc,EAAE,EAAE;YACjB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC,EACD,GAAG,EACH,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAClC,CAAC;QApCA,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;QAChH,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAC5G,CAAC;IAGO,eAAe,CAAC,MAAc;QACpC,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACjE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACxC,CAAC;IAEO,KAAK;QACX,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC;QAC3D,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,GAAG,YAAY,CAAC,CAAC;QACvE,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YACtC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,iBAAiB,CAAC,MAAc;QACtC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAEO,oBAAoB;QAC1B,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC;QAC3D,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC1C,CAAC;CAUF,CAAA;AAjDC;IAAC,IAAA,cAAS,EAAC,6BAAsB,CAAC;sCACD,6BAAsB;oDAAC;AAExD;IAAC,iBAAU;;kDAC8C;AAEzD;IAAC,iBAAU;;+CAC6C;AAUxD;IAAC,aAAM,CAAC,KAAK;;;;mDAKZ;AAmBD;IAAC,aAAM,CAAC,KAAK;;wDAOX;AAjDS,YAAY;IADxB,IAAA,eAAU,GAAE;;GACA,YAAY,CAkDxB;AAlDY,oCAAY"}
+{"version":3,"file":"menu-bar.store.js","sourceRoot":"","sources":["../../src/browser/menu-bar.store.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-menu-bar",
-  "version": "2.23.4",
+  "version": "2.23.5-rc-1681807382.0",
   "description": "@opensumi/ide-menu-bar",
   "files": [
     "lib",
@@ -18,12 +18,12 @@
     "url": "git@github.com:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-core-common": "2.23.4"
+    "@opensumi/ide-core-common": "2.23.5-rc-1681807382.0"
   },
   "devDependencies": {
-    "@opensumi/ide-components": "2.23.4",
-    "@opensumi/ide-core-browser": "2.23.4",
+    "@opensumi/ide-components": "2.23.5-rc-1681807382.0",
+    "@opensumi/ide-core-browser": "2.23.5-rc-1681807382.0",
     "@opensumi/ide-dev-tool": "1.3.1"
   },
-  "gitHead": "23400e4cfb82f3eada37c0d6c110e6d44d8a8193"
+  "gitHead": "9b66cc87f0e2ddc79fcfc7b3b0ec96a6a34e5537"
 }

package/src/browser/menu-bar.contribution.ts

@@ -1,17 +1,94 @@
 import { Autowired } from '@opensumi/di';
-import { ToolBarActionContribution, AppConfig, IToolbarRegistry } from '@opensumi/ide-core-browser';
+import {
+  ToolBarActionContribution,
+  AppConfig,
+  IToolbarRegistry,
+  getExternalIcon,
+  Disposable,
+  PreferenceService,
+  MenubarSettingId,
+} from '@opensumi/ide-core-browser';
 import { ComponentContribution, ComponentRegistry } from '@opensumi/ide-core-browser/lib/layout';
+import {
+  IMenuRegistry,
+  IMenubarItem,
+  ISubmenuItem,
+  MenuContribution,
+  MenuId,
+} from '@opensumi/ide-core-browser/lib/menu/next';
 import { Domain } from '@opensumi/ide-core-common/lib/di-helper';
 
+import { MenubarStore } from './menu-bar.store';
 import { MenuBarMixToolbarAction } from './menu-bar.view';
 import { ToolbarAction } from './toolbar-action.view';
 
-
 @Domain(ComponentContribution, ToolBarActionContribution)
-export class MenuBarContribution implements ComponentContribution, ToolBarActionContribution {
+export class MenuBarContribution extends Disposable implements ComponentContribution, ToolBarActionContribution {
   @Autowired(AppConfig)
   private readonly appConfig: AppConfig;
 
+  @Autowired(MenubarStore)
+  private readonly menubarStore: MenubarStore;
+
+  @Autowired(IMenuRegistry)
+  private readonly menuRegistry: IMenuRegistry;
+
+  @Autowired(PreferenceService)
+  private readonly preferenceService: PreferenceService;
+
+  constructor() {
+    super();
+
+    this.addDispose(
+      this.menubarStore.onDidMenuBarChange((menubarItems: IMenubarItem[]) => {
+        const isCompact = this.preferenceService.getValid<boolean>(MenubarSettingId.CompactMode);
+
+        if (isCompact) {
+          this.registerMenusBarByCompact(menubarItems);
+        }
+      }),
+    );
+
+    this.addDispose(
+      this.preferenceService.onSpecificPreferenceChange(MenubarSettingId.CompactMode, ({ newValue }) => {
+        if (newValue) {
+          this.registerMenusBarByCompact();
+        } else {
+          this.unregisterMenusBarByCompact();
+        }
+      }),
+    );
+  }
+
+  private unregisterMenusBarByCompact() {
+    const preMenu = this.menuRegistry.getMenuItems(MenuId.MenubarCompactMenu) as ISubmenuItem[];
+    preMenu.forEach((c) => {
+      this.menuRegistry.unregisterMenuItem(MenuId.MenubarCompactMenu, c.submenu);
+    });
+
+    this.menuRegistry.unregisterMenuItem(MenuId.ActivityBarTopExtra, MenuId.MenubarCompactMenu);
+  }
+
+  private registerMenusBarByCompact(menubarItems: IMenubarItem[] = this.menubarStore.menubarItems) {
+    this.menuRegistry.registerMenuItem(MenuId.ActivityBarTopExtra, {
+      submenu: MenuId.MenubarCompactMenu,
+      iconClass: getExternalIcon('menu'),
+      order: 1,
+      group: 'navigation',
+    });
+
+    this.menuRegistry.registerMenuItems(
+      MenuId.MenubarCompactMenu,
+      menubarItems.map(
+        (item: IMenubarItem) =>
+          ({
+            label: item.label,
+            submenu: item.id,
+          } as ISubmenuItem),
+      ),
+    );
+  }
+
   registerComponent(registry: ComponentRegistry) {
     registry.register(
       '@opensumi/ide-menu-bar',

package/src/browser/menu-bar.store.ts

@@ -2,7 +2,7 @@ import debounce from 'lodash/debounce';
 import { observable, action } from 'mobx';
 
 import { Injectable, Autowired } from '@opensumi/di';
-import { Disposable } from '@opensumi/ide-core-browser';
+import { Disposable, Emitter, Event } from '@opensumi/ide-core-browser';
 import { AbstractMenubarService, IMenubarItem, MenuNode } from '@opensumi/ide-core-browser/lib/menu/next';
 
 export abstract class AbstractMenubarStore extends Disposable {
@@ -21,6 +21,11 @@ export class MenubarStore extends Disposable implements AbstractMenubarStore {
   @observable
   public menuItems = observable.map<string, MenuNode[]>();
 
+  private readonly _onDidMenuBarChange = new Emitter<IMenubarItem[]>();
+  public get onDidMenuBarChange(): Event<IMenubarItem[]> {
+    return this._onDidMenuBarChange.event;
+  }
+
   constructor() {
     super();
 
@@ -29,10 +34,14 @@ export class MenubarStore extends Disposable implements AbstractMenubarStore {
     this.registerDispose(this.menubarService.onDidMenuChange(this.handleMenuChanged, this, this.disposables));
   }
 
+  private getMenubarSubItems(menuId: string): MenuNode[] {
+    this.menubarService.rebuildMenuNodes(menuId);
+    return this.menubarService.getMenuNodes(menuId) || [];
+  }
+
   @action.bound
   private updateMenuNodes(menuId: string) {
-    this.menubarService.rebuildMenuNodes(menuId);
-    const menuItems = this.menubarService.getMenuNodes(menuId) || [];
+    const menuItems = this.getMenubarSubItems(menuId);
     this.menuItems.set(menuId, menuItems);
   }
 
@@ -42,6 +51,7 @@ export class MenubarStore extends Disposable implements AbstractMenubarStore {
     menubarItems.forEach(({ id: menuId }) => {
       this.updateMenuNodes(menuId);
     });
+    this._onDidMenuBarChange.fire(this.menubarItems);
   }
 
   private handleMenuChanged(menuId: string) {
@@ -51,6 +61,7 @@ export class MenubarStore extends Disposable implements AbstractMenubarStore {
   private handleMenubarChanged() {
     const menubarItems = this.menubarService.getMenubarItems();
     this.menubarItems.replace(menubarItems);
+    this._onDidMenuBarChange.fire(this.menubarItems);
   }
 
   @action.bound