@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
@@ -14,6 +14,7 @@
14
14
  //
15
15
  // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
16
16
  // *****************************************************************************
17
+ var SecondaryWindowHandler_1;
17
18
  Object.defineProperty(exports, "__esModule", { value: true });
18
19
  exports.SecondaryWindowHandler = void 0;
19
20
  exports.getDefaultRestoreArea = getDefaultRestoreArea;
@@ -23,18 +24,24 @@ exports.extractSecondaryWindow = extractSecondaryWindow;
23
24
  const tslib_1 = require("tslib");
24
25
  const debounce = require("lodash.debounce");
25
26
  const inversify_1 = require("inversify");
27
+ const algorithm_1 = require("@lumino/algorithm");
26
28
  const widgets_1 = require("./widgets");
27
29
  const message_service_1 = require("../common/message-service");
28
30
  const application_shell_1 = require("./shell/application-shell");
29
31
  const event_1 = require("../common/event");
32
+ const common_1 = require("../common");
30
33
  const secondary_window_service_1 = require("./window/secondary-window-service");
31
34
  const keybinding_1 = require("./keybinding");
32
35
  const theia_dock_panel_1 = require("./shell/theia-dock-panel");
33
36
  const logger_1 = require("../common/logger");
34
37
  const nls_1 = require("../common/nls");
38
+ const native_tab_drag_service_1 = require("./shell/native-tab-drag-service");
39
+ const window_service_1 = require("./window/window-service");
40
+ const preferences_1 = require("../common/preferences");
41
+ const window_focus_service_1 = require("./window/window-focus-service");
35
42
  /** Widgets to be contained inside a DockPanel in the secondary window. */
