@opensumi/ide-electron-basic 2.17.4 → 2.17.5-next-1652428160.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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../src/browser/header/header.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAsC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../src/browser/header/header.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAyE3D;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;EAuE7B,CAAC;AAIF,eAAO,MAAM,SAAS;;EA6EpB,CAAC"}
|
|
@@ -7,10 +7,11 @@ const mobx_react_lite_1 = require("mobx-react-lite");
|
|
|
7
7
|
const react_1 = tslib_1.__importStar(require("react"));
|
|
8
8
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
9
9
|
const ide_core_browser_2 = require("@opensumi/ide-core-browser");
|
|
10
|
+
const ide_core_browser_3 = require("@opensumi/ide-core-browser");
|
|
10
11
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
11
12
|
const electron_1 = require("@opensumi/ide-core-common/lib/electron");
|
|
12
|
-
const paths_1 = require("@opensumi/ide-core-common/lib/utils/paths");
|
|
13
13
|
const ide_editor_1 = require("@opensumi/ide-editor");
|
|
14
|
+
const { basename } = ide_core_browser_3.path;
|
|
14
15
|
const header_module_less_1 = tslib_1.__importDefault(require("./header.module.less"));
|
|
15
16
|
const useFullScreen = () => {
|
|
16
17
|
const uiService = (0, ide_core_browser_1.useInjectable)(electron_1.IElectronMainUIService);
|
|
@@ -55,7 +56,7 @@ const useMaximize = () => {
|
|
|
55
56
|
};
|
|
56
57
|
};
|
|
57
58
|
// Big Sur increases title bar height
|
|
58
|
-
const isNewMacHeaderBar = () =>
|
|
59
|
+
const isNewMacHeaderBar = () => ide_core_browser_3.isMacintosh && parseFloat(ide_core_browser_1.electronEnv.osRelease) >= 20;
|
|
59
60
|
/**
|
|
60
61
|
* autoHide: Hide the HeaderBar when the macOS full screen
|
|
61
62
|
*/
|
|
@@ -65,7 +66,7 @@ exports.ElectronHeaderBar = (0, mobx_react_lite_1.observer)(({ Icon, autoHide =
|
|
|
65
66
|
const { isFullScreen } = useFullScreen();
|
|
66
67
|
const { maximized, getMaximized } = useMaximize();
|
|
67
68
|
const LeftComponent = () => {
|
|
68
|
-
if (
|
|
69
|
+
if (ide_core_browser_3.isMacintosh) {
|
|
69
70
|
return null;
|
|
70
71
|
}
|
|
71
72
|
const initialProps = {
|
|
@@ -75,7 +76,7 @@ exports.ElectronHeaderBar = (0, mobx_react_lite_1.observer)(({ Icon, autoHide =
|
|
|
75
76
|
react_1.default.createElement(ide_core_browser_1.ComponentRenderer, { Component: componentRegistry.getComponentRegistryInfo('@opensumi/ide-menu-bar').views[0].component, initialProps: initialProps })));
|
|
76
77
|
};
|
|
77
78
|
const RightComponent = () => {
|
|
78
|
-
if (
|
|
79
|
+
if (ide_core_browser_3.isMacintosh) {
|
|
79
80
|
return null;
|
|
80
81
|
}
|
|
81
82
|
return (react_1.default.createElement("div", { className: header_module_less_1.default.windowActions },
|
|
@@ -84,7 +85,7 @@ exports.ElectronHeaderBar = (0, mobx_react_lite_1.observer)(({ Icon, autoHide =
|
|
|
84
85
|
react_1.default.createElement("div", { className: (0, ide_core_browser_2.getIcon)('close1'), onClick: () => windowService.close() })));
|
|
85
86
|
};
|
|
86
87
|
// in Mac, hide the header bar if it is in full screen mode
|
|
87
|
-
if (
|
|
88
|
+
if (ide_core_browser_3.isMacintosh && isFullScreen && autoHide) {
|
|
88
89
|
return (react_1.default.createElement("div", null,
|
|
89
90
|
react_1.default.createElement(exports.TitleInfo, { hidden: true })));
|
|
90
91
|
}
|
|
@@ -109,7 +110,7 @@ exports.TitleInfo = (0, mobx_react_lite_1.observer)(({ hidden }) => {
|
|
|
109
110
|
const [appTitle, setAppTitle] = (0, react_1.useState)();
|
|
110
111
|
(0, react_1.useEffect)(() => {
|
|
111
112
|
setPosition();
|
|
112
|
-
const disposer = new
|
|
113
|
+
const disposer = new ide_core_browser_3.Disposable();
|
|
113
114
|
disposer.addDispose(editorService.onActiveResourceChange((resource) => {
|
|
114
115
|
setCurrentResource(resource);
|
|
115
116
|
}));
|
|
@@ -143,7 +144,7 @@ exports.TitleInfo = (0, mobx_react_lite_1.observer)(({ hidden }) => {
|
|
|
143
144
|
}
|
|
144
145
|
});
|
|
145
146
|
}
|
|
146
|
-
const dirname = appConfig.workspaceDir ?
|
|
147
|
+
const dirname = appConfig.workspaceDir ? basename(appConfig.workspaceDir) : undefined;
|
|
147
148
|
const title = (currentResource ? currentResource.name + ' — ' : '') +
|
|
148
149
|
(dirname ? dirname + ' — ' : '') +
|
|
149
150
|
(0, ide_core_browser_1.replaceLocalizePlaceholder)(appConfig.appName) +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../src/browser/header/header.tsx"],"names":[],"mappings":";;;;AAAA,oEAA6B;AAC7B,qDAA2C;AAC3C,uDAA2D;
|
|
1
|
+
{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../src/browser/header/header.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.17.
|
|
3
|
+
"version": "2.17.5-next-1652428160.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib"
|
|
6
6
|
],
|
|
@@ -16,15 +16,15 @@
|
|
|
16
16
|
"url": "git@github.com:opensumi/core.git"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@opensumi/ide-core-common": "2.17.
|
|
20
|
-
"@opensumi/ide-core-node": "2.17.
|
|
19
|
+
"@opensumi/ide-core-common": "2.17.5-next-1652428160.0",
|
|
20
|
+
"@opensumi/ide-core-node": "2.17.5-next-1652428160.0"
|
|
21
21
|
},
|
|
22
22
|
"devDependencies": {
|
|
23
|
-
"@opensumi/ide-core-browser": "2.17.
|
|
23
|
+
"@opensumi/ide-core-browser": "2.17.5-next-1652428160.0",
|
|
24
24
|
"@opensumi/ide-dev-tool": "^1.3.1",
|
|
25
|
-
"@opensumi/ide-editor": "2.17.
|
|
26
|
-
"@opensumi/ide-overlay": "2.17.
|
|
27
|
-
"@opensumi/ide-workspace": "2.17.
|
|
25
|
+
"@opensumi/ide-editor": "2.17.5-next-1652428160.0",
|
|
26
|
+
"@opensumi/ide-overlay": "2.17.5-next-1652428160.0",
|
|
27
|
+
"@opensumi/ide-workspace": "2.17.5-next-1652428160.0"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "0985a6a4ac9ed767dc2d2dd81d1be43e209492e9"
|
|
30
30
|
}
|