@theia/toolbar 1.61.0-next.8 → 1.61.1
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/application-shell-with-toolbar-override.d.ts.map +1 -1
- package/lib/browser/application-shell-with-toolbar-override.js +4 -8
- package/lib/browser/application-shell-with-toolbar-override.js.map +1 -1
- package/package.json +10 -10
- package/src/browser/application-shell-with-toolbar-override.ts +6 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application-shell-with-toolbar-override.d.ts","sourceRoot":"","sources":["../../src/browser/application-shell-with-toolbar-override.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,gBAAgB,EAChB,MAAM,
|
|
1
|
+
{"version":3,"file":"application-shell-with-toolbar-override.d.ts","sourceRoot":"","sources":["../../src/browser/application-shell-with-toolbar-override.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,gBAAgB,EAChB,MAAM,EAEN,iBAAiB,EAEpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAsB,UAAU,EAAiB,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,OAAO,EAAkB,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAgC,MAAM,mCAAmC,CAAC;AAErG,qBACa,mCAAoC,SAAQ,gBAAgB;IACzC,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAClD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC3D,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,OAAO,CAAC;IAEzE,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;cAGR,IAAI,IAAI,IAAI;cAIf,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBvC,SAAS,CAAC,cAAc,IAAI,OAAO;cAWhB,YAAY,IAAI,MAAM;CAsB5C;AAED,eAAO,MAAM,2BAA2B,SAAU,WAAW,IAAI,UAAU,WAAW,MAAM,UAAU,WAAW,MAAM,KAAG,IAGzH,CAAC"}
|
|
@@ -19,7 +19,6 @@ exports.bindToolbarApplicationShell = exports.ApplicationShellWithToolbarOverrid
|
|
|
19
19
|
const tslib_1 = require("tslib");
|
|
20
20
|
const browser_1 = require("@theia/core/lib/browser");
|
|
21
21
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
22
|
-
const theia_dock_panel_1 = require("@theia/core/lib/browser/shell/theia-dock-panel");
|
|
23
22
|
const toolbar_interfaces_1 = require("./toolbar-interfaces");
|
|
24
23
|
const toolbar_preference_contribution_1 = require("./toolbar-preference-contribution");
|
|
25
24
|
let ApplicationShellWithToolbarOverride = class ApplicationShellWithToolbarOverride extends browser_1.ApplicationShell {
|
|
@@ -32,10 +31,7 @@ let ApplicationShellWithToolbarOverride = class ApplicationShellWithToolbarOverr
|
|
|
32
31
|
super.init();
|
|
33
32
|
await this.toolbarPreferences.ready;
|
|
34
33
|
this.tryShowToolbar();
|
|
35
|
-
this.
|
|
36
|
-
this.tryShowToolbar();
|
|
37
|
-
});
|
|
38
|
-
this.bottomPanel.onDidToggleMaximized(() => {
|
|
34
|
+
this.onDidToggleMaximized(() => {
|
|
39
35
|
this.tryShowToolbar();
|
|
40
36
|
});
|
|
41
37
|
this.preferenceService.onPreferenceChanged(event => {
|
|
@@ -46,7 +42,7 @@ let ApplicationShellWithToolbarOverride = class ApplicationShellWithToolbarOverr
|
|
|
46
42
|
}
|
|
47
43
|
tryShowToolbar() {
|
|
48
44
|
const doShowToolbarFromPreference = this.toolbarPreferences[toolbar_preference_contribution_1.TOOLBAR_ENABLE_PREFERENCE_ID];
|
|
49
|
-
const isShellMaximized = this.mainPanel.hasClass(
|
|
45
|
+
const isShellMaximized = this.mainPanel.hasClass(browser_1.MAXIMIZED_CLASS) || this.bottomPanel.hasClass(browser_1.MAXIMIZED_CLASS);
|
|
50
46
|
if (doShowToolbarFromPreference && !isShellMaximized) {
|
|
51
47
|
this.toolbar.show();
|
|
52
48
|
return true;
|
|
@@ -56,10 +52,10 @@ let ApplicationShellWithToolbarOverride = class ApplicationShellWithToolbarOverr
|
|
|
56
52
|
}
|
|
57
53
|
createLayout() {
|
|
58
54
|
const bottomSplitLayout = this.createSplitLayout([this.mainPanel, this.bottomPanel], [1, 0], { orientation: 'vertical', spacing: 0 });
|
|
59
|
-
const panelForBottomArea = new browser_1.
|
|
55
|
+
const panelForBottomArea = new browser_1.TheiaSplitPanel({ layout: bottomSplitLayout });
|
|
60
56
|
panelForBottomArea.id = 'theia-bottom-split-panel';
|
|
61
57
|
const leftRightSplitLayout = this.createSplitLayout([this.leftPanelHandler.container, panelForBottomArea, this.rightPanelHandler.container], [0, 1, 0], { orientation: 'horizontal', spacing: 0 });
|
|
62
|
-
const panelForSideAreas = new browser_1.
|
|
58
|
+
const panelForSideAreas = new browser_1.TheiaSplitPanel({ layout: leftRightSplitLayout });
|
|
63
59
|
panelForSideAreas.id = 'theia-left-right-split-panel';
|
|
64
60
|
return this.createBoxLayout([this.topPanel, this.toolbar, panelForSideAreas, this.statusBar], [0, 0, 1, 0], { direction: 'top-to-bottom', spacing: 0 });
|
|
65
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application-shell-with-toolbar-override.js","sourceRoot":"","sources":["../../src/browser/application-shell-with-toolbar-override.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,
|
|
1
|
+
{"version":3,"file":"application-shell-with-toolbar-override.js","sourceRoot":"","sources":["../../src/browser/application-shell-with-toolbar-override.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/toolbar",
|
|
3
|
-
"version": "1.61.
|
|
3
|
+
"version": "1.61.1",
|
|
4
4
|
"description": "Theia - Toolbar",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"theia-extension"
|
|
@@ -27,15 +27,15 @@
|
|
|
27
27
|
"watch": "theiaext watch"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@theia/core": "1.61.
|
|
31
|
-
"@theia/editor": "1.61.
|
|
32
|
-
"@theia/file-search": "1.61.
|
|
33
|
-
"@theia/filesystem": "1.61.
|
|
34
|
-
"@theia/monaco": "1.61.
|
|
30
|
+
"@theia/core": "1.61.1",
|
|
31
|
+
"@theia/editor": "1.61.1",
|
|
32
|
+
"@theia/file-search": "1.61.1",
|
|
33
|
+
"@theia/filesystem": "1.61.1",
|
|
34
|
+
"@theia/monaco": "1.61.1",
|
|
35
35
|
"@theia/monaco-editor-core": "1.96.302",
|
|
36
|
-
"@theia/search-in-workspace": "1.61.
|
|
37
|
-
"@theia/userstorage": "1.61.
|
|
38
|
-
"@theia/workspace": "1.61.
|
|
36
|
+
"@theia/search-in-workspace": "1.61.1",
|
|
37
|
+
"@theia/userstorage": "1.61.1",
|
|
38
|
+
"@theia/workspace": "1.61.1",
|
|
39
39
|
"ajv": "^6.5.3",
|
|
40
40
|
"jsonc-parser": "^2.2.0",
|
|
41
41
|
"perfect-scrollbar": "1.5.5",
|
|
@@ -49,5 +49,5 @@
|
|
|
49
49
|
"publishConfig": {
|
|
50
50
|
"access": "public"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "5ea3cf6111aded4ccf1d5ccaf67b04e6588a6dea"
|
|
53
53
|
}
|
|
@@ -17,11 +17,11 @@
|
|
|
17
17
|
import {
|
|
18
18
|
ApplicationShell,
|
|
19
19
|
Layout,
|
|
20
|
+
MAXIMIZED_CLASS,
|
|
20
21
|
PreferenceService,
|
|
21
|
-
|
|
22
|
+
TheiaSplitPanel,
|
|
22
23
|
} from '@theia/core/lib/browser';
|
|
23
24
|
import { inject, injectable, interfaces, postConstruct } from '@theia/core/shared/inversify';
|
|
24
|
-
import { MAXIMIZED_CLASS } from '@theia/core/lib/browser/shell/theia-dock-panel';
|
|
25
25
|
import { Toolbar, ToolbarFactory } from './toolbar-interfaces';
|
|
26
26
|
import { ToolbarPreferences, TOOLBAR_ENABLE_PREFERENCE_ID } from './toolbar-preference-contribution';
|
|
27
27
|
|
|
@@ -44,12 +44,10 @@ export class ApplicationShellWithToolbarOverride extends ApplicationShell {
|
|
|
44
44
|
super.init();
|
|
45
45
|
await this.toolbarPreferences.ready;
|
|
46
46
|
this.tryShowToolbar();
|
|
47
|
-
this.
|
|
48
|
-
this.tryShowToolbar();
|
|
49
|
-
});
|
|
50
|
-
this.bottomPanel.onDidToggleMaximized(() => {
|
|
47
|
+
this.onDidToggleMaximized(() => {
|
|
51
48
|
this.tryShowToolbar();
|
|
52
49
|
});
|
|
50
|
+
|
|
53
51
|
this.preferenceService.onPreferenceChanged(event => {
|
|
54
52
|
if (event.preferenceName === TOOLBAR_ENABLE_PREFERENCE_ID) {
|
|
55
53
|
this.tryShowToolbar();
|
|
@@ -74,7 +72,7 @@ export class ApplicationShellWithToolbarOverride extends ApplicationShell {
|
|
|
74
72
|
[1, 0],
|
|
75
73
|
{ orientation: 'vertical', spacing: 0 },
|
|
76
74
|
);
|
|
77
|
-
const panelForBottomArea = new
|
|
75
|
+
const panelForBottomArea = new TheiaSplitPanel({ layout: bottomSplitLayout });
|
|
78
76
|
panelForBottomArea.id = 'theia-bottom-split-panel';
|
|
79
77
|
|
|
80
78
|
const leftRightSplitLayout = this.createSplitLayout(
|
|
@@ -82,7 +80,7 @@ export class ApplicationShellWithToolbarOverride extends ApplicationShell {
|
|
|
82
80
|
[0, 1, 0],
|
|
83
81
|
{ orientation: 'horizontal', spacing: 0 },
|
|
84
82
|
);
|
|
85
|
-
const panelForSideAreas = new
|
|
83
|
+
const panelForSideAreas = new TheiaSplitPanel({ layout: leftRightSplitLayout });
|
|
86
84
|
panelForSideAreas.id = 'theia-left-right-split-panel';
|
|
87
85
|
return this.createBoxLayout(
|
|
88
86
|
[this.topPanel, this.toolbar, panelForSideAreas, this.statusBar],
|