36
43
  class SecondaryWindowDockPanelWidget extends secondary_window_service_1.SecondaryWindowRootWidget {
37
- constructor(dockPanelFactory, dockPanelRendererFactory, closeHandler, secondaryWindow) {
44
+ constructor(dockPanelFactory, dockPanelRendererFactory, closeHandler, secondaryWindow, dropOptions) {
38
45
  super();
39
46
  this._widgets = [];
40
47
  this.secondaryWindow = secondaryWindow;
@@ -44,12 +51,22 @@ class SecondaryWindowDockPanelWidget extends secondary_window_service_1.Secondar
44
51
  renderer.tabBarClasses.push(application_shell_1.MAIN_BOTTOM_AREA_CLASS);
45
52
  renderer.tabBarClasses.push(application_shell_1.MAIN_AREA_CLASS);
46
53
  this.dockPanel = dockPanelFactory({
47
- disableDragAndDrop: true,
54
+ disableDragAndDrop: !dropOptions,
48
55
  closeHandler,
49
56
  mode: 'multiple-document',
50
57
  renderer,
58
+ canDropWidget: dropOptions?.canDropWidget,
59
+ onWillDropWidget: dropOptions?.onWillDropWidget
51
60
  });
52
61
  this.dockPanel.id = theia_dock_panel_1.MAIN_AREA_ID;
62
+ if (dropOptions) {
63
+ // widgets added through `addWidget` are tracked already
64
+ this.dockPanel.widgetAdded.connect((_, widget) => {
65
+ if (!this._widgets.includes(widget)) {
66
+ dropOptions.onDidDropWidget(widget);
67
+ }
68
+ });
69
+ }
53
70
  widgets_1.BoxLayout.setStretch(this.dockPanel, 1);
54
71
  boxLayout.addWidget(this.dockPanel);
55
72
  this.layout = boxLayout;
@@ -58,20 +75,53 @@ class SecondaryWindowDockPanelWidget extends secondary_window_service_1.Secondar
58
75
  return this._widgets;
59
76
  }
60
77
  addWidget(widget, disposeCallback, options) {
61
- this._widgets.push(widget);
78
+ this.track(widget, disposeCallback);
62
79
  this.dockPanel.addWidget(widget, options);
63
- widget.disposed.connect(() => {
80
+ this.dockPanel.activateWidget(widget);
81
+ }
82
+ /**
83
+ * Tracks the given widget, which has been added to the dock panel of this window.
84
+ *
85
+ * @param disposeCallback called when the widget leaves this window
86
+ */
87
+ track(widget, disposeCallback) {
88
+ this._widgets.push(widget);
89
+ // the widget leaves this window when it is disposed, moved back to the main window or dragged to another window
90
+ const onRemove = () => {
64
91
  const index = this._widgets.indexOf(widget);
65
92
  if (index > -1) {
66
93
  this._widgets.splice(index, 1);
94
+ widget.disposed.disconnect(onRemove);
95
+ this.dockPanel.widgetRemoved.disconnect(onWidgetRemoved);
96
+ disposeCallback();
67
97
  }
68
- disposeCallback();
69
- });
70
- this.dockPanel.activateWidget(widget);
98
+ };
99
+ const onWidgetRemoved = (_, removed) => {
100
+ if (removed === widget) {
101
+ onRemove();
102
+ }
103
+ };
104
+ widget.disposed.connect(onRemove);
105
+ this.dockPanel.widgetRemoved.connect(onWidgetRemoved);
71
106
  }
72
107
  getTabBar(widget) {
73
108
  return this.dockPanel.findTabBar(widget.title);
74
109
  }
110
+ /**
111
+ * @returns the widgets in the order of the dock panel's layout
112
+ */
113
+ getLayoutWidgets() {
114
+ return (0, algorithm_1.toArray)(this.dockPanel.widgets());
115
+ }
116
+ saveLayout() {
117
+ return this.dockPanel.saveLayout();
118
+ }
119
+ /**
120
+ * Restores the layout of the dock panel. The widgets of the layout must be tracked with {@link track} beforehand.
121
+ */
122
+ restoreLayout(config) {
123
+ this.dockPanel.restoreLayout(config);
124
+ }
75
125
  }
76
126
  /**
77
127
  * Offers functionality to move a widget out of the main window to a newly created window.
@@ -81,7 +131,7 @@ class SecondaryWindowDockPanelWidget extends secondary_window_service_1.Secondar
81
131
  * In addition, it provides access to the extracted widgets and provides notifications when widgets are added to or removed from this handler.
82
132
  *
83
133
  */
84
- let SecondaryWindowHandler = class SecondaryWindowHandler {
134
+ let SecondaryWindowHandler = SecondaryWindowHandler_1 = class SecondaryWindowHandler {
85
135
  constructor() {
86
136
  /** List of widgets in secondary windows. */
87
137
  this._widgets = [];
@@ -97,6 +147,11 @@ let SecondaryWindowHandler = class SecondaryWindowHandler {
97
147
  this.onDidRemoveWidgetEmitter = new event_1.Emitter();
98
148
  /** Subscribe to get notified when a widget is removed from this handler, i.e. the widget's window was closed or the widget was disposed. */
99
149
  this.onDidRemoveWidget = this.onDidRemoveWidgetEmitter.event;
150
+ /**
151
+ * The secondary windows that are being restored, see {@link setLayoutData}, and have not been loaded yet.
152
+ * Their widgets are not tracked yet, so they are stored with the layout as they were restored.
153
+ */
154
+ this.pendingWindows = new Map();
100
155
  }
101
156
  /** @returns List of widgets in secondary windows. */
102
157
  get widgets() {
@@ -118,13 +173,32 @@ let SecondaryWindowHandler = class SecondaryWindowHandler {
118
173
  this.applicationShell = shell;
119
174
  this.dockPanelRendererFactory = dockPanelRendererFactory;
120
175
  this.secondaryWindowService.beforeWidgetRestore(([widget, window]) => this.removeWidget(widget, window));
176
+ this.nativeTabDragService.onDidDropTab(({ title, window: target }) => this.focusDroppedWidget(title.owner, target));
177
+ }
178
+ /**
179
+ * Focuses the window in which a tab has been dropped and the widget of the tab. The drag started in another window,
180
+ * or outside of the main area, which keeps the focus otherwise.
181
+ */
182
+ focusDroppedWidget(widget, target) {
183
+ if (widget.isDisposed) {
184
+ return;
185
+ }
186
+ if (target === window) {
187
+ this.windowService.focus();
188
+ this.applicationShell.activateWidget(widget.id);
189
+ }
190
+ else {
191
+ this.secondaryWindowService.focus(target);
192
+ widget.activate();
193
+ }
121
194
  }
122
195
  /**
123
196
  * Moves the given widget to a new window.
124
197
  *
125
198
  * @param widget the widget to extract
199
+ * @param options optional options for the created window, e.g. its screen position
126
200
  */
127
- moveWidgetToSecondaryWindow(widget) {
201
+ moveWidgetToSecondaryWindow(widget, options) {
128
202
  if (!this.applicationShell) {
129
203
  this.logger.error('Widget cannot be extracted because the WidgetExtractionHandler has not been initialized.');
130
204
  return;
@@ -133,14 +207,45 @@ let SecondaryWindowHandler = class SecondaryWindowHandler {
133
207
  this.logger.error('Widget is not extractable.', widget.id);
134
208
  return;
135
209
  }
136
- const newWindow = this.secondaryWindowService.createSecondaryWindow(widget, this.applicationShell);
137
- if (!newWindow) {
210
+ // a widget that is moved from one secondary window to another one keeps the area to restore it to
211
+ const previousArea = widget.secondaryWindow ? widget.previousArea : this.applicationShell.getAreaFor(widget);
212
+ const opened = this.openSecondaryWindow(widget, options, (newWindow, rootWidget) => {
213
+ this.onWillAddWidgetEmitter.fire([widget, newWindow]);
214
+ widget.secondaryWindow = newWindow;
215
+ widget.previousArea = previousArea;
216
+ rootWidget.defaultRestoreArea = previousArea;
217
+ rootWidget.addWidget(widget, () => {
218
+ this.onWidgetRemove(widget, newWindow, rootWidget);
219
+ });
220
+ widget.show();
221
+ widget.update();
222
+ this.addWidget(widget, newWindow);
223
+ widget.activate();
224
+ });
225
+ if (!opened) {
138
226
  this.messageService.error('The widget could not be moved to a secondary window because the window creation failed. Please make sure to allow popups.');
139
- return;
227
+ }
228
+ }
229
+ /**
230
+ * Opens a secondary window and sets up its root widget once the window has been loaded.
231
+ *
232
+ * @param widget the widget the window is created for, its label is used as the window title
233
+ * @param options the options for the created window, e.g. its bounds
234
+ * @param populate adds the widgets to the root widget of the loaded window
235
+ * @param onDidFailToLoad called if the loaded window cannot host widgets, the window is closed then
236
+ * @returns the created window or `undefined` if it could not be created
237
+ */
238
+ openSecondaryWindow(widget, options, populate, onDidFailToLoad) {
239
+ const newWindow = this.secondaryWindowService.createSecondaryWindow(widget, this.applicationShell, options);
240
+ if (!newWindow) {
241
+ return undefined;
140
242
  }
141
243
  const mainWindowTitle = document.title;
142
244
  newWindow.addEventListener('load', () => {
143
245
  this.keybindings.registerEventListeners(newWindow);
246
+ // tabs dragged from other windows must not be dropped on the default drop targets of this window
247
+ const tabDragRegistration = this.nativeTabDragService.installWindow(newWindow);
248
+ newWindow.addEventListener('pagehide', () => tabDragRegistration.dispose());
144
249
  // Use the widget's title as the window title
145
250
  // Even if the widget's label were malicious, this should be safe against XSS because the HTML standard defines this is inserted via a text node.
146
251
  // See https://html.spec.whatwg.org/multipage/dom.html#document.title
@@ -149,25 +254,26 @@ let SecondaryWindowHandler = class SecondaryWindowHandler {
149
254
  const element = newWindow.document.getElementById('widget-host');
150
255
  if (!element) {
151
256
  this.logger.error('Could not find dom element to attach to in secondary window');
257
+ newWindow.close();
258
+ onDidFailToLoad?.(newWindow);
152
259
  return;
153
260
  }
154
- this.onWillAddWidgetEmitter.fire([widget, newWindow]);
155
- widget.secondaryWindow = newWindow;
156
- widget.previousArea = this.applicationShell.getAreaFor(widget);
157
- const rootWidget = new SecondaryWindowDockPanelWidget(this.dockPanelFactory, this.dockPanelRendererFactory, this.onTabCloseRequested, newWindow);
158
- rootWidget.defaultRestoreArea = widget.previousArea;
261
+ const rootWidget = new SecondaryWindowDockPanelWidget(this.dockPanelFactory, this.dockPanelRendererFactory, this.onTabCloseRequested, newWindow, {
262
+ canDropWidget: dropped => this.canDropInSecondaryWindow(dropped),
263
+ onWillDropWidget: dropped => this.onWillDropInSecondaryWindow(dropped),
264
+ onDidDropWidget: dropped => this.onDidDropInSecondaryWindow(dropped, newWindow, rootWidget)
265
+ });
159
266
  rootWidget.addClass('secondary-widget-root');
160
267
  rootWidget.addClass('monaco-workbench'); // needed for compatility with VSCode styles
161
268
  widgets_1.Widget.attach(rootWidget, element);
162
269
  if ((0, secondary_window_service_1.isSecondaryWindow)(newWindow)) {
163
270
  newWindow.rootWidget = rootWidget;
164
271
  }
165
- rootWidget.addWidget(widget, () => {
166
- this.onWidgetRemove(widget, newWindow, rootWidget);
272
+ // the window is closed already when the layout is stored on shutdown
273
+ newWindow.addEventListener('pagehide', () => {
274
+ rootWidget.closedBounds = this.getWindowBounds(newWindow);
167
275
  });
168
- widget.show();
169
- widget.update();
170
- this.addWidget(widget, newWindow);
276
+ populate(newWindow, rootWidget);
171
277
  // debounce to avoid rapid updates while resizing the secondary window
172
278
  const updateWidget = debounce(() => {
173
279
  rootWidget.update();
@@ -175,20 +281,213 @@ let SecondaryWindowHandler = class SecondaryWindowHandler {
175
281
  newWindow.addEventListener('resize', () => {
176
282
  updateWidget();
177
283
  });
178
- widget.activate();
179
284
  });
285
+ return newWindow;
286
+ }
287
+ /**
288
+ * @returns the bounds of the given window, the size as expected by `window.open`
289
+ */
290
+ getWindowBounds(win) {
291
+ // Electron applies the size given to `window.open` to the window, browsers apply it to the content
292
+ return common_1.environment.electron.is()
293
+ ? { x: win.screenX, y: win.screenY, width: win.outerWidth, height: win.outerHeight }
294
+ : { x: win.screenX, y: win.screenY, width: win.innerWidth, height: win.innerHeight };
295
+ }
296
+ /**
297
+ * @returns the data to restore the open secondary windows with their widgets, see {@link setLayoutData}
298
+ */
299
+ getLayoutData() {
300
+ const rootWidgets = new Set();
301
+ for (const widget of this._widgets) {
302
+ const rootWidget = extractSecondaryWindowRootWidget(widget);
303
+ if (rootWidget instanceof SecondaryWindowDockPanelWidget) {
304
+ rootWidgets.add(rootWidget);
305
+ }
306
+ }
307
+ const openWindows = Array.from(rootWidgets, rootWidget => ({
308
+ bounds: rootWidget.secondaryWindow.closed ? rootWidget.closedBounds : this.getWindowBounds(rootWidget.secondaryWindow),
309
+ config: rootWidget.saveLayout(),
310
+ restoreAreas: rootWidget.getLayoutWidgets().map(widget => (widgets_1.ExtractableWidget.is(widget) ? widget.previousArea : undefined) ?? rootWidget.defaultRestoreArea ?? 'main')
311
+ }));
312
+ return [...openWindows, ...this.pendingWindows.values()];
313
+ }
314
+ /**
315
+ * Opens secondary windows with the widgets of the given layout data, see {@link getLayoutData}.
316
+ * The widgets are added to the main window instead if the `window.restoreSecondaryWindows` preference is disabled,
317
+ * or if their window cannot be opened, e.g. because a browser blocks the popup.
318
+ */
319
+ async setLayoutData(layoutData) {
320
+ if (!this.applicationShell) {
321
+ this.logger.error('Secondary windows cannot be restored because the SecondaryWindowHandler has not been initialized.');
322
+ return;
323
+ }
324
+ // the layout may be restored before the preferences have been loaded
325
+ await this.preferenceService.ready;
326
+ const openWindows = this.preferenceService.get('window.restoreSecondaryWindows', true);
327
+ for (const data of layoutData) {
328
+ this.restoreSecondaryWindow(data, openWindows);
329
+ }
330
+ }
331
+ restoreSecondaryWindow(data, openWindow) {
332
+ const { bounds, config, restoreAreas } = data;
333
+ const widgets = this.collectLayoutWidgets(config.main);
334
+ // widgets that could not be stored or restored are missing from the layout, the areas cannot be matched with the widgets then
335
+ const previousArea = new Map();
336
+ if (restoreAreas?.length === widgets.length) {
337
+ widgets.forEach((widget, i) => previousArea.set(widget, restoreAreas[i]));
338
+ }
339
+ const getPreviousArea = (widget) => previousArea.get(widget) ?? 'main';
340
+ // widgets that have been added elsewhere in the meantime are not moved
341
+ const isAvailable = (widget) => !widget.parent && !widget.isDisposed;
342
+ const addToMainWindow = () => {
343
+ for (const widget of widgets.filter(isAvailable)) {
344
+ this.applicationShell.addWidget(widget, { area: SecondaryWindowHandler_1.getMainWindowArea(getPreviousArea(widget)) });
345
+ }
346
+ };
347
+ const extractable = widgets.find(widget => isAvailable(widget) && widgets_1.ExtractableWidget.is(widget) && widget.isExtractable);
348
+ const options = bounds && { position: { x: bounds.x, y: bounds.y }, size: { width: bounds.width, height: bounds.height } };
349
+ const opened = openWindow && extractable && this.openSecondaryWindow(extractable, options, (newWindow, rootWidget) => {
350
+ this.pendingWindows.delete(newWindow);
351
+ this.removeFromLayout(config.main, isAvailable);
352
+ const windowWidgets = this.collectLayoutWidgets(config.main);
353
+ if (windowWidgets.length === 0) {
354
+ newWindow.close();
355
+ return;
356
+ }
357
+ rootWidget.defaultRestoreArea = getPreviousArea(windowWidgets[0]);
358
+ for (const widget of windowWidgets) {
359
+ this.onWillAddWidgetEmitter.fire([widget, newWindow]);
360
+ if (widgets_1.ExtractableWidget.is(widget)) {
361
+ widget.secondaryWindow = newWindow;
362
+ widget.previousArea = getPreviousArea(widget);
363
+ }
364
+ rootWidget.track(widget, () => {
365
+ this.onWidgetRemove(widget, newWindow, rootWidget);
366
+ });
367
+ }
368
+ rootWidget.restoreLayout(config);
369
+ for (const widget of windowWidgets) {
370
+ this.addWidget(widget, newWindow);
371
+ }
372
+ }, newWindow => {
373
+ this.pendingWindows.delete(newWindow);
374
+ addToMainWindow();
375
+ });
376
+ if (opened) {
377
+ this.pendingWindows.set(opened, data);
378
+ // the window may be closed before it has been populated, its widgets would not be shown anywhere then
379
+ const closeListener = this.secondaryWindowService.onWindowClosed(closed => {
380
+ if (closed === opened) {
381
+ closeListener.dispose();
382
+ if (this.pendingWindows.delete(opened)) {
383
+ addToMainWindow();
384
+ }
385
+ }
386
+ });
387
+ }
388
+ else {
389
+ addToMainWindow();
390
+ }
391
+ }
392
+ collectLayoutWidgets(area) {
393
+ if (!area) {
394
+ return [];
395
+ }
396
+ if (area.type === 'tab-area') {
397
+ return [...area.widgets];
398
+ }
399
+ return area.children.flatMap(child => this.collectLayoutWidgets(child));
400
+ }
401
+ /**
402
+ * Removes the widgets that do not match the given predicate from the given layout. Empty areas are removed when the layout is restored.
403
+ */
404
+ removeFromLayout(area, keep) {
405
+ if (!area) {
406
+ return;
407
+ }
408
+ if (area.type === 'tab-area') {
409
+ const current = area.widgets[area.currentIndex];
410
+ area.widgets = area.widgets.filter(keep);
411
+ area.currentIndex = Math.max(0, area.widgets.indexOf(current));
412
+ }
413
+ else {
414
+ area.children.forEach(child => this.removeFromLayout(child, keep));
415
+ }
180
416
  }
181
417
  setupHtmlLanguageAttributes(element) {
182
418
  nls_1.nls.setHtmlLang(element);
183
419
  nls_1.nls.setHtmlNoTranslate(element);
184
420
  }
421
+ /**
422
+ * Moves the given widget from its secondary window back to the main window.
423
+ * The secondary window is closed once it does not contain any widgets anymore.
424
+ *
425
+ * @param widget the widget to move back
426
+ */
427
+ async moveWidgetToMainWindow(widget) {
428
+ if (!this.applicationShell) {
429
+ this.logger.error('Widget cannot be moved back because the WidgetExtractionHandler has not been initialized.');
430
+ return;
431
+ }
432
+ const secondaryWindow = extractSecondaryWindow(widget);
433
+ if (!secondaryWindow) {
434
+ this.logger.error('Widget is not contained in a secondary window.', widget.id);
435
+ return;
436
+ }
437
+ await this.secondaryWindowService.restoreWidget(widget, secondaryWindow, this.applicationShell);
438
+ }
439
+ /**
440
+ * Moves all widgets of the given secondary window back to the main window, which closes the secondary window.
441
+ *
442
+ * @param secondaryWindow the window to move the widgets from
443
+ */
444
+ async moveAllWidgetsToMainWindow(secondaryWindow) {
445
+ // copy, as moving a widget back removes it from the secondary window's widgets
446
+ for (const widget of [...getAllWidgetsFromSecondaryWindow(secondaryWindow) ?? []]) {
447
+ await this.moveWidgetToMainWindow(widget);
448
+ }
449
+ }
450
+ /**
451
+ * Only widgets that can be moved to secondary windows, or that are in a secondary window already, can be dropped on secondary windows.
452
+ */
453
+ canDropInSecondaryWindow(widget) {
454
+ return widgets_1.ExtractableWidget.is(widget) || this._widgets.includes(widget);
455
+ }
456
+ onWillDropInSecondaryWindow(widget) {
457
+ if (widgets_1.ExtractableWidget.is(widget) && widget.secondaryWindow === undefined) {
458
+ // the widget is still in the main window
459
+ widget.previousArea = this.applicationShell.getAreaFor(widget);
460
+ }
461
+ }
462
+ onDidDropInSecondaryWindow(widget, secondaryWindow, rootWidget) {
463
+ // the widget is part of the window's dock panel already, but not tracked yet
464
+ this.onWillAddWidgetEmitter.fire([widget, secondaryWindow]);
465
+ if (widgets_1.ExtractableWidget.is(widget)) {
466
+ widget.secondaryWindow = secondaryWindow;
467
+ }
468
+ rootWidget.track(widget, () => {
469
+ this.onWidgetRemove(widget, secondaryWindow, rootWidget);
470
+ });
471
+ this.addWidget(widget, secondaryWindow);
472
+ }
185
473
  onWidgetRemove(widget, newWindow, rootWidget) {
186
- // Close the window if the widget is disposed, e.g. by a command closing all widgets.
187
- this.onWillRemoveWidgetEmitter.fire([widget, newWindow]);
188
- this.removeWidget(widget, newWindow);
474
+ // Widgets moved back to the main window have already been removed via `beforeWidgetRestore`
475
+ if (this._widgets.includes(widget)) {
476
+ this.onWillRemoveWidgetEmitter.fire([widget, newWindow]);
477
+ this.removeWidget(widget, newWindow);
478
+ }
479
+ // A widget dropped on another window is assigned to that window once it has been added there
480
+ if (widgets_1.ExtractableWidget.is(widget) && widget.secondaryWindow === newWindow) {
481
+ widget.secondaryWindow = undefined;
482
+ }
483
+ // Close the window if the widget is disposed, e.g. by a command closing all widgets, or the last widget was moved away.
189
484
  if (!newWindow.closed && rootWidget.widgets.length === 0) {
190
- // no remaining widgets in window -> close the window
191
- newWindow.close();
485
+ // Close asynchronously, as the widget may have been dragged away by a drag that started in this window
486
+ setTimeout(() => {
487
+ if (!newWindow.closed && rootWidget.widgets.length === 0) {
488
+ newWindow.close();
489
+ }
490
+ });
192
491
  }
193
492
  }
194
493
  addWidgetToSecondaryWindow(widget, secondaryWindow, options) {
@@ -258,7 +557,7 @@ let SecondaryWindowHandler = class SecondaryWindowHandler {
258
557
  return undefined;
259
558
  }
260
559
  getFocusedWindow() {
261
- return window.document.hasFocus() ? window : this.secondaryWindowService.getWindows().find(candidate => candidate.document.hasFocus());
560
+ return this.windowFocusService.focusedWindow;
262
561
  }
263
562
  addWidget(widget, win) {
264
563
  if (!this._widgets.includes(widget)) {
@@ -303,9 +602,34 @@ tslib_1.__decorate([
303
602
  (0, inversify_1.inject)(secondary_window_service_1.SecondaryWindowService),
304
603
  tslib_1.__metadata("design:type", Object)
305
604
  ], SecondaryWindowHandler.prototype, "secondaryWindowService", void 0);
306
- exports.SecondaryWindowHandler = SecondaryWindowHandler = tslib_1.__decorate([
605
+ tslib_1.__decorate([
606
+ (0, inversify_1.inject)(native_tab_drag_service_1.NativeTabDragService),
607
+ tslib_1.__metadata("design:type", native_tab_drag_service_1.NativeTabDragService)
608
+ ], SecondaryWindowHandler.prototype, "nativeTabDragService", void 0);
609
+ tslib_1.__decorate([
610
+ (0, inversify_1.inject)(window_service_1.WindowService),
611
+ tslib_1.__metadata("design:type", Object)
612
+ ], SecondaryWindowHandler.prototype, "windowService", void 0);
613
+ tslib_1.__decorate([
614
+ (0, inversify_1.inject)(preferences_1.PreferenceService),
615
+ tslib_1.__metadata("design:type", Object)
616
+ ], SecondaryWindowHandler.prototype, "preferenceService", void 0);
617
+ tslib_1.__decorate([
618
+ (0, inversify_1.inject)(window_focus_service_1.WindowFocusService),
619
+ tslib_1.__metadata("design:type", window_focus_service_1.WindowFocusService)
620
+ ], SecondaryWindowHandler.prototype, "windowFocusService", void 0);
621
+ exports.SecondaryWindowHandler = SecondaryWindowHandler = SecondaryWindowHandler_1 = tslib_1.__decorate([
307
622
  (0, inversify_1.injectable)()
308
623
  ], SecondaryWindowHandler);
624
+ (function (SecondaryWindowHandler) {
625
+ /**
626
+ * @returns the area of the main window to move a widget back to whose previous area is the given one
627
+ */
628
+ function getMainWindowArea(previousArea) {
629
+ return previousArea === undefined || previousArea === 'top' || previousArea === 'secondaryWindow' ? 'main' : previousArea;
630
+ }
631
+ SecondaryWindowHandler.getMainWindowArea = getMainWindowArea;
632
+ })(SecondaryWindowHandler || (exports.SecondaryWindowHandler = SecondaryWindowHandler = {}));
309
633
  function getDefaultRestoreArea(window) {
310
634
  if ((0, secondary_window_service_1.isSecondaryWindow)(window) && window.rootWidget !== undefined) {
311
635
  return window.rootWidget.defaultRestoreArea;
@@ -1 +1 @@
1
- {"version":3,"file":"secondary-window-handler.js","sourceRoot":"","sources":["../../src/browser/secondary-window-handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"secondary-window-handler.js","sourceRoot":"","sources":["../../src/browser/secondary-window-handler.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@ import { DisposableCollection } from '../../common/disposable';
4
4
  import { Emitter, Event } from '../../common/event';
5
5
  import { SplitPanel } from '@lumino/widgets';
6
6
  import { Widget } from '../widgets';
7
+ import { NativeTabDragService } from './native-tab-drag-service';
7
8
  /**
8
9
  * Contribution that tracks `mouseup` and `mousedown` events.
9
10
  *
@@ -14,6 +15,7 @@ import { Widget } from '../widgets';
14
15
  */
15
16
  export declare class ApplicationShellMouseTracker implements FrontendApplicationContribution {
16
17
  protected readonly applicationShell: ApplicationShell;
18
+ protected readonly nativeTabDragService: NativeTabDragService;
17
19
  protected readonly toDispose: DisposableCollection;
18
20
  protected readonly toDisposeOnActiveChange: DisposableCollection;
19
21
  protected readonly mouseupEmitter: Emitter<MouseEvent>;
@@ -1 +1 @@
1
- {"version":3,"file":"application-shell-mouse-tracker.d.ts","sourceRoot":"","sources":["../../../src/browser/shell/application-shell-mouse-tracker.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AACvF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAc,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAA6B,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAoB,MAAM,EAAE,MAAM,YAAY,CAAC;AACtD;;;;;;;GAOG;AACH,qBACa,4BAA6B,YAAW,+BAA+B;IAGhF,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAEtD,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;IAC1D,SAAS,CAAC,QAAQ,CAAC,uBAAuB,uBAA8B;IAExE,SAAS,CAAC,QAAQ,CAAC,cAAc,sBAA6B;IAC9D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,sBAA6B;IAChE,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,IAAI,CAAoC;IAC/F,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,IAAI,CAAsC;IAEnG,OAAO,IAAI,IAAI;IAoCf,MAAM,IAAI,IAAI;IAKd,IAAI,SAAS,IAAI,KAAK,CAAC,UAAU,CAAC,CAEjC;IAED,IAAI,WAAW,IAAI,KAAK,CAAC,UAAU,CAAC,CAEnC;CAEJ;AAED,yBAAiB,4BAA4B,CAAC;IAE1C,SAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,IAAI,UAAU,CAE3D;CAEJ"}
1
+ {"version":3,"file":"application-shell-mouse-tracker.d.ts","sourceRoot":"","sources":["../../../src/browser/shell/application-shell-mouse-tracker.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AACvF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAc,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAA6B,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAoB,MAAM,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE;;;;;;;GAOG;AACH,qBACa,4BAA6B,YAAW,+BAA+B;IAGhF,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAE9D,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;IAC1D,SAAS,CAAC,QAAQ,CAAC,uBAAuB,uBAA8B;IAExE,SAAS,CAAC,QAAQ,CAAC,cAAc,sBAA6B;IAC9D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,sBAA6B;IAChE,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,IAAI,CAAoC;IAC/F,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,IAAI,CAAsC;IAEnG,OAAO,IAAI,IAAI;IA0Cf,MAAM,IAAI,IAAI;IAKd,IAAI,SAAS,IAAI,KAAK,CAAC,UAAU,CAAC,CAEjC;IAED,IAAI,WAAW,IAAI,KAAK,CAAC,UAAU,CAAC,CAEnC;CAEJ;AAED,yBAAiB,4BAA4B,CAAC;IAE1C,SAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,IAAI,UAAU,CAE3D;CAEJ"}
@@ -24,6 +24,7 @@ const disposable_1 = require("../../common/disposable");
24
24
  const event_1 = require("../../common/event");
25
25
  const widgets_1 = require("@lumino/widgets");
26
26
  const widgets_2 = require("../widgets");
27
+ const native_tab_drag_service_1 = require("./native-tab-drag-service");
27
28
  /**
28
29
  * Contribution that tracks `mouseup` and `mousedown` events.
29
30
  *
@@ -64,6 +65,11 @@ let ApplicationShellMouseTracker = ApplicationShellMouseTracker_1 = class Applic
64
65
  .map(panel => (0, widgets_2.addEventListener)(panel.node, 'mousedown', this.mousedownListener, true)));
65
66
  // The `mouseup` event has to be tracked on the `document`. Lumino attaches to there.
66
67
  document.addEventListener('mouseup', this.mouseupListener, true);
68
+ // Native tab drags end without a `mouseup` event. They may also start in a secondary window, whose `mousedown` events are not tracked.
69
+ this.toDispose.pushAll([
70
+ this.nativeTabDragService.onDidStartDrag(e => this.mousedownEmitter.fire(e)),
71
+ this.nativeTabDragService.onDidEndDrag(e => this.mouseupEmitter.fire(e))
72
+ ]);
67
73
  // Make sure it is disposed in the end.
68
74
  this.toDispose.pushAll([
69
75
  this.mousedownEmitter,
@@ -87,6 +93,10 @@ tslib_1.__decorate([
87
93
  (0, inversify_1.inject)(application_shell_1.ApplicationShell),
88
94
  tslib_1.__metadata("design:type", application_shell_1.ApplicationShell)
89
95
  ], ApplicationShellMouseTracker.prototype, "applicationShell", void 0);
96
+ tslib_1.__decorate([
97
+ (0, inversify_1.inject)(native_tab_drag_service_1.NativeTabDragService),
98
+ tslib_1.__metadata("design:type", native_tab_drag_service_1.NativeTabDragService)
99
+ ], ApplicationShellMouseTracker.prototype, "nativeTabDragService", void 0);
90
100
  exports.ApplicationShellMouseTracker = ApplicationShellMouseTracker = ApplicationShellMouseTracker_1 = tslib_1.__decorate([
91
101
  (0, inversify_1.injectable)()
92
102
  ], ApplicationShellMouseTracker);