@theia/toolbar 1.53.0-next.6 → 1.53.0-next.64
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/toolbar-controller.d.ts.map +1 -1
- package/lib/browser/toolbar-controller.js +1 -2
- package/lib/browser/toolbar-controller.js.map +1 -1
- package/lib/browser/toolbar-interfaces.d.ts +2 -2
- package/lib/browser/toolbar-interfaces.d.ts.map +1 -1
- package/lib/browser/toolbar.d.ts +2 -2
- package/lib/browser/toolbar.d.ts.map +1 -1
- package/lib/browser/toolbar.js +2 -2
- package/lib/browser/toolbar.js.map +1 -1
- package/package.json +10 -10
- package/src/browser/toolbar-controller.ts +1 -2
- package/src/browser/toolbar-interfaces.ts +2 -2
- package/src/browser/toolbar.tsx +5 -5
|
@@ -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;AACnG,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,+BAA+B,EAAE,MAAM,oDAAoD,CAAC;
|
|
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;AACnG,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,+BAA+B,EAAE,MAAM,oDAAoD,CAAC;AACrG,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAG/D,OAAO,EACH,mBAAmB,EACnB,mBAAmB,EACnB,iBAAiB,EAEjB,gBAAgB,EAChB,mBAAmB,EACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,sBAAsB,EAAkC,MAAM,4BAA4B,CAAC;AAEpG,qBACa,iBAAiB;IACM,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,sBAAsB,CAAC;IAClD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,+BAA+B,CAAC;IAC9E,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAC1C,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,mBAAmB,CAAC;IAE9F,SAAS,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;IAEzE,SAAS,CAAC,4BAA4B,gBAAuB;IAC7D,QAAQ,CAAC,uBAAuB,oCAA2C;IAE3E,SAAS,CAAC,0BAA0B,mBAA0B;IAC9D,QAAQ,CAAC,2BAA2B,uCAAyC;IAE7E,QAAQ,CAAC,KAAK,iBAAwB;IAEtC,SAAS,CAAC,aAAa,EAAE,iBAAiB,CAAC;IAC3C,IAAI,YAAY,IAAI,iBAAiB,CAEpC;IAED,IAAI,YAAY,CAAC,OAAO,EAAE,iBAAiB,EAG1C;IAED,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,mBAAmB,GAAG,iBAAiB;IA8BtE,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS;IAKhE,SAAS,CAAC,IAAI,IAAI,IAAI;cAIN,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;cAevB,mBAAmB,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAa3D,UAAU,CACZ,WAAW,EAAE,mBAAmB,EAChC,WAAW,EAAE,mBAAmB,EAChC,SAAS,EAAE,eAAe,GAAG,gBAAgB,GAC9C,OAAO,CAAC,OAAO,CAAC;IAOb,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAI5B,oBAAoB,CAAC,MAAM,UAAQ,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIjE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAOnE,UAAU,CAAC,QAAQ,EAAE,mBAAmB,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOxE,oBAAoB,CACtB,mBAAmB,EAAE,mBAAmB,EACxC,MAAM,EAAE,gBAAgB,EACxB,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,GAClC,OAAO,CAAC,OAAO,CAAC;IAOb,WAAW,CAAC,QAAQ,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAO/F,QAAQ,CAAC,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;CAMzE"}
|
|
@@ -19,7 +19,6 @@ exports.ToolbarController = void 0;
|
|
|
19
19
|
const tslib_1 = require("tslib");
|
|
20
20
|
const core_1 = require("@theia/core");
|
|
21
21
|
const frontend_application_state_1 = require("@theia/core/lib/browser/frontend-application-state");
|
|
22
|
-
const tab_bar_toolbar_1 = require("@theia/core/lib/browser/shell/tab-bar-toolbar");
|
|
23
22
|
const promise_util_1 = require("@theia/core/lib/common/promise-util");
|
|
24
23
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
25
24
|
const toolbar_defaults_1 = require("./toolbar-defaults");
|
|
@@ -59,7 +58,7 @@ let ToolbarController = class ToolbarController {
|
|
|
59
58
|
newGroup.push(contribution);
|
|
60
59
|
}
|
|
61
60
|
}
|
|
62
|
-
else
|
|
61
|
+
else {
|
|
63
62
|
newGroup.push({ ...item });
|
|
64
63
|
}
|
|
65
64
|
}
|
|
@@ -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,sCAAmG;AAEnG,mGAAqG;AACrG,
|
|
1
|
+
{"version":3,"file":"toolbar-controller.js","sourceRoot":"","sources":["../../src/browser/toolbar-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { interfaces } from '@theia/core/shared/inversify';
|
|
2
|
-
import { ReactTabBarToolbarItem, TabBarToolbar, TabBarToolbarItem } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
2
|
+
import { ReactTabBarToolbarItem, RenderedToolbarItem, TabBarToolbar, TabBarToolbarItem } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
3
3
|
export declare enum ToolbarAlignment {
|
|
4
4
|
LEFT = "left",
|
|
5
5
|
CENTER = "center",
|
|
@@ -26,7 +26,7 @@ export declare const ToolbarContribution: unique symbol;
|
|
|
26
26
|
export declare const Toolbar: unique symbol;
|
|
27
27
|
export declare const ToolbarFactory: unique symbol;
|
|
28
28
|
export type Toolbar = TabBarToolbar;
|
|
29
|
-
export type ToolbarItem = ToolbarContribution |
|
|
29
|
+
export type ToolbarItem = ToolbarContribution | RenderedToolbarItem;
|
|
30
30
|
export interface DeflatedContributedToolbarItem {
|
|
31
31
|
id: string;
|
|
32
32
|
group: 'contributed';
|
|
@@ -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,sBAAsB,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;
|
|
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,sBAAsB,EAAE,mBAAmB,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAE9I,oBAAY,gBAAgB;IACxB,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,KAAK,UAAU;CAClB;AAED,MAAM,WAAW,iBAAiB;IAC9B,KAAK,EAAE;SACF,GAAG,IAAI,gBAAgB,GAAG,WAAW,EAAE,EAAE;KAC7C,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,sBAAsB,GAAG,6BAA6B,CAAC;AAEzF,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,mBAAmB,CAAC;AACpE,MAAM,WAAW,8BAA8B;IAAG,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,aAAa,CAAA;CAAE;AACpF,MAAM,MAAM,mBAAmB,GAAG,8BAA8B,GAAG,iBAAiB,CAAC;AAErF,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"}
|
package/lib/browser/toolbar.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
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 { TabBarToolbar, TabBarToolbarFactory
|
|
4
|
+
import { RenderedToolbarItem, 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';
|
|
@@ -39,7 +39,7 @@ export declare class ToolbarImpl extends TabBarToolbar {
|
|
|
39
39
|
protected renderColumnWrapper(alignment: ToolbarAlignment, columnGroup: ToolbarItem[][]): React.ReactNode;
|
|
40
40
|
protected renderColumnSpace(alignment: ToolbarAlignment, position?: 'left' | 'right'): React.ReactNode;
|
|
41
41
|
protected renderItemWithDraggableWrapper(item: ToolbarItem, position: ToolbarItemPosition): React.ReactNode;
|
|
42
|
-
protected renderItem(item:
|
|
42
|
+
protected renderItem(item: RenderedToolbarItem): 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;AAElI,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,
|
|
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
|
@@ -186,7 +186,7 @@ let ToolbarImpl = class ToolbarImpl extends tab_bar_toolbar_1.TabBarToolbar {
|
|
|
186
186
|
const stringifiedPosition = JSON.stringify(position);
|
|
187
187
|
let toolbarItemClassNames = '';
|
|
188
188
|
let renderBody;
|
|
189
|
-
if (tab_bar_toolbar_1.
|
|
189
|
+
if (!tab_bar_toolbar_1.ReactTabBarToolbarItem.is(item)) {
|
|
190
190
|
toolbarItemClassNames = tab_bar_toolbar_1.TabBarToolbar.Styles.TAB_BAR_TOOLBAR_ITEM;
|
|
191
191
|
if (this.evaluateWhenClause(item.when)) {
|
|
192
192
|
toolbarItemClassNames += ' enabled';
|
|
@@ -199,7 +199,7 @@ let ToolbarImpl = class ToolbarImpl extends tab_bar_toolbar_1.TabBarToolbar {
|
|
|
199
199
|
renderBody = contribution.render();
|
|
200
200
|
}
|
|
201
201
|
}
|
|
202
|
-
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: this.executeCommand, onDragOver: this.handleOnDragEnter, onDragLeave: this.handleOnDragLeave, onContextMenu: this.handleContextMenu, onDragEnd: this.handleOnDragEnd, onDrop: this.handleOnDrop },
|
|
202
|
+
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 },
|
|
203
203
|
renderBody,
|
|
204
204
|
React.createElement("div", { className: 'hover-overlay' })));
|
|
205
205
|
}
|
|
@@ -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.53.0-next.
|
|
3
|
+
"version": "1.53.0-next.64+23b351d26",
|
|
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.53.0-next.
|
|
31
|
-
"@theia/editor": "1.53.0-next.
|
|
32
|
-
"@theia/file-search": "1.53.0-next.
|
|
33
|
-
"@theia/filesystem": "1.53.0-next.
|
|
34
|
-
"@theia/monaco": "1.53.0-next.
|
|
30
|
+
"@theia/core": "1.53.0-next.64+23b351d26",
|
|
31
|
+
"@theia/editor": "1.53.0-next.64+23b351d26",
|
|
32
|
+
"@theia/file-search": "1.53.0-next.64+23b351d26",
|
|
33
|
+
"@theia/filesystem": "1.53.0-next.64+23b351d26",
|
|
34
|
+
"@theia/monaco": "1.53.0-next.64+23b351d26",
|
|
35
35
|
"@theia/monaco-editor-core": "1.83.101",
|
|
36
|
-
"@theia/search-in-workspace": "1.53.0-next.
|
|
37
|
-
"@theia/userstorage": "1.53.0-next.
|
|
38
|
-
"@theia/workspace": "1.53.0-next.
|
|
36
|
+
"@theia/search-in-workspace": "1.53.0-next.64+23b351d26",
|
|
37
|
+
"@theia/userstorage": "1.53.0-next.64+23b351d26",
|
|
38
|
+
"@theia/workspace": "1.53.0-next.64+23b351d26",
|
|
39
39
|
"ajv": "^6.5.3",
|
|
40
40
|
"jsonc-parser": "^2.2.0",
|
|
41
41
|
"perfect-scrollbar": "^1.3.0",
|
|
@@ -49,5 +49,5 @@
|
|
|
49
49
|
"publishConfig": {
|
|
50
50
|
"access": "public"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "23b351d26346a2b5d6aca3ee81fba59c056132f7"
|
|
53
53
|
}
|
|
@@ -17,7 +17,6 @@
|
|
|
17
17
|
import { Command, ContributionProvider, Emitter, MaybePromise, MessageService } from '@theia/core';
|
|
18
18
|
import { Widget } from '@theia/core/lib/browser';
|
|
19
19
|
import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
|
|
20
|
-
import { TabBarToolbarItem } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
21
20
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
22
21
|
import { injectable, inject, postConstruct, named } from '@theia/core/shared/inversify';
|
|
23
22
|
import { ToolbarDefaultsFactory } from './toolbar-defaults';
|
|
@@ -76,7 +75,7 @@ export class ToolbarController {
|
|
|
76
75
|
if (contribution) {
|
|
77
76
|
newGroup.push(contribution);
|
|
78
77
|
}
|
|
79
|
-
} else
|
|
78
|
+
} else {
|
|
80
79
|
newGroup.push({ ...item });
|
|
81
80
|
}
|
|
82
81
|
}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { interfaces } from '@theia/core/shared/inversify';
|
|
18
|
-
import { ReactTabBarToolbarItem, TabBarToolbar, TabBarToolbarItem } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
18
|
+
import { ReactTabBarToolbarItem, RenderedToolbarItem, TabBarToolbar, TabBarToolbarItem } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
19
19
|
|
|
20
20
|
export enum ToolbarAlignment {
|
|
21
21
|
LEFT = 'left',
|
|
@@ -52,7 +52,7 @@ export const Toolbar = Symbol('Toolbar');
|
|
|
52
52
|
export const ToolbarFactory = Symbol('ToolbarFactory');
|
|
53
53
|
export type Toolbar = TabBarToolbar;
|
|
54
54
|
|
|
55
|
-
export type ToolbarItem = ToolbarContribution |
|
|
55
|
+
export type ToolbarItem = ToolbarContribution | RenderedToolbarItem;
|
|
56
56
|
export interface DeflatedContributedToolbarItem { id: string; group: 'contributed' };
|
|
57
57
|
export type ToolbarItemDeflated = DeflatedContributedToolbarItem | TabBarToolbarItem;
|
|
58
58
|
|
package/src/browser/toolbar.tsx
CHANGED
|
@@ -17,7 +17,7 @@
|
|
|
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
19
|
import { LabelIcon } from '@theia/core/lib/browser/label-parser';
|
|
20
|
-
import { TabBarToolbar, TabBarToolbarFactory
|
|
20
|
+
import { ReactTabBarToolbarItem, RenderedToolbarItem, TabBarToolbar, TabBarToolbarFactory } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
21
21
|
import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
|
|
22
22
|
import { MenuPath, ProgressService } from '@theia/core';
|
|
23
23
|
import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
|
|
@@ -239,7 +239,7 @@ export class ToolbarImpl extends TabBarToolbar {
|
|
|
239
239
|
let toolbarItemClassNames = '';
|
|
240
240
|
let renderBody: React.ReactNode;
|
|
241
241
|
|
|
242
|
-
if (
|
|
242
|
+
if (!ReactTabBarToolbarItem.is(item)) {
|
|
243
243
|
toolbarItemClassNames = TabBarToolbar.Styles.TAB_BAR_TOOLBAR_ITEM;
|
|
244
244
|
if (this.evaluateWhenClause(item.when)) {
|
|
245
245
|
toolbarItemClassNames += ' enabled';
|
|
@@ -265,7 +265,7 @@ export class ToolbarImpl extends TabBarToolbar {
|
|
|
265
265
|
onMouseOut={this.onMouseUpEvent}
|
|
266
266
|
draggable={true}
|
|
267
267
|
onDragStart={this.handleOnDragStart}
|
|
268
|
-
onClick={this.executeCommand}
|
|
268
|
+
onClick={e => this.executeCommand(e, item)}
|
|
269
269
|
onDragOver={this.handleOnDragEnter}
|
|
270
270
|
onDragLeave={this.handleOnDragLeave}
|
|
271
271
|
onContextMenu={this.handleContextMenu}
|
|
@@ -279,7 +279,7 @@ export class ToolbarImpl extends TabBarToolbar {
|
|
|
279
279
|
}
|
|
280
280
|
|
|
281
281
|
protected override renderItem(
|
|
282
|
-
item:
|
|
282
|
+
item: RenderedToolbarItem,
|
|
283
283
|
): React.ReactNode {
|
|
284
284
|
const classNames = [];
|
|
285
285
|
if (item.text) {
|
|
@@ -290,7 +290,7 @@ export class ToolbarImpl extends TabBarToolbar {
|
|
|
290
290
|
}
|
|
291
291
|
}
|
|
292
292
|
}
|
|
293
|
-
const command = this.commands.getCommand(item.command);
|
|
293
|
+
const command = this.commands.getCommand(item.command!);
|
|
294
294
|
const iconClass = (typeof item.icon === 'function' && item.icon()) || item.icon || command?.iconClass;
|
|
295
295
|
if (iconClass) {
|
|
296
296
|
classNames.push(iconClass);
|