@opensumi/ide-electron-basic 2.26.9-rc-1696917712.0 → 2.27.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: () =>
|
|
3
|
-
export declare const HeaderBarRightComponent: () =>
|
|
2
|
+
export declare const HeaderBarLeftComponent: () => JSX.Element | null;
|
|
3
|
+
export declare const HeaderBarRightComponent: () => 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,KAAsC,MAAM,OAAO,CAAC;AA6E3D,eAAO,MAAM,sBAAsB,0BAmBlC,CAAC;AAEF,eAAO,MAAM,uBAAuB,0BAwBnC,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,iDAiD7B,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,14 +54,13 @@ const useMaximize = () => {
|
|
|
54
54
|
getMaximized,
|
|
55
55
|
};
|
|
56
56
|
};
|
|
57
|
-
const defaultHeight = (
|
|
58
|
-
const layoutViewSize = appConfig.layoutViewSize || constants_1.LAYOUT_VIEW_SIZE;
|
|
57
|
+
const defaultHeight = () => {
|
|
59
58
|
if (ide_core_browser_3.isMacintosh) {
|
|
60
59
|
// Big Sur increases title bar height
|
|
61
60
|
const isNewMacHeaderBar = parseFloat(ide_core_browser_1.electronEnv.osRelease) >= 20;
|
|
62
|
-
return isNewMacHeaderBar ?
|
|
61
|
+
return isNewMacHeaderBar ? constants_1.LAYOUT_VIEW_SIZE.BIG_SUR_TITLEBAR_HEIGHT : constants_1.LAYOUT_VIEW_SIZE.TITLEBAR_HEIGHT;
|
|
63
62
|
}
|
|
64
|
-
return
|
|
63
|
+
return constants_1.LAYOUT_VIEW_SIZE.MENUBAR_HEIGHT;
|
|
65
64
|
};
|
|
66
65
|
const HeaderBarLeftComponent = () => {
|
|
67
66
|
const componentRegistry = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.ComponentRegistry);
|
|
@@ -78,12 +77,11 @@ exports.HeaderBarLeftComponent = HeaderBarLeftComponent;
|
|
|
78
77
|
const HeaderBarRightComponent = () => {
|
|
79
78
|
const { maximized } = useMaximize();
|
|
80
79
|
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);
|
|
82
80
|
if (ide_core_browser_3.isMacintosh) {
|
|
83
81
|
return null;
|
|
84
82
|
}
|
|
85
83
|
return (react_1.default.createElement("div", { className: header_module_less_1.default.windowActions, style: {
|
|
86
|
-
height: defaultHeight(
|
|
84
|
+
height: defaultHeight(),
|
|
87
85
|
} },
|
|
88
86
|
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() }),
|
|
89
87
|
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() })),
|
|
@@ -93,9 +91,8 @@ exports.HeaderBarRightComponent = HeaderBarRightComponent;
|
|
|
93
91
|
/**
|
|
94
92
|
* autoHide: Hide the HeaderBar when the macOS full screen
|
|
95
93
|
*/
|
|
96
|
-
exports.ElectronHeaderBar = (0, mobx_react_lite_1.observer)(({ LeftComponent, RightComponent, TitleComponent, autoHide = true, height, }) => {
|
|
94
|
+
exports.ElectronHeaderBar = (0, mobx_react_lite_1.observer)(({ LeftComponent, RightComponent, TitleComponent, autoHide = true, height = defaultHeight(), }) => {
|
|
97
95
|
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);
|
|
99
96
|
const { isFullScreen } = useFullScreen();
|
|
100
97
|
const { getMaximized } = useMaximize();
|
|
101
98
|
if (!LeftComponent) {
|
|
@@ -112,13 +109,7 @@ exports.ElectronHeaderBar = (0, mobx_react_lite_1.observer)(({ LeftComponent, Ri
|
|
|
112
109
|
return (react_1.default.createElement("div", null,
|
|
113
110
|
react_1.default.createElement(TitleComponent, { hidden: true })));
|
|
114
111
|
}
|
|
115
|
-
|
|
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 () => {
|
|
112
|
+
return (react_1.default.createElement("div", { className: header_module_less_1.default.header, style: { height }, onDoubleClick: async () => {
|
|
122
113
|
if (await getMaximized()) {
|
|
123
114
|
windowService.unmaximize();
|
|
124
115
|
}
|
|
@@ -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.
|
|
3
|
+
"version": "2.27.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.
|
|
21
|
-
"@opensumi/ide-core-node": "2.
|
|
22
|
-
"@opensumi/ide-file-service": "2.
|
|
23
|
-
"@opensumi/ide-utils": "2.
|
|
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"
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
|
-
"@opensumi/ide-core-browser": "2.
|
|
26
|
+
"@opensumi/ide-core-browser": "2.27.0",
|
|
27
27
|
"@opensumi/ide-dev-tool": "1.3.1",
|
|
28
|
-
"@opensumi/ide-editor": "2.
|
|
29
|
-
"@opensumi/ide-overlay": "2.
|
|
30
|
-
"@opensumi/ide-workspace": "2.
|
|
28
|
+
"@opensumi/ide-editor": "2.27.0",
|
|
29
|
+
"@opensumi/ide-overlay": "2.27.0",
|
|
30
|
+
"@opensumi/ide-workspace": "2.27.0"
|
|
31
31
|
},
|
|
32
|
-
"gitHead": "
|
|
32
|
+
"gitHead": "0ee5a7112a234d1e50f3a1e35c2f43295a32e6ef"
|
|
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
|
|
3
|
+
import React, { useState, useEffect, useRef } from 'react';
|
|
4
4
|
|
|
5
5
|
import {
|
|
6
6
|
useInjectable,
|
|
@@ -10,7 +10,6 @@ import {
|
|
|
10
10
|
electronEnv,
|
|
11
11
|
IWindowService,
|
|
12
12
|
useEventEffect,
|
|
13
|
-
AppConfig,
|
|
14
13
|
} from '@opensumi/ide-core-browser';
|
|
15
14
|
import { getIcon } from '@opensumi/ide-core-browser';
|
|
16
15
|
import { isMacintosh, Disposable } from '@opensumi/ide-core-browser';
|
|
@@ -69,15 +68,13 @@ const useMaximize = () => {
|
|
|
69
68
|
};
|
|
70
69
|
};
|
|
71
70
|
|
|
72
|
-
const defaultHeight = (
|
|
73
|
-
const layoutViewSize = appConfig.layoutViewSize || LAYOUT_VIEW_SIZE;
|
|
74
|
-
|
|
71
|
+
const defaultHeight = () => {
|
|
75
72
|
if (isMacintosh) {
|
|
76
73
|
// Big Sur increases title bar height
|
|
77
74
|
const isNewMacHeaderBar = parseFloat(electronEnv.osRelease) >= 20;
|
|
78
|
-
return isNewMacHeaderBar ?
|
|
75
|
+
return isNewMacHeaderBar ? LAYOUT_VIEW_SIZE.BIG_SUR_TITLEBAR_HEIGHT : LAYOUT_VIEW_SIZE.TITLEBAR_HEIGHT;
|
|
79
76
|
}
|
|
80
|
-
return
|
|
77
|
+
return LAYOUT_VIEW_SIZE.MENUBAR_HEIGHT;
|
|
81
78
|
};
|
|
82
79
|
|
|
83
80
|
export const HeaderBarLeftComponent = () => {
|
|
@@ -104,7 +101,6 @@ export const HeaderBarLeftComponent = () => {
|
|
|
104
101
|
export const HeaderBarRightComponent = () => {
|
|
105
102
|
const { maximized } = useMaximize();
|
|
106
103
|
const windowService: IWindowService = useInjectable(IWindowService);
|
|
107
|
-
const appConfig = useInjectable<AppConfig>(AppConfig);
|
|
108
104
|
|
|
109
105
|
if (isMacintosh) {
|
|
110
106
|
return null;
|
|
@@ -114,7 +110,7 @@ export const HeaderBarRightComponent = () => {
|
|
|
114
110
|
<div
|
|
115
111
|
className={styles.windowActions}
|
|
116
112
|
style={{
|
|
117
|
-
height: defaultHeight(
|
|
113
|
+
height: defaultHeight(),
|
|
118
114
|
}}
|
|
119
115
|
>
|
|
120
116
|
<div className={cls(styles.icon, getIcon('min'))} onClick={() => windowService.minimize()} />
|
|
@@ -146,10 +142,9 @@ export const ElectronHeaderBar = observer(
|
|
|
146
142
|
RightComponent,
|
|
147
143
|
TitleComponent,
|
|
148
144
|
autoHide = true,
|
|
149
|
-
height,
|
|
145
|
+
height = defaultHeight(),
|
|
150
146
|
}: React.PropsWithChildren<ElectronHeaderBarPorps>) => {
|
|
151
147
|
const windowService: IWindowService = useInjectable(IWindowService);
|
|
152
|
-
const appConfig = useInjectable<AppConfig>(AppConfig);
|
|
153
148
|
|
|
154
149
|
const { isFullScreen } = useFullScreen();
|
|
155
150
|
const { getMaximized } = useMaximize();
|
|
@@ -172,18 +167,10 @@ export const ElectronHeaderBar = observer(
|
|
|
172
167
|
);
|
|
173
168
|
}
|
|
174
169
|
|
|
175
|
-
const safeHeight = useMemo(() => {
|
|
176
|
-
if (height) {
|
|
177
|
-
return height;
|
|
178
|
-
}
|
|
179
|
-
|
|
180
|
-
return defaultHeight(appConfig);
|
|
181
|
-
}, [appConfig, height]);
|
|
182
|
-
|
|
183
170
|
return (
|
|
184
171
|
<div
|
|
185
172
|
className={styles.header}
|
|
186
|
-
style={{ height
|
|
173
|
+
style={{ height }}
|
|
187
174
|
onDoubleClick={async () => {
|
|
188
175
|
if (await getMaximized()) {
|
|
189
176
|
windowService.unmaximize();
|