@theia/toolbar 1.56.0 → 1.57.0-next.136
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/README.md +3 -2
- package/lib/browser/toolbar-command-contribution.d.ts +3 -3
- package/lib/browser/toolbar-command-contribution.d.ts.map +1 -1
- package/lib/browser/toolbar-command-contribution.js +4 -4
- package/lib/browser/toolbar-command-contribution.js.map +1 -1
- package/lib/browser/toolbar-content-hover-widget-patcher.d.ts +9 -0
- package/lib/browser/toolbar-content-hover-widget-patcher.d.ts.map +1 -0
- package/lib/browser/toolbar-content-hover-widget-patcher.js +53 -0
- package/lib/browser/toolbar-content-hover-widget-patcher.js.map +1 -0
- package/lib/browser/toolbar-frontend-module.d.ts.map +1 -1
- package/lib/browser/toolbar-frontend-module.js +2 -0
- package/lib/browser/toolbar-frontend-module.js.map +1 -1
- package/package.json +12 -12
- package/src/browser/toolbar-command-contribution.ts +3 -4
- package/src/browser/toolbar-content-hover-widget-patcher.ts +51 -0
- package/src/browser/toolbar-frontend-module.ts +2 -0
package/README.md
CHANGED
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
|
|
13
13
|
## Description
|
|
14
14
|
|
|
15
|
-
The `@theia/toolbar` extension contributes a global toolbar to the application shell. The toolbar supplements the `Command Palette` and allows users to easily add, remove, and rearrange toolbar items to their liking. The toolbar is hidden by default and ships with a default layout which can be overridden by downstream applications. Extenders can also contribute custom widgets to the toolbar through a contribution point.
|
|
15
|
+
The `@theia/toolbar` extension contributes a global toolbar to the application shell. The toolbar supplements the `Command Palette` and allows users to easily add, remove, and rearrange toolbar items to their liking. The toolbar is hidden by default and ships with a default layout which can be overridden by downstream applications. Extenders can also contribute custom widgets to the toolbar through a contribution point.
|
|
16
16
|
|
|
17
17
|
## Additional Information
|
|
18
18
|
|
|
@@ -28,5 +28,6 @@ An example toolbar custom widget and layout override can be found in [here](http
|
|
|
28
28
|
- [一 (Secondary) GNU General Public License, version 2 with the GNU Classpath Exception](https://projects.eclipse.org/license/secondary-gpl-2.0-cp)
|
|
29
29
|
|
|
30
30
|
## Trademark
|
|
31
|
+
|
|
31
32
|
"Theia" is a trademark of the Eclipse Foundation
|
|
32
|
-
https://www.eclipse.org/theia
|
|
33
|
+
<https://www.eclipse.org/theia>
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { CommandContribution, CommandRegistry, CommandService,
|
|
1
|
+
import { CommandContribution, CommandRegistry, CommandService, MenuContribution, MenuModelRegistry } from '@theia/core';
|
|
2
2
|
import { KeybindingContribution, KeybindingRegistry, PreferenceService, QuickInputService } from '@theia/core/lib/browser';
|
|
3
3
|
import { interfaces } from '@theia/core/shared/inversify';
|
|
4
4
|
import { EditorManager } from '@theia/editor/lib/browser';
|
|
5
5
|
import { ToolbarCommandQuickInputService } from './toolbar-command-quick-input-service';
|
|
6
6
|
import { ToolbarController } from './toolbar-controller';
|
|
7
|
-
import { JsonSchemaContribution, JsonSchemaRegisterContext } from '@theia/core/lib/browser/json-schema-store';
|
|
7
|
+
import { JsonSchemaContribution, JsonSchemaDataStore, JsonSchemaRegisterContext } from '@theia/core/lib/browser/json-schema-store';
|
|
8
8
|
import URI from '@theia/core/lib/common/uri';
|
|
9
9
|
export declare class ToolbarCommandContribution implements CommandContribution, KeybindingContribution, MenuContribution, JsonSchemaContribution {
|
|
10
10
|
protected readonly model: ToolbarController;
|
|
@@ -14,7 +14,7 @@ export declare class ToolbarCommandContribution implements CommandContribution,
|
|
|
14
14
|
protected readonly editorManager: EditorManager;
|
|
15
15
|
protected readonly preferenceService: PreferenceService;
|
|
16
16
|
protected readonly toolbarModel: ToolbarController;
|
|
17
|
-
protected readonly
|
|
17
|
+
protected readonly schemaStore: JsonSchemaDataStore;
|
|
18
18
|
protected readonly schemaURI: URI;
|
|
19
19
|
registerSchemas(context: JsonSchemaRegisterContext): void;
|
|
20
20
|
registerCommands(registry: CommandRegistry): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolbar-command-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/toolbar-command-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAEH,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,
|
|
1
|
+
{"version":3,"file":"toolbar-command-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/toolbar-command-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAEH,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,iBAAiB,EACpB,MAAM,aAAa,CAAC;AACrB,OAAO,EAGH,sBAAsB,EACtB,kBAAkB,EAGlB,iBAAiB,EACjB,iBAAiB,EAEpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAsB,UAAU,EAAa,MAAM,8BAA8B,CAAC;AACzF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAW1D,OAAO,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAC;AAExF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAIzD,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AAEnI,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAE7C,qBACa,0BAA2B,YAAW,mBAAmB,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,sBAAsB;IACzG,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC;IAC5C,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC1C,SAAS,CAAC,yBAAyB,EAAE,+BAA+B,CAAC;IACtF,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACnD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAC5C,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACxD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,iBAAiB,CAAC;IACjD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,mBAAmB,CAAC;IACjF,SAAS,CAAC,QAAQ,CAAC,SAAS,MAA4B;IAExD,eAAe,CAAC,OAAO,EAAE,yBAAyB,GAAG,IAAI;IAQzD,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IA8CjD,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO;IAIhD,mBAAmB,CAAC,IAAI,EAAE,kBAAkB,GAAG,IAAI;IAOnD,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;CAwCnD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAiCvD"}
|
|
@@ -38,7 +38,7 @@ let ToolbarCommandContribution = class ToolbarCommandContribution {
|
|
|
38
38
|
this.schemaURI = new uri_1.default(toolbar_preference_schema_1.toolbarSchemaId);
|
|
39
39
|
}
|
|
40
40
|
registerSchemas(context) {
|
|
41
|
-
this.
|
|
41
|
+
this.schemaStore.setSchema(this.schemaURI, toolbar_preference_schema_1.toolbarConfigurationSchema);
|
|
42
42
|
context.registerSchema({
|
|
43
43
|
fileMatch: ['toolbar.json'],
|
|
44
44
|
url: this.schemaURI.toString(),
|
|
@@ -166,9 +166,9 @@ tslib_1.__decorate([
|
|
|
166
166
|
tslib_1.__metadata("design:type", toolbar_controller_1.ToolbarController)
|
|
167
167
|
], ToolbarCommandContribution.prototype, "toolbarModel", void 0);
|
|
168
168
|
tslib_1.__decorate([
|
|
169
|
-
(0, inversify_1.inject)(
|
|
170
|
-
tslib_1.__metadata("design:type",
|
|
171
|
-
], ToolbarCommandContribution.prototype, "
|
|
169
|
+
(0, inversify_1.inject)(json_schema_store_1.JsonSchemaDataStore),
|
|
170
|
+
tslib_1.__metadata("design:type", json_schema_store_1.JsonSchemaDataStore)
|
|
171
|
+
], ToolbarCommandContribution.prototype, "schemaStore", void 0);
|
|
172
172
|
exports.ToolbarCommandContribution = ToolbarCommandContribution = tslib_1.__decorate([
|
|
173
173
|
(0, inversify_1.injectable)()
|
|
174
174
|
], ToolbarCommandContribution);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolbar-command-contribution.js","sourceRoot":"","sources":["../../src/browser/toolbar-command-contribution.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-command-contribution.js","sourceRoot":"","sources":["../../src/browser/toolbar-command-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { ApplicationShell, FrontendApplication } from '@theia/core/lib/browser';
|
|
2
|
+
import { interfaces } from '@theia/core/shared/inversify';
|
|
3
|
+
import { DefaultContentHoverWidgetPatcher } from '@theia/monaco/lib/browser/default-content-hover-widget-patcher';
|
|
4
|
+
export declare class ToolbarContentHoverWidgetPatcher extends DefaultContentHoverWidgetPatcher {
|
|
5
|
+
onStart(app: FrontendApplication): void;
|
|
6
|
+
protected getTopPanelHeight(shell: ApplicationShell): number;
|
|
7
|
+
}
|
|
8
|
+
export declare const bindToolbarContentHoverWidgetPatcher: (bind: interfaces.Bind, rebind: interfaces.Rebind, unbind: interfaces.Unbind) => void;
|
|
9
|
+
//# sourceMappingURL=toolbar-content-hover-widget-patcher.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"toolbar-content-hover-widget-patcher.d.ts","sourceRoot":"","sources":["../../src/browser/toolbar-content-hover-widget-patcher.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAc,UAAU,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,gCAAgC,EAAE,MAAM,gEAAgE,CAAC;AAGlH,qBACa,gCAAiC,SAAQ,gCAAgC;IAEzE,OAAO,CAAC,GAAG,EAAE,mBAAmB,GAAG,IAAI;cAY7B,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,MAAM;CAQxE;AAED,eAAO,MAAM,oCAAoC,SAAU,WAAW,IAAI,UAAU,WAAW,MAAM,UAAU,WAAW,MAAM,KAAG,IAGlI,CAAC"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// *****************************************************************************
|
|
3
|
+
// Copyright (C) 2025 and others.
|
|
4
|
+
//
|
|
5
|
+
// This program and the accompanying materials are made available under the
|
|
6
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
7
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
8
|
+
//
|
|
9
|
+
// This Source Code may also be made available under the following Secondary
|
|
10
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
11
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
12
|
+
// with the GNU Classpath Exception which is available at
|
|
13
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
14
|
+
//
|
|
15
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
|
+
// *****************************************************************************
|
|
17
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
exports.bindToolbarContentHoverWidgetPatcher = exports.ToolbarContentHoverWidgetPatcher = void 0;
|
|
19
|
+
const tslib_1 = require("tslib");
|
|
20
|
+
const inversify_1 = require("@theia/core/shared/inversify");
|
|
21
|
+
const default_content_hover_widget_patcher_1 = require("@theia/monaco/lib/browser/default-content-hover-widget-patcher");
|
|
22
|
+
const application_shell_with_toolbar_override_1 = require("./application-shell-with-toolbar-override");
|
|
23
|
+
let ToolbarContentHoverWidgetPatcher = class ToolbarContentHoverWidgetPatcher extends default_content_hover_widget_patcher_1.DefaultContentHoverWidgetPatcher {
|
|
24
|
+
onStart(app) {
|
|
25
|
+
super.onStart(app);
|
|
26
|
+
const shell = app.shell;
|
|
27
|
+
if (shell instanceof application_shell_with_toolbar_override_1.ApplicationShellWithToolbarOverride) {
|
|
28
|
+
shell['toolbar'].onDidChangeVisibility(() => {
|
|
29
|
+
this.updateContentHoverWidgetHeight({
|
|
30
|
+
topHeight: this.getTopPanelHeight(shell)
|
|
31
|
+
});
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
getTopPanelHeight(shell) {
|
|
36
|
+
const defaultHeight = shell.topPanel.node.getBoundingClientRect().height;
|
|
37
|
+
if (shell instanceof application_shell_with_toolbar_override_1.ApplicationShellWithToolbarOverride) {
|
|
38
|
+
const toolbarHeight = shell['toolbar'].node.getBoundingClientRect().height;
|
|
39
|
+
return defaultHeight + toolbarHeight;
|
|
40
|
+
}
|
|
41
|
+
return defaultHeight;
|
|
42
|
+
}
|
|
43
|
+
};
|
|
44
|
+
exports.ToolbarContentHoverWidgetPatcher = ToolbarContentHoverWidgetPatcher;
|
|
45
|
+
exports.ToolbarContentHoverWidgetPatcher = ToolbarContentHoverWidgetPatcher = tslib_1.__decorate([
|
|
46
|
+
(0, inversify_1.injectable)()
|
|
47
|
+
], ToolbarContentHoverWidgetPatcher);
|
|
48
|
+
const bindToolbarContentHoverWidgetPatcher = (bind, rebind, unbind) => {
|
|
49
|
+
bind(ToolbarContentHoverWidgetPatcher).toSelf().inSingletonScope();
|
|
50
|
+
rebind(default_content_hover_widget_patcher_1.DefaultContentHoverWidgetPatcher).toService(ToolbarContentHoverWidgetPatcher);
|
|
51
|
+
};
|
|
52
|
+
exports.bindToolbarContentHoverWidgetPatcher = bindToolbarContentHoverWidgetPatcher;
|
|
53
|
+
//# sourceMappingURL=toolbar-content-hover-widget-patcher.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"toolbar-content-hover-widget-patcher.js","sourceRoot":"","sources":["../../src/browser/toolbar-content-hover-widget-patcher.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,iCAAiC;AACjC,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;;;;AAGhF,4DAAsE;AACtE,yHAAkH;AAClH,uGAAgG;AAGzF,IAAM,gCAAgC,GAAtC,MAAM,gCAAiC,SAAQ,uEAAgC;IAEzE,OAAO,CAAC,GAAwB;QACrC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACnB,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;QACxB,IAAI,KAAK,YAAY,6EAAmC,EAAE,CAAC;YACvD,KAAK,CAAC,SAAS,CAAC,CAAC,qBAAqB,CAAC,GAAG,EAAE;gBACxC,IAAI,CAAC,8BAA8B,CAAC;oBAChC,SAAS,EAAE,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;iBAC3C,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAEkB,iBAAiB,CAAC,KAAuB;QACxD,MAAM,aAAa,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,MAAM,CAAC;QACzE,IAAI,KAAK,YAAY,6EAAmC,EAAE,CAAC;YACvD,MAAM,aAAa,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,MAAM,CAAC;YAC3E,OAAO,aAAa,GAAG,aAAa,CAAC;QACzC,CAAC;QACD,OAAO,aAAa,CAAC;IACzB,CAAC;CACJ,CAAA;AAtBY,4EAAgC;2CAAhC,gCAAgC;IAD5C,IAAA,sBAAU,GAAE;GACA,gCAAgC,CAsB5C;AAEM,MAAM,oCAAoC,GAAG,CAAC,IAAqB,EAAE,MAAyB,EAAE,MAAyB,EAAQ,EAAE;IACtI,IAAI,CAAC,gCAAgC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACnE,MAAM,CAAC,uEAAgC,CAAC,CAAC,SAAS,CAAC,gCAAgC,CAAC,CAAC;AACzF,CAAC,CAAC;AAHW,QAAA,oCAAoC,wCAG/C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolbar-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/toolbar-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,qCAAqC,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAc,MAAM,8BAA8B,CAAC;;
|
|
1
|
+
{"version":3,"file":"toolbar-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/toolbar-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,qCAAqC,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAc,MAAM,8BAA8B,CAAC;;AAK3E,wBASG"}
|
|
@@ -19,8 +19,10 @@ require("../../src/browser/style/toolbar.css");
|
|
|
19
19
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
20
20
|
const application_shell_with_toolbar_override_1 = require("./application-shell-with-toolbar-override");
|
|
21
21
|
const toolbar_command_contribution_1 = require("./toolbar-command-contribution");
|
|
22
|
+
const toolbar_content_hover_widget_patcher_1 = require("./toolbar-content-hover-widget-patcher");
|
|
22
23
|
exports.default = new inversify_1.ContainerModule((bind, unbind, _isBound, rebind) => {
|
|
23
24
|
(0, application_shell_with_toolbar_override_1.bindToolbarApplicationShell)(bind, rebind, unbind);
|
|
24
25
|
(0, toolbar_command_contribution_1.bindToolbar)(bind);
|
|
26
|
+
(0, toolbar_content_hover_widget_patcher_1.bindToolbarContentHoverWidgetPatcher)(bind, rebind, unbind);
|
|
25
27
|
});
|
|
26
28
|
//# sourceMappingURL=toolbar-frontend-module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolbar-frontend-module.js","sourceRoot":"","sources":["../../src/browser/toolbar-frontend-module.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,+CAA6C;AAC7C,4DAA2E;AAC3E,uGAAwF;AACxF,iFAA6D;
|
|
1
|
+
{"version":3,"file":"toolbar-frontend-module.js","sourceRoot":"","sources":["../../src/browser/toolbar-frontend-module.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,+CAA6C;AAC7C,4DAA2E;AAC3E,uGAAwF;AACxF,iFAA6D;AAC7D,iGAA8F;AAE9F,kBAAe,IAAI,2BAAe,CAAC,CAC/B,IAAqB,EACrB,MAAyB,EACzB,QAA4B,EAC5B,MAAyB,EAC3B,EAAE;IACA,IAAA,qEAA2B,EAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClD,IAAA,0CAAW,EAAC,IAAI,CAAC,CAAC;IAClB,IAAA,2EAAoC,EAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAC/D,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/toolbar",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.57.0-next.136+9a2072774",
|
|
4
4
|
"description": "Theia - Toolbar",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"theia-extension"
|
|
@@ -27,18 +27,18 @@
|
|
|
27
27
|
"watch": "theiaext watch"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@theia/core": "1.
|
|
31
|
-
"@theia/editor": "1.
|
|
32
|
-
"@theia/file-search": "1.
|
|
33
|
-
"@theia/filesystem": "1.
|
|
34
|
-
"@theia/monaco": "1.
|
|
35
|
-
"@theia/monaco-editor-core": "1.
|
|
36
|
-
"@theia/search-in-workspace": "1.
|
|
37
|
-
"@theia/userstorage": "1.
|
|
38
|
-
"@theia/workspace": "1.
|
|
30
|
+
"@theia/core": "1.57.0-next.136+9a2072774",
|
|
31
|
+
"@theia/editor": "1.57.0-next.136+9a2072774",
|
|
32
|
+
"@theia/file-search": "1.57.0-next.136+9a2072774",
|
|
33
|
+
"@theia/filesystem": "1.57.0-next.136+9a2072774",
|
|
34
|
+
"@theia/monaco": "1.57.0-next.136+9a2072774",
|
|
35
|
+
"@theia/monaco-editor-core": "1.96.302",
|
|
36
|
+
"@theia/search-in-workspace": "1.57.0-next.136+9a2072774",
|
|
37
|
+
"@theia/userstorage": "1.57.0-next.136+9a2072774",
|
|
38
|
+
"@theia/workspace": "1.57.0-next.136+9a2072774",
|
|
39
39
|
"ajv": "^6.5.3",
|
|
40
40
|
"jsonc-parser": "^2.2.0",
|
|
41
|
-
"perfect-scrollbar": "^1.
|
|
41
|
+
"perfect-scrollbar": "^1.5.5",
|
|
42
42
|
"tslib": "^2.6.2"
|
|
43
43
|
},
|
|
44
44
|
"theiaExtensions": [
|
|
@@ -49,5 +49,5 @@
|
|
|
49
49
|
"publishConfig": {
|
|
50
50
|
"access": "public"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "9a20727743172a4efa46334f4136a1242b160848"
|
|
53
53
|
}
|
|
@@ -19,7 +19,6 @@ import {
|
|
|
19
19
|
CommandContribution,
|
|
20
20
|
CommandRegistry,
|
|
21
21
|
CommandService,
|
|
22
|
-
InMemoryResources,
|
|
23
22
|
MenuContribution,
|
|
24
23
|
MenuModelRegistry,
|
|
25
24
|
} from '@theia/core';
|
|
@@ -52,7 +51,7 @@ import { ToolbarController } from './toolbar-controller';
|
|
|
52
51
|
import { ToolbarPreferencesSchema, ToolbarPreferences, TOOLBAR_ENABLE_PREFERENCE_ID } from './toolbar-preference-contribution';
|
|
53
52
|
import { ToolbarDefaults, ToolbarDefaultsFactory } from './toolbar-defaults';
|
|
54
53
|
import { ToolbarCommands, ToolbarMenus, UserToolbarURI, USER_TOOLBAR_URI } from './toolbar-constants';
|
|
55
|
-
import { JsonSchemaContribution, JsonSchemaRegisterContext } from '@theia/core/lib/browser/json-schema-store';
|
|
54
|
+
import { JsonSchemaContribution, JsonSchemaDataStore, JsonSchemaRegisterContext } from '@theia/core/lib/browser/json-schema-store';
|
|
56
55
|
import { toolbarConfigurationSchema, toolbarSchemaId } from './toolbar-preference-schema';
|
|
57
56
|
import URI from '@theia/core/lib/common/uri';
|
|
58
57
|
|
|
@@ -65,11 +64,11 @@ export class ToolbarCommandContribution implements CommandContribution, Keybindi
|
|
|
65
64
|
@inject(EditorManager) protected readonly editorManager: EditorManager;
|
|
66
65
|
@inject(PreferenceService) protected readonly preferenceService: PreferenceService;
|
|
67
66
|
@inject(ToolbarController) protected readonly toolbarModel: ToolbarController;
|
|
68
|
-
@inject(
|
|
67
|
+
@inject(JsonSchemaDataStore) protected readonly schemaStore: JsonSchemaDataStore;
|
|
69
68
|
protected readonly schemaURI = new URI(toolbarSchemaId);
|
|
70
69
|
|
|
71
70
|
registerSchemas(context: JsonSchemaRegisterContext): void {
|
|
72
|
-
this.
|
|
71
|
+
this.schemaStore.setSchema(this.schemaURI, toolbarConfigurationSchema);
|
|
73
72
|
context.registerSchema({
|
|
74
73
|
fileMatch: ['toolbar.json'],
|
|
75
74
|
url: this.schemaURI.toString(),
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
// *****************************************************************************
|
|
2
|
+
// Copyright (C) 2025 and others.
|
|
3
|
+
//
|
|
4
|
+
// This program and the accompanying materials are made available under the
|
|
5
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
+
//
|
|
8
|
+
// This Source Code may also be made available under the following Secondary
|
|
9
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
+
// with the GNU Classpath Exception which is available at
|
|
12
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
13
|
+
//
|
|
14
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
|
+
// *****************************************************************************
|
|
16
|
+
|
|
17
|
+
import { ApplicationShell, FrontendApplication } from '@theia/core/lib/browser';
|
|
18
|
+
import { injectable, interfaces } from '@theia/core/shared/inversify';
|
|
19
|
+
import { DefaultContentHoverWidgetPatcher } from '@theia/monaco/lib/browser/default-content-hover-widget-patcher';
|
|
20
|
+
import { ApplicationShellWithToolbarOverride } from './application-shell-with-toolbar-override';
|
|
21
|
+
|
|
22
|
+
@injectable()
|
|
23
|
+
export class ToolbarContentHoverWidgetPatcher extends DefaultContentHoverWidgetPatcher {
|
|
24
|
+
|
|
25
|
+
override onStart(app: FrontendApplication): void {
|
|
26
|
+
super.onStart(app);
|
|
27
|
+
const shell = app.shell;
|
|
28
|
+
if (shell instanceof ApplicationShellWithToolbarOverride) {
|
|
29
|
+
shell['toolbar'].onDidChangeVisibility(() => {
|
|
30
|
+
this.updateContentHoverWidgetHeight({
|
|
31
|
+
topHeight: this.getTopPanelHeight(shell)
|
|
32
|
+
});
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
protected override getTopPanelHeight(shell: ApplicationShell): number {
|
|
38
|
+
const defaultHeight = shell.topPanel.node.getBoundingClientRect().height;
|
|
39
|
+
if (shell instanceof ApplicationShellWithToolbarOverride) {
|
|
40
|
+
const toolbarHeight = shell['toolbar'].node.getBoundingClientRect().height;
|
|
41
|
+
return defaultHeight + toolbarHeight;
|
|
42
|
+
}
|
|
43
|
+
return defaultHeight;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
export const bindToolbarContentHoverWidgetPatcher = (bind: interfaces.Bind, rebind: interfaces.Rebind, unbind: interfaces.Unbind): void => {
|
|
48
|
+
bind(ToolbarContentHoverWidgetPatcher).toSelf().inSingletonScope();
|
|
49
|
+
rebind(DefaultContentHoverWidgetPatcher).toService(ToolbarContentHoverWidgetPatcher);
|
|
50
|
+
};
|
|
51
|
+
|
|
@@ -18,6 +18,7 @@ import '../../src/browser/style/toolbar.css';
|
|
|
18
18
|
import { ContainerModule, interfaces } from '@theia/core/shared/inversify';
|
|
19
19
|
import { bindToolbarApplicationShell } from './application-shell-with-toolbar-override';
|
|
20
20
|
import { bindToolbar } from './toolbar-command-contribution';
|
|
21
|
+
import { bindToolbarContentHoverWidgetPatcher } from './toolbar-content-hover-widget-patcher';
|
|
21
22
|
|
|
22
23
|
export default new ContainerModule((
|
|
23
24
|
bind: interfaces.Bind,
|
|
@@ -27,4 +28,5 @@ export default new ContainerModule((
|
|
|
27
28
|
) => {
|
|
28
29
|
bindToolbarApplicationShell(bind, rebind, unbind);
|
|
29
30
|
bindToolbar(bind);
|
|
31
|
+
bindToolbarContentHoverWidgetPatcher(bind, rebind, unbind);
|
|
30
32
|
});
|