@theia/toolbar 1.62.0-next.3 → 1.62.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.
- 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/lib/browser/toolbar-controller.d.ts +8 -2
- package/lib/browser/toolbar-controller.d.ts.map +1 -1
- package/lib/browser/toolbar-controller.js +22 -2
- package/lib/browser/toolbar-controller.js.map +1 -1
- package/lib/browser/toolbar-interfaces.d.ts +6 -5
- package/lib/browser/toolbar-interfaces.d.ts.map +1 -1
- package/lib/browser/toolbar-interfaces.js.map +1 -1
- package/lib/browser/toolbar.d.ts +6 -6
- package/lib/browser/toolbar.d.ts.map +1 -1
- package/lib/browser/toolbar.js +7 -48
- package/lib/browser/toolbar.js.map +1 -1
- package/package.json +10 -10
- package/src/browser/application-shell-with-toolbar-override.ts +6 -8
- package/src/browser/toolbar-controller.ts +13 -6
- package/src/browser/toolbar-interfaces.ts +6 -5
- package/src/browser/toolbar.tsx +12 -65
|
@@ -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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"}
|
|
@@ -1,14 +1,20 @@
|
|
|
1
|
-
import { Command, ContributionProvider, Emitter, MaybePromise, MessageService } from '@theia/core';
|
|
2
|
-
import { Widget } from '@theia/core/lib/browser';
|
|
1
|
+
import { Command, CommandRegistry, ContributionProvider, Emitter, MaybePromise, MessageService } from '@theia/core';
|
|
2
|
+
import { KeybindingRegistry, Widget } from '@theia/core/lib/browser';
|
|
3
3
|
import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
|
|
4
4
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
5
5
|
import { DeflatedToolbarTree, ToolbarContribution, ToolbarTreeSchema, ToolbarAlignment, ToolbarItemPosition } from './toolbar-interfaces';
|
|
6
6
|
import { ToolbarStorageProvider } from './toolbar-storage-provider';
|
|
7
|
+
import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
|
|
8
|
+
import { LabelParser } from '@theia/core/lib/browser/label-parser';
|
|
7
9
|
export declare class ToolbarController {
|
|
8
10
|
protected readonly storageProvider: ToolbarStorageProvider;
|
|
9
11
|
protected readonly appState: FrontendApplicationStateService;
|
|
10
12
|
protected readonly messageService: MessageService;
|
|
11
13
|
protected readonly defaultsFactory: () => DeflatedToolbarTree;
|
|
14
|
+
commandRegistry: CommandRegistry;
|
|
15
|
+
contextKeyService: ContextKeyService;
|
|
16
|
+
keybindingRegistry: KeybindingRegistry;
|
|
17
|
+
labelParser: LabelParser;
|
|
12
18
|
protected widgetContributions: ContributionProvider<ToolbarContribution>;
|
|
13
19
|
protected toolbarModelDidUpdateEmitter: Emitter<void>;
|
|
14
20
|
readonly onToolbarModelDidUpdate: import("@theia/core").Event<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolbar-controller.d.ts","sourceRoot":"","sources":["../../src/browser/toolbar-controller.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"toolbar-controller.d.ts","sourceRoot":"","sources":["../../src/browser/toolbar-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,12 +18,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
18
18
|
exports.ToolbarController = void 0;
|
|
19
19
|
const tslib_1 = require("tslib");
|
|
20
20
|
const core_1 = require("@theia/core");
|
|
21
|
+
const browser_1 = require("@theia/core/lib/browser");
|
|
21
22
|
const frontend_application_state_1 = require("@theia/core/lib/browser/frontend-application-state");
|
|
22
23
|
const promise_util_1 = require("@theia/core/lib/common/promise-util");
|
|
23
24
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
24
25
|
const toolbar_defaults_1 = require("./toolbar-defaults");
|
|
25
26
|
const toolbar_interfaces_1 = require("./toolbar-interfaces");
|
|
26
27
|
const toolbar_storage_provider_1 = require("./toolbar-storage-provider");
|
|
28
|
+
const tab_toolbar_item_1 = require("@theia/core/lib/browser/shell/tab-bar-toolbar/tab-toolbar-item");
|
|
29
|
+
const context_key_service_1 = require("@theia/core/lib/browser/context-key-service");
|
|
30
|
+
const label_parser_1 = require("@theia/core/lib/browser/label-parser");
|
|
27
31
|
let ToolbarController = class ToolbarController {
|
|
28
32
|
constructor() {
|
|
29
33
|
this.toolbarModelDidUpdateEmitter = new core_1.Emitter();
|
|
@@ -55,11 +59,11 @@ let ToolbarController = class ToolbarController {
|
|
|
55
59
|
if (item.group === 'contributed') {
|
|
56
60
|
const contribution = this.getContributionByID(item.id);
|
|
57
61
|
if (contribution) {
|
|
58
|
-
newGroup.push(contribution);
|
|
62
|
+
newGroup.push(new tab_toolbar_item_1.ReactToolbarItemImpl(this.commandRegistry, this.contextKeyService, contribution));
|
|
59
63
|
}
|
|
60
64
|
}
|
|
61
65
|
else {
|
|
62
|
-
newGroup.push(
|
|
66
|
+
newGroup.push(new tab_toolbar_item_1.RenderedToolbarItemImpl(this.commandRegistry, this.contextKeyService, this.keybindingRegistry, this.labelParser, item));
|
|
63
67
|
}
|
|
64
68
|
}
|
|
65
69
|
if (newGroup.length) {
|
|
@@ -161,6 +165,22 @@ tslib_1.__decorate([
|
|
|
161
165
|
(0, inversify_1.inject)(toolbar_defaults_1.ToolbarDefaultsFactory),
|
|
162
166
|
tslib_1.__metadata("design:type", Function)
|
|
163
167
|
], ToolbarController.prototype, "defaultsFactory", void 0);
|
|
168
|
+
tslib_1.__decorate([
|
|
169
|
+
(0, inversify_1.inject)(core_1.CommandRegistry),
|
|
170
|
+
tslib_1.__metadata("design:type", core_1.CommandRegistry)
|
|
171
|
+
], ToolbarController.prototype, "commandRegistry", void 0);
|
|
172
|
+
tslib_1.__decorate([
|
|
173
|
+
(0, inversify_1.inject)(context_key_service_1.ContextKeyService),
|
|
174
|
+
tslib_1.__metadata("design:type", Object)
|
|
175
|
+
], ToolbarController.prototype, "contextKeyService", void 0);
|
|
176
|
+
tslib_1.__decorate([
|
|
177
|
+
(0, inversify_1.inject)(browser_1.KeybindingRegistry),
|
|
178
|
+
tslib_1.__metadata("design:type", browser_1.KeybindingRegistry)
|
|
179
|
+
], ToolbarController.prototype, "keybindingRegistry", void 0);
|
|
180
|
+
tslib_1.__decorate([
|
|
181
|
+
(0, inversify_1.inject)(label_parser_1.LabelParser),
|
|
182
|
+
tslib_1.__metadata("design:type", label_parser_1.LabelParser)
|
|
183
|
+
], ToolbarController.prototype, "labelParser", void 0);
|
|
164
184
|
tslib_1.__decorate([
|
|
165
185
|
(0, inversify_1.inject)(core_1.ContributionProvider),
|
|
166
186
|
(0, inversify_1.named)(toolbar_interfaces_1.ToolbarContribution),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolbar-controller.js","sourceRoot":"","sources":["../../src/browser/toolbar-controller.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":"toolbar-controller.js","sourceRoot":"","sources":["../../src/browser/toolbar-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { interfaces } from '@theia/core/shared/inversify';
|
|
2
|
-
import {
|
|
2
|
+
import { ReactTabBarToolbarAction, RenderedToolbarAction, TabBarToolbar } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
3
|
+
import { TabBarToolbarItem } from '@theia/core/lib/browser/shell/tab-bar-toolbar/tab-toolbar-item';
|
|
3
4
|
export declare enum ToolbarAlignment {
|
|
4
5
|
LEFT = "left",
|
|
5
6
|
CENTER = "center",
|
|
@@ -7,7 +8,7 @@ export declare enum ToolbarAlignment {
|
|
|
7
8
|
}
|
|
8
9
|
export interface ToolbarTreeSchema {
|
|
9
10
|
items: {
|
|
10
|
-
[key in ToolbarAlignment]:
|
|
11
|
+
[key in ToolbarAlignment]: TabBarToolbarItem[][];
|
|
11
12
|
};
|
|
12
13
|
}
|
|
13
14
|
export interface DeflatedToolbarTree {
|
|
@@ -21,17 +22,17 @@ export declare namespace ToolbarAlignmentString {
|
|
|
21
22
|
export interface ToolbarContributionProperties {
|
|
22
23
|
toJSON(): DeflatedContributedToolbarItem;
|
|
23
24
|
}
|
|
24
|
-
export type ToolbarContribution =
|
|
25
|
+
export type ToolbarContribution = ReactTabBarToolbarAction & ToolbarContributionProperties;
|
|
25
26
|
export declare const ToolbarContribution: unique symbol;
|
|
26
27
|
export declare const Toolbar: unique symbol;
|
|
27
28
|
export declare const ToolbarFactory: unique symbol;
|
|
28
29
|
export type Toolbar = TabBarToolbar;
|
|
29
|
-
export type ToolbarItem = ToolbarContribution |
|
|
30
|
+
export type ToolbarItem = ToolbarContribution | RenderedToolbarAction;
|
|
30
31
|
export interface DeflatedContributedToolbarItem {
|
|
31
32
|
id: string;
|
|
32
33
|
group: 'contributed';
|
|
33
34
|
}
|
|
34
|
-
export type ToolbarItemDeflated = DeflatedContributedToolbarItem |
|
|
35
|
+
export type ToolbarItemDeflated = DeflatedContributedToolbarItem | RenderedToolbarAction;
|
|
35
36
|
export declare const LateInjector: unique symbol;
|
|
36
37
|
export declare const lateInjector: <T>(context: interfaces.Container, serviceIdentifier: interfaces.ServiceIdentifier<T>) => T;
|
|
37
38
|
export interface ToolbarItemPosition {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolbar-interfaces.d.ts","sourceRoot":"","sources":["../../src/browser/toolbar-interfaces.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"toolbar-interfaces.d.ts","sourceRoot":"","sources":["../../src/browser/toolbar-interfaces.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AAC/H,OAAO,EAAE,iBAAiB,EAAE,MAAM,gEAAgE,CAAC;AAEnG,oBAAY,gBAAgB;IACxB,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,KAAK,UAAU;CAClB;AAED,MAAM,WAAW,iBAAiB;IAC9B,KAAK,EAAE;SACF,GAAG,IAAI,gBAAgB,GAAG,iBAAiB,EAAE,EAAE;KACnD,CAAC;CACL;AAED,MAAM,WAAW,mBAAmB;IAChC,KAAK,EAAE;SACF,GAAG,IAAI,gBAAgB,GAAG,mBAAmB,EAAE,EAAE;KACrD,CAAC;CACL;AACD,yBAAiB,sBAAsB,CAAC;IAC7B,MAAM,EAAE,QAAS,OAAO,4BAEM,CAAC;CACzC;AAED,MAAM,WAAW,6BAA6B;IAC1C,MAAM,IAAI,8BAA8B,CAAC;CAC5C;AAED,MAAM,MAAM,mBAAmB,GAAG,wBAAwB,GAAG,6BAA6B,CAAC;AAE3F,eAAO,MAAM,mBAAmB,eAAgC,CAAC;AAEjE,eAAO,MAAM,OAAO,eAAoB,CAAC;AACzC,eAAO,MAAM,cAAc,eAA2B,CAAC;AACvD,MAAM,MAAM,OAAO,GAAG,aAAa,CAAC;AAEpC,MAAM,MAAM,WAAW,GAAG,mBAAmB,GAAG,qBAAqB,CAAC;AACtE,MAAM,WAAW,8BAA8B;IAAG,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,aAAa,CAAA;CAAE;AACpF,MAAM,MAAM,mBAAmB,GAAG,8BAA8B,GAAG,qBAAqB,CAAC;AAEzF,eAAO,MAAM,YAAY,eAAyB,CAAC;AAEnD,eAAO,MAAM,YAAY,eACZ,WAAW,SAAS,qBACV,WAAW,iBAAiB,CAAC,CAAC,CAAC,KACnD,CAAsC,CAAC;AAE1C,MAAM,WAAW,mBAAmB;IAChC,SAAS,EAAE,gBAAgB,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,oBAAY,OAAO;IACf,EAAE,OAAO;IACT,OAAO,YAAY;CACtB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolbar-interfaces.js","sourceRoot":"","sources":["../../src/browser/toolbar-interfaces.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;;;
|
|
1
|
+
{"version":3,"file":"toolbar-interfaces.js","sourceRoot":"","sources":["../../src/browser/toolbar-interfaces.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;;;AAMhF,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IACxB,iCAAa,CAAA;IACb,qCAAiB,CAAA;IACjB,mCAAe,CAAA;AACnB,CAAC,EAJW,gBAAgB,gCAAhB,gBAAgB,QAI3B;AAaD,IAAiB,sBAAsB,CAItC;AAJD,WAAiB,sBAAsB;IACtB,yBAAE,GAAG,CAAC,GAAY,EAA2B,EAAE,CAAC,GAAG,KAAK,gBAAgB,CAAC,IAAI;WACnF,GAAG,KAAK,gBAAgB,CAAC,MAAM;WAC/B,GAAG,KAAK,gBAAgB,CAAC,KAAK,CAAC;AAC1C,CAAC,EAJgB,sBAAsB,sCAAtB,sBAAsB,QAItC;AAQY,QAAA,mBAAmB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAEpD,QAAA,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;AAC5B,QAAA,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAI6B,CAAC;AAGxE,QAAA,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAE5C,MAAM,YAAY,GAAG,CACxB,OAA6B,EAC7B,iBAAkD,EACjD,EAAE,CAAC,OAAO,CAAC,GAAG,CAAI,iBAAiB,CAAC,CAAC;AAH7B,QAAA,YAAY,gBAGiB;AAQ1C,IAAY,OAGX;AAHD,WAAY,OAAO;IACf,oBAAS,CAAA;IACT,8BAAmB,CAAA;AACvB,CAAC,EAHW,OAAO,uBAAP,OAAO,QAGlB"}
|
package/lib/browser/toolbar.d.ts
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import * as React from '@theia/core/shared/react';
|
|
3
3
|
import { Anchor, ContextMenuAccess, KeybindingRegistry, PreferenceService, Widget, WidgetManager } from '@theia/core/lib/browser';
|
|
4
|
-
import {
|
|
4
|
+
import { TabBarToolbar, TabBarToolbarFactory } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
5
5
|
import { MenuPath, ProgressService } from '@theia/core';
|
|
6
6
|
import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
|
|
7
7
|
import { ProgressBarFactory } from '@theia/core/lib/browser/progress-bar-factory';
|
|
8
8
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
9
|
-
import {
|
|
9
|
+
import { ToolbarAlignment, ToolbarItemPosition } from './toolbar-interfaces';
|
|
10
10
|
import { ToolbarController } from './toolbar-controller';
|
|
11
|
+
import { TabBarToolbarItem } from '@theia/core/lib/browser/shell/tab-bar-toolbar/tab-toolbar-item';
|
|
11
12
|
export declare const TOOLBAR_PROGRESSBAR_ID = "main-toolbar-progress";
|
|
12
13
|
export declare class ToolbarImpl extends TabBarToolbar {
|
|
13
14
|
protected readonly tabbarToolbarFactory: TabBarToolbarFactory;
|
|
@@ -32,14 +33,13 @@ export declare class ToolbarImpl extends TabBarToolbar {
|
|
|
32
33
|
anchor: Anchor;
|
|
33
34
|
};
|
|
34
35
|
protected getContextMenuArgs(event: React.MouseEvent): Array<string | Widget>;
|
|
35
|
-
protected renderGroupsInColumn(groups:
|
|
36
|
+
protected renderGroupsInColumn(groups: TabBarToolbarItem[][], alignment: ToolbarAlignment): React.ReactNode[];
|
|
36
37
|
protected assignRef: (element: HTMLDivElement) => void;
|
|
37
38
|
protected doAssignRef(element: HTMLDivElement): void;
|
|
38
39
|
protected render(): React.ReactNode;
|
|
39
|
-
protected renderColumnWrapper(alignment: ToolbarAlignment, columnGroup:
|
|
40
|
+
protected renderColumnWrapper(alignment: ToolbarAlignment, columnGroup: TabBarToolbarItem[][]): React.ReactNode;
|
|
40
41
|
protected renderColumnSpace(alignment: ToolbarAlignment, position?: 'left' | 'right'): React.ReactNode;
|
|
41
|
-
protected renderItemWithDraggableWrapper(item:
|
|
42
|
-
protected renderItem(item: RenderedToolbarItem): React.ReactNode;
|
|
42
|
+
protected renderItemWithDraggableWrapper(item: TabBarToolbarItem, position: ToolbarItemPosition): React.ReactNode;
|
|
43
43
|
protected handleOnDragStart: (e: React.DragEvent<HTMLDivElement>) => void;
|
|
44
44
|
protected doHandleOnDragStart(e: React.DragEvent<HTMLDivElement>): void;
|
|
45
45
|
protected handleOnDragEnter: (e: React.DragEvent<HTMLDivElement>) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolbar.d.ts","sourceRoot":"","sources":["../../src/browser/toolbar.tsx"],"names":[],"mappings":";AAgBA,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"toolbar.d.ts","sourceRoot":"","sources":["../../src/browser/toolbar.tsx"],"names":[],"mappings":"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"}
|
package/lib/browser/toolbar.js
CHANGED
|
@@ -19,7 +19,6 @@ exports.ToolbarImpl = exports.TOOLBAR_PROGRESSBAR_ID = void 0;
|
|
|
19
19
|
const tslib_1 = require("tslib");
|
|
20
20
|
const React = require("@theia/core/shared/react");
|
|
21
21
|
const browser_1 = require("@theia/core/lib/browser");
|
|
22
|
-
const label_parser_1 = require("@theia/core/lib/browser/label-parser");
|
|
23
22
|
const tab_bar_toolbar_1 = require("@theia/core/lib/browser/shell/tab-bar-toolbar");
|
|
24
23
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
25
24
|
const core_1 = require("@theia/core");
|
|
@@ -70,21 +69,20 @@ let ToolbarImpl = class ToolbarImpl extends tab_bar_toolbar_1.TabBarToolbar {
|
|
|
70
69
|
this.progressFactory({ container: this.node, insertMode: 'append', locationId: exports.TOOLBAR_PROGRESSBAR_ID });
|
|
71
70
|
}
|
|
72
71
|
updateInlineItems() {
|
|
73
|
-
|
|
72
|
+
this.toDisposeOnUpdateItems.dispose();
|
|
73
|
+
this.toDisposeOnUpdateItems = new core_1.DisposableCollection();
|
|
74
74
|
this.inline.clear();
|
|
75
75
|
const { items } = this.model.toolbarItems;
|
|
76
|
-
const contextKeys = new Set();
|
|
77
76
|
for (const column of Object.keys(items)) {
|
|
78
77
|
for (const group of items[column]) {
|
|
79
78
|
for (const item of group) {
|
|
80
79
|
this.inline.set(item.id, item);
|
|
81
|
-
if (item.
|
|
82
|
-
|
|
80
|
+
if (item.onDidChange) {
|
|
81
|
+
this.toDisposeOnUpdateItems.push(item.onDidChange(() => this.maybeUpdate()));
|
|
83
82
|
}
|
|
84
83
|
}
|
|
85
84
|
}
|
|
86
85
|
}
|
|
87
|
-
this.updateContextKeyListener(contextKeys);
|
|
88
86
|
}
|
|
89
87
|
doHandleContextMenu(event) {
|
|
90
88
|
event.preventDefault();
|
|
@@ -185,51 +183,12 @@ let ToolbarImpl = class ToolbarImpl extends tab_bar_toolbar_1.TabBarToolbar {
|
|
|
185
183
|
}
|
|
186
184
|
renderItemWithDraggableWrapper(item, position) {
|
|
187
185
|
const stringifiedPosition = JSON.stringify(position);
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
toolbarItemClassNames = tab_bar_toolbar_1.TabBarToolbar.Styles.TAB_BAR_TOOLBAR_ITEM;
|
|
192
|
-
if (this.evaluateWhenClause(item.when)) {
|
|
193
|
-
toolbarItemClassNames += ' enabled';
|
|
194
|
-
}
|
|
195
|
-
renderBody = this.renderItem(item);
|
|
196
|
-
}
|
|
197
|
-
else {
|
|
198
|
-
const contribution = this.model.getContributionByID(item.id);
|
|
199
|
-
if (contribution) {
|
|
200
|
-
renderBody = contribution.render();
|
|
201
|
-
}
|
|
202
|
-
}
|
|
203
|
-
return (React.createElement("div", { role: 'button', tabIndex: 0, "data-id": item.id, id: item.id, "data-position": stringifiedPosition, key: `${item.id}-${stringifiedPosition}`, className: `${toolbarItemClassNames} toolbar-item action-label`, onMouseDown: this.onMouseDownEvent, onMouseUp: this.onMouseUpEvent, onMouseOut: this.onMouseUpEvent, draggable: true, onDragStart: this.handleOnDragStart, onClick: e => this.executeCommand(e, item), onDragOver: this.handleOnDragEnter, onDragLeave: this.handleOnDragLeave, onContextMenu: this.handleContextMenu, onDragEnd: this.handleOnDragEnd, onDrop: this.handleOnDrop },
|
|
186
|
+
const toolbarItemClassNames = '';
|
|
187
|
+
const renderBody = item.render(this);
|
|
188
|
+
return (React.createElement("div", { role: 'button', tabIndex: 0, "data-id": item.id, id: item.id, "data-position": stringifiedPosition, key: `${item.id}-${stringifiedPosition}`, className: `${toolbarItemClassNames} toolbar-item action-label`, draggable: true, onDragStart: this.handleOnDragStart, onDragOver: this.handleOnDragEnter, onDragLeave: this.handleOnDragLeave, onContextMenu: this.handleContextMenu, onDragEnd: this.handleOnDragEnd, onDrop: this.handleOnDrop },
|
|
204
189
|
renderBody,
|
|
205
190
|
React.createElement("div", { className: 'hover-overlay' })));
|
|
206
191
|
}
|
|
207
|
-
renderItem(item) {
|
|
208
|
-
const classNames = [];
|
|
209
|
-
if (item.text) {
|
|
210
|
-
for (const labelPart of this.labelParser.parse(item.text)) {
|
|
211
|
-
if (typeof labelPart !== 'string' && label_parser_1.LabelIcon.is(labelPart)) {
|
|
212
|
-
const className = `fa fa-${labelPart.name}${labelPart.animation ? ' fa-' + labelPart.animation : ''}`;
|
|
213
|
-
classNames.push(...className.split(' '));
|
|
214
|
-
}
|
|
215
|
-
}
|
|
216
|
-
}
|
|
217
|
-
const command = this.commands.getCommand(item.command);
|
|
218
|
-
const iconClass = (typeof item.icon === 'function' && item.icon()) || item.icon || (command === null || command === void 0 ? void 0 : command.iconClass);
|
|
219
|
-
if (iconClass) {
|
|
220
|
-
classNames.push(iconClass);
|
|
221
|
-
}
|
|
222
|
-
let itemTooltip = '';
|
|
223
|
-
if (item.tooltip) {
|
|
224
|
-
itemTooltip = item.tooltip;
|
|
225
|
-
}
|
|
226
|
-
else if (command === null || command === void 0 ? void 0 : command.label) {
|
|
227
|
-
itemTooltip = command.label;
|
|
228
|
-
}
|
|
229
|
-
const keybindingString = this.resolveKeybindingForCommand(command === null || command === void 0 ? void 0 : command.id);
|
|
230
|
-
itemTooltip = `${itemTooltip}${keybindingString}`;
|
|
231
|
-
return (React.createElement("div", { id: item.id, className: classNames.join(' '), title: itemTooltip }));
|
|
232
|
-
}
|
|
233
192
|
doHandleOnDragStart(e) {
|
|
234
193
|
var _a;
|
|
235
194
|
const draggedElement = e.currentTarget;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolbar.js","sourceRoot":"","sources":["../../src/browser/toolbar.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"toolbar.js","sourceRoot":"","sources":["../../src/browser/toolbar.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/toolbar",
|
|
3
|
-
"version": "1.62.0
|
|
3
|
+
"version": "1.62.0",
|
|
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.62.0
|
|
31
|
-
"@theia/editor": "1.62.0
|
|
32
|
-
"@theia/file-search": "1.62.0
|
|
33
|
-
"@theia/filesystem": "1.62.0
|
|
34
|
-
"@theia/monaco": "1.62.0
|
|
30
|
+
"@theia/core": "1.62.0",
|
|
31
|
+
"@theia/editor": "1.62.0",
|
|
32
|
+
"@theia/file-search": "1.62.0",
|
|
33
|
+
"@theia/filesystem": "1.62.0",
|
|
34
|
+
"@theia/monaco": "1.62.0",
|
|
35
35
|
"@theia/monaco-editor-core": "1.96.302",
|
|
36
|
-
"@theia/search-in-workspace": "1.62.0
|
|
37
|
-
"@theia/userstorage": "1.62.0
|
|
38
|
-
"@theia/workspace": "1.62.0
|
|
36
|
+
"@theia/search-in-workspace": "1.62.0",
|
|
37
|
+
"@theia/userstorage": "1.62.0",
|
|
38
|
+
"@theia/workspace": "1.62.0",
|
|
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": "a4e035ccc26fde24c2769a466cb18e3b54c517c5"
|
|
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],
|
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { Command, ContributionProvider, Emitter, MaybePromise, MessageService } from '@theia/core';
|
|
18
|
-
import { Widget } from '@theia/core/lib/browser';
|
|
17
|
+
import { Command, CommandRegistry, ContributionProvider, Emitter, MaybePromise, MessageService } from '@theia/core';
|
|
18
|
+
import { KeybindingRegistry, Widget } from '@theia/core/lib/browser';
|
|
19
19
|
import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
|
|
20
20
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
21
21
|
import { injectable, inject, postConstruct, named } from '@theia/core/shared/inversify';
|
|
@@ -24,11 +24,13 @@ import {
|
|
|
24
24
|
DeflatedToolbarTree,
|
|
25
25
|
ToolbarContribution,
|
|
26
26
|
ToolbarTreeSchema,
|
|
27
|
-
ToolbarItem,
|
|
28
27
|
ToolbarAlignment,
|
|
29
28
|
ToolbarItemPosition,
|
|
30
29
|
} from './toolbar-interfaces';
|
|
31
30
|
import { ToolbarStorageProvider, TOOLBAR_BAD_JSON_ERROR_MESSAGE } from './toolbar-storage-provider';
|
|
31
|
+
import { ReactToolbarItemImpl, RenderedToolbarItemImpl, TabBarToolbarItem } from '@theia/core/lib/browser/shell/tab-bar-toolbar/tab-toolbar-item';
|
|
32
|
+
import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
|
|
33
|
+
import { LabelParser } from '@theia/core/lib/browser/label-parser';
|
|
32
34
|
|
|
33
35
|
@injectable()
|
|
34
36
|
export class ToolbarController {
|
|
@@ -36,6 +38,11 @@ export class ToolbarController {
|
|
|
36
38
|
@inject(FrontendApplicationStateService) protected readonly appState: FrontendApplicationStateService;
|
|
37
39
|
@inject(MessageService) protected readonly messageService: MessageService;
|
|
38
40
|
@inject(ToolbarDefaultsFactory) protected readonly defaultsFactory: () => DeflatedToolbarTree;
|
|
41
|
+
@inject(CommandRegistry) commandRegistry: CommandRegistry;
|
|
42
|
+
@inject(ContextKeyService) contextKeyService: ContextKeyService;
|
|
43
|
+
@inject(KeybindingRegistry) keybindingRegistry: KeybindingRegistry;
|
|
44
|
+
@inject(LabelParser) labelParser: LabelParser;
|
|
45
|
+
|
|
39
46
|
@inject(ContributionProvider) @named(ToolbarContribution)
|
|
40
47
|
protected widgetContributions: ContributionProvider<ToolbarContribution>;
|
|
41
48
|
|
|
@@ -68,15 +75,15 @@ export class ToolbarController {
|
|
|
68
75
|
for (const column of Object.keys(schema.items)) {
|
|
69
76
|
const currentColumn = schema.items[column as ToolbarAlignment];
|
|
70
77
|
for (const group of currentColumn) {
|
|
71
|
-
const newGroup:
|
|
78
|
+
const newGroup: TabBarToolbarItem[] = [];
|
|
72
79
|
for (const item of group) {
|
|
73
80
|
if (item.group === 'contributed') {
|
|
74
81
|
const contribution = this.getContributionByID(item.id);
|
|
75
82
|
if (contribution) {
|
|
76
|
-
newGroup.push(contribution);
|
|
83
|
+
newGroup.push(new ReactToolbarItemImpl(this.commandRegistry, this.contextKeyService, contribution));
|
|
77
84
|
}
|
|
78
85
|
} else {
|
|
79
|
-
newGroup.push(
|
|
86
|
+
newGroup.push(new RenderedToolbarItemImpl(this.commandRegistry, this.contextKeyService, this.keybindingRegistry, this.labelParser, item));
|
|
80
87
|
}
|
|
81
88
|
}
|
|
82
89
|
if (newGroup.length) {
|
|
@@ -15,7 +15,8 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { interfaces } from '@theia/core/shared/inversify';
|
|
18
|
-
import {
|
|
18
|
+
import { ReactTabBarToolbarAction, RenderedToolbarAction, TabBarToolbar } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
19
|
+
import { TabBarToolbarItem } from '@theia/core/lib/browser/shell/tab-bar-toolbar/tab-toolbar-item';
|
|
19
20
|
|
|
20
21
|
export enum ToolbarAlignment {
|
|
21
22
|
LEFT = 'left',
|
|
@@ -25,7 +26,7 @@ export enum ToolbarAlignment {
|
|
|
25
26
|
|
|
26
27
|
export interface ToolbarTreeSchema {
|
|
27
28
|
items: {
|
|
28
|
-
[key in ToolbarAlignment]:
|
|
29
|
+
[key in ToolbarAlignment]: TabBarToolbarItem[][];
|
|
29
30
|
};
|
|
30
31
|
}
|
|
31
32
|
|
|
@@ -44,7 +45,7 @@ export interface ToolbarContributionProperties {
|
|
|
44
45
|
toJSON(): DeflatedContributedToolbarItem;
|
|
45
46
|
}
|
|
46
47
|
|
|
47
|
-
export type ToolbarContribution =
|
|
48
|
+
export type ToolbarContribution = ReactTabBarToolbarAction & ToolbarContributionProperties;
|
|
48
49
|
|
|
49
50
|
export const ToolbarContribution = Symbol('ToolbarContribution');
|
|
50
51
|
|
|
@@ -52,9 +53,9 @@ export const Toolbar = Symbol('Toolbar');
|
|
|
52
53
|
export const ToolbarFactory = Symbol('ToolbarFactory');
|
|
53
54
|
export type Toolbar = TabBarToolbar;
|
|
54
55
|
|
|
55
|
-
export type ToolbarItem = ToolbarContribution |
|
|
56
|
+
export type ToolbarItem = ToolbarContribution | RenderedToolbarAction;
|
|
56
57
|
export interface DeflatedContributedToolbarItem { id: string; group: 'contributed' };
|
|
57
|
-
export type ToolbarItemDeflated = DeflatedContributedToolbarItem |
|
|
58
|
+
export type ToolbarItemDeflated = DeflatedContributedToolbarItem | RenderedToolbarAction;
|
|
58
59
|
|
|
59
60
|
export const LateInjector = Symbol('LateInjector');
|
|
60
61
|
|
package/src/browser/toolbar.tsx
CHANGED
|
@@ -16,21 +16,20 @@
|
|
|
16
16
|
|
|
17
17
|
import * as React from '@theia/core/shared/react';
|
|
18
18
|
import { Anchor, ContextMenuAccess, KeybindingRegistry, PreferenceService, Widget, WidgetManager } from '@theia/core/lib/browser';
|
|
19
|
-
import {
|
|
20
|
-
import { ReactTabBarToolbarItem, RenderedToolbarItem, TabBarToolbar, TabBarToolbarFactory } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
19
|
+
import { TabBarToolbar, TabBarToolbarFactory } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
21
20
|
import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
|
|
22
|
-
import { MenuPath, ProgressService } from '@theia/core';
|
|
21
|
+
import { DisposableCollection, MenuPath, ProgressService } from '@theia/core';
|
|
23
22
|
import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
|
|
24
23
|
import { ProgressBarFactory } from '@theia/core/lib/browser/progress-bar-factory';
|
|
25
24
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
26
25
|
import {
|
|
27
|
-
ToolbarItem,
|
|
28
26
|
ToolbarAlignment,
|
|
29
27
|
ToolbarAlignmentString,
|
|
30
28
|
ToolbarItemPosition,
|
|
31
29
|
} from './toolbar-interfaces';
|
|
32
30
|
import { ToolbarController } from './toolbar-controller';
|
|
33
31
|
import { ToolbarMenus } from './toolbar-constants';
|
|
32
|
+
import { TabBarToolbarItem } from '@theia/core/lib/browser/shell/tab-bar-toolbar/tab-toolbar-item';
|
|
34
33
|
|
|
35
34
|
const TOOLBAR_BACKGROUND_DATA_ID = 'toolbar-wrapper';
|
|
36
35
|
export const TOOLBAR_PROGRESSBAR_ID = 'main-toolbar-progress';
|
|
@@ -80,22 +79,21 @@ export class ToolbarImpl extends TabBarToolbar {
|
|
|
80
79
|
}
|
|
81
80
|
|
|
82
81
|
protected updateInlineItems(): void {
|
|
82
|
+
this.toDisposeOnUpdateItems.dispose();
|
|
83
|
+
this.toDisposeOnUpdateItems = new DisposableCollection();
|
|
83
84
|
this.inline.clear();
|
|
84
85
|
const { items } = this.model.toolbarItems;
|
|
85
86
|
|
|
86
|
-
const contextKeys = new Set<string>();
|
|
87
87
|
for (const column of Object.keys(items)) {
|
|
88
88
|
for (const group of items[column as ToolbarAlignment]) {
|
|
89
89
|
for (const item of group) {
|
|
90
90
|
this.inline.set(item.id, item);
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
this.contextKeyService.parseKeys(item.when)?.forEach(key => contextKeys.add(key));
|
|
91
|
+
if (item.onDidChange) {
|
|
92
|
+
this.toDisposeOnUpdateItems.push(item.onDidChange(() => this.maybeUpdate()));
|
|
94
93
|
}
|
|
95
94
|
}
|
|
96
95
|
}
|
|
97
96
|
}
|
|
98
|
-
this.updateContextKeyListener(contextKeys);
|
|
99
97
|
}
|
|
100
98
|
|
|
101
99
|
protected handleContextMenu = (e: React.MouseEvent<HTMLDivElement>): ContextMenuAccess => this.doHandleContextMenu(e);
|
|
@@ -142,7 +140,7 @@ export class ToolbarImpl extends TabBarToolbar {
|
|
|
142
140
|
return args;
|
|
143
141
|
}
|
|
144
142
|
|
|
145
|
-
protected renderGroupsInColumn(groups:
|
|
143
|
+
protected renderGroupsInColumn(groups: TabBarToolbarItem[][], alignment: ToolbarAlignment): React.ReactNode[] {
|
|
146
144
|
const nodes: React.ReactNode[] = [];
|
|
147
145
|
groups.forEach((group, groupIndex) => {
|
|
148
146
|
if (nodes.length && group.length) {
|
|
@@ -181,7 +179,7 @@ export class ToolbarImpl extends TabBarToolbar {
|
|
|
181
179
|
);
|
|
182
180
|
}
|
|
183
181
|
|
|
184
|
-
protected renderColumnWrapper(alignment: ToolbarAlignment, columnGroup:
|
|
182
|
+
protected renderColumnWrapper(alignment: ToolbarAlignment, columnGroup: TabBarToolbarItem[][]): React.ReactNode {
|
|
185
183
|
let children: React.ReactNode;
|
|
186
184
|
if (alignment === ToolbarAlignment.LEFT) {
|
|
187
185
|
children = (
|
|
@@ -235,23 +233,11 @@ export class ToolbarImpl extends TabBarToolbar {
|
|
|
235
233
|
);
|
|
236
234
|
}
|
|
237
235
|
|
|
238
|
-
protected renderItemWithDraggableWrapper(item:
|
|
236
|
+
protected renderItemWithDraggableWrapper(item: TabBarToolbarItem, position: ToolbarItemPosition): React.ReactNode {
|
|
239
237
|
const stringifiedPosition = JSON.stringify(position);
|
|
240
|
-
|
|
241
|
-
|
|
238
|
+
const toolbarItemClassNames = '';
|
|
239
|
+
const renderBody = item.render(this);
|
|
242
240
|
|
|
243
|
-
if (!ReactTabBarToolbarItem.is(item)) {
|
|
244
|
-
toolbarItemClassNames = TabBarToolbar.Styles.TAB_BAR_TOOLBAR_ITEM;
|
|
245
|
-
if (this.evaluateWhenClause(item.when)) {
|
|
246
|
-
toolbarItemClassNames += ' enabled';
|
|
247
|
-
}
|
|
248
|
-
renderBody = this.renderItem(item);
|
|
249
|
-
} else {
|
|
250
|
-
const contribution = this.model.getContributionByID(item.id);
|
|
251
|
-
if (contribution) {
|
|
252
|
-
renderBody = contribution.render();
|
|
253
|
-
}
|
|
254
|
-
}
|
|
255
241
|
return (
|
|
256
242
|
<div
|
|
257
243
|
role='button'
|
|
@@ -261,12 +247,8 @@ export class ToolbarImpl extends TabBarToolbar {
|
|
|
261
247
|
data-position={stringifiedPosition}
|
|
262
248
|
key={`${item.id}-${stringifiedPosition}`}
|
|
263
249
|
className={`${toolbarItemClassNames} toolbar-item action-label`}
|
|
264
|
-
onMouseDown={this.onMouseDownEvent}
|
|
265
|
-
onMouseUp={this.onMouseUpEvent}
|
|
266
|
-
onMouseOut={this.onMouseUpEvent}
|
|
267
250
|
draggable={true}
|
|
268
251
|
onDragStart={this.handleOnDragStart}
|
|
269
|
-
onClick={e => this.executeCommand(e, item)}
|
|
270
252
|
onDragOver={this.handleOnDragEnter}
|
|
271
253
|
onDragLeave={this.handleOnDragLeave}
|
|
272
254
|
onContextMenu={this.handleContextMenu}
|
|
@@ -279,41 +261,6 @@ export class ToolbarImpl extends TabBarToolbar {
|
|
|
279
261
|
);
|
|
280
262
|
}
|
|
281
263
|
|
|
282
|
-
protected override renderItem(
|
|
283
|
-
item: RenderedToolbarItem,
|
|
284
|
-
): React.ReactNode {
|
|
285
|
-
const classNames = [];
|
|
286
|
-
if (item.text) {
|
|
287
|
-
for (const labelPart of this.labelParser.parse(item.text)) {
|
|
288
|
-
if (typeof labelPart !== 'string' && LabelIcon.is(labelPart)) {
|
|
289
|
-
const className = `fa fa-${labelPart.name}${labelPart.animation ? ' fa-' + labelPart.animation : ''}`;
|
|
290
|
-
classNames.push(...className.split(' '));
|
|
291
|
-
}
|
|
292
|
-
}
|
|
293
|
-
}
|
|
294
|
-
const command = this.commands.getCommand(item.command!);
|
|
295
|
-
const iconClass = (typeof item.icon === 'function' && item.icon()) || item.icon || command?.iconClass;
|
|
296
|
-
if (iconClass) {
|
|
297
|
-
classNames.push(iconClass);
|
|
298
|
-
}
|
|
299
|
-
let itemTooltip = '';
|
|
300
|
-
if (item.tooltip) {
|
|
301
|
-
itemTooltip = item.tooltip;
|
|
302
|
-
} else if (command?.label) {
|
|
303
|
-
itemTooltip = command.label;
|
|
304
|
-
}
|
|
305
|
-
const keybindingString = this.resolveKeybindingForCommand(command?.id);
|
|
306
|
-
itemTooltip = `${itemTooltip}${keybindingString}`;
|
|
307
|
-
|
|
308
|
-
return (
|
|
309
|
-
<div
|
|
310
|
-
id={item.id}
|
|
311
|
-
className={classNames.join(' ')}
|
|
312
|
-
title={itemTooltip}
|
|
313
|
-
/>
|
|
314
|
-
);
|
|
315
|
-
}
|
|
316
|
-
|
|
317
264
|
protected handleOnDragStart = (e: React.DragEvent<HTMLDivElement>): void => this.doHandleOnDragStart(e);
|
|
318
265
|
protected doHandleOnDragStart(e: React.DragEvent<HTMLDivElement>): void {
|
|
319
266
|
const draggedElement = e.currentTarget;
|