@opensumi/ide-menu-bar 2.24.6-next-1686045771.0 → 2.24.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,8 +1,6 @@
1
1
  import { Provider } from '@opensumi/di';
2
2
  import { BrowserModule } from '@opensumi/ide-core-browser';
3
- import { MenuBarWebContribution } from './menu-bar-web.contribution';
4
3
  export declare class MenuBarModule extends BrowserModule {
5
4
  providers: Provider[];
6
- webProviders: (typeof MenuBarWebContribution)[];
7
5
  }
8
6
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAc,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAIrE,qBACa,aAAc,SAAQ,aAAa;IAC9C,SAAS,EAAE,QAAQ,EAAE,CAMnB;IACF,YAAY,oCAA4B;CACzC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAc,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAK3D,qBACa,aAAc,SAAQ,aAAa;IAC9C,SAAS,EAAE,QAAQ,EAAE,CAMnB;CACH"}
@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
5
5
  /* istanbul ignore file */
6
6
  const di_1 = require("@opensumi/di");
7
7
  const ide_core_browser_1 = require("@opensumi/ide-core-browser");
8
- const menu_bar_web_contribution_1 = require("./menu-bar-web.contribution");
9
8
  const menu_bar_contribution_1 = require("./menu-bar.contribution");
10
9
  const menu_bar_store_1 = require("./menu-bar.store");
11
10
  let MenuBarModule = class MenuBarModule extends ide_core_browser_1.BrowserModule {
@@ -18,7 +17,6 @@ let MenuBarModule = class MenuBarModule extends ide_core_browser_1.BrowserModule
18
17
  useClass: menu_bar_store_1.MenubarStore,
19
18
  },
20
19
  ];
21
- this.webProviders = [menu_bar_web_contribution_1.MenuBarWebContribution];
22
20
  }
23
21
  };
24
22
  MenuBarModule = tslib_1.__decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":";;;;AAAA,0BAA0B;AAC1B,qCAAoD;AACpD,iEAA2D;AAE3D,2EAAqE;AACrE,mEAA8D;AAC9D,qDAAsE;AAG/D,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,gCAAa;IAAzC;;QACL,cAAS,GAAe;YACtB,2CAAmB;YACnB;gBACE,KAAK,EAAE,qCAAoB;gBAC3B,QAAQ,EAAE,6BAAY;aACvB;SACF,CAAC;QACF,iBAAY,GAAG,CAAC,kDAAsB,CAAC,CAAC;IAC1C,CAAC;CAAA,CAAA;AATY,aAAa;IADzB,IAAA,eAAU,GAAE;GACA,aAAa,CASzB;AATY,sCAAa"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":";;;;AAAA,0BAA0B;AAC1B,qCAAoD;AACpD,iEAA2D;AAE3D,mEAA8D;AAC9D,qDAAsE;AAG/D,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,gCAAa;IAAzC;;QACL,cAAS,GAAe;YACtB,2CAAmB;YACnB;gBACE,KAAK,EAAE,qCAAoB;gBAC3B,QAAQ,EAAE,6BAAY;aACvB;SACF,CAAC;IACJ,CAAC;CAAA,CAAA;AARY,aAAa;IADzB,IAAA,eAAU,GAAE;GACA,aAAa,CAQzB;AARY,sCAAa"}
@@ -1,6 +1,7 @@
1
- import { Disposable } from '@opensumi/ide-core-browser';
1
+ import { ToolBarActionContribution, IToolbarRegistry, Disposable } from '@opensumi/ide-core-browser';
2
2
  import { ComponentContribution, ComponentRegistry } from '@opensumi/ide-core-browser/lib/layout';
3
- export declare class MenuBarContribution extends Disposable implements ComponentContribution {
3
+ export declare class MenuBarContribution extends Disposable implements ComponentContribution, ToolBarActionContribution {
4
+ private readonly appConfig;
4
5
  private readonly menubarStore;
5
6
  private readonly menuRegistry;
6
7
  private readonly preferenceService;
@@ -8,5 +9,6 @@ export declare class MenuBarContribution extends Disposable implements Component
8
9
  private unregisterMenusBarByCompact;
9
10
  private registerMenusBarByCompact;
10
11
  registerComponent(registry: ComponentRegistry): void;
12
+ registerToolbarActions(registry: IToolbarRegistry): void;
11
13
  }
12
14
  //# sourceMappingURL=menu-bar.contribution.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"menu-bar.contribution.d.ts","sourceRoot":"","sources":["../../src/browser/menu-bar.contribution.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,UAAU,EAAuC,MAAM,4BAA4B,CAAC;AAC9G,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAOjG,qBACa,mBAAoB,SAAQ,UAAW,YAAW,qBAAqB;IAElF,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;CAY9C"}
1
+ {"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"}
@@ -9,6 +9,7 @@ const next_1 = require("@opensumi/ide-core-browser/lib/menu/next");
9
9
  const di_helper_1 = require("@opensumi/ide-core-common/lib/di-helper");
10
10
  const menu_bar_store_1 = require("./menu-bar.store");
11
11
  const menu_bar_view_1 = require("./menu-bar.view");
12
+ const toolbar_action_view_1 = require("./toolbar-action.view");
12
13
  let MenuBarContribution = class MenuBarContribution extends ide_core_browser_1.Disposable {
13
14
  constructor() {
14
15
  super();
@@ -53,8 +54,24 @@ let MenuBarContribution = class MenuBarContribution extends ide_core_browser_1.D
53
54
  }, {
54
55
  size: 27,
55
56
  });
57
+ if (!this.appConfig.isElectronRenderer) {
58
+ registry.register('@opensumi/ide-toolbar-action', {
59
+ id: 'ide-toolbar-action',
60
+ component: toolbar_action_view_1.ToolbarAction,
61
+ });
62
+ }
63
+ }
64
+ registerToolbarActions(registry) {
65
+ if (!this.appConfig.isElectronRenderer) {
66
+ registry.addLocation('menu-right');
67
+ registry.addLocation('menu-left');
68
+ }
56
69
  }
57
70
  };
71
+ tslib_1.__decorate([
72
+ (0, di_1.Autowired)(ide_core_browser_1.AppConfig),
73
+ tslib_1.__metadata("design:type", Object)
74
+ ], MenuBarContribution.prototype, "appConfig", void 0);
58
75
  tslib_1.__decorate([
59
76
  (0, di_1.Autowired)(menu_bar_store_1.MenubarStore),
60
77
  tslib_1.__metadata("design:type", menu_bar_store_1.MenubarStore)
@@ -68,7 +85,7 @@ tslib_1.__decorate([
68
85
  tslib_1.__metadata("design:type", Object)
69
86
  ], MenuBarContribution.prototype, "preferenceService", void 0);
70
87
  MenuBarContribution = tslib_1.__decorate([
71
- (0, di_helper_1.Domain)(layout_1.ComponentContribution),
88
+ (0, di_helper_1.Domain)(layout_1.ComponentContribution, ide_core_browser_1.ToolBarActionContribution),
72
89
  tslib_1.__metadata("design:paramtypes", [])
73
90
  ], MenuBarContribution);
74
91
  exports.MenuBarContribution = MenuBarContribution;
@@ -1 +1 @@
1
- {"version":3,"file":"menu-bar.contribution.js","sourceRoot":"","sources":["../../src/browser/menu-bar.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAyC;AACzC,iEAA8G;AAC9G,kEAAiG;AACjG,mEAA6G;AAC7G,uEAAiE;AAEjE,qDAAgD;AAChD,mDAA0D;AAGnD,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,6BAAU;IAUjD;QACE,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,YAA4B,EAAE,EAAE;YACpE,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,0DAAuC,CAAC;YAEzF,IAAI,SAAS,EAAE;gBACb,IAAI,CAAC,yBAAyB,CAAC,YAAY,CAAC,CAAC;aAC9C;QACH,CAAC,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,iBAAiB,CAAC,0BAA0B,2DAA+B,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;YAC/F,IAAI,QAAQ,EAAE;gBACZ,IAAI,CAAC,yBAAyB,EAAE,CAAC;aAClC;iBAAM;gBACL,IAAI,CAAC,2BAA2B,EAAE,CAAC;aACpC;QACH,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAEO,2BAA2B;QACjC,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,aAAM,CAAC,kBAAkB,CAAmB,CAAC;QAC5F,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACpB,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,aAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QAC7E,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,aAAM,CAAC,mBAAmB,EAAE,aAAM,CAAC,kBAAkB,CAAC,CAAC;IAC9F,CAAC;IAEO,yBAAyB,CAAC,eAA+B,IAAI,CAAC,YAAY,CAAC,YAAY;QAC7F,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,aAAM,CAAC,mBAAmB,EAAE;YAC7D,OAAO,EAAE,aAAM,CAAC,kBAAkB;YAClC,SAAS,EAAE,IAAA,kCAAe,EAAC,MAAM,CAAC;YAClC,KAAK,EAAE,CAAC;YACR,KAAK,EAAE,YAAY;SACpB,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,iBAAiB,CACjC,aAAM,CAAC,kBAAkB,EACzB,YAAY,CAAC,GAAG,CACd,CAAC,IAAkB,EAAE,EAAE,CACrB,CAAC;YACC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO,EAAE,IAAI,CAAC,EAAE;SACA,CAAA,CACrB,CACF,CAAC;IACJ,CAAC;IAED,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;IACJ,CAAC;CACF,CAAA;AA1EC;IAAC,IAAA,cAAS,EAAC,6BAAY,CAAC;sCACO,6BAAY;yDAAC;AAE5C;IAAC,IAAA,cAAS,EAAC,oBAAa,CAAC;sCACM,oBAAa;yDAAC;AAE7C;IAAC,IAAA,cAAS,EAAC,oCAAiB,CAAC;;8DACyB;AAR3C,mBAAmB;IAD/B,IAAA,kBAAM,EAAC,8BAAqB,CAAC;;GACjB,mBAAmB,CA2E/B;AA3EY,kDAAmB"}
1
+ {"version":3,"file":"menu-bar.contribution.js","sourceRoot":"","sources":["../../src/browser/menu-bar.contribution.ts"],"names":[],"mappings":"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"}
@@ -46,20 +46,3 @@
46
46
  top: 100%;
47
47
  }
48
48
  }
49
-
50
- .icon_menubar_container {
51
- display: flex;
52
- align-items: center;
53
-
54
- .menubar_action {
55
- margin-right: 1px;
56
-
57
- > span[class*='-icon'] {
58
- font-size: 1.5em;
59
- }
60
-
61
- span + span {
62
- margin-left: 12px;
63
- }
64
- }
65
- }
@@ -3,10 +3,5 @@ export declare const MenuBar: React.FunctionComponent<object>;
3
3
  type MenuBarMixToolbarActionProps = Pick<React.HTMLProps<HTMLElement>, 'className'>;
4
4
  export declare const MenuBarMixToolbarAction: React.FC<MenuBarMixToolbarActionProps>;
5
5
  export declare const MenuBarActionWrapper: (props: MenuBarMixToolbarActionProps) => React.FunctionComponentElement<MenuBarMixToolbarActionProps>;
6
- /**
7
- * 可供集成方导入的组件
8
- * 后续如果有一些改动需要考虑是否有 breakchange
9
- */
10
- export declare const IconMenuBar: () => JSX.Element;
11
6
  export {};
12
7
  //# sourceMappingURL=menu-bar.view.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"menu-bar.view.d.ts","sourceRoot":"","sources":["../../src/browser/menu-bar.view.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAgF1B,eAAO,MAAM,OAAO,iCAiDlB,CAAC;AAIH,KAAK,4BAA4B,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC;AAEpF,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,4BAA4B,CAK1E,CAAC;AAIF,eAAO,MAAM,oBAAoB,uGAA8E,CAAC;AAEhH;;;GAGG;AACH,eAAO,MAAM,WAAW,mBASvB,CAAC"}
1
+ {"version":3,"file":"menu-bar.view.d.ts","sourceRoot":"","sources":["../../src/browser/menu-bar.view.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AA8E1B,eAAO,MAAM,OAAO,iCAiDlB,CAAC;AAIH,KAAK,4BAA4B,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC;AAEpF,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,4BAA4B,CAK1E,CAAC;AAIF,eAAO,MAAM,oBAAoB,uGAA8E,CAAC"}
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.IconMenuBar = exports.MenuBarActionWrapper = exports.MenuBarMixToolbarAction = exports.MenuBar = void 0;
3
+ exports.MenuBarActionWrapper = exports.MenuBarMixToolbarAction = exports.MenuBar = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const classnames_1 = tslib_1.__importDefault(require("classnames"));
6
6
  const mobx_react_lite_1 = require("mobx-react-lite");
@@ -11,13 +11,10 @@ const deprecated_1 = require("@opensumi/ide-components/lib/utils/deprecated");
11
11
  const ide_core_browser_1 = require("@opensumi/ide-core-browser");
12
12
  const actions_1 = require("@opensumi/ide-core-browser/lib/components/actions");
13
13
  const constants_1 = require("@opensumi/ide-core-browser/lib/layout/constants");
14
- const next_1 = require("@opensumi/ide-core-browser/lib/menu/next");
15
- const theme_service_1 = require("@opensumi/ide-theme/lib/common/theme.service");
16
14
  const menu_bar_module_less_1 = tslib_1.__importDefault(require("./menu-bar.module.less"));
17
15
  const menu_bar_store_1 = require("./menu-bar.store");
18
16
  const MenubarItem = (0, mobx_react_lite_1.observer)(({ id, label, focusMode, afterMenubarClick, afterMenuClick }) => {
19
17
  const menubarStore = (0, ide_core_browser_1.useInjectable)(menu_bar_store_1.MenubarStore);
20
- const iconService = (0, ide_core_browser_1.useInjectable)(theme_service_1.IIconService);
21
18
  const [menuOpen, setMenuOpen] = react_1.default.useState(false);
22
19
  const handleMenubarItemClick = react_1.default.useCallback(() => {
23
20
  menubarStore.handleMenubarClick(id);
@@ -45,7 +42,7 @@ const MenubarItem = (0, mobx_react_lite_1.observer)(({ id, label, focusMode, aft
45
42
  const data = menubarStore.menuItems.get(id) || [];
46
43
  return (react_1.default.createElement(dropdown_1.Dropdown, { className: 'kt-menu', transitionName: '', align: {
47
44
  offset: [0, 0],
48
- }, visible: menuOpen, onVisibleChange: triggerMenuVisibleChange, overlay: react_1.default.createElement(actions_1.MenuActionList, { data: data, afterClick: handleMenuItemClick, iconService: iconService }), trigger: focusMode ? ['click', 'hover'] : ['click'] },
45
+ }, visible: menuOpen, onVisibleChange: triggerMenuVisibleChange, overlay: react_1.default.createElement(actions_1.MenuActionList, { data: data, afterClick: handleMenuItemClick }), trigger: focusMode ? ['click', 'hover'] : ['click'] },
49
46
  react_1.default.createElement("div", { className: (0, classnames_1.default)(menu_bar_module_less_1.default.menubar, { [menu_bar_module_less_1.default['menu-open']]: menuOpen }), onMouseOver: handleMouseOver, onClick: handleMenubarItemClick }, label)));
50
47
  });
51
48
  // 点击一次后开启 focus mode, 此时 hover 也能出现子菜单
@@ -86,15 +83,4 @@ const MenuBarMixToolbarAction = (props) => (react_1.default.createElement("div",
86
83
  exports.MenuBarMixToolbarAction = MenuBarMixToolbarAction;
87
84
  exports.MenuBarMixToolbarAction.displayName = 'MenuBarMixToolbarAction';
88
85
  exports.MenuBarActionWrapper = (0, deprecated_1.Deprecated)(exports.MenuBarMixToolbarAction, 'please use `MenuBarMixToolbarAction`');
89
- /**
90
- * 可供集成方导入的组件
91
- * 后续如果有一些改动需要考虑是否有 breakchange
92
- */
93
- const IconMenuBar = () => {
94
- const menuService = (0, ide_core_browser_1.useInjectable)(next_1.AbstractMenuService);
95
- const menus = menuService.createMenu(next_1.MenuId.IconMenubarContext);
96
- return (react_1.default.createElement("div", { className: menu_bar_module_less_1.default.icon_menubar_container },
97
- react_1.default.createElement(actions_1.InlineActionBar, { menus: menus, type: 'icon', className: menu_bar_module_less_1.default.menubar_action, isFlattenMenu: true })));
98
- };
99
- exports.IconMenuBar = IconMenuBar;
100
86
  //# sourceMappingURL=menu-bar.view.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"menu-bar.view.js","sourceRoot":"","sources":["../../src/browser/menu-bar.view.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"menu-bar.view.js","sourceRoot":"","sources":["../../src/browser/menu-bar.view.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opensumi/ide-menu-bar",
3
- "version": "2.24.6-next-1686045771.0",
3
+ "version": "2.24.6",
4
4
  "description": "@opensumi/ide-menu-bar",
5
5
  "files": [
6
6
  "lib",
@@ -18,13 +18,12 @@
18
18
  "url": "git@github.com:opensumi/core.git"
19
19
  },
20
20
  "dependencies": {
21
- "@opensumi/ide-core-common": "2.24.6-next-1686045771.0",
22
- "@opensumi/ide-theme": "2.24.6-next-1686045771.0"
21
+ "@opensumi/ide-core-common": "2.24.6"
23
22
  },
24
23
  "devDependencies": {
25
- "@opensumi/ide-components": "2.24.6-next-1686045771.0",
26
- "@opensumi/ide-core-browser": "2.24.6-next-1686045771.0",
24
+ "@opensumi/ide-components": "2.24.6",
25
+ "@opensumi/ide-core-browser": "2.24.6",
27
26
  "@opensumi/ide-dev-tool": "1.3.1"
28
27
  },
29
- "gitHead": "fcc5fec2b9fb64a7b395df09eb66f6a890cd8638"
28
+ "gitHead": "eaa523bf30631fed0c6cd7d2e83e4bae4b345ec5"
30
29
  }
@@ -2,7 +2,6 @@
2
2
  import { Provider, Injectable } from '@opensumi/di';
3
3
  import { BrowserModule } from '@opensumi/ide-core-browser';
4
4
 
5
- import { MenuBarWebContribution } from './menu-bar-web.contribution';
6
5
  import { MenuBarContribution } from './menu-bar.contribution';
7
6
  import { AbstractMenubarStore, MenubarStore } from './menu-bar.store';
8
7
 
@@ -15,5 +14,4 @@ export class MenuBarModule extends BrowserModule {
15
14
  useClass: MenubarStore,
16
15
  },
17
16
  ];
18
- webProviders = [MenuBarWebContribution];
19
17
  }
@@ -1,14 +1,32 @@
1
1
  import { Autowired } from '@opensumi/di';
2
- import { getExternalIcon, Disposable, PreferenceService, MenubarSettingId } from '@opensumi/ide-core-browser';
2
+ import {
3
+ ToolBarActionContribution,
4
+ AppConfig,
5
+ IToolbarRegistry,
6
+ getExternalIcon,
7
+ Disposable,
8
+ PreferenceService,
9
+ MenubarSettingId,
10
+ } from '@opensumi/ide-core-browser';
3
11
  import { ComponentContribution, ComponentRegistry } from '@opensumi/ide-core-browser/lib/layout';
4
- import { IMenuRegistry, IMenubarItem, ISubmenuItem, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
12
+ import {
13
+ IMenuRegistry,
14
+ IMenubarItem,
15
+ ISubmenuItem,
16
+ MenuContribution,
17
+ MenuId,
18
+ } from '@opensumi/ide-core-browser/lib/menu/next';
5
19
  import { Domain } from '@opensumi/ide-core-common/lib/di-helper';
6
20
 
7
21
  import { MenubarStore } from './menu-bar.store';
8
22
  import { MenuBarMixToolbarAction } from './menu-bar.view';
23
+ import { ToolbarAction } from './toolbar-action.view';
24
+
25
+ @Domain(ComponentContribution, ToolBarActionContribution)
26
+ export class MenuBarContribution extends Disposable implements ComponentContribution, ToolBarActionContribution {
27
+ @Autowired(AppConfig)
28
+ private readonly appConfig: AppConfig;
9
29
 
10
- @Domain(ComponentContribution)
11
- export class MenuBarContribution extends Disposable implements ComponentContribution {
12
30
  @Autowired(MenubarStore)
13
31
  private readonly menubarStore: MenubarStore;
14
32
 
@@ -82,5 +100,19 @@ export class MenuBarContribution extends Disposable implements ComponentContribu
82
100
  size: 27,
83
101
  },
84
102
  );
103
+
104
+ if (!this.appConfig.isElectronRenderer) {
105
+ registry.register('@opensumi/ide-toolbar-action', {
106
+ id: 'ide-toolbar-action',
107
+ component: ToolbarAction,
108
+ });
109
+ }
110
+ }
111
+
112
+ registerToolbarActions(registry: IToolbarRegistry) {
113
+ if (!this.appConfig.isElectronRenderer) {
114
+ registry.addLocation('menu-right');
115
+ registry.addLocation('menu-left');
116
+ }
85
117
  }
86
118
  }
@@ -46,20 +46,3 @@
46
46
  top: 100%;
47
47
  }
48
48
  }
49
-
50
- .icon_menubar_container {
51
- display: flex;
52
- align-items: center;
53
-
54
- .menubar_action {
55
- margin-right: 1px;
56
-
57
- > span[class*='-icon'] {
58
- font-size: 1.5em;
59
- }
60
-
61
- span + span {
62
- margin-left: 12px;
63
- }
64
- }
65
- }
@@ -6,10 +6,9 @@ import { ClickOutside } from '@opensumi/ide-components';
6
6
  import { Dropdown } from '@opensumi/ide-components/lib/dropdown';
7
7
  import { Deprecated } from '@opensumi/ide-components/lib/utils/deprecated';
8
8
  import { useInjectable, SlotRenderer, ComponentRegistry } from '@opensumi/ide-core-browser';
9
- import { InlineActionBar, MenuActionList } from '@opensumi/ide-core-browser/lib/components/actions';
9
+ import { MenuActionList } from '@opensumi/ide-core-browser/lib/components/actions';
10
10
  import { LAYOUT_VIEW_SIZE } from '@opensumi/ide-core-browser/lib/layout/constants';
11
- import { AbstractMenuService, IMenubarItem, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
12
- import { IIconService } from '@opensumi/ide-theme/lib/common/theme.service';
11
+ import { IMenubarItem } from '@opensumi/ide-core-browser/lib/menu/next';
13
12
 
14
13
  import styles from './menu-bar.module.less';
15
14
  import { MenubarStore } from './menu-bar.store';
@@ -22,7 +21,6 @@ const MenubarItem = observer<
22
21
  }
23
22
  >(({ id, label, focusMode, afterMenubarClick, afterMenuClick }) => {
24
23
  const menubarStore = useInjectable<MenubarStore>(MenubarStore);
25
- const iconService = useInjectable<IIconService>(IIconService);
26
24
  const [menuOpen, setMenuOpen] = React.useState<boolean>(false);
27
25
 
28
26
  const handleMenubarItemClick = React.useCallback(() => {
@@ -62,7 +60,7 @@ const MenubarItem = observer<
62
60
  }}
63
61
  visible={menuOpen}
64
62
  onVisibleChange={triggerMenuVisibleChange}
65
- overlay={<MenuActionList data={data} afterClick={handleMenuItemClick} iconService={iconService} />}
63
+ overlay={<MenuActionList data={data} afterClick={handleMenuItemClick} />}
66
64
  trigger={focusMode ? ['click', 'hover'] : ['click']}
67
65
  >
68
66
  <div
@@ -145,18 +143,3 @@ export const MenuBarMixToolbarAction: React.FC<MenuBarMixToolbarActionProps> = (
145
143
  MenuBarMixToolbarAction.displayName = 'MenuBarMixToolbarAction';
146
144
 
147
145
  export const MenuBarActionWrapper = Deprecated(MenuBarMixToolbarAction, 'please use `MenuBarMixToolbarAction`');
148
-
149
- /**
150
- * 可供集成方导入的组件
151
- * 后续如果有一些改动需要考虑是否有 breakchange
152
- */
153
- export const IconMenuBar = () => {
154
- const menuService = useInjectable<AbstractMenuService>(AbstractMenuService);
155
- const menus = menuService.createMenu(MenuId.IconMenubarContext);
156
-
157
- return (
158
- <div className={styles.icon_menubar_container}>
159
- <InlineActionBar menus={menus} type='icon' className={styles.menubar_action} isFlattenMenu={true} />
160
- </div>
161
- );
162
- };
@@ -1,7 +0,0 @@
1
- import { ToolBarActionContribution, IToolbarRegistry, Disposable } from '@opensumi/ide-core-browser';
2
- import { ComponentContribution, ComponentRegistry } from '@opensumi/ide-core-browser/lib/layout';
3
- export declare class MenuBarWebContribution extends Disposable implements ComponentContribution, ToolBarActionContribution {
4
- registerComponent(registry: ComponentRegistry): void;
5
- registerToolbarActions(registry: IToolbarRegistry): void;
6
- }
7
- //# sourceMappingURL=menu-bar-web.contribution.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"menu-bar-web.contribution.d.ts","sourceRoot":"","sources":["../../src/browser/menu-bar-web.contribution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACrG,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAKjG,qBACa,sBAAuB,SAAQ,UAAW,YAAW,qBAAqB,EAAE,yBAAyB;IAChH,iBAAiB,CAAC,QAAQ,EAAE,iBAAiB;IAO7C,sBAAsB,CAAC,QAAQ,EAAE,gBAAgB;CAIlD"}
@@ -1,25 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.MenuBarWebContribution = void 0;
4
- const tslib_1 = require("tslib");
5
- const ide_core_browser_1 = require("@opensumi/ide-core-browser");
6
- const layout_1 = require("@opensumi/ide-core-browser/lib/layout");
7
- const di_helper_1 = require("@opensumi/ide-core-common/lib/di-helper");
8
- const toolbar_action_view_1 = require("./toolbar-action.view");
9
- let MenuBarWebContribution = class MenuBarWebContribution extends ide_core_browser_1.Disposable {
10
- registerComponent(registry) {
11
- registry.register('@opensumi/ide-toolbar-action', {
12
- id: 'ide-toolbar-action',
13
- component: toolbar_action_view_1.ToolbarAction,
14
- });
15
- }
16
- registerToolbarActions(registry) {
17
- registry.addLocation('menu-right');
18
- registry.addLocation('menu-left');
19
- }
20
- };
21
- MenuBarWebContribution = tslib_1.__decorate([
22
- (0, di_helper_1.Domain)(layout_1.ComponentContribution, ide_core_browser_1.ToolBarActionContribution)
23
- ], MenuBarWebContribution);
24
- exports.MenuBarWebContribution = MenuBarWebContribution;
25
- //# sourceMappingURL=menu-bar-web.contribution.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"menu-bar-web.contribution.js","sourceRoot":"","sources":["../../src/browser/menu-bar-web.contribution.ts"],"names":[],"mappings":";;;;AAAA,iEAAqG;AACrG,kEAAiG;AACjG,uEAAiE;AAEjE,+DAAsD;AAG/C,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,6BAAU;IACpD,iBAAiB,CAAC,QAA2B;QAC3C,QAAQ,CAAC,QAAQ,CAAC,8BAA8B,EAAE;YAChD,EAAE,EAAE,oBAAoB;YACxB,SAAS,EAAE,mCAAa;SACzB,CAAC,CAAC;IACL,CAAC;IAED,sBAAsB,CAAC,QAA0B;QAC/C,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QACnC,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IACpC,CAAC;CACF,CAAA;AAZY,sBAAsB;IADlC,IAAA,kBAAM,EAAC,8BAAqB,EAAE,4CAAyB,CAAC;GAC5C,sBAAsB,CAYlC;AAZY,wDAAsB"}
@@ -1,20 +0,0 @@
1
- import { ToolBarActionContribution, IToolbarRegistry, Disposable } from '@opensumi/ide-core-browser';
2
- import { ComponentContribution, ComponentRegistry } from '@opensumi/ide-core-browser/lib/layout';
3
- import { Domain } from '@opensumi/ide-core-common/lib/di-helper';
4
-
5
- import { ToolbarAction } from './toolbar-action.view';
6
-
7
- @Domain(ComponentContribution, ToolBarActionContribution)
8
- export class MenuBarWebContribution extends Disposable implements ComponentContribution, ToolBarActionContribution {
9
- registerComponent(registry: ComponentRegistry) {
10
- registry.register('@opensumi/ide-toolbar-action', {
11
- id: 'ide-toolbar-action',
12
- component: ToolbarAction,
13
- });
14
- }
15
-
16
- registerToolbarActions(registry: IToolbarRegistry) {
17
- registry.addLocation('menu-right');
18
- registry.addLocation('menu-left');
19
- }
20
- }