@opensumi/ide-menu-bar 2.26.8 → 2.26.9-rc-1695060705.0
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.
|
@@ -7,6 +7,6 @@ export declare const MenuBarActionWrapper: (props: MenuBarMixToolbarActionProps)
|
|
|
7
7
|
* 可供集成方导入的组件
|
|
8
8
|
* 后续如果有一些改动需要考虑是否有 breakchange
|
|
9
9
|
*/
|
|
10
|
-
export declare const IconMenuBar: () => JSX.Element;
|
|
10
|
+
export declare const IconMenuBar: () => React.JSX.Element;
|
|
11
11
|
export {};
|
|
12
12
|
//# 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,
|
|
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,iCAsDlB,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,yBASvB,CAAC"}
|
|
@@ -56,6 +56,7 @@ exports.MenuBar = (0, mobx_react_lite_1.observer)(() => {
|
|
|
56
56
|
var _a;
|
|
57
57
|
const menubarStore = (0, ide_core_browser_1.useInjectable)(menu_bar_store_1.MenubarStore);
|
|
58
58
|
const componentRegistry = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.ComponentRegistry);
|
|
59
|
+
const appConfig = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.AppConfig);
|
|
59
60
|
const [focusMode, setFocusMode] = react_1.default.useState(false);
|
|
60
61
|
const relatedTarget = react_1.default.useRef();
|
|
61
62
|
const handleMenubarFocusIn = react_1.default.useCallback((e) => {
|
|
@@ -75,7 +76,11 @@ exports.MenuBar = (0, mobx_react_lite_1.observer)(() => {
|
|
|
75
76
|
setFocusMode(false);
|
|
76
77
|
}, [focusMode]);
|
|
77
78
|
const LogoIcon = (_a = componentRegistry.getComponentRegistryInfo('@opensumi/ide-menu-bar-logo')) === null || _a === void 0 ? void 0 : _a.views[0].component;
|
|
78
|
-
|
|
79
|
+
const MENUBAR_HEIGHT = react_1.default.useMemo(() => {
|
|
80
|
+
var _a;
|
|
81
|
+
return ((_a = appConfig.layoutViewSize) === null || _a === void 0 ? void 0 : _a.MENUBAR_HEIGHT) || constants_1.LAYOUT_VIEW_SIZE.MENUBAR_HEIGHT;
|
|
82
|
+
}, [appConfig]);
|
|
83
|
+
return (react_1.default.createElement(ide_components_1.ClickOutside, { className: menu_bar_module_less_1.default.menubars, style: { height: MENUBAR_HEIGHT }, mouseEvents: ['click', 'contextmenu'], tabIndex: -1, onFocus: handleMenubarFocusIn, onOutsideClick: handleMouseLeave },
|
|
79
84
|
LogoIcon ? react_1.default.createElement(LogoIcon, null) : react_1.default.createElement("div", { className: menu_bar_module_less_1.default.logoIconEmpty }),
|
|
80
85
|
menubarStore.menubarItems.map(({ id, label }) => (react_1.default.createElement(MenubarItem, { key: id, id: id, label: label, focusMode: focusMode, afterMenuClick: handleMenuItemClick, afterMenubarClick: () => setFocusMode((r) => !r) })))));
|
|
81
86
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu-bar.view.js","sourceRoot":"","sources":["../../src/browser/menu-bar.view.tsx"],"names":[],"mappings":";;;;AAAA,oEAA6B;AAC7B,qDAA2C;AAC3C,0DAA0B;AAE1B,6DAAwD;AACxD,oEAAiE;AACjE,8EAA2E;AAC3E,
|
|
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.26.
|
|
3
|
+
"version": "2.26.9-rc-1695060705.0",
|
|
4
4
|
"description": "@opensumi/ide-menu-bar",
|
|
5
5
|
"files": [
|
|
6
6
|
"lib",
|
|
@@ -18,13 +18,13 @@
|
|
|
18
18
|
"url": "git@github.com:opensumi/core.git"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@opensumi/ide-core-common": "2.26.
|
|
22
|
-
"@opensumi/ide-theme": "2.26.
|
|
21
|
+
"@opensumi/ide-core-common": "2.26.9-rc-1695060705.0",
|
|
22
|
+
"@opensumi/ide-theme": "2.26.9-rc-1695060705.0"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
|
-
"@opensumi/ide-components": "2.26.
|
|
26
|
-
"@opensumi/ide-core-browser": "2.26.
|
|
25
|
+
"@opensumi/ide-components": "2.26.9-rc-1695060705.0",
|
|
26
|
+
"@opensumi/ide-core-browser": "2.26.9-rc-1695060705.0",
|
|
27
27
|
"@opensumi/ide-dev-tool": "1.3.1"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "727aca70b9cfad7c49648e93896f0866a788dad4"
|
|
30
30
|
}
|
|
@@ -5,7 +5,7 @@ import React from 'react';
|
|
|
5
5
|
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
|
-
import { useInjectable, SlotRenderer, ComponentRegistry } from '@opensumi/ide-core-browser';
|
|
8
|
+
import { useInjectable, SlotRenderer, ComponentRegistry, AppConfig } from '@opensumi/ide-core-browser';
|
|
9
9
|
import { InlineActionBar, MenuActionList } from '@opensumi/ide-core-browser/lib/components/actions';
|
|
10
10
|
import { LAYOUT_VIEW_SIZE } from '@opensumi/ide-core-browser/lib/layout/constants';
|
|
11
11
|
import { AbstractMenuService, IMenubarItem, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
|
|
@@ -83,6 +83,7 @@ const MenubarItem = observer<
|
|
|
83
83
|
export const MenuBar = observer(() => {
|
|
84
84
|
const menubarStore = useInjectable<MenubarStore>(MenubarStore);
|
|
85
85
|
const componentRegistry: ComponentRegistry = useInjectable(ComponentRegistry);
|
|
86
|
+
const appConfig = useInjectable<AppConfig>(AppConfig);
|
|
86
87
|
const [focusMode, setFocusMode] = React.useState(false);
|
|
87
88
|
const relatedTarget = React.useRef<HTMLElement>();
|
|
88
89
|
|
|
@@ -107,10 +108,14 @@ export const MenuBar = observer(() => {
|
|
|
107
108
|
|
|
108
109
|
const LogoIcon = componentRegistry.getComponentRegistryInfo('@opensumi/ide-menu-bar-logo')?.views[0].component;
|
|
109
110
|
|
|
111
|
+
const MENUBAR_HEIGHT = React.useMemo(() => {
|
|
112
|
+
return appConfig.layoutViewSize?.MENUBAR_HEIGHT || LAYOUT_VIEW_SIZE.MENUBAR_HEIGHT;
|
|
113
|
+
}, [appConfig])
|
|
114
|
+
|
|
110
115
|
return (
|
|
111
116
|
<ClickOutside
|
|
112
117
|
className={styles.menubars}
|
|
113
|
-
style={{ height:
|
|
118
|
+
style={{ height: MENUBAR_HEIGHT }}
|
|
114
119
|
mouseEvents={['click', 'contextmenu']}
|
|
115
120
|
tabIndex={-1} // make focus event implement
|
|
116
121
|
onFocus={handleMenubarFocusIn}
|