@opensumi/ide-electron-basic 2.22.3-next-1676346868.0 → 2.22.3
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.
- package/lib/browser/header/header.module.less +27 -25
- package/lib/browser/header/header.view.d.ts.map +1 -1
- package/lib/browser/header/header.view.js +14 -7
- package/lib/browser/header/header.view.js.map +1 -1
- package/package.json +10 -10
- package/src/browser/header/header.module.less +27 -25
- package/src/browser/header/header.view.tsx +15 -8
|
@@ -22,40 +22,42 @@
|
|
|
22
22
|
}
|
|
23
23
|
|
|
24
24
|
:global .menubarWrapper {
|
|
25
|
-
background-color: var(--
|
|
25
|
+
background-color: var(--menu-background);
|
|
26
26
|
}
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
.windowActions {
|
|
30
|
-
display: flex;
|
|
31
|
-
align-items: center;
|
|
32
|
-
-webkit-app-region: no-drag;
|
|
33
|
-
user-select: none;
|
|
34
27
|
|
|
35
|
-
|
|
36
|
-
font-size: 16px;
|
|
37
|
-
padding: 0 15px;
|
|
38
|
-
height: 100%;
|
|
39
|
-
width: 100%;
|
|
28
|
+
.windowActions {
|
|
40
29
|
display: flex;
|
|
41
30
|
align-items: center;
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
31
|
+
-webkit-app-region: no-drag;
|
|
32
|
+
user-select: none;
|
|
33
|
+
|
|
34
|
+
> .icon {
|
|
35
|
+
font-size: 16px;
|
|
36
|
+
padding: 0 15px;
|
|
37
|
+
height: 100%;
|
|
38
|
+
width: 100%;
|
|
39
|
+
display: flex;
|
|
40
|
+
align-items: center;
|
|
41
|
+
|
|
42
|
+
&:hover {
|
|
43
|
+
background-color: hsla(0, 0%, 100%, 0.1);
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
&:hover:last-child {
|
|
47
|
+
background-color: rgba(232, 17, 35, 0.9);
|
|
48
|
+
color: white;
|
|
49
|
+
}
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
|
|
54
54
|
:global(.vs) {
|
|
55
|
-
.
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
55
|
+
.header {
|
|
56
|
+
.windowActions {
|
|
57
|
+
> .icon:not(:last-child):hover {
|
|
58
|
+
background-color: rgba(0, 0, 0, 0.1);
|
|
59
|
+
color: #696767;
|
|
60
|
+
}
|
|
59
61
|
}
|
|
60
62
|
}
|
|
61
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.view.d.ts","sourceRoot":"","sources":["../../../src/browser/header/header.view.tsx"],"names":[],"mappings":"
|
|
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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.HeaderBarTitleComponent = exports.ElectronHeaderBar = exports.HeaderBarRightComponent = exports.HeaderBarLeftComponent = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const classnames_1 = tslib_1.__importDefault(require("classnames"));
|
|
5
6
|
const mobx_react_lite_1 = require("mobx-react-lite");
|
|
6
7
|
const react_1 = tslib_1.__importStar(require("react"));
|
|
7
8
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
@@ -53,8 +54,14 @@ const useMaximize = () => {
|
|
|
53
54
|
getMaximized,
|
|
54
55
|
};
|
|
55
56
|
};
|
|
56
|
-
|
|
57
|
-
|
|
57
|
+
const defaultHeight = () => {
|
|
58
|
+
if (ide_core_browser_3.isMacintosh) {
|
|
59
|
+
// Big Sur increases title bar height
|
|
60
|
+
const isNewMacHeaderBar = parseFloat(ide_core_browser_1.electronEnv.osRelease) >= 20;
|
|
61
|
+
return isNewMacHeaderBar ? constants_1.LAYOUT_VIEW_SIZE.BIG_SUR_TITLEBAR_HEIGHT : constants_1.LAYOUT_VIEW_SIZE.TITLEBAR_HEIGHT;
|
|
62
|
+
}
|
|
63
|
+
return constants_1.LAYOUT_VIEW_SIZE.MENUBAR_HEIGHT;
|
|
64
|
+
};
|
|
58
65
|
const HeaderBarLeftComponent = () => {
|
|
59
66
|
const componentRegistry = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.ComponentRegistry);
|
|
60
67
|
if (ide_core_browser_3.isMacintosh) {
|
|
@@ -74,17 +81,17 @@ const HeaderBarRightComponent = () => {
|
|
|
74
81
|
return null;
|
|
75
82
|
}
|
|
76
83
|
return (react_1.default.createElement("div", { className: header_module_less_1.default.windowActions, style: {
|
|
77
|
-
height:
|
|
84
|
+
height: defaultHeight(),
|
|
78
85
|
} },
|
|
79
|
-
react_1.default.createElement("div", { className: (0, ide_core_browser_2.getIcon)('min'), onClick: () => windowService.minimize() }),
|
|
80
|
-
maximized ? (react_1.default.createElement("div", { className: (0, ide_core_browser_2.getIcon)('max'), onClick: () => windowService.unmaximize() })) : (react_1.default.createElement("div", { className: (0, ide_core_browser_2.getIcon)('unmax'), onClick: () => windowService.maximize() })),
|
|
81
|
-
react_1.default.createElement("div", { className: (0, ide_core_browser_2.getIcon)('close1'), onClick: () => windowService.close() })));
|
|
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() }),
|
|
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() })),
|
|
88
|
+
react_1.default.createElement("div", { className: (0, classnames_1.default)(header_module_less_1.default.icon, (0, ide_core_browser_2.getIcon)('close1')), onClick: () => windowService.close() })));
|
|
82
89
|
};
|
|
83
90
|
exports.HeaderBarRightComponent = HeaderBarRightComponent;
|
|
84
91
|
/**
|
|
85
92
|
* autoHide: Hide the HeaderBar when the macOS full screen
|
|
86
93
|
*/
|
|
87
|
-
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(), }) => {
|
|
88
95
|
const windowService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.IWindowService);
|
|
89
96
|
const { isFullScreen } = useFullScreen();
|
|
90
97
|
const { getMaximized } = useMaximize();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.view.js","sourceRoot":"","sources":["../../../src/browser/header/header.view.tsx"],"names":[],"mappings":";;;;AAAA,qDAA2C;AAC3C,uDAA2D;AAE3D,iEAQoC;AACpC,iEAAqD;AACrD,iEAAqE;AACrE,+EAAmF;AACnF,qEAAgF;AAEhF,gDAA6D;AAE7D,sFAA0C;AAE1C,MAAM,aAAa,GAAG,GAAG,EAAE;IACzB,MAAM,SAAS,GAA2B,IAAA,gCAAa,EAAC,iCAAsB,CAAC,CAAC;IAChF,MAAM,CAAC,YAAY,EAAE,aAAa,CAAC,GAAG,IAAA,gBAAQ,EAAU,KAAK,CAAC,CAAC;IAE/D,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,SAAS,CAAC,YAAY,CAAC,8BAAW,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE;YACtE,aAAa,CAAC,UAAU,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,SAAS,CAAC,EAAE,CAAC,wBAAwB,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE;YAC/E,IAAI,QAAQ,KAAK,8BAAW,CAAC,eAAe,EAAE;gBAC5C,aAAa,CAAC,UAAU,CAAC,CAAC;aAC3B;QACH,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,EAAE;YACV,QAAQ,CAAC,OAAO,EAAE,CAAC;QACrB,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,OAAO;QACL,YAAY;KACb,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,GAAG,EAAE;IACvB,MAAM,SAAS,GAA2B,IAAA,gCAAa,EAAC,iCAAsB,CAAC,CAAC;IAChF,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAElD,MAAM,YAAY,GAAG,KAAK,IAAI,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,8BAAW,CAAC,eAAe,CAAC,CAAC;IAEpF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,gBAAgB,GAAG,SAAS,CAAC,EAAE,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE;YACtF,IAAI,QAAQ,KAAK,8BAAW,CAAC,eAAe,EAAE;gBAC5C,YAAY,CAAC,WAAW,CAAC,CAAC;aAC3B;QACH,CAAC,CAAC,CAAC;QACH,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;YAChC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,EAAE;YACV,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACL,SAAS;QACT,YAAY;KACb,CAAC;AACJ,CAAC,CAAC;AAEF,
|
|
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.22.3
|
|
3
|
+
"version": "2.22.3",
|
|
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.22.3
|
|
21
|
-
"@opensumi/ide-core-node": "2.22.3
|
|
22
|
-
"@opensumi/ide-file-service": "2.22.3
|
|
23
|
-
"@opensumi/ide-utils": "2.22.3
|
|
20
|
+
"@opensumi/ide-core-common": "2.22.3",
|
|
21
|
+
"@opensumi/ide-core-node": "2.22.3",
|
|
22
|
+
"@opensumi/ide-file-service": "2.22.3",
|
|
23
|
+
"@opensumi/ide-utils": "2.22.3"
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
|
-
"@opensumi/ide-core-browser": "2.22.3
|
|
26
|
+
"@opensumi/ide-core-browser": "2.22.3",
|
|
27
27
|
"@opensumi/ide-dev-tool": "1.3.1",
|
|
28
|
-
"@opensumi/ide-editor": "2.22.3
|
|
29
|
-
"@opensumi/ide-overlay": "2.22.3
|
|
30
|
-
"@opensumi/ide-workspace": "2.22.3
|
|
28
|
+
"@opensumi/ide-editor": "2.22.3",
|
|
29
|
+
"@opensumi/ide-overlay": "2.22.3",
|
|
30
|
+
"@opensumi/ide-workspace": "2.22.3"
|
|
31
31
|
},
|
|
32
|
-
"gitHead": "
|
|
32
|
+
"gitHead": "628daa791b629280ea3bf2aa0ea2f4609a942767"
|
|
33
33
|
}
|
|
@@ -22,40 +22,42 @@
|
|
|
22
22
|
}
|
|
23
23
|
|
|
24
24
|
:global .menubarWrapper {
|
|
25
|
-
background-color: var(--
|
|
25
|
+
background-color: var(--menu-background);
|
|
26
26
|
}
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
.windowActions {
|
|
30
|
-
display: flex;
|
|
31
|
-
align-items: center;
|
|
32
|
-
-webkit-app-region: no-drag;
|
|
33
|
-
user-select: none;
|
|
34
27
|
|
|
35
|
-
|
|
36
|
-
font-size: 16px;
|
|
37
|
-
padding: 0 15px;
|
|
38
|
-
height: 100%;
|
|
39
|
-
width: 100%;
|
|
28
|
+
.windowActions {
|
|
40
29
|
display: flex;
|
|
41
30
|
align-items: center;
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
31
|
+
-webkit-app-region: no-drag;
|
|
32
|
+
user-select: none;
|
|
33
|
+
|
|
34
|
+
> .icon {
|
|
35
|
+
font-size: 16px;
|
|
36
|
+
padding: 0 15px;
|
|
37
|
+
height: 100%;
|
|
38
|
+
width: 100%;
|
|
39
|
+
display: flex;
|
|
40
|
+
align-items: center;
|
|
41
|
+
|
|
42
|
+
&:hover {
|
|
43
|
+
background-color: hsla(0, 0%, 100%, 0.1);
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
&:hover:last-child {
|
|
47
|
+
background-color: rgba(232, 17, 35, 0.9);
|
|
48
|
+
color: white;
|
|
49
|
+
}
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
|
|
54
54
|
:global(.vs) {
|
|
55
|
-
.
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
55
|
+
.header {
|
|
56
|
+
.windowActions {
|
|
57
|
+
> .icon:not(:last-child):hover {
|
|
58
|
+
background-color: rgba(0, 0, 0, 0.1);
|
|
59
|
+
color: #696767;
|
|
60
|
+
}
|
|
59
61
|
}
|
|
60
62
|
}
|
|
61
63
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import cls from 'classnames';
|
|
1
2
|
import { observer } from 'mobx-react-lite';
|
|
2
3
|
import React, { useState, useEffect, useRef } from 'react';
|
|
3
4
|
|
|
@@ -67,8 +68,14 @@ const useMaximize = () => {
|
|
|
67
68
|
};
|
|
68
69
|
};
|
|
69
70
|
|
|
70
|
-
|
|
71
|
-
|
|
71
|
+
const defaultHeight = () => {
|
|
72
|
+
if (isMacintosh) {
|
|
73
|
+
// Big Sur increases title bar height
|
|
74
|
+
const isNewMacHeaderBar = parseFloat(electronEnv.osRelease) >= 20;
|
|
75
|
+
return isNewMacHeaderBar ? LAYOUT_VIEW_SIZE.BIG_SUR_TITLEBAR_HEIGHT : LAYOUT_VIEW_SIZE.TITLEBAR_HEIGHT;
|
|
76
|
+
}
|
|
77
|
+
return LAYOUT_VIEW_SIZE.MENUBAR_HEIGHT;
|
|
78
|
+
};
|
|
72
79
|
|
|
73
80
|
export const HeaderBarLeftComponent = () => {
|
|
74
81
|
const componentRegistry: ComponentRegistry = useInjectable(ComponentRegistry);
|
|
@@ -103,16 +110,16 @@ export const HeaderBarRightComponent = () => {
|
|
|
103
110
|
<div
|
|
104
111
|
className={styles.windowActions}
|
|
105
112
|
style={{
|
|
106
|
-
height:
|
|
113
|
+
height: defaultHeight(),
|
|
107
114
|
}}
|
|
108
115
|
>
|
|
109
|
-
<div className={getIcon('min')} onClick={() => windowService.minimize()} />
|
|
116
|
+
<div className={cls(styles.icon, getIcon('min'))} onClick={() => windowService.minimize()} />
|
|
110
117
|
{maximized ? (
|
|
111
|
-
<div className={getIcon('max')} onClick={() => windowService.unmaximize()} />
|
|
118
|
+
<div className={cls(styles.icon, getIcon('max'))} onClick={() => windowService.unmaximize()} />
|
|
112
119
|
) : (
|
|
113
|
-
<div className={getIcon('unmax')} onClick={() => windowService.maximize()} />
|
|
120
|
+
<div className={cls(styles.icon, getIcon('unmax'))} onClick={() => windowService.maximize()} />
|
|
114
121
|
)}
|
|
115
|
-
<div className={getIcon('close1')} onClick={() => windowService.close()} />
|
|
122
|
+
<div className={cls(styles.icon, getIcon('close1'))} onClick={() => windowService.close()} />
|
|
116
123
|
</div>
|
|
117
124
|
);
|
|
118
125
|
};
|
|
@@ -135,7 +142,7 @@ export const ElectronHeaderBar = observer(
|
|
|
135
142
|
RightComponent,
|
|
136
143
|
TitleComponent,
|
|
137
144
|
autoHide = true,
|
|
138
|
-
height =
|
|
145
|
+
height = defaultHeight(),
|
|
139
146
|
}: React.PropsWithChildren<ElectronHeaderBarPorps>) => {
|
|
140
147
|
const windowService: IWindowService = useInjectable(IWindowService);
|
|
141
148
|
|