@opensumi/ide-electron-basic 2.27.0 → 2.27.1-next-1697789179.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.
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
export declare const HeaderBarLeftComponent: () => JSX.Element | null;
|
|
3
|
-
export declare const HeaderBarRightComponent: () => JSX.Element | null;
|
|
2
|
+
export declare const HeaderBarLeftComponent: () => React.JSX.Element | null;
|
|
3
|
+
export declare const HeaderBarRightComponent: () => React.JSX.Element | null;
|
|
4
4
|
interface ElectronHeaderBarPorps {
|
|
5
5
|
LeftComponent?: React.FunctionComponent;
|
|
6
6
|
RightComponent?: React.FunctionComponent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.view.d.ts","sourceRoot":"","sources":["../../../src/browser/header/header.view.tsx"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"header.view.d.ts","sourceRoot":"","sources":["../../../src/browser/header/header.view.tsx"],"names":[],"mappings":"AAEA,OAAO,KAA+C,MAAM,OAAO,CAAC;AAgFpE,eAAO,MAAM,sBAAsB,gCAmBlC,CAAC;AAEF,eAAO,MAAM,uBAAuB,gCAyBnC,CAAC;AAEF,UAAU,sBAAsB;IAC9B,aAAa,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC;IACxC,cAAc,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC;IACzC,cAAc,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;IACxD,IAAI,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC;IAC/B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,eAAO,MAAM,iBAAiB,iDA0D7B,CAAC;AAIF,MAAM,WAAW,SAAS;IACxB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,eAAO,MAAM,uBAAuB,wCAkElC,CAAC"}
|
|
@@ -54,13 +54,14 @@ const useMaximize = () => {
|
|
|
54
54
|
getMaximized,
|
|
55
55
|
};
|
|
56
56
|
};
|
|
57
|
-
const defaultHeight = () => {
|
|
57
|
+
const defaultHeight = (appConfig) => {
|
|
58
|
+
const layoutViewSize = appConfig.layoutViewSize || constants_1.LAYOUT_VIEW_SIZE;
|
|
58
59
|
if (ide_core_browser_3.isMacintosh) {
|
|
59
60
|
// Big Sur increases title bar height
|
|
60
61
|
const isNewMacHeaderBar = parseFloat(ide_core_browser_1.electronEnv.osRelease) >= 20;
|
|
61
|
-
return isNewMacHeaderBar ?
|
|
62
|
+
return isNewMacHeaderBar ? layoutViewSize.BIG_SUR_TITLEBAR_HEIGHT : layoutViewSize.TITLEBAR_HEIGHT;
|
|
62
63
|
}
|
|
63
|
-
return
|
|
64
|
+
return layoutViewSize.MENUBAR_HEIGHT;
|
|
64
65
|
};
|
|
65
66
|
const HeaderBarLeftComponent = () => {
|
|
66
67
|
const componentRegistry = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.ComponentRegistry);
|
|
@@ -77,11 +78,12 @@ exports.HeaderBarLeftComponent = HeaderBarLeftComponent;
|
|
|
77
78
|
const HeaderBarRightComponent = () => {
|
|
78
79
|
const { maximized } = useMaximize();
|
|
79
80
|
const windowService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.IWindowService);
|
|
81
|
+
const appConfig = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.AppConfig);
|
|
80
82
|
if (ide_core_browser_3.isMacintosh) {
|
|
81
83
|
return null;
|
|
82
84
|
}
|
|
83
85
|
return (react_1.default.createElement("div", { className: header_module_less_1.default.windowActions, style: {
|
|
84
|
-
height: defaultHeight(),
|
|
86
|
+
height: defaultHeight(appConfig),
|
|
85
87
|
} },
|
|
86
88
|
react_1.default.createElement("div", { className: (0, classnames_1.default)(header_module_less_1.default.icon, (0, ide_core_browser_2.getIcon)('min')), onClick: () => windowService.minimize() }),
|
|
87
89
|
maximized ? (react_1.default.createElement("div", { className: (0, classnames_1.default)(header_module_less_1.default.icon, (0, ide_core_browser_2.getIcon)('max')), onClick: () => windowService.unmaximize() })) : (react_1.default.createElement("div", { className: (0, classnames_1.default)(header_module_less_1.default.icon, (0, ide_core_browser_2.getIcon)('unmax')), onClick: () => windowService.maximize() })),
|
|
@@ -91,8 +93,9 @@ exports.HeaderBarRightComponent = HeaderBarRightComponent;
|
|
|
91
93
|
/**
|
|
92
94
|
* autoHide: Hide the HeaderBar when the macOS full screen
|
|
93
95
|
*/
|
|
94
|
-
exports.ElectronHeaderBar = (0, mobx_react_lite_1.observer)(({ LeftComponent, RightComponent, TitleComponent, autoHide = true, height
|
|
96
|
+
exports.ElectronHeaderBar = (0, mobx_react_lite_1.observer)(({ LeftComponent, RightComponent, TitleComponent, autoHide = true, height, }) => {
|
|
95
97
|
const windowService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.IWindowService);
|
|
98
|
+
const appConfig = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.AppConfig);
|
|
96
99
|
const { isFullScreen } = useFullScreen();
|
|
97
100
|
const { getMaximized } = useMaximize();
|
|
98
101
|
if (!LeftComponent) {
|
|
@@ -109,7 +112,13 @@ exports.ElectronHeaderBar = (0, mobx_react_lite_1.observer)(({ LeftComponent, Ri
|
|
|
109
112
|
return (react_1.default.createElement("div", null,
|
|
110
113
|
react_1.default.createElement(TitleComponent, { hidden: true })));
|
|
111
114
|
}
|
|
112
|
-
|
|
115
|
+
const safeHeight = (0, react_1.useMemo)(() => {
|
|
116
|
+
if (height) {
|
|
117
|
+
return height;
|
|
118
|
+
}
|
|
119
|
+
return defaultHeight(appConfig);
|
|
120
|
+
}, [appConfig, height]);
|
|
121
|
+
return (react_1.default.createElement("div", { className: header_module_less_1.default.header, style: { height: safeHeight }, onDoubleClick: async () => {
|
|
113
122
|
if (await getMaximized()) {
|
|
114
123
|
windowService.unmaximize();
|
|
115
124
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.view.js","sourceRoot":"","sources":["../../../src/browser/header/header.view.tsx"],"names":[],"mappings":";;;;AAAA,oEAA6B;AAC7B,qDAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"header.view.js","sourceRoot":"","sources":["../../../src/browser/header/header.view.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-electron-basic",
|
|
3
|
-
"version": "2.27.0",
|
|
3
|
+
"version": "2.27.1-next-1697789179.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src"
|
|
@@ -17,17 +17,17 @@
|
|
|
17
17
|
"url": "git@github.com:opensumi/core.git"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@opensumi/ide-core-common": "2.27.0",
|
|
21
|
-
"@opensumi/ide-core-node": "2.27.0",
|
|
22
|
-
"@opensumi/ide-file-service": "2.27.0",
|
|
23
|
-
"@opensumi/ide-utils": "2.27.0"
|
|
20
|
+
"@opensumi/ide-core-common": "2.27.1-next-1697789179.0",
|
|
21
|
+
"@opensumi/ide-core-node": "2.27.1-next-1697789179.0",
|
|
22
|
+
"@opensumi/ide-file-service": "2.27.1-next-1697789179.0",
|
|
23
|
+
"@opensumi/ide-utils": "2.27.1-next-1697789179.0"
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
|
-
"@opensumi/ide-core-browser": "2.27.0",
|
|
26
|
+
"@opensumi/ide-core-browser": "2.27.1-next-1697789179.0",
|
|
27
27
|
"@opensumi/ide-dev-tool": "1.3.1",
|
|
28
|
-
"@opensumi/ide-editor": "2.27.0",
|
|
29
|
-
"@opensumi/ide-overlay": "2.27.0",
|
|
30
|
-
"@opensumi/ide-workspace": "2.27.0"
|
|
28
|
+
"@opensumi/ide-editor": "2.27.1-next-1697789179.0",
|
|
29
|
+
"@opensumi/ide-overlay": "2.27.1-next-1697789179.0",
|
|
30
|
+
"@opensumi/ide-workspace": "2.27.1-next-1697789179.0"
|
|
31
31
|
},
|
|
32
|
-
"gitHead": "
|
|
32
|
+
"gitHead": "f098f6685e6fedf4c74f7ef4910ba9fe87644ba1"
|
|
33
33
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import cls from 'classnames';
|
|
2
2
|
import { observer } from 'mobx-react-lite';
|
|
3
|
-
import React, { useState, useEffect, useRef } from 'react';
|
|
3
|
+
import React, { useState, useEffect, useRef, useMemo } from 'react';
|
|
4
4
|
|
|
5
5
|
import {
|
|
6
6
|
useInjectable,
|
|
@@ -10,6 +10,7 @@ import {
|
|
|
10
10
|
electronEnv,
|
|
11
11
|
IWindowService,
|
|
12
12
|
useEventEffect,
|
|
13
|
+
AppConfig,
|
|
13
14
|
} from '@opensumi/ide-core-browser';
|
|
14
15
|
import { getIcon } from '@opensumi/ide-core-browser';
|
|
15
16
|
import { isMacintosh, Disposable } from '@opensumi/ide-core-browser';
|
|
@@ -68,13 +69,15 @@ const useMaximize = () => {
|
|
|
68
69
|
};
|
|
69
70
|
};
|
|
70
71
|
|
|
71
|
-
const defaultHeight = () => {
|
|
72
|
+
const defaultHeight = (appConfig: AppConfig) => {
|
|
73
|
+
const layoutViewSize = appConfig.layoutViewSize || LAYOUT_VIEW_SIZE;
|
|
74
|
+
|
|
72
75
|
if (isMacintosh) {
|
|
73
76
|
// Big Sur increases title bar height
|
|
74
77
|
const isNewMacHeaderBar = parseFloat(electronEnv.osRelease) >= 20;
|
|
75
|
-
return isNewMacHeaderBar ?
|
|
78
|
+
return isNewMacHeaderBar ? layoutViewSize.BIG_SUR_TITLEBAR_HEIGHT : layoutViewSize.TITLEBAR_HEIGHT;
|
|
76
79
|
}
|
|
77
|
-
return
|
|
80
|
+
return layoutViewSize.MENUBAR_HEIGHT;
|
|
78
81
|
};
|
|
79
82
|
|
|
80
83
|
export const HeaderBarLeftComponent = () => {
|
|
@@ -101,6 +104,7 @@ export const HeaderBarLeftComponent = () => {
|
|
|
101
104
|
export const HeaderBarRightComponent = () => {
|
|
102
105
|
const { maximized } = useMaximize();
|
|
103
106
|
const windowService: IWindowService = useInjectable(IWindowService);
|
|
107
|
+
const appConfig = useInjectable<AppConfig>(AppConfig);
|
|
104
108
|
|
|
105
109
|
if (isMacintosh) {
|
|
106
110
|
return null;
|
|
@@ -110,7 +114,7 @@ export const HeaderBarRightComponent = () => {
|
|
|
110
114
|
<div
|
|
111
115
|
className={styles.windowActions}
|
|
112
116
|
style={{
|
|
113
|
-
height: defaultHeight(),
|
|
117
|
+
height: defaultHeight(appConfig),
|
|
114
118
|
}}
|
|
115
119
|
>
|
|
116
120
|
<div className={cls(styles.icon, getIcon('min'))} onClick={() => windowService.minimize()} />
|
|
@@ -142,9 +146,10 @@ export const ElectronHeaderBar = observer(
|
|
|
142
146
|
RightComponent,
|
|
143
147
|
TitleComponent,
|
|
144
148
|
autoHide = true,
|
|
145
|
-
height
|
|
149
|
+
height,
|
|
146
150
|
}: React.PropsWithChildren<ElectronHeaderBarPorps>) => {
|
|
147
151
|
const windowService: IWindowService = useInjectable(IWindowService);
|
|
152
|
+
const appConfig = useInjectable<AppConfig>(AppConfig);
|
|
148
153
|
|
|
149
154
|
const { isFullScreen } = useFullScreen();
|
|
150
155
|
const { getMaximized } = useMaximize();
|
|
@@ -167,10 +172,18 @@ export const ElectronHeaderBar = observer(
|
|
|
167
172
|
);
|
|
168
173
|
}
|
|
169
174
|
|
|
175
|
+
const safeHeight = useMemo(() => {
|
|
176
|
+
if (height) {
|
|
177
|
+
return height;
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
return defaultHeight(appConfig);
|
|
181
|
+
}, [appConfig, height]);
|
|
182
|
+
|
|
170
183
|
return (
|
|
171
184
|
<div
|
|
172
185
|
className={styles.header}
|
|
173
|
-
style={{ height }}
|
|
186
|
+
style={{ height: safeHeight }}
|
|
174
187
|
onDoubleClick={async () => {
|
|
175
188
|
if (await getMaximized()) {
|
|
176
189
|
windowService.unmaximize();
|