@theia/core 1.71.0-next.6 → 1.71.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/README.md +13 -13
- package/i18n/nls.cs.json +4 -4
- package/i18n/nls.de.json +4 -4
- package/i18n/nls.es.json +4 -4
- package/i18n/nls.fr.json +4 -4
- package/i18n/nls.hu.json +4 -4
- package/i18n/nls.it.json +4 -4
- package/i18n/nls.ja.json +4 -4
- package/i18n/nls.ko.json +4 -4
- package/i18n/nls.pl.json +4 -4
- package/i18n/nls.pt-br.json +4 -4
- package/i18n/nls.ru.json +4 -4
- package/i18n/nls.tr.json +4 -4
- package/i18n/nls.zh-cn.json +4 -4
- package/i18n/nls.zh-tw.json +4 -4
- package/lib/browser/catalog.json +149 -8
- package/lib/browser/common-frontend-contribution.js +2 -2
- package/lib/browser/common-frontend-contribution.js.map +1 -1
- package/lib/browser/components/card.d.ts.map +1 -1
- package/lib/browser/components/card.js +11 -3
- package/lib/browser/components/card.js.map +1 -1
- package/lib/browser/connection-status-service.js +1 -1
- package/lib/browser/connection-status-service.js.map +1 -1
- package/lib/browser/keyboard/index.d.ts +1 -0
- package/lib/browser/keyboard/index.d.ts.map +1 -1
- package/lib/browser/keyboard/index.js +1 -0
- package/lib/browser/keyboard/index.js.map +1 -1
- package/lib/browser/keyboard/keyboard-utils.d.ts +17 -0
- package/lib/browser/keyboard/keyboard-utils.d.ts.map +1 -0
- package/lib/browser/keyboard/keyboard-utils.js +40 -0
- package/lib/browser/keyboard/keyboard-utils.js.map +1 -0
- package/lib/browser/menu/browser-menu-plugin.d.ts.map +1 -1
- package/lib/browser/menu/browser-menu-plugin.js +8 -1
- package/lib/browser/menu/browser-menu-plugin.js.map +1 -1
- package/lib/browser/messaging/messaging-frontend-module.d.ts.map +1 -1
- package/lib/browser/messaging/messaging-frontend-module.js +3 -0
- package/lib/browser/messaging/messaging-frontend-module.js.map +1 -1
- package/lib/browser/messaging/ws-connection-source.d.ts +2 -1
- package/lib/browser/messaging/ws-connection-source.d.ts.map +1 -1
- package/lib/browser/messaging/ws-connection-source.js +5 -2
- package/lib/browser/messaging/ws-connection-source.js.map +1 -1
- package/lib/browser/saveable-service.d.ts +9 -2
- package/lib/browser/saveable-service.d.ts.map +1 -1
- package/lib/browser/saveable-service.js +34 -25
- package/lib/browser/saveable-service.js.map +1 -1
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar.d.ts +1 -0
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar.d.ts.map +1 -1
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar.js +10 -1
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar.js.map +1 -1
- package/lib/browser/shell/tab-bar-toolbar/tab-toolbar-item.d.ts +2 -0
- package/lib/browser/shell/tab-bar-toolbar/tab-toolbar-item.d.ts.map +1 -1
- package/lib/browser/shell/tab-bar-toolbar/tab-toolbar-item.js +11 -2
- package/lib/browser/shell/tab-bar-toolbar/tab-toolbar-item.js.map +1 -1
- package/lib/browser/window/browser-window-module.d.ts.map +1 -1
- package/lib/browser/window/browser-window-module.js +2 -0
- package/lib/browser/window/browser-window-module.js.map +1 -1
- package/lib/browser/window/default-secondary-window-service.d.ts +2 -0
- package/lib/browser/window/default-secondary-window-service.d.ts.map +1 -1
- package/lib/browser/window/default-secondary-window-service.js +7 -0
- package/lib/browser/window/default-secondary-window-service.js.map +1 -1
- package/lib/browser/window/window-focus-service.d.ts +71 -0
- package/lib/browser/window/window-focus-service.d.ts.map +1 -0
- package/lib/browser/window/window-focus-service.js +173 -0
- package/lib/browser/window/window-focus-service.js.map +1 -0
- package/lib/common/event.d.ts +16 -0
- package/lib/common/event.d.ts.map +1 -1
- package/lib/common/event.js +20 -2
- package/lib/common/event.js.map +1 -1
- package/lib/common/event.spec.js +63 -0
- package/lib/common/event.spec.js.map +1 -1
- package/lib/common/glob.d.ts +2 -0
- package/lib/common/glob.d.ts.map +1 -1
- package/lib/common/glob.js +8 -7
- package/lib/common/glob.js.map +1 -1
- package/lib/common/message-rpc/channel.d.ts +1 -1
- package/lib/common/message-rpc/channel.d.ts.map +1 -1
- package/lib/common/message-rpc/channel.js +20 -12
- package/lib/common/message-rpc/channel.js.map +1 -1
- package/lib/common/message-rpc/channel.spec.d.ts.map +1 -1
- package/lib/common/message-rpc/channel.spec.js +94 -0
- package/lib/common/message-rpc/channel.spec.js.map +1 -1
- package/lib/common/message-rpc/rpc-protocol.d.ts.map +1 -1
- package/lib/common/message-rpc/rpc-protocol.js +13 -3
- package/lib/common/message-rpc/rpc-protocol.js.map +1 -1
- package/lib/common/message-rpc/uint8-array-message-buffer.d.ts.map +1 -1
- package/lib/common/message-rpc/uint8-array-message-buffer.js +1 -1
- package/lib/common/message-rpc/uint8-array-message-buffer.js.map +1 -1
- package/lib/common/messaging/index.d.ts +1 -0
- package/lib/common/messaging/index.d.ts.map +1 -1
- package/lib/common/messaging/index.js +1 -0
- package/lib/common/messaging/index.js.map +1 -1
- package/lib/common/messaging/socket-write-buffer.d.ts +4 -3
- package/lib/common/messaging/socket-write-buffer.d.ts.map +1 -1
- package/lib/common/messaging/socket-write-buffer.js +14 -4
- package/lib/common/messaging/socket-write-buffer.js.map +1 -1
- package/lib/common/preferences/index.d.ts +1 -0
- package/lib/common/preferences/index.d.ts.map +1 -1
- package/lib/common/preferences/index.js +1 -0
- package/lib/common/preferences/index.js.map +1 -1
- package/lib/common/preferences/preference-utils.d.ts +6 -0
- package/lib/common/preferences/preference-utils.d.ts.map +1 -0
- package/lib/common/preferences/preference-utils.js +29 -0
- package/lib/common/preferences/preference-utils.js.map +1 -0
- package/lib/common/resource.d.ts +2 -0
- package/lib/common/resource.d.ts.map +1 -1
- package/lib/common/resource.js +7 -3
- package/lib/common/resource.js.map +1 -1
- package/lib/electron-browser/menu/electron-main-menu-factory.d.ts.map +1 -1
- package/lib/electron-browser/menu/electron-main-menu-factory.js +5 -1
- package/lib/electron-browser/menu/electron-main-menu-factory.js.map +1 -1
- package/lib/electron-browser/messaging/electron-messaging-frontend-module.d.ts.map +1 -1
- package/lib/electron-browser/messaging/electron-messaging-frontend-module.js +3 -0
- package/lib/electron-browser/messaging/electron-messaging-frontend-module.js.map +1 -1
- package/lib/electron-browser/window/electron-window-module.d.ts.map +1 -1
- package/lib/electron-browser/window/electron-window-module.js +2 -0
- package/lib/electron-browser/window/electron-window-module.js.map +1 -1
- package/lib/electron-main/electron-api-main.d.ts.map +1 -1
- package/lib/electron-main/electron-api-main.js +4 -2
- package/lib/electron-main/electron-api-main.js.map +1 -1
- package/lib/electron-main/theia-electron-window.d.ts.map +1 -1
- package/lib/electron-main/theia-electron-window.js +3 -0
- package/lib/electron-main/theia-electron-window.js.map +1 -1
- package/lib/node/messaging/default-messaging-service.d.ts.map +1 -1
- package/lib/node/messaging/default-messaging-service.js +1 -0
- package/lib/node/messaging/default-messaging-service.js.map +1 -1
- package/lib/node/messaging/index.d.ts +1 -0
- package/lib/node/messaging/index.d.ts.map +1 -1
- package/lib/node/messaging/index.js +1 -0
- package/lib/node/messaging/index.js.map +1 -1
- package/lib/node/messaging/messaging-backend-module.d.ts.map +1 -1
- package/lib/node/messaging/messaging-backend-module.js +4 -0
- package/lib/node/messaging/messaging-backend-module.js.map +1 -1
- package/lib/node/messaging/test/default-messaging-service.spec.d.ts +2 -0
- package/lib/node/messaging/test/default-messaging-service.spec.d.ts.map +1 -0
- package/lib/node/messaging/test/default-messaging-service.spec.js +81 -0
- package/lib/node/messaging/test/default-messaging-service.spec.js.map +1 -0
- package/lib/node/messaging/websocket-frontend-connection-service.d.ts +9 -5
- package/lib/node/messaging/websocket-frontend-connection-service.d.ts.map +1 -1
- package/lib/node/messaging/websocket-frontend-connection-service.js +21 -5
- package/lib/node/messaging/websocket-frontend-connection-service.js.map +1 -1
- package/lib/node/process-utils.d.ts.map +1 -1
- package/lib/node/process-utils.js +9 -1
- package/lib/node/process-utils.js.map +1 -1
- package/package.json +32 -32
- package/src/browser/common-frontend-contribution.ts +2 -2
- package/src/browser/components/card.tsx +13 -2
- package/src/browser/connection-status-service.ts +1 -1
- package/src/browser/keyboard/index.ts +1 -0
- package/src/browser/keyboard/keyboard-utils.ts +37 -0
- package/src/browser/menu/browser-menu-plugin.ts +8 -1
- package/src/browser/messaging/messaging-frontend-module.ts +3 -0
- package/src/browser/messaging/ws-connection-source.ts +3 -2
- package/src/browser/saveable-service.ts +34 -27
- package/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.tsx +14 -1
- package/src/browser/shell/tab-bar-toolbar/tab-toolbar-item.tsx +13 -2
- package/src/browser/style/card.css +4 -2
- package/src/browser/style/hover-service.css +7 -0
- package/src/browser/window/browser-window-module.ts +2 -0
- package/src/browser/window/default-secondary-window-service.ts +6 -0
- package/src/browser/window/window-focus-service.ts +187 -0
- package/src/common/event.spec.ts +80 -0
- package/src/common/event.ts +31 -2
- package/src/common/glob.ts +2 -2
- package/src/common/i18n/nls.metadata.json +4254 -1058
- package/src/common/message-rpc/channel.spec.ts +116 -0
- package/src/common/message-rpc/channel.ts +15 -11
- package/src/common/message-rpc/rpc-protocol.ts +12 -3
- package/src/common/message-rpc/uint8-array-message-buffer.ts +1 -1
- package/src/common/messaging/index.ts +1 -0
- package/src/common/messaging/socket-write-buffer.ts +10 -4
- package/src/common/preferences/index.ts +1 -0
- package/src/common/preferences/preference-utils.ts +28 -0
- package/src/common/resource.ts +8 -2
- package/src/electron-browser/menu/electron-main-menu-factory.ts +5 -1
- package/src/electron-browser/messaging/electron-messaging-frontend-module.ts +3 -0
- package/src/electron-browser/window/electron-window-module.ts +2 -0
- package/src/electron-main/electron-api-main.ts +4 -2
- package/src/electron-main/theia-electron-window.ts +3 -0
- package/src/node/messaging/default-messaging-service.ts +1 -0
- package/src/node/messaging/index.ts +1 -0
- package/src/node/messaging/messaging-backend-module.ts +5 -1
- package/src/node/messaging/test/default-messaging-service.spec.ts +85 -0
- package/src/node/messaging/websocket-frontend-connection-service.ts +20 -7
- package/src/node/process-utils.ts +9 -1
|
@@ -123,7 +123,14 @@ function isMenuElement(element) {
|
|
|
123
123
|
}
|
|
124
124
|
class DynamicMenuBarWidget extends MenuBarWidget {
|
|
125
125
|
constructor() {
|
|
126
|
-
|
|
126
|
+
// Disable Lumino's overflow menu feature. The feature has a bug where
|
|
127
|
+
// `onUpdateRequest` consumes a stale `_overflowIndex` (only recomputed at the
|
|
128
|
+
// end of the method), which causes a RangeError when the menu bar is rendered
|
|
129
|
+
// at zero width. Additionally, Theia's CSS does not constrain the menu bar's
|
|
130
|
+
// offsetWidth to the available space, so the overflow detection never triggers.
|
|
131
|
+
// See https://github.com/eclipse-theia/theia/issues/17352
|
|
132
|
+
// See https://github.com/jupyterlab/lumino/issues/811
|
|
133
|
+
super({ overflowMenuOptions: { isVisible: false } });
|
|
127
134
|
// HACK we need to hook in on private method _openChildMenu. Don't do this at home!
|
|
128
135
|
DynamicMenuBarWidget.prototype['_openChildMenu'] = () => {
|
|
129
136
|
if (this.activeMenu instanceof DynamicMenuWidget) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser-menu-plugin.js","sourceRoot":"","sources":["../../../src/browser/menu/browser-menu-plugin.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"browser-menu-plugin.js","sourceRoot":"","sources":["../../../src/browser/menu/browser-menu-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messaging-frontend-module.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/messaging-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"messaging-frontend-module.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/messaging-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAW5C,eAAO,MAAM,uBAAuB,iBAgBlC,CAAC"}
|
|
@@ -23,8 +23,11 @@ const service_connection_provider_1 = require("./service-connection-provider");
|
|
|
23
23
|
const connection_source_1 = require("./connection-source");
|
|
24
24
|
const connection_management_1 = require("../../common/messaging/connection-management");
|
|
25
25
|
const ws_connection_provider_1 = require("./ws-connection-provider");
|
|
26
|
+
const socket_write_buffer_1 = require("../../common/messaging/socket-write-buffer");
|
|
26
27
|
const backendServiceProvider = Symbol('backendServiceProvider');
|
|
27
28
|
exports.messagingFrontendModule = new inversify_1.ContainerModule(bind => {
|
|
29
|
+
// Transient: each connection source gets its own private buffer instance.
|
|
30
|
+
bind(socket_write_buffer_1.SocketWriteBuffer).toSelf();
|
|
28
31
|
bind(connection_management_1.ConnectionCloseService).toDynamicValue(ctx => ws_connection_provider_1.WebSocketConnectionProvider.createProxy(ctx.container, connection_management_1.connectionCloseServicePath)).inSingletonScope();
|
|
29
32
|
bind(frontend_id_provider_1.BrowserFrontendIdProvider).toSelf().inSingletonScope();
|
|
30
33
|
bind(frontend_id_provider_1.FrontendIdProvider).toService(frontend_id_provider_1.BrowserFrontendIdProvider);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messaging-frontend-module.js","sourceRoot":"","sources":["../../../src/browser/messaging/messaging-frontend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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,yCAA4C;AAC5C,iEAAuF;AACvF,iEAAmE;AACnE,+EAA6H;AAC7H,2DAAuD;AACvD,wFAAkH;AAClH,qEAAuE;
|
|
1
|
+
{"version":3,"file":"messaging-frontend-module.js","sourceRoot":"","sources":["../../../src/browser/messaging/messaging-frontend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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,yCAA4C;AAC5C,iEAAuF;AACvF,iEAAmE;AACnE,+EAA6H;AAC7H,2DAAuD;AACvD,wFAAkH;AAClH,qEAAuE;AACvE,oFAA+E;AAE/E,MAAM,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAEnD,QAAA,uBAAuB,GAAG,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IAC9D,0EAA0E;IAC1E,IAAI,CAAC,uCAAiB,CAAC,CAAC,MAAM,EAAE,CAAC;IACjC,IAAI,CAAC,8CAAsB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,oDAA2B,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,kDAA0B,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC1J,IAAI,CAAC,gDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,yCAAkB,CAAC,CAAC,SAAS,CAAC,gDAAyB,CAAC,CAAC;IAC9D,IAAI,CAAC,gDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,sBAAsB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QAC9C,IAAI,CAAC,uDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;QAC5D,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QAC9C,SAAS,CAAC,IAAI,CAAC,oCAAgB,CAAC,CAAC,SAAS,CAAC,gDAAyB,CAAC,CAAC;QACtE,OAAO,SAAS,CAAC,GAAG,CAAC,uDAAyB,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,qDAAuB,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IAChE,IAAI,CAAC,sDAAwB,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IACjE,IAAI,CAAC,oDAA2B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AAClE,CAAC,CAAC,CAAC"}
|
|
@@ -3,10 +3,11 @@ import { ConnectionSource } from './connection-source';
|
|
|
3
3
|
import { Socket } from 'socket.io-client';
|
|
4
4
|
import { Endpoint } from '../endpoint';
|
|
5
5
|
import { FrontendIdProvider } from './frontend-id-provider';
|
|
6
|
+
import { SocketWriteBuffer } from '../../common/messaging/socket-write-buffer';
|
|
6
7
|
export declare class WebSocketConnectionSource implements ConnectionSource {
|
|
7
8
|
static readonly NO_CONNECTION = "<none>";
|
|
8
9
|
protected readonly frontendIdProvider: FrontendIdProvider;
|
|
9
|
-
|
|
10
|
+
protected readonly writeBuffer: SocketWriteBuffer;
|
|
10
11
|
private _socket;
|
|
11
12
|
get socket(): Socket;
|
|
12
13
|
protected currentChannel: AbstractChannel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-connection-source.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-source.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAoC,OAAO,EAAE,KAAK,EAAgB,MAAM,cAAc,CAAC;AACxH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAM,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"ws-connection-source.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-source.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAoC,OAAO,EAAE,KAAK,EAAgB,MAAM,cAAc,CAAC;AACxH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAM,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAG/E,qBACa,yBAA0B,YAAW,gBAAgB;IAC9D,MAAM,CAAC,QAAQ,CAAC,aAAa,YAAY;IAGzC,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAElD,OAAO,CAAC,OAAO,CAAS;IACxB,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,SAAS,CAAC,cAAc,EAAE,eAAe,CAAC;IAE1C,SAAS,CAAC,QAAQ,CAAC,0BAA0B,EAAE,OAAO,CAAC,OAAO,CAAC,CAAiB;IAChF,IAAI,mBAAmB,IAAI,KAAK,CAAC,OAAO,CAAC,CAExC;IAED,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IACzE,IAAI,eAAe,IAAI,KAAK,CAAC,IAAI,CAAC,CAEjC;IAED,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IAC1E,IAAI,gBAAgB,IAAI,KAAK,CAAC,IAAI,CAAC,CAElC;IAED,SAAS,CAAC,QAAQ,CAAC,gCAAgC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IACnF,IAAI,yBAAyB,IAAI,KAAK,CAAC,IAAI,CAAC,CAE3C;;IAMD,UAAU,IAAI,IAAI;IAqBlB,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAyBpC,SAAS,CAAC,uBAAuB,IAAI,IAAI;IAazC,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAQvC,iBAAiB,IAAI,IAAI;IAUzB,SAAS,CAAC,aAAa,IAAI,eAAe;IAoC1C;;OAEG;IACH,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAMlD,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAItD,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ;IAIhD;;OAEG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAe9C;;OAEG;IACH,SAAS,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;CAUhE"}
|
|
@@ -45,7 +45,6 @@ let WebSocketConnectionSource = class WebSocketConnectionSource {
|
|
|
45
45
|
return this.onIncomingMessageActivityEmitter.event;
|
|
46
46
|
}
|
|
47
47
|
constructor() {
|
|
48
|
-
this.writeBuffer = new socket_write_buffer_1.SocketWriteBuffer();
|
|
49
48
|
this.onConnectionDidOpenEmitter = new common_1.Emitter();
|
|
50
49
|
this.onSocketDidOpenEmitter = new common_1.Emitter();
|
|
51
50
|
this.onSocketDidCloseEmitter = new common_1.Emitter();
|
|
@@ -115,8 +114,8 @@ let WebSocketConnectionSource = class WebSocketConnectionSource {
|
|
|
115
114
|
}
|
|
116
115
|
connectNewChannel() {
|
|
117
116
|
if (this.currentChannel) {
|
|
118
|
-
this.currentChannel.close();
|
|
119
117
|
this.currentChannel.onCloseEmitter.fire({ reason: 'reconnecting channel' });
|
|
118
|
+
this.currentChannel.close();
|
|
120
119
|
}
|
|
121
120
|
this.writeBuffer.drain();
|
|
122
121
|
this.currentChannel = this.createChannel();
|
|
@@ -205,6 +204,10 @@ tslib_1.__decorate([
|
|
|
205
204
|
(0, inversify_1.inject)(frontend_id_provider_1.FrontendIdProvider),
|
|
206
205
|
tslib_1.__metadata("design:type", Object)
|
|
207
206
|
], WebSocketConnectionSource.prototype, "frontendIdProvider", void 0);
|
|
207
|
+
tslib_1.__decorate([
|
|
208
|
+
(0, inversify_1.inject)(socket_write_buffer_1.SocketWriteBuffer),
|
|
209
|
+
tslib_1.__metadata("design:type", socket_write_buffer_1.SocketWriteBuffer)
|
|
210
|
+
], WebSocketConnectionSource.prototype, "writeBuffer", void 0);
|
|
208
211
|
tslib_1.__decorate([
|
|
209
212
|
(0, inversify_1.postConstruct)(),
|
|
210
213
|
tslib_1.__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-connection-source.js","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-source.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,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,yCAAwH;AAExH,uDAA8C;AAC9C,0CAAuC;AACvC,8DAAqE;AACrE,oGAAkH;AAClH,yCAA8D;AAC9D,iEAA4D;AAC5D,kGAA4F;AAC5F,oFAA+E;AAC/E,wFAA4F;AAGrF,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;aAClB,kBAAa,GAAG,QAAQ,AAAX,CAAY;
|
|
1
|
+
{"version":3,"file":"ws-connection-source.js","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-source.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,7 @@ import { AutoSaveMode, Saveable, SaveableSource, SaveableWidget, SaveOptions, Po
|
|
|
20
20
|
import { Widget } from './widgets';
|
|
21
21
|
import { FrontendApplicationContribution } from './frontend-application-contribution';
|
|
22
22
|
import { FrontendApplication } from './frontend-application';
|
|
23
|
+
import { WindowFocusService } from './window/window-focus-service';
|
|
23
24
|
export declare const SaveErrorChecker: unique symbol;
|
|
24
25
|
/**
|
|
25
26
|
* Contribution point for checking whether a given URI has errors.
|
|
@@ -39,6 +40,7 @@ export interface SaveErrorChecker {
|
|
|
39
40
|
}
|
|
40
41
|
export declare class SaveableService implements FrontendApplicationContribution {
|
|
41
42
|
protected readonly errorCheckers: ContributionProvider<SaveErrorChecker>;
|
|
43
|
+
protected readonly windowFocusService: WindowFocusService;
|
|
42
44
|
protected saveThrottles: Map<Widget, AutoSaveThrottle>;
|
|
43
45
|
protected saveMode: AutoSaveMode;
|
|
44
46
|
protected saveDelay: number;
|
|
@@ -57,11 +59,16 @@ export declare class SaveableService implements FrontendApplicationContribution
|
|
|
57
59
|
get autoSaveWhenNoErrors(): boolean;
|
|
58
60
|
set autoSaveWhenNoErrors(value: boolean);
|
|
59
61
|
onDidInitializeLayout(app: FrontendApplication): void;
|
|
62
|
+
/**
|
|
63
|
+
* Save all dirty saveables when the application window loses focus.
|
|
64
|
+
* Triggered for both `onFocusChange` and `onWindowChange` auto-save modes,
|
|
65
|
+
* matching VSCode's behavior where a window focus loss is a superset of
|
|
66
|
+
* editor focus loss.
|
|
67
|
+
*/
|
|
68
|
+
protected saveOnWindowBlur(): void;
|
|
60
69
|
protected updateAutoSaveMode(mode: AutoSaveMode): void;
|
|
61
70
|
protected updateAutoSaveDelay(delay: number): void;
|
|
62
71
|
registerSaveable(widget: Widget, saveable: Saveable): Disposable;
|
|
63
|
-
protected addBlurListener(widget: Widget, saveable: Saveable): Disposable;
|
|
64
|
-
protected windowHasFocus(document: Document): boolean;
|
|
65
72
|
protected shouldAutoSave(widget: Widget, saveable: Saveable): boolean;
|
|
66
73
|
protected applySaveableWidget(widget: Widget, saveable: Saveable): void;
|
|
67
74
|
protected createCloseWithSaving(): (this: SaveableWidget, options?: SaveableWidget.CloseOptions) => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saveable-service.d.ts","sourceRoot":"","sources":["../../src/browser/saveable-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD,OAAO,EAAE,oBAAoB,EAAmB,GAAG,EAAE,UAAU,EAAwB,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AACzH,OAAO,EAAE,WAAW,EAAqB,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,WAAW,EAA+B,0BAA0B,EAAoB,MAAM,YAAY,CAAC;AAC5K,OAAO,EAAiB,MAAM,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"saveable-service.d.ts","sourceRoot":"","sources":["../../src/browser/saveable-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,7 @@ const common_1 = require("../common");
|
|
|
22
22
|
const navigatable_types_1 = require("./navigatable-types");
|
|
23
23
|
const saveable_1 = require("./saveable");
|
|
24
24
|
const widgets_1 = require("./widgets");
|
|
25
|
+
const window_focus_service_1 = require("./window/window-focus-service");
|
|
25
26
|
const throttle = require("lodash.throttle");
|
|
26
27
|
exports.SaveErrorChecker = Symbol('SaveErrorChecker');
|
|
27
28
|
let SaveableService = class SaveableService {
|
|
@@ -97,6 +98,34 @@ let SaveableService = class SaveableService {
|
|
|
97
98
|
this.saveThrottles.get(e)?.dispose();
|
|
98
99
|
this.saveThrottles.delete(e);
|
|
99
100
|
});
|
|
101
|
+
// Save all dirty editors when any application window loses focus
|
|
102
|
+
this.windowFocusService.onDidWindowChangeFocus(({ hasFocus }) => {
|
|
103
|
+
if (!hasFocus) {
|
|
104
|
+
this.saveOnWindowBlur();
|
|
105
|
+
}
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
/**
|
|
109
|
+
* Save all dirty saveables when the application window loses focus.
|
|
110
|
+
* Triggered for both `onFocusChange` and `onWindowChange` auto-save modes,
|
|
111
|
+
* matching VSCode's behavior where a window focus loss is a superset of
|
|
112
|
+
* editor focus loss.
|
|
113
|
+
*/
|
|
114
|
+
saveOnWindowBlur() {
|
|
115
|
+
if (this.saveMode !== 'onWindowChange' && this.saveMode !== 'onFocusChange') {
|
|
116
|
+
return;
|
|
117
|
+
}
|
|
118
|
+
if (!this.shell) {
|
|
119
|
+
return;
|
|
120
|
+
}
|
|
121
|
+
for (const widget of this.shell.widgets) {
|
|
122
|
+
const saveable = saveable_1.Saveable.get(widget);
|
|
123
|
+
if (saveable && this.shouldAutoSave(widget, saveable)) {
|
|
124
|
+
saveable.save({
|
|
125
|
+
saveReason: saveable_1.SaveReason.FocusChange
|
|
126
|
+
});
|
|
127
|
+
}
|
|
128
|
+
}
|
|
100
129
|
}
|
|
101
130
|
updateAutoSaveMode(mode) {
|
|
102
131
|
this.saveMode = mode;
|
|
@@ -129,35 +158,11 @@ let SaveableService = class SaveableService {
|
|
|
129
158
|
saveReason: saveable_1.SaveReason.AfterDelay
|
|
130
159
|
});
|
|
131
160
|
}
|
|
132
|
-
}
|
|
161
|
+
});
|
|
133
162
|
this.saveThrottles.set(widget, saveThrottle);
|
|
134
163
|
this.applySaveableWidget(widget, saveable);
|
|
135
164
|
return saveThrottle;
|
|
136
165
|
}
|
|
137
|
-
addBlurListener(widget, saveable) {
|
|
138
|
-
const document = widget.node.ownerDocument;
|
|
139
|
-
const listener = (() => {
|
|
140
|
-
if (this.saveMode === 'onWindowChange' && !this.windowHasFocus(document) && this.shouldAutoSave(widget, saveable)) {
|
|
141
|
-
saveable.save({
|
|
142
|
-
saveReason: saveable_1.SaveReason.FocusChange
|
|
143
|
-
});
|
|
144
|
-
}
|
|
145
|
-
}).bind(this);
|
|
146
|
-
document.addEventListener('blur', listener);
|
|
147
|
-
return common_1.Disposable.create(() => {
|
|
148
|
-
document.removeEventListener('blur', listener);
|
|
149
|
-
});
|
|
150
|
-
}
|
|
151
|
-
windowHasFocus(document) {
|
|
152
|
-
if (document.visibilityState === 'hidden') {
|
|
153
|
-
return false;
|
|
154
|
-
}
|
|
155
|
-
else if (document.hasFocus()) {
|
|
156
|
-
return true;
|
|
157
|
-
}
|
|
158
|
-
// TODO: Add support for iframes
|
|
159
|
-
return false;
|
|
160
|
-
}
|
|
161
166
|
shouldAutoSave(widget, saveable) {
|
|
162
167
|
const uri = navigatable_types_1.NavigatableWidget.getUri(widget);
|
|
163
168
|
if (uri?.scheme === common_1.UNTITLED_SCHEME) {
|
|
@@ -292,6 +297,10 @@ tslib_1.__decorate([
|
|
|
292
297
|
(0, inversify_1.named)(exports.SaveErrorChecker),
|
|
293
298
|
tslib_1.__metadata("design:type", Object)
|
|
294
299
|
], SaveableService.prototype, "errorCheckers", void 0);
|
|
300
|
+
tslib_1.__decorate([
|
|
301
|
+
(0, inversify_1.inject)(window_focus_service_1.WindowFocusService),
|
|
302
|
+
tslib_1.__metadata("design:type", window_focus_service_1.WindowFocusService)
|
|
303
|
+
], SaveableService.prototype, "windowFocusService", void 0);
|
|
295
304
|
exports.SaveableService = SaveableService = tslib_1.__decorate([
|
|
296
305
|
(0, inversify_1.injectable)()
|
|
297
306
|
], SaveableService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saveable-service.js","sourceRoot":"","sources":["../../src/browser/saveable-service.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;AAGlF,yCAAsD;AACtD,sCAAyH;AACzH,2DAAqE;AACrE,yCAA4K;AAC5K,uCAAkD;AAGlD,4CAA6C;AAEhC,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAoBpD,IAAM,eAAe,GAArB,MAAM,eAAe;IAArB;
|
|
1
|
+
{"version":3,"file":"saveable-service.js","sourceRoot":"","sources":["../../src/browser/saveable-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,6 +43,7 @@ export declare class TabBarToolbar extends ReactWidget {
|
|
|
43
43
|
protected render(): React.ReactNode;
|
|
44
44
|
protected renderMore(): React.ReactNode;
|
|
45
45
|
protected showMoreContextMenu: (event: React.MouseEvent) => void;
|
|
46
|
+
protected handleMoreKeyDown: (event: React.KeyboardEvent) => void;
|
|
46
47
|
renderMoreContextMenu(anchor: Anchor): ContextMenuAccess;
|
|
47
48
|
shouldHandleMouseEvent(event: MouseEvent): boolean;
|
|
48
49
|
protected commandIsEnabled(command: string): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tab-bar-toolbar.d.ts","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.tsx"],"names":[],"mappings":"AAiBA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"tab-bar-toolbar.d.ts","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.tsx"],"names":[],"mappings":"AAiBA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,oBAAoB,EAAO,MAAM,iBAAiB,CAAC;AACzF,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAC7F,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAW,WAAW,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAa,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEpE;;GAEG;AACH,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AACnE,MAAM,WAAW,oBAAoB;IACjC,IAAI,aAAa,CAAC;CACrB;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,GAAG,MAAM,CAGxD;AAED;;GAEG;AACH,qBACa,aAAc,SAAQ,WAAW;IAE1C,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,SAAS,CAAC,MAAM,iCAAwC;IACxD,SAAS,CAAC,IAAI,iCAAwC;IAEtD,SAAS,CAAC,kBAAkB,EAAE,UAAU,GAAG,SAAS,CAAC;IACrD,SAAS,CAAC,sBAAsB,EAAE,oBAAoB,CAA8B;IAEpF,SAAS,CAAC,kBAAkB,cAAqB;IACjD,SAAS,CAAC,qBAAqB,cAAqB;IAE3B,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IACjD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IACtC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC;IAC1C,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAC1D,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,qBAAqB,CAAC;IAC9D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACvD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAC;;IAS/E,SAAS,CAAC,IAAI,IAAI,IAAI;IAiBtB,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,iBAAiB,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,GAAE,GAAG,CAAC,MAAM,CAAa,GAAG,IAAI;IA4BrH,YAAY,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAOpC,SAAS,CAAC,QAAQ,CAAC,qBAAqB,uBAA8B;IACtE,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAgBvD,SAAS,CAAC,MAAM,IAAI,KAAK,CAAC,SAAS;IAQnC,SAAS,CAAC,UAAU,IAAI,KAAK,CAAC,SAAS;IAUvC,SAAS,CAAC,mBAAmB,GAAI,OAAO,KAAK,CAAC,UAAU,UAKtD;IAEF,SAAS,CAAC,iBAAiB,GAAI,OAAO,KAAK,CAAC,aAAa,UAOvD;IAEF,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB;IA8BxD,sBAAsB,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO;IAIlD,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIpD,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIpD,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;IAIrE,SAAS,CAAC,WAAW,IAAI,IAAI;CAKhC;AAED,yBAAiB,aAAa,CAAC;IAE3B,UAAiB,MAAM,CAAC;QAEb,MAAM,eAAe,sBAAsB,CAAC;QAC5C,MAAM,oBAAoB,SAAS,CAAC;KAE9C;CACJ"}
|
|
@@ -21,6 +21,7 @@ exports.toAnchor = toAnchor;
|
|
|
21
21
|
const tslib_1 = require("tslib");
|
|
22
22
|
const inversify_1 = require("inversify");
|
|
23
23
|
const React = require("react");
|
|
24
|
+
const keyboard_utils_1 = require("../../keyboard/keyboard-utils");
|
|
24
25
|
const context_key_service_1 = require("../../context-key-service");
|
|
25
26
|
const common_1 = require("../../../common");
|
|
26
27
|
const context_menu_renderer_1 = require("../../context-menu-renderer");
|
|
@@ -56,6 +57,14 @@ let TabBarToolbar = TabBarToolbar_1 = class TabBarToolbar extends widgets_1.Reac
|
|
|
56
57
|
const anchor = toAnchor(event);
|
|
57
58
|
this.renderMoreContextMenu(anchor);
|
|
58
59
|
};
|
|
60
|
+
this.handleMoreKeyDown = (event) => {
|
|
61
|
+
if ((0, keyboard_utils_1.isActivationKey)(event)) {
|
|
62
|
+
event.preventDefault();
|
|
63
|
+
event.stopPropagation();
|
|
64
|
+
const { left, bottom } = event.currentTarget.getBoundingClientRect();
|
|
65
|
+
this.renderMoreContextMenu({ x: left, y: bottom });
|
|
66
|
+
}
|
|
67
|
+
};
|
|
59
68
|
this.addClass(TabBarToolbar_1.Styles.TAB_BAR_TOOLBAR);
|
|
60
69
|
this.hide();
|
|
61
70
|
}
|
|
@@ -129,7 +138,7 @@ let TabBarToolbar = TabBarToolbar_1 = class TabBarToolbar extends widgets_1.Reac
|
|
|
129
138
|
}
|
|
130
139
|
renderMore() {
|
|
131
140
|
return !!this.more.size && React.createElement("div", { key: '__more__', className: TabBarToolbar_1.Styles.TAB_BAR_TOOLBAR_ITEM + ' enabled' },
|
|
132
|
-
React.createElement("div", { id: '__more__', className: (0, widgets_1.codicon)('ellipsis', true), onClick: this.showMoreContextMenu, title: common_1.nls.localizeByDefault('More Actions...') }));
|
|
141
|
+
React.createElement("div", { id: '__more__', className: (0, widgets_1.codicon)('ellipsis', true), ...(0, keyboard_utils_1.buttonKeyboardProps)(common_1.nls.localizeByDefault('More Actions...')), onClick: this.showMoreContextMenu, onKeyDown: this.handleMoreKeyDown, title: common_1.nls.localizeByDefault('More Actions...') }));
|
|
133
142
|
}
|
|
134
143
|
renderMoreContextMenu(anchor) {
|
|
135
144
|
const toDisposeOnHide = new common_1.DisposableCollection();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tab-bar-toolbar.js","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.tsx"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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":"tab-bar-toolbar.js","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.tsx"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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;;;;AAwBhF,4BAGC;;AAzBD,yCAA8D;AAC9D,+BAA+B;AAC/B,kEAAqF;AACrF,mEAA8D;AAC9D,4CAAyF;AACzF,uEAA6F;AAC7F,qDAAiD;AACjD,2CAA6D;AAC7D,yEAAmE;AACnE,mEAA6G;AAC7G,kDAAuD;AAEvD,+CAAoE;AAEpE;;GAEG;AACU,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAKnE,SAAgB,QAAQ,CAAC,KAAuB;IAC5C,MAAM,OAAO,GAAG,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,GAAG,aAAa,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACtH,OAAO,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC;AAChF,CAAC;AAED;;GAEG;AAEI,IAAM,aAAa,qBAAnB,MAAM,aAAc,SAAQ,qBAAW;IAoB1C;QACI,KAAK,EAAE,CAAC;QAlBF,WAAM,GAAG,IAAI,GAAG,EAA6B,CAAC;QAC9C,SAAI,GAAG,IAAI,GAAG,EAA6B,CAAC;QAG5C,2BAAsB,GAAyB,IAAI,6BAAoB,EAAE,CAAC;QAE1E,uBAAkB,GAAG,IAAI,GAAG,EAAU,CAAC;QACvC,0BAAqB,GAAG,IAAI,GAAG,EAAU,CAAC;QAqEjC,0BAAqB,GAAG,IAAI,6BAAoB,EAAE,CAAC;QAmC5D,wBAAmB,GAAG,CAAC,KAAuB,EAAE,EAAE;YACxD,KAAK,CAAC,eAAe,EAAE,CAAC;YACxB,KAAK,CAAC,cAAc,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC/B,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QACvC,CAAC,CAAC;QAEQ,sBAAiB,GAAG,CAAC,KAA0B,EAAE,EAAE;YACzD,IAAI,IAAA,gCAAe,EAAC,KAAK,CAAC,EAAE,CAAC;gBACzB,KAAK,CAAC,cAAc,EAAE,CAAC;gBACvB,KAAK,CAAC,eAAe,EAAE,CAAC;gBACxB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAI,KAAK,CAAC,aAA6B,CAAC,qBAAqB,EAAE,CAAC;gBACtF,IAAI,CAAC,qBAAqB,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YACvD,CAAC;QACL,CAAC,CAAC;QA1GE,IAAI,CAAC,QAAQ,CAAC,eAAa,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QACpD,IAAI,CAAC,IAAI,EAAE,CAAC;IAChB,CAAC;IAGS,IAAI;QACV,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YACnB,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YAC/D,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;gBACnC,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC;oBACrD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACpC,CAAC;qBAAM,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,CAAC;oBAC/C,IAAI,CAAC,WAAW,EAAE,CAAC;gBACvB,CAAC;YACL,CAAC,CAAC;YACF,mBAAU,CAAC,MAAM,CAAC,GAAG,EAAE;gBACnB,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,CAAC;gBACtC,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC;YACzC,CAAC,CAAC;SACL,CAAC,CAAC;IACP,CAAC;IAED,WAAW,CAAC,KAA+B,EAAE,OAA2B,EAAE,cAA2B,IAAI,GAAG,EAAE;QAC1G,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,CAAC;QACtC,IAAI,CAAC,sBAAsB,GAAG,IAAI,6BAAoB,EAAE,CAAC;QACzD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACpB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAClB,IAAI,CAAC,kBAAkB,GAAG,WAAW,CAAC;QAEtC,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,2CAAmB,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YAE/E,IAAI,CAAC,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,KAAK,YAAY,EAAE,CAAC;gBACrF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YACjC,CAAC;YACD,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACnB,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;YACjF,CAAC;QACL,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACzB,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACf,IAAI,CAAC,IAAI,EAAE,CAAC;QAChB,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,IAAI,EAAE,CAAC;QAChB,CAAC;QACD,IAAI,CAAC,WAAW,EAAE,CAAC;IACvB,CAAC;IAED,YAAY,CAAC,OAAgB;QACzB,MAAM,eAAe,GAAG,uCAAe,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC5F,MAAM,KAAK,GAAG,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACxF,MAAM,WAAW,GAAG,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAAU,CAAC;QACnH,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;IAC1D,CAAC;IAGS,UAAU,CAAC,OAA2B;QAC5C,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC;QACrC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAChD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,OAAO,EAAE,CAAC;YACV,MAAM,YAAY,GAAG,GAAG,EAAE;gBACtB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;gBAC3B,IAAI,CAAC,WAAW,EAAE,CAAC;YACvB,CAAC,CAAC;YACF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YACvC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,mBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CACnD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,CAC5C,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAES,MAAM;QACZ,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;QACnC,OAAO,oBAAC,KAAK,CAAC,QAAQ;YACjB,IAAI,CAAC,UAAU,EAAE;YACjB,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CACpD,CAAC;IACtB,CAAC;IAES,UAAU;QAChB,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,6BAAK,GAAG,EAAC,UAAU,EAAC,SAAS,EAAE,eAAa,CAAC,MAAM,CAAC,oBAAoB,GAAG,UAAU;YAC5G,6BAAK,EAAE,EAAC,UAAU,EAAC,SAAS,EAAE,IAAA,iBAAO,EAAC,UAAU,EAAE,IAAI,CAAC,KAC/C,IAAA,oCAAmB,EAAC,YAAG,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,EACjE,OAAO,EAAE,IAAI,CAAC,mBAAmB,EACjC,SAAS,EAAE,IAAI,CAAC,iBAAiB,EACjC,KAAK,EAAE,YAAG,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,GAAI,CACrD,CAAC;IACX,CAAC;IAkBD,qBAAqB,CAAC,MAAc;QAChC,MAAM,eAAe,GAAG,IAAI,6BAAoB,EAAE,CAAC;QACnD,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC3B,eAAe,CAAC,IAAI,CAAC,mBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAE7E,MAAM,IAAI,GAAG,IAAI,gBAAS,CAAC,aAAa,CAAC,CAAC;QAC1C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;YACpC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBAClB,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;gBAC/B,IAAI,IAAI,EAAE,CAAC;oBACP,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;wBACb,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;oBACvD,CAAC;yBAAM,CAAC;wBACJ,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;oBACvB,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC;YACnC,IAAI,EAAE,wBAAiB,CAAC,qBAAqB,CAAC,IAAI,CAAC;YACnD,QAAQ,EAAE,oDAA4B;YACtC,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;YACpB,MAAM;YACN,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,IAAI,IAAI,CAAC,IAAI;YACxC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,gBAAgB,EAAE,KAAK;YACvB,MAAM,EAAE,GAAG,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE;SAC1C,CAAC,CAAC;IACP,CAAC;IAED,sBAAsB,CAAC,KAAiB;QACpC,OAAO,KAAK,CAAC,MAAM,YAAY,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/E,CAAC;IAES,gBAAgB,CAAC,OAAe;QACtC,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;IAES,gBAAgB,CAAC,OAAe;QACtC,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;IAES,kBAAkB,CAAC,UAA8B;QACvD,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5F,CAAC;IAES,WAAW;QACjB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACnB,IAAI,CAAC,MAAM,EAAE,CAAC;QAClB,CAAC;IACL,CAAC;CACJ,CAAA;AArLY,sCAAa;AAYsB;IAA3C,IAAA,kBAAM,EAAC,wBAAe,CAAC;sCAA8B,wBAAe;+CAAC;AAC9B;IAAvC,IAAA,kBAAM,EAAC,0BAAW,CAAC;sCAAiC,0BAAW;kDAAC;AACnB;IAA7C,IAAA,kBAAM,EAAC,wBAAiB,CAAC;sCAA2B,wBAAiB;4CAAC;AACvB;IAA/C,IAAA,kBAAM,EAAC,2CAAmB,CAAC;sCAAyC,2CAAmB;0DAAC;AACvC;IAAjD,IAAA,kBAAM,EAAC,gDAAqB,CAAC;sCAAqC,gDAAqB;sDAAC;AAC3C;IAA7C,IAAA,kBAAM,EAAC,uCAAiB,CAAC;;wDAAyD;AACpC;IAA9C,IAAA,kBAAM,EAAC,+BAAkB,CAAC;sCAAiC,+BAAkB;kDAAC;AASrE;IADT,IAAA,yBAAa,GAAE;;;;yCAgBf;wBA1CQ,aAAa;IADzB,IAAA,sBAAU,GAAE;;GACA,aAAa,CAqLzB;AAED,WAAiB,aAAa;IAE1B,IAAiB,MAAM,CAKtB;IALD,WAAiB,MAAM;QAEN,sBAAe,GAAG,mBAAmB,CAAC;QACtC,2BAAoB,GAAG,MAAM,CAAC;IAE/C,CAAC,EALgB,MAAM,GAAN,oBAAM,KAAN,oBAAM,QAKtB;AACL,CAAC,EARgB,aAAa,6BAAb,aAAa,QAQ7B"}
|
|
@@ -49,6 +49,8 @@ export declare class RenderedToolbarItemImpl extends AbstractToolbarItemImpl<Ren
|
|
|
49
49
|
protected onMouseDownEvent: (e: React.MouseEvent<HTMLElement>) => void;
|
|
50
50
|
protected onMouseUpEvent: (e: React.MouseEvent<HTMLElement>) => void;
|
|
51
51
|
protected executeCommand(e: React.MouseEvent<HTMLElement>, widget: Widget): void;
|
|
52
|
+
protected doExecuteCommand(e: React.SyntheticEvent<HTMLElement>, widget: Widget): void;
|
|
53
|
+
protected onKeyDownEvent: (e: React.KeyboardEvent<HTMLElement>, widget: Widget) => void;
|
|
52
54
|
protected renderItem(widget: Widget): React.ReactNode;
|
|
53
55
|
}
|
|
54
56
|
export declare class ReactToolbarItemImpl extends AbstractToolbarItemImpl<ReactTabBarToolbarAction> implements TabBarToolbarItem {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tab-toolbar-item.d.ts","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-toolbar-item.tsx"],"names":[],"mappings":"AAgBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AACnH,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAa,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACpG,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAGtD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"tab-toolbar-item.d.ts","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-toolbar-item.tsx"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,7 @@ const common_1 = require("../../../common");
|
|
|
21
21
|
const widgets_1 = require("../../widgets");
|
|
22
22
|
const tab_bar_toolbar_1 = require("./tab-bar-toolbar");
|
|
23
23
|
const React = require("react");
|
|
24
|
+
const keyboard_utils_1 = require("../../keyboard/keyboard-utils");
|
|
24
25
|
const menu_1 = require("../../../common/menu");
|
|
25
26
|
/**
|
|
26
27
|
* Class name indicating rendering of a toolbar item without an icon but instead with a text label.
|
|
@@ -77,6 +78,11 @@ class RenderedToolbarItemImpl extends AbstractToolbarItemImpl {
|
|
|
77
78
|
this.onMouseUpEvent = (e) => {
|
|
78
79
|
e.currentTarget.classList.remove('active');
|
|
79
80
|
};
|
|
81
|
+
this.onKeyDownEvent = (e, widget) => {
|
|
82
|
+
if ((0, keyboard_utils_1.isActivationKey)(e)) {
|
|
83
|
+
this.doExecuteCommand(e, widget);
|
|
84
|
+
}
|
|
85
|
+
};
|
|
80
86
|
if (action.onDidChange) {
|
|
81
87
|
this.disposables.push(action.onDidChange(() => this.onDidChangeEmitter.fire()));
|
|
82
88
|
}
|
|
@@ -153,6 +159,10 @@ class RenderedToolbarItemImpl extends AbstractToolbarItemImpl {
|
|
|
153
159
|
return action;
|
|
154
160
|
}
|
|
155
161
|
executeCommand(e, widget) {
|
|
162
|
+
this.doExecuteCommand(e, widget);
|
|
163
|
+
}
|
|
164
|
+
;
|
|
165
|
+
doExecuteCommand(e, widget) {
|
|
156
166
|
e.preventDefault();
|
|
157
167
|
e.stopPropagation();
|
|
158
168
|
if (!this.isEnabled(widget)) {
|
|
@@ -162,7 +172,6 @@ class RenderedToolbarItemImpl extends AbstractToolbarItemImpl {
|
|
|
162
172
|
this.commandRegistry.executeCommand(this.action.command, widget);
|
|
163
173
|
}
|
|
164
174
|
}
|
|
165
|
-
;
|
|
166
175
|
renderItem(widget) {
|
|
167
176
|
let innerText = '';
|
|
168
177
|
const classNames = [];
|
|
@@ -199,7 +208,7 @@ class RenderedToolbarItemImpl extends AbstractToolbarItemImpl {
|
|
|
199
208
|
classNames.push(widgets_1.ACTION_ITEM);
|
|
200
209
|
const toolbarItemClassNames = this.getToolbarItemClassNames(widget);
|
|
201
210
|
return React.createElement("div", { key: this.action.id, className: toolbarItemClassNames.join(' '), onMouseDown: this.onMouseDownEvent, onMouseUp: this.onMouseUpEvent, onMouseOut: this.onMouseUpEvent },
|
|
202
|
-
React.createElement("div", { id: this.action.id, className: classNames.join(' '), onClick: e => this.executeCommand(e, widget), title: tooltip },
|
|
211
|
+
React.createElement("div", { id: this.action.id, className: classNames.join(' '), ...(0, keyboard_utils_1.buttonKeyboardProps)(tooltip), onClick: e => this.executeCommand(e, widget), onKeyDown: e => this.onKeyDownEvent(e, widget), title: tooltip },
|
|
203
212
|
" ",
|
|
204
213
|
innerText));
|
|
205
214
|
}
|