@theia/core 1.77.0-next.84 → 1.77.0-next.89

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.
Files changed (143) hide show
  1. package/lib/browser/catalog.json +33 -4
  2. package/lib/browser/color-application-contribution.d.ts +2 -2
  3. package/lib/browser/color-application-contribution.d.ts.map +1 -1
  4. package/lib/browser/color-application-contribution.js +7 -8
  5. package/lib/browser/color-application-contribution.js.map +1 -1
  6. package/lib/browser/common-frontend-contribution.d.ts.map +1 -1
  7. package/lib/browser/common-frontend-contribution.js +7 -0
  8. package/lib/browser/common-frontend-contribution.js.map +1 -1
  9. package/lib/browser/frontend-application-module.d.ts.map +1 -1
  10. package/lib/browser/frontend-application-module.js +6 -0
  11. package/lib/browser/frontend-application-module.js.map +1 -1
  12. package/lib/browser/quick-input/quick-command-service.d.ts +2 -0
  13. package/lib/browser/quick-input/quick-command-service.d.ts.map +1 -1
  14. package/lib/browser/quick-input/quick-command-service.js +10 -2
  15. package/lib/browser/quick-input/quick-command-service.js.map +1 -1
  16. package/lib/browser/saveable-service.d.ts +4 -0
  17. package/lib/browser/saveable-service.d.ts.map +1 -1
  18. package/lib/browser/saveable-service.js +7 -0
  19. package/lib/browser/saveable-service.js.map +1 -1
  20. package/lib/browser/secondary-window-handler.d.ts +126 -3
  21. package/lib/browser/secondary-window-handler.d.ts.map +1 -1
  22. package/lib/browser/secondary-window-handler.js +354 -30
  23. package/lib/browser/secondary-window-handler.js.map +1 -1
  24. package/lib/browser/shell/application-shell-mouse-tracker.d.ts +2 -0
  25. package/lib/browser/shell/application-shell-mouse-tracker.d.ts.map +1 -1
  26. package/lib/browser/shell/application-shell-mouse-tracker.js +10 -0
  27. package/lib/browser/shell/application-shell-mouse-tracker.js.map +1 -1
  28. package/lib/browser/shell/application-shell.d.ts +11 -0
  29. package/lib/browser/shell/application-shell.d.ts.map +1 -1
  30. package/lib/browser/shell/application-shell.js +33 -4
  31. package/lib/browser/shell/application-shell.js.map +1 -1
  32. package/lib/browser/shell/index.d.ts +1 -0
  33. package/lib/browser/shell/index.d.ts.map +1 -1
  34. package/lib/browser/shell/index.js +1 -0
  35. package/lib/browser/shell/index.js.map +1 -1
  36. package/lib/browser/shell/native-tab-drag-service.d.ts +141 -0
  37. package/lib/browser/shell/native-tab-drag-service.d.ts.map +1 -0
  38. package/lib/browser/shell/native-tab-drag-service.js +349 -0
  39. package/lib/browser/shell/native-tab-drag-service.js.map +1 -0
  40. package/lib/browser/shell/native-tab-drag-service.spec.d.ts +2 -0
  41. package/lib/browser/shell/native-tab-drag-service.spec.d.ts.map +1 -0
  42. package/lib/browser/shell/native-tab-drag-service.spec.js +71 -0
  43. package/lib/browser/shell/native-tab-drag-service.spec.js.map +1 -0
  44. package/lib/browser/shell/shell-layout-restorer.d.ts +3 -0
  45. package/lib/browser/shell/shell-layout-restorer.d.ts.map +1 -1
  46. package/lib/browser/shell/shell-layout-restorer.js +20 -0
  47. package/lib/browser/shell/shell-layout-restorer.js.map +1 -1
  48. package/lib/browser/shell/shell-layout-restorer.spec.js +31 -0
  49. package/lib/browser/shell/shell-layout-restorer.spec.js.map +1 -1
  50. package/lib/browser/shell/side-panel-handler.d.ts +8 -0
  51. package/lib/browser/shell/side-panel-handler.d.ts.map +1 -1
  52. package/lib/browser/shell/side-panel-handler.js +14 -0
  53. package/lib/browser/shell/side-panel-handler.js.map +1 -1
  54. package/lib/browser/shell/tab-bars.d.ts +39 -0
  55. package/lib/browser/shell/tab-bars.d.ts.map +1 -1
  56. package/lib/browser/shell/tab-bars.js +127 -2
  57. package/lib/browser/shell/tab-bars.js.map +1 -1
  58. package/lib/browser/shell/tab-bars.spec.js +48 -0
  59. package/lib/browser/shell/tab-bars.spec.js.map +1 -1
  60. package/lib/browser/shell/tab-drop-helper.d.ts +32 -0
  61. package/lib/browser/shell/tab-drop-helper.d.ts.map +1 -0
  62. package/lib/browser/shell/tab-drop-helper.js +75 -0
  63. package/lib/browser/shell/tab-drop-helper.js.map +1 -0
  64. package/lib/browser/shell/theia-dock-panel.d.ts +25 -0
  65. package/lib/browser/shell/theia-dock-panel.d.ts.map +1 -1
  66. package/lib/browser/shell/theia-dock-panel.js +107 -11
  67. package/lib/browser/shell/theia-dock-panel.js.map +1 -1
  68. package/lib/browser/styling-service.d.ts +2 -2
  69. package/lib/browser/styling-service.d.ts.map +1 -1
  70. package/lib/browser/styling-service.js +7 -8
  71. package/lib/browser/styling-service.js.map +1 -1
  72. package/lib/browser/widget-open-handler.d.ts +10 -0
  73. package/lib/browser/widget-open-handler.d.ts.map +1 -1
  74. package/lib/browser/widget-open-handler.js +24 -1
  75. package/lib/browser/widget-open-handler.js.map +1 -1
  76. package/lib/browser/window/default-secondary-window-service.d.ts +17 -3
  77. package/lib/browser/window/default-secondary-window-service.d.ts.map +1 -1
  78. package/lib/browser/window/default-secondary-window-service.js +76 -23
  79. package/lib/browser/window/default-secondary-window-service.js.map +1 -1
  80. package/lib/browser/window/default-secondary-window-service.spec.d.ts +2 -0
  81. package/lib/browser/window/default-secondary-window-service.spec.d.ts.map +1 -0
  82. package/lib/browser/window/default-secondary-window-service.spec.js +49 -0
  83. package/lib/browser/window/default-secondary-window-service.spec.js.map +1 -0
  84. package/lib/browser/window/secondary-window-close-contribution.d.ts +23 -0
  85. package/lib/browser/window/secondary-window-close-contribution.d.ts.map +1 -0
  86. package/lib/browser/window/secondary-window-close-contribution.js +39 -0
  87. package/lib/browser/window/secondary-window-close-contribution.js.map +1 -0
  88. package/lib/browser/window/secondary-window-service.d.ts +24 -1
  89. package/lib/browser/window/secondary-window-service.d.ts.map +1 -1
  90. package/lib/browser/window/secondary-window-service.js.map +1 -1
  91. package/lib/browser/window/window-focus-service.d.ts +4 -0
  92. package/lib/browser/window/window-focus-service.d.ts.map +1 -1
  93. package/lib/browser/window/window-focus-service.js +8 -2
  94. package/lib/browser/window/window-focus-service.js.map +1 -1
  95. package/lib/common/core-preferences.d.ts +2 -0
  96. package/lib/common/core-preferences.d.ts.map +1 -1
  97. package/lib/common/core-preferences.js +15 -0
  98. package/lib/common/core-preferences.js.map +1 -1
  99. package/lib/common/preferences/preference-schema-service.d.ts.map +1 -1
  100. package/lib/common/preferences/preference-schema-service.js +9 -5
  101. package/lib/common/preferences/preference-schema-service.js.map +1 -1
  102. package/lib/common/preferences/preference-schema-service.spec.d.ts +2 -0
  103. package/lib/common/preferences/preference-schema-service.spec.d.ts.map +1 -0
  104. package/lib/common/preferences/preference-schema-service.spec.js +80 -0
  105. package/lib/common/preferences/preference-schema-service.spec.js.map +1 -0
  106. package/lib/electron-browser/menu/electron-context-menu-renderer.d.ts.map +1 -1
  107. package/lib/electron-browser/menu/electron-context-menu-renderer.js +2 -1
  108. package/lib/electron-browser/menu/electron-context-menu-renderer.js.map +1 -1
  109. package/lib/electron-browser/window/electron-secondary-window-service.d.ts.map +1 -1
  110. package/lib/electron-browser/window/electron-secondary-window-service.js +1 -0
  111. package/lib/electron-browser/window/electron-secondary-window-service.js.map +1 -1
  112. package/package.json +4 -4
  113. package/src/browser/color-application-contribution.ts +6 -7
  114. package/src/browser/common-frontend-contribution.ts +8 -0
  115. package/src/browser/frontend-application-module.ts +6 -0
  116. package/src/browser/quick-input/quick-command-service.ts +8 -2
  117. package/src/browser/saveable-service.ts +8 -0
  118. package/src/browser/secondary-window-handler.ts +397 -34
  119. package/src/browser/shell/application-shell-mouse-tracker.ts +10 -0
  120. package/src/browser/shell/application-shell.ts +38 -5
  121. package/src/browser/shell/index.ts +1 -0
  122. package/src/browser/shell/native-tab-drag-service.spec.ts +86 -0
  123. package/src/browser/shell/native-tab-drag-service.ts +402 -0
  124. package/src/browser/shell/shell-layout-restorer.spec.ts +42 -0
  125. package/src/browser/shell/shell-layout-restorer.ts +20 -0
  126. package/src/browser/shell/side-panel-handler.ts +15 -0
  127. package/src/browser/shell/tab-bars.spec.ts +56 -2
  128. package/src/browser/shell/tab-bars.ts +146 -3
  129. package/src/browser/shell/tab-drop-helper.ts +79 -0
  130. package/src/browser/shell/theia-dock-panel.ts +122 -11
  131. package/src/browser/style/dockpanel.css +9 -0
  132. package/src/browser/styling-service.ts +6 -7
  133. package/src/browser/widget-open-handler.ts +24 -3
  134. package/src/browser/window/default-secondary-window-service.spec.ts +54 -0
  135. package/src/browser/window/default-secondary-window-service.ts +78 -26
  136. package/src/browser/window/secondary-window-close-contribution.ts +47 -0
  137. package/src/browser/window/secondary-window-service.ts +20 -1
  138. package/src/browser/window/window-focus-service.ts +9 -2
  139. package/src/common/core-preferences.ts +19 -0
  140. package/src/common/preferences/preference-schema-service.spec.ts +99 -0
  141. package/src/common/preferences/preference-schema-service.ts +9 -5
  142. package/src/electron-browser/menu/electron-context-menu-renderer.ts +2 -1
  143. package/src/electron-browser/window/electron-secondary-window-service.ts +1 -0
@@ -0,0 +1 @@
1
+ {"version":3,"file":"tab-drop-helper.d.ts","sourceRoot":"","sources":["../../../src/browser/shell/tab-drop-helper.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAGjD;;;GAGG;AACH,qBAAa,aAAa;IAOV,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IALlF,SAAS,CAAC,eAAe,CAAC,EAAE;QAAE,GAAG,EAAE,OAAO,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAEhE;;OAEG;gBAC4B,gBAAgB,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAElF,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,MAAM,GAAG,SAAS;IAMvD;;;OAGG;IACH,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM;IAcpF,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAchE,mBAAmB,IAAI,IAAI;CAO9B"}
@@ -0,0 +1,75 @@
1
+ "use strict";
2
+ // *****************************************************************************
3
+ // Copyright (C) 2026 EclipseSource 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.TabDropHelper = void 0;
19
+ const widgets_1 = require("@lumino/widgets");
20
+ const native_tab_drag_service_1 = require("./native-tab-drag-service");
21
+ /**
22
+ * Supports drop targets that insert a dragged widget as a tab of a tab bar where it is dropped:
23
+ * finds the dragged widget and the insertion index, and marks the tab before or after which the widget is inserted.
24
+ */
25
+ class TabDropHelper {
26
+ /**
27
+ * @param markerClassNames the classes marking the tab before (`before`) or after (`after`) which a dropped widget is inserted
28
+ */
29
+ constructor(markerClassNames) {
30
+ this.markerClassNames = markerClassNames;
31
+ }
32
+ getDraggedWidget(event) {
33
+ const factory = event.mimeData.getData(native_tab_drag_service_1.WIDGET_FACTORY_MIME_TYPE);
34
+ const widget = typeof factory === 'function' ? factory() : undefined;
35
+ return widget instanceof widgets_1.Widget ? widget : undefined;
36
+ }
37
+ /**
38
+ * @returns the index of the tab before which a widget dropped at the given position is inserted,
39
+ * or the number of tabs if it is appended
40
+ */
41
+ findInsertionIndex(tabBar, clientX, clientY) {
42
+ const horizontal = tabBar.orientation === 'horizontal';
43
+ const tabs = tabBar.contentNode.children;
44
+ for (let i = 0; i < tabs.length; i++) {
45
+ const rect = tabs[i].getBoundingClientRect();
46
+ const start = horizontal ? rect.left : rect.top;
47
+ const size = horizontal ? rect.width : rect.height;
48
+ if (size > 0 && (horizontal ? clientX : clientY) < start + size / 2) {
49
+ return i;
50
+ }
51
+ }
52
+ return tabs.length;
53
+ }
54
+ showInsertionMarker(tabBar, index) {
55
+ const tabs = tabBar.contentNode.children;
56
+ const tab = index < tabs.length ? tabs[index] : tabs[tabs.length - 1];
57
+ const className = index < tabs.length ? this.markerClassNames.before : this.markerClassNames.after;
58
+ if (this.insertionMarker?.tab === tab && this.insertionMarker.className === className) {
59
+ return;
60
+ }
61
+ this.hideInsertionMarker();
62
+ if (tab) {
63
+ tab.classList.add(className);
64
+ this.insertionMarker = { tab, className };
65
+ }
66
+ }
67
+ hideInsertionMarker() {
68
+ if (this.insertionMarker) {
69
+ this.insertionMarker.tab.classList.remove(this.insertionMarker.className);
70
+ this.insertionMarker = undefined;
71
+ }
72
+ }
73
+ }
74
+ exports.TabDropHelper = TabDropHelper;
75
+ //# sourceMappingURL=tab-drop-helper.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"tab-drop-helper.js","sourceRoot":"","sources":["../../../src/browser/shell/tab-drop-helper.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,10 @@
1
1
  import { TabBar, Widget, DockPanel, Title } from '@lumino/widgets';
2
2
  import { Signal } from '@lumino/signaling';
3
+ import { Drag } from '@lumino/dragdrop';
3
4
  import { DisposableCollection } from '../../common/disposable';
4
5
  import { CorePreferences } from '../../common/core-preferences';
5
6
  import { Emitter, Event } from '../../common';
7
+ import { TabDropHelper } from './tab-drop-helper';
6
8
  export declare const ACTIVE_TABBAR_CLASS = "theia-tabBar-active";
7
9
  export declare const MAIN_AREA_ID = "theia-main-content-panel";
8
10
  export declare const BOTTOM_AREA_ID = "theia-bottom-content-panel";
@@ -28,11 +30,26 @@ export declare class TheiaDockPanel extends DockPanel {
28
30
  protected readonly onDidChangeCurrentEmitter: Emitter<Title<Widget> | undefined>;
29
31
  protected disableDND: boolean | undefined;
30
32
  protected tabWithDNDDisabledStyling?: HTMLElement;
33
+ protected readonly tabDropHelper: TabDropHelper;
34
+ protected canDropWidget?: (widget: Widget) => boolean;
35
+ protected onWillDropWidget?: (widget: Widget) => void;
31
36
  get onDidChangeCurrent(): Event<Title<Widget> | undefined>;
32
37
  constructor(options?: DockPanel.IOptions, preferences?: CorePreferences | undefined, maximizeCallback?: ((area: TheiaDockPanel) => void) | undefined);
33
38
  protected onTabDetachRequestedWithDisabledDND(sender: TabBar<Widget>, args: TabBar.ITabDetachRequestedArgs<Widget>): void;
34
39
  protected onNullTabDragDataWithDisabledDND(): void;
35
40
  handleEvent(event: globalThis.Event): void;
41
+ protected isDropAllowed(event: Drag.Event): boolean;
42
+ protected notifyWillDrop(event: Drag.Event): void;
43
+ /**
44
+ * Handles dragging a widget over the tab bars of this panel: the widget is inserted as a tab where it is dropped,
45
+ * instead of after the current tab of the tab bar as Lumino does.
46
+ *
47
+ * @returns `true` if the event has been handled
48
+ */
49
+ protected handleTabBarDragEvent(event: Drag.Event): boolean;
50
+ protected getDraggedWidget(event: Drag.Event): Widget | undefined;
51
+ protected findTabBarAt(clientX: number, clientY: number): TabBar<Widget> | undefined;
52
+ protected insertTab(tabBar: TabBar<Widget>, index: number, widget: Widget): void;
36
53
  toggleMaximized(): void;
37
54
  isElectron(): boolean;
38
55
  protected _currentTitle: Title<Widget> | undefined;
@@ -65,6 +82,14 @@ export declare namespace TheiaDockPanel {
65
82
  * @returns true if the request was handled by this handler, false if the tabbar should handle the request
66
83
  */
67
84
  closeHandler?: (sender: TabBar<Widget>, args: TabBar.ITabCloseRequestedArgs<Widget>) => boolean;
85
+ /**
86
+ * Whether the given widget may be dropped on this panel. By default, any widget may be dropped.
87
+ */
88
+ canDropWidget?: (widget: Widget) => boolean;
89
+ /**
90
+ * Called when the given widget is dropped on this panel, before it is added to the panel.
91
+ */
92
+ onWillDropWidget?: (widget: Widget) => void;
68
93
  }
69
94
  function isTheiaDockPanelIOptions(options: DockPanel.IOptions | undefined): options is IOptions;
70
95
  interface AddOptions extends DockPanel.IAddOptions {
@@ -1 +1 @@
1
- {"version":3,"file":"theia-dock-panel.d.ts","sourceRoot":"","sources":["../../../src/browser/shell/theia-dock-panel.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"theia-dock-panel.d.ts","sourceRoot":"","sources":["../../../src/browser/shell/theia-dock-panel.ts"],"names":[],"mappings":"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"}
@@ -22,6 +22,7 @@ const signaling_1 = require("@lumino/signaling");
22
22
  const disposable_1 = require("../../common/disposable");
23
23
  const common_1 = require("../../common");
24
24
  const tab_bars_1 = require("./tab-bars");
25
+ const tab_drop_helper_1 = require("./tab-drop-helper");
25
26
  exports.ACTIVE_TABBAR_CLASS = 'theia-tabBar-active';
26
27
  exports.MAIN_AREA_ID = 'theia-main-content-panel';
27
28
  exports.BOTTOM_AREA_ID = 'theia-bottom-content-panel';
@@ -52,8 +53,13 @@ class TheiaDockPanel extends widgets_1.DockPanel {
52
53
  this.onDidChangeCurrentEmitter = new common_1.Emitter();
53
54
  this.disableDND = false;
54
55
  this.tabWithDNDDisabledStyling = undefined;
56
+ this.tabDropHelper = new tab_drop_helper_1.TabDropHelper({ before: 'theia-mod-drop-before', after: 'theia-mod-drop-after' });
55
57
  this.toDisposeOnMarkAsCurrent = new disposable_1.DisposableCollection();
56
58
  this.disableDND = TheiaDockPanel.isTheiaDockPanelIOptions(options) && options.disableDragAndDrop;
59
+ if (TheiaDockPanel.isTheiaDockPanelIOptions(options)) {
60
+ this.canDropWidget = options.canDropWidget;
61
+ this.onWillDropWidget = options.onWillDropWidget;
62
+ }
57
63
  this['_onCurrentChanged'] = (sender, args) => {
58
64
  this.markAsCurrent(args.currentTitle || undefined);
59
65
  super['_onCurrentChanged'](sender, args);
@@ -63,6 +69,9 @@ class TheiaDockPanel extends widgets_1.DockPanel {
63
69
  const tabBar = super['_createTabBar']();
64
70
  if (tabBar instanceof tab_bars_1.ToolbarAwareTabBar) {
65
71
  tabBar.setDockPanel(this);
72
+ if (!this.disableDND) {
73
+ tabBar.enableNativeTabDrag();
74
+ }
66
75
  }
67
76
  if (this.disableDND) {
68
77
  tabBar['tabDetachRequested'].disconnect(this['_onTabDetachRequested'], this);
@@ -113,20 +122,107 @@ class TheiaDockPanel extends widgets_1.DockPanel {
113
122
  }
114
123
  }
115
124
  handleEvent(event) {
116
- if (this.disableDND) {
117
- switch (event.type) {
118
- case 'lm-dragenter':
119
- case 'lm-dragleave':
120
- case 'lm-dragover':
121
- case 'lm-drop':
122
- /* no-op */
123
- break;
124
- default:
125
- super.handleEvent(event);
126
- }
125
+ switch (event.type) {
126
+ case 'lm-dragenter':
127
+ case 'lm-dragleave':
128
+ case 'lm-dragover':
129
+ case 'lm-drop':
130
+ if (this.disableDND) {
131
+ return;
132
+ }
133
+ if ((event.type === 'lm-dragenter' || event.type === 'lm-drop') && !this.isDropAllowed(event)) {
134
+ // not accepting the drag enter keeps this panel from becoming the drop target
135
+ return;
136
+ }
137
+ if (event.type === 'lm-drop') {
138
+ this.notifyWillDrop(event);
139
+ }
140
+ if (this.handleTabBarDragEvent(event)) {
141
+ return;
142
+ }
143
+ break;
127
144
  }
128
145
  super.handleEvent(event);
129
146
  }
147
+ isDropAllowed(event) {
148
+ const widget = this.canDropWidget && this.getDraggedWidget(event);
149
+ return !widget || this.canDropWidget(widget);
150
+ }
151
+ notifyWillDrop(event) {
152
+ const widget = this.onWillDropWidget && this.getDraggedWidget(event);
153
+ if (widget) {
154
+ this.onWillDropWidget(widget);
155
+ }
156
+ }
157
+ /**
158
+ * Handles dragging a widget over the tab bars of this panel: the widget is inserted as a tab where it is dropped,
159
+ * instead of after the current tab of the tab bar as Lumino does.
160
+ *
161
+ * @returns `true` if the event has been handled
162
+ */
163
+ handleTabBarDragEvent(event) {
164
+ if (event.type !== 'lm-dragover' && event.type !== 'lm-drop') {
165
+ if (event.type === 'lm-dragleave' && !(event.relatedTarget && this.node.contains(event.relatedTarget))) {
166
+ this.tabDropHelper.hideInsertionMarker();
167
+ }
168
+ return false;
169
+ }
170
+ const tabBar = this.findTabBarAt(event.clientX, event.clientY);
171
+ const widget = tabBar && this.getDraggedWidget(event);
172
+ if (!tabBar || !widget) {
173
+ this.tabDropHelper.hideInsertionMarker();
174
+ return false;
175
+ }
176
+ event.preventDefault();
177
+ event.stopPropagation();
178
+ this.overlay.hide(0);
179
+ const index = this.tabDropHelper.findInsertionIndex(tabBar, event.clientX, event.clientY);
180
+ if (event.type === 'lm-dragover') {
181
+ this.tabDropHelper.showInsertionMarker(tabBar, index);
182
+ }
183
+ else {
184
+ this.tabDropHelper.hideInsertionMarker();
185
+ this.insertTab(tabBar, index, widget);
186
+ }
187
+ event.dropAction = event.proposedAction;
188
+ return true;
189
+ }
190
+ getDraggedWidget(event) {
191
+ if (this['_tabsConstrained'] && event.source !== this) {
192
+ return undefined;
193
+ }
194
+ const widget = this.tabDropHelper.getDraggedWidget(event);
195
+ return widget && !widget.contains(this) ? widget : undefined;
196
+ }
197
+ findTabBarAt(clientX, clientY) {
198
+ return (0, algorithm_1.find)(this.tabBars(), tabBar => {
199
+ const barRect = tabBar.node.getBoundingClientRect();
200
+ const contentRect = tabBar.contentNode.getBoundingClientRect();
201
+ return clientX >= barRect.left && clientX < barRect.right && clientY >= contentRect.top && clientY < contentRect.bottom;
202
+ });
203
+ }
204
+ insertTab(tabBar, index, widget) {
205
+ const titles = tabBar.titles;
206
+ const currentIndex = titles.indexOf(widget.title);
207
+ if (currentIndex !== -1) {
208
+ const toIndex = index > currentIndex ? index - 1 : index;
209
+ if (toIndex !== currentIndex) {
210
+ tabBar.insertTab(toIndex, widget.title);
211
+ // `insertTab` does not emit the signal that Lumino emits when a tab is moved with the pointer
212
+ tabBar.tabMoved.emit({ fromIndex: currentIndex, toIndex, title: widget.title });
213
+ }
214
+ }
215
+ else if (index < titles.length) {
216
+ this.addWidget(widget, { mode: 'tab-before', ref: titles[index].owner });
217
+ }
218
+ else if (titles.length > 0) {
219
+ this.addWidget(widget, { mode: 'tab-after', ref: titles[titles.length - 1].owner });
220
+ }
221
+ else {
222
+ this.addWidget(widget);
223
+ }
224
+ this.activateWidget(widget);
225
+ }
130
226
  toggleMaximized() {
131
227
  if (this.maximizeCallback) {
132
228
  this.maximizeCallback(this);
@@ -1 +1 @@
1
- {"version":3,"file":"theia-dock-panel.js","sourceRoot":"","sources":["../../../src/browser/shell/theia-dock-panel.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"theia-dock-panel.js","sourceRoot":"","sources":["../../../src/browser/shell/theia-dock-panel.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,7 @@ import { Theme, ThemeType } from '../common/theme';
3
3
  import { ColorRegistry } from './color-registry';
4
4
  import { FrontendApplicationContribution } from './frontend-application-contribution';
5
5
  import { ThemeService } from './theming';
6
- import { SecondaryWindowHandler } from './secondary-window-handler';
6
+ import { SecondaryWindowService } from './window/secondary-window-service';
7
7
  export declare const StylingParticipant: unique symbol;
8
8
  export interface StylingParticipant {
9
9
  registerThemeStyle(theme: ColorTheme, collector: CssStyleCollector): void;
@@ -21,7 +21,7 @@ export declare class StylingService implements FrontendApplicationContribution {
21
21
  protected readonly themeService: ThemeService;
22
22
  protected readonly colorRegistry: ColorRegistry;
23
23
  protected readonly themingParticipants: ContributionProvider<StylingParticipant>;
24
- protected readonly secondaryWindowHandler: SecondaryWindowHandler;
24
+ protected readonly secondaryWindowService: SecondaryWindowService;
25
25
  onStart(): void;
26
26
  registerWindow(win: Window): void;
27
27
  protected applyStylingToWindows(theme: Theme): void;
@@ -1 +1 @@
1
- {"version":3,"file":"styling-service.d.ts","sourceRoot":"","sources":["../../src/browser/styling-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAC;AACtF,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAE/D,MAAM,WAAW,kBAAkB;IAC/B,kBAAkB,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,iBAAiB,GAAG,IAAI,CAAA;CAC5E;AAED,MAAM,WAAW,UAAU;IACvB,IAAI,EAAE,SAAS,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CAC/C;AAED,MAAM,WAAW,iBAAiB;IAC9B,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,qBACa,cAAe,YAAW,+BAA+B;IAClE,SAAS,CAAC,WAAW,gCAAuC;IAG5D,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAG9C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,CAAC;IAGjF,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAElE,OAAO,IAAI,IAAI;IAYf,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAMjC,SAAS,CAAC,qBAAqB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAInD,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,gBAAgB,GAAG,IAAI;CAgB3E"}
1
+ {"version":3,"file":"styling-service.d.ts","sourceRoot":"","sources":["../../src/browser/styling-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAC;AACtF,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAE3E,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAE/D,MAAM,WAAW,kBAAkB;IAC/B,kBAAkB,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,iBAAiB,GAAG,IAAI,CAAA;CAC5E;AAED,MAAM,WAAW,UAAU;IACvB,IAAI,EAAE,SAAS,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CAC/C;AAED,MAAM,WAAW,iBAAiB;IAC9B,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,qBACa,cAAe,YAAW,+BAA+B;IAClE,SAAS,CAAC,WAAW,gCAAuC;IAG5D,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAG9C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,CAAC;IAGjF,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAElE,OAAO,IAAI,IAAI;IAWf,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAMjC,SAAS,CAAC,qBAAqB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAInD,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,gBAAgB,GAAG,IAAI;CAgB3E"}
@@ -22,7 +22,7 @@ const contribution_provider_1 = require("../common/contribution-provider");
22
22
  const color_registry_1 = require("./color-registry");
23
23
  const decoration_style_1 = require("./decoration-style");
24
24
  const theming_1 = require("./theming");
25
- const secondary_window_handler_1 = require("./secondary-window-handler");
25
+ const secondary_window_service_1 = require("./window/secondary-window-service");
26
26
  exports.StylingParticipant = Symbol('StylingParticipant');
27
27
  let StylingService = class StylingService {
28
28
  constructor() {
@@ -30,10 +30,9 @@ let StylingService = class StylingService {
30
30
  }
31
31
  onStart() {
32
32
  this.registerWindow(window);
33
- this.secondaryWindowHandler.onWillAddWidget(([widget, window]) => {
34
- this.registerWindow(window);
35
- });
36
- this.secondaryWindowHandler.onWillRemoveWidget(([widget, window]) => {
33
+ // registered per window rather than per widget, as a window may contain several widgets
34
+ this.secondaryWindowService.onWindowLoaded(win => this.registerWindow(win));
35
+ this.secondaryWindowService.onWindowClosed(window => {
37
36
  this.cssElements.delete(window);
38
37
  });
39
38
  this.themeService.onDidColorThemeChange(e => this.applyStylingToWindows(e.newTheme));
@@ -78,9 +77,9 @@ tslib_1.__decorate([
78
77
  tslib_1.__metadata("design:type", Object)
79
78
  ], StylingService.prototype, "themingParticipants", void 0);
80
79
  tslib_1.__decorate([
81
- (0, inversify_1.inject)(secondary_window_handler_1.SecondaryWindowHandler),
82
- tslib_1.__metadata("design:type", secondary_window_handler_1.SecondaryWindowHandler)
83
- ], StylingService.prototype, "secondaryWindowHandler", void 0);
80
+ (0, inversify_1.inject)(secondary_window_service_1.SecondaryWindowService),
81
+ tslib_1.__metadata("design:type", Object)
82
+ ], StylingService.prototype, "secondaryWindowService", void 0);
84
83
  exports.StylingService = StylingService = tslib_1.__decorate([
85
84
  (0, inversify_1.injectable)()
86
85
  ], StylingService);
@@ -1 +1 @@
1
- {"version":3,"file":"styling-service.js","sourceRoot":"","sources":["../../src/browser/styling-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"styling-service.js","sourceRoot":"","sources":["../../src/browser/styling-service.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@ import { BaseWidget } from './widgets';
4
4
  import { ApplicationShell } from './shell';
5
5
  import { OpenHandler, OpenerOptions } from './opener-service';
6
6
  import { WidgetManager } from './widget-manager';
7
+ import { WindowFocusService } from './window/window-focus-service';
7
8
  export type WidgetOpenMode = 'open' | 'reveal' | 'activate';
8
9
  /**
9
10
  * `WidgetOpenerOptions` define generic options used by the {@link WidgetOpenHandler}.
@@ -29,6 +30,7 @@ export interface WidgetOpenerOptions extends OpenerOptions {
29
30
  export declare abstract class WidgetOpenHandler<W extends BaseWidget> implements OpenHandler {
30
31
  protected readonly shell: ApplicationShell;
31
32
  protected readonly widgetManager: WidgetManager;
33
+ protected readonly windowFocusService: WindowFocusService | undefined;
32
34
  protected readonly onCreatedEmitter: Emitter<W>;
33
35
  /**
34
36
  * Emit when a new widget is created.
@@ -55,6 +57,14 @@ export declare abstract class WidgetOpenHandler<W extends BaseWidget> implements
55
57
  */
56
58
  open(uri: URI, options?: WidgetOpenerOptions): Promise<W>;
57
59
  protected doOpen(widget: W, uri: URI, options?: WidgetOpenerOptions): Promise<void>;
60
+ /**
61
+ * The options to add a widget with if the opener options don't specify any: widgets are added to the main area,
62
+ * unless the user works in a secondary window. Then widgets that can be moved to secondary windows are added there,
63
+ * next to the current widget, like editors are opened in the active editor group in VS Code.
64
+ *
65
+ * @param widget the widget to add, if known already
66
+ */
67
+ protected getDefaultWidgetOptions(widget?: W): ApplicationShell.WidgetOptions;
58
68
  /**
59
69
  * Tries to get an existing widget for the given uri.
60
70
  * @param uri the uri of the widget.
@@ -1 +1 @@
1
- {"version":3,"file":"widget-open-handler.d.ts","sourceRoot":"","sources":["../../src/browser/widget-open-handler.ts"],"names":[],"mappings":"AAiBA,OAAO,GAAG,MAAM,eAAe,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,QAAQ,GAAG,UAAU,CAAC;AAC5D;;;;;GAKG;AACH,MAAM,WAAW,mBAAoB,SAAQ,aAAa;IACtD;;;OAGG;IACH,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB;;;OAGG;IACH,aAAa,CAAC,EAAE,gBAAgB,CAAC,aAAa,CAAC;CAClD;AAED;;GAEG;AACH,8BACsB,iBAAiB,CAAC,CAAC,SAAS,UAAU,CAAE,YAAW,WAAW;IAGhF,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAG3C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEhD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,aAAoB;IACvD;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,CAA+B;IAG3D,SAAS,CAAC,IAAI,IAAI,IAAI;IAQtB;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,YAAY,CAAC,MAAM,CAAC;IAEjF;;;;;;;OAOG;IACG,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,CAAC,CAAC;cAK/C,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAezF;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAI1C;;;;;;;OAOG;IACH,gBAAgB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC;IAItC;;;;OAIG;IACH,IAAI,GAAG,IAAI,CAAC,EAAE,CAEb;IAED,SAAS,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS;IAKnG,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAKpF,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,CAAC,CAAC;IAKhF,SAAS,CAAC,QAAQ,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,MAAM;IAEvF;;;;;OAKG;IACG,QAAQ,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,YAAY,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;CAGxE"}
1
+ {"version":3,"file":"widget-open-handler.d.ts","sourceRoot":"","sources":["../../src/browser/widget-open-handler.ts"],"names":[],"mappings":"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"}
@@ -19,8 +19,11 @@ exports.WidgetOpenHandler = void 0;
19
19
  const tslib_1 = require("tslib");
20
20
  const inversify_1 = require("inversify");
21
21
  const common_1 = require("../common");
22
+ const widgets_1 = require("./widgets");
22
23
  const shell_1 = require("./shell");
23
24
  const widget_manager_1 = require("./widget-manager");
25
+ const secondary_window_handler_1 = require("./secondary-window-handler");
26
+ const window_focus_service_1 = require("./window/window-focus-service");
24
27
  /**
25
28
  * Generic base class for {@link OpenHandler}s that are opening a widget for a given {@link URI}.
26
29
  */
@@ -58,7 +61,7 @@ let WidgetOpenHandler = class WidgetOpenHandler {
58
61
  ...options
59
62
  };
60
63
  if (!widget.isAttached) {
61
- await this.shell.addWidget(widget, op.widgetOptions || { area: 'main' });
64
+ await this.shell.addWidget(widget, op.widgetOptions || this.getDefaultWidgetOptions(widget));
62
65
  }
63
66
  if (op.mode === 'activate') {
64
67
  await this.shell.activateWidget(widget.id);
@@ -67,6 +70,21 @@ let WidgetOpenHandler = class WidgetOpenHandler {
67
70
  await this.shell.revealWidget(widget.id);
68
71
  }
69
72
  }
73
+ /**
74
+ * The options to add a widget with if the opener options don't specify any: widgets are added to the main area,
75
+ * unless the user works in a secondary window. Then widgets that can be moved to secondary windows are added there,
76
+ * next to the current widget, like editors are opened in the active editor group in VS Code.
77
+ *
78
+ * @param widget the widget to add, if known already
79
+ */
80
+ getDefaultWidgetOptions(widget) {
81
+ const current = this.shell.currentWidget;
82
+ const secondaryWindow = current && (0, secondary_window_handler_1.extractSecondaryWindow)(current);
83
+ if (secondaryWindow && secondaryWindow === this.windowFocusService?.focusedWindow && (!widget || widgets_1.ExtractableWidget.is(widget))) {
84
+ return { area: 'secondaryWindow', ref: current };
85
+ }
86
+ return { area: 'main' };
87
+ }
70
88
  /**
71
89
  * Tries to get an existing widget for the given uri.
72
90
  * @param uri the uri of the widget.
@@ -126,6 +144,11 @@ tslib_1.__decorate([
126
144
  (0, inversify_1.inject)(widget_manager_1.WidgetManager),
127
145
  tslib_1.__metadata("design:type", widget_manager_1.WidgetManager)
128
146
  ], WidgetOpenHandler.prototype, "widgetManager", void 0);
147
+ tslib_1.__decorate([
148
+ (0, inversify_1.inject)(window_focus_service_1.WindowFocusService),
149
+ (0, inversify_1.optional)(),
150
+ tslib_1.__metadata("design:type", Object)
151
+ ], WidgetOpenHandler.prototype, "windowFocusService", void 0);
129
152
  tslib_1.__decorate([
130
153
  (0, inversify_1.postConstruct)(),
131
154
  tslib_1.__metadata("design:type", Function),
@@ -1 +1 @@
1
- {"version":3,"file":"widget-open-handler.js","sourceRoot":"","sources":["../../src/browser/widget-open-handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"widget-open-handler.js","sourceRoot":"","sources":["../../src/browser/widget-open-handler.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,12 @@
1
- import { SecondaryWindow, SecondaryWindowService } from './secondary-window-service';
1
+ import { SecondaryWindow, SecondaryWindowOptions, SecondaryWindowService } from './secondary-window-service';
2
2
  import { WindowService } from './window-service';
3
3
  import { ExtractableWidget, Widget } from '../widgets';
4
4
  import { ApplicationShell } from '../shell';
5
5
  import { Emitter, Event, PreferenceService, ILogger } from '../../common';
6
6
  import { SaveableService } from '../saveable-service';
7
7
  import { WindowFocusService } from './window-focus-service';
8
+ import { SecondaryWindowCloseContribution } from './secondary-window-close-contribution';
9
+ import { ContributionProvider } from '../../common/contribution-provider';
8
10
  export declare class DefaultSecondaryWindowService implements SecondaryWindowService {
9
11
  protected readonly onWindowOpenedEmitter: Emitter<Window>;
10
12
  readonly onWindowOpened: Event<Window>;
@@ -23,22 +25,34 @@ export declare class DefaultSecondaryWindowService implements SecondaryWindowSer
23
25
  /** Unique id. Increase after every access. */
24
26
  private nextId;
25
27
  protected secondaryWindows: Window[];
28
+ /**
29
+ * Whether the main window is shutting down, which closes all secondary windows. Such a close is not handled like a close by the user:
30
+ * the widgets stay in their windows, so that the windows are stored with the layout and restored on the next start.
31
+ */
32
+ protected shuttingDown: boolean;
26
33
  protected readonly windowService: WindowService;
27
34
  protected readonly preferenceService: PreferenceService;
28
35
  protected readonly saveResourceService: SaveableService;
29
36
  protected readonly windowFocusService: WindowFocusService;
30
37
  protected readonly logger: ILogger;
38
+ protected readonly closeContributions: ContributionProvider<SecondaryWindowCloseContribution>;
31
39
  init(): void;
32
40
  protected registerShutdownListeners(): void;
33
- createSecondaryWindow(widget: ExtractableWidget, shell: ApplicationShell): Window | SecondaryWindow | undefined;
41
+ createSecondaryWindow(widget: ExtractableWidget, shell: ApplicationShell, options?: SecondaryWindowOptions): Window | SecondaryWindow | undefined;
34
42
  protected windowCreated(newWindow: Window, widget: ExtractableWidget, shell: ApplicationShell): void;
35
43
  protected findWindow<T>(windowName: string): Window | undefined;
36
44
  protected findSecondaryWindowCoordinates(widget: ExtractableWidget): (number | undefined)[];
37
45
  getWindows(): Window[];
38
46
  focus(win: Window): void;
39
47
  protected nextWindowId(): string;
48
+ restoreWidget(widget: Widget, secondaryWindow: Window, shell: ApplicationShell): Promise<void>;
49
+ /**
50
+ * @returns whether the given widget is to be moved back to the main window instead of being closed with its secondary window
51
+ */
52
+ protected shouldRestoreOnClose(widget: Widget): Promise<boolean>;
40
53
  /**
41
- * Restore the widgets back to the main window. SecondaryWindowHandler needs to get informated about this.
54
+ * Restore the widgets back to the main window, or close them, depending on the `window.secondaryWindowCloseBehavior` preference.
55
+ * SecondaryWindowHandler needs to get informated about this.
42
56
  */
43
57
  protected restoreWidgets(newWindow: Window, extractableWidget: ExtractableWidget, shell: ApplicationShell): Promise<boolean>;
44
58
  }
@@ -1 +1 @@
1
- {"version":3,"file":"default-secondary-window-service.d.ts","sourceRoot":"","sources":["../../../src/browser/window/default-secondary-window-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAe,KAAK,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,qBACa,6BAA8B,YAAW,sBAAsB;IACxE,SAAS,CAAC,QAAQ,CAAC,qBAAqB,kBAAuB;IAC/D,QAAQ,CAAC,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC,CAAoC;IAC1E,SAAS,CAAC,QAAQ,CAAC,qBAAqB,kBAAuB;IAC/D,QAAQ,CAAC,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC,CAAoC;IAC1E,SAAS,CAAC,QAAQ,CAAC,qBAAqB,kBAAuB;IAC/D,QAAQ,CAAC,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC,CAAoC;IAC1E,SAAS,CAAC,QAAQ,CAAC,0BAA0B,4BAAiC;IAC9E,QAAQ,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAyC;IAE9F,SAAS,CAAC,MAAM,CAAC,oBAAoB,SAA2B;IAEhE;;;OAGG;IACH,SAAS,CAAC,QAAQ,CAAC,MAAM,SAAiD;IAC1E,8CAA8C;IAC9C,OAAO,CAAC,MAAM,CAAK;IAEnB,SAAS,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAM;IAG1C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,eAAe,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,IAAI,IAAI,IAAI;IA+BZ,SAAS,CAAC,yBAAyB,IAAI,IAAI;IAU3C,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,gBAAgB,GAAG,MAAM,GAAG,eAAe,GAAG,SAAS;IA4C/G,SAAS,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAMpG,SAAS,CAAC,UAAU,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAS/D,SAAS,CAAC,8BAA8B,CAAC,MAAM,EAAE,iBAAiB,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE;IA0C3F,UAAU,IAAI,MAAM,EAAE;IAItB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIxB,SAAS,CAAC,YAAY,IAAI,MAAM;IAIhC;;OAEG;cACa,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CAgCrI"}
1
+ {"version":3,"file":"default-secondary-window-service.d.ts","sourceRoot":"","sources":["../../../src/browser/window/default-secondary-window-service.ts"],"names":[],"mappings":"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"}