@codingame/monaco-vscode-notifications-service-override 1.83.16 → 1.85.0-next.0

package/notifications.js

@@ -13,7 +13,7 @@ import getServiceOverride$1 from '@codingame/monaco-vscode-layout-service-overri
 import { onRenderWorkbench } from 'vscode/lifecycle';
 
 onRenderWorkbench(async (accessor) => {
-    const container = accessor.get(ILayoutService).container;
+    const container = accessor.get(ILayoutService).mainContainer;
     const model = accessor.get(INotificationService).model;
     const instantiationService = accessor.get(IInstantiationService);
     setTimeout(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-notifications-service-override",
-  "version": "1.83.16",
+  "version": "1.85.0-next.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,8 +18,8 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.16",
-    "monaco-editor": "0.44.0",
-    "@codingame/monaco-vscode-layout-service-override": "1.83.16"
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0-next.0",
+    "monaco-editor": "0.45.0",
+    "@codingame/monaco-vscode-layout-service-override": "1.85.0-next.0"
   }
 }

package/vscode/src/vs/workbench/browser/parts/notifications/media/notificationsList.css.js

@@ -1,6 +1,6 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
 
-var css = ".monaco-workbench .notifications-list-container{background:var(--vscode-notifications-background);border-radius:inherit;color:var(--vscode-notifications-foreground);outline-color:var(--vscode-contrastBorder)}.monaco-workbench .notifications-list-container .notification-list-item{border-radius:4px;box-sizing:border-box;display:flex;flex-direction:column;flex-direction:column-reverse;height:100%;padding:10px 5px}.monaco-workbench .notifications-list-container .notification-offset-helper{word-wrap:break-word;line-height:22px;opacity:0;position:absolute}.monaco-workbench .notifications-list-container .monaco-scrollable-element{border-radius:4px}.monaco-workbench .notifications-list-container .notification-list-item>.notification-list-item-main-row{display:flex;flex-grow:1}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon{align-items:center;background-position:50%;background-repeat:no-repeat;display:flex;flex:0 0 16px;font-size:18px;height:22px;margin-left:4px;margin-right:4px}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-message{flex:1;line-height:22px;overflow:hidden;text-overflow:ellipsis;user-select:text;-webkit-user-select:text}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-message a{color:var(--vscode-notificationLink-foreground)}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-message a:focus{outline-color:var(--vscode-focusBorder);outline-style:solid;outline-width:1px}.monaco-workbench .notifications-list-container .notification-list-item.expanded .notification-list-item-message{word-wrap:break-word;white-space:normal}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container{display:none;height:22px}.monaco-workbench .notifications-list-container .monaco-list-row.focused .notification-list-item .notification-list-item-toolbar-container,.monaco-workbench .notifications-list-container .monaco-list:focus-within .notification-list-item .notification-list-item-toolbar-container,.monaco-workbench .notifications-list-container .notification-list-item.expanded .notification-list-item-toolbar-container,.monaco-workbench .notifications-list-container .notification-list-item:hover .notification-list-item-toolbar-container{display:block}.monaco-workbench .notifications-list-container .notification-list-item>.notification-list-item-details-row{align-items:center;display:none;overflow:hidden;padding-left:5px}.monaco-workbench .notifications-list-container .notification-list-item.expanded>.notification-list-item-details-row{display:flex}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-source{flex:1;font-size:12px;overflow:hidden;text-overflow:ellipsis}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container{display:flex;overflow:hidden}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container>.monaco-button,.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container>.monaco-button-dropdown{margin:4px 5px}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container .monaco-button{outline-offset:2px!important}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container .monaco-text-button{display:inline-block;font-size:12px;overflow:hidden;padding:4px 10px;text-overflow:ellipsis;width:fit-content}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container .monaco-dropdown-button{padding:5px}.monaco-workbench .notifications-list-container .progress-bit{bottom:0;height:2px}";
+var css = ".monaco-workbench .notifications-list-container{background:var(--vscode-notifications-background);border-radius:inherit;color:var(--vscode-notifications-foreground);outline-color:var(--vscode-contrastBorder)}.monaco-workbench .notifications-list-container .notification-list-item{border-radius:4px;box-sizing:border-box;display:flex;flex-direction:column;flex-direction:column-reverse;height:100%;padding:10px 5px}.monaco-workbench .notifications-list-container .notification-offset-helper{word-wrap:break-word;line-height:22px;opacity:0;position:absolute}.monaco-workbench .notifications-list-container .monaco-scrollable-element{border-radius:4px}.monaco-workbench .notifications-list-container .notification-list-item>.notification-list-item-main-row{display:flex;flex-grow:1}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon{align-items:center;background-position:50%;background-repeat:no-repeat;display:flex;flex:0 0 16px;font-size:18px;height:22px;margin-left:4px;margin-right:4px}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-message{flex:1;line-height:22px;overflow:hidden;text-overflow:ellipsis;user-select:text;-webkit-user-select:text}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-message a{color:var(--vscode-notificationLink-foreground)}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-message a:focus{outline-color:var(--vscode-focusBorder);outline-style:solid;outline-width:1px}.monaco-workbench .notifications-list-container .notification-list-item.expanded .notification-list-item-message{word-wrap:break-word;white-space:normal}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container{display:none;height:22px}.monaco-workbench .notifications-list-container .monaco-list-row.focused .notification-list-item .notification-list-item-toolbar-container,.monaco-workbench .notifications-list-container .monaco-list:focus-within .notification-list-item .notification-list-item-toolbar-container,.monaco-workbench .notifications-list-container .notification-list-item.expanded .notification-list-item-toolbar-container,.monaco-workbench .notifications-list-container .notification-list-item:hover .notification-list-item-toolbar-container{display:block}.monaco-workbench .notifications-list-container .notification-list-item>.notification-list-item-details-row{align-items:center;display:none;overflow:hidden;padding-left:5px}.monaco-workbench .notifications-list-container .notification-list-item.expanded>.notification-list-item-details-row{display:flex}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-source{flex:1;font-size:12px;overflow:hidden;text-overflow:ellipsis}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container{display:flex;overflow:hidden}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container>.monaco-button,.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container>.monaco-button-dropdown{margin:4px 5px}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container .monaco-button{outline-offset:2px!important}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container .monaco-text-button{display:inline-block;font-size:12px;overflow:hidden;padding:4px 10px;text-overflow:ellipsis;width:fit-content}.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container .monaco-dropdown-button{padding:5px}.monaco-workbench .notifications-list-container .progress-bit{bottom:0}";
 n(css,{});
 
 export { css, css as default };

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCenter.js

@@ -9,7 +9,7 @@ import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/com
 import { NotificationActionRunner } from 'vscode/vscode/vs/workbench/browser/parts/notifications/notificationsCommands';
 import { NotificationsList } from './notificationsList.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { Dimension, isAncestor } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { Dimension, isAncestorOfActiveElement } from 'monaco-editor/esm/vs/base/browser/dom.js';
 import { widgetShadow } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
@@ -19,12 +19,14 @@ import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/com
 import { assertIsDefined, assertAllDefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { NotificationsCenterVisibleContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
+import { IAccessibleNotificationService } from 'monaco-editor/esm/vs/platform/accessibility/common/accessibility.js';
+import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
 
 var NotificationsCenter_1;
 let NotificationsCenter = class NotificationsCenter extends Themable {
     static { NotificationsCenter_1 = this; }
     static { this.MAX_DIMENSIONS = ( new Dimension(450, 400)); }
-    constructor(container, model, themeService, instantiationService, layoutService, contextKeyService, editorGroupService, keybindingService, notificationService) {
+    constructor(container, model, themeService, instantiationService, layoutService, contextKeyService, editorGroupService, keybindingService, notificationService, accessibleNotificationService) {
         super(themeService);
         this.container = container;
         this.model = model;
@@ -34,6 +36,7 @@ let NotificationsCenter = class NotificationsCenter extends Themable {
         this.editorGroupService = editorGroupService;
         this.keybindingService = keybindingService;
         this.notificationService = notificationService;
+        this.accessibleNotificationService = accessibleNotificationService;
         this._onDidChangeVisibility = this._register(( new Emitter()));
         this.onDidChangeVisibility = this._onDidChangeVisibility.event;
         this.notificationsCenterVisibleContextKey = NotificationsCenterVisibleContext.bindTo(this.contextKeyService);
@@ -42,7 +45,7 @@ let NotificationsCenter = class NotificationsCenter extends Themable {
     }
     registerListeners() {
         this._register(this.model.onDidChangeNotification(e => this.onDidChangeNotification(e)));
-        this._register(this.layoutService.onDidLayout(dimension => this.layout(Dimension.lift(dimension))));
+        this._register(this.layoutService.onDidLayoutMainContainer(dimension => this.layout(Dimension.lift(dimension))));
         this._register(this.notificationService.onDidChangeDoNotDisturbMode(() => this.onDidChangeDoNotDisturbMode()));
     }
     onDidChangeDoNotDisturbMode() {
@@ -160,7 +163,7 @@ let NotificationsCenter = class NotificationsCenter extends Themable {
                 notificationsList.updateNotificationsList(e.index, 1, [e.item]);
                 break;
             case 3 :
-                focusEditor = isAncestor(document.activeElement, notificationsCenterContainer);
+                focusEditor = isAncestorOfActiveElement(notificationsCenterContainer);
                 notificationsList.updateNotificationsList(e.index, 1);
                 e.item.updateVisibility(false);
                 break;
@@ -177,7 +180,7 @@ let NotificationsCenter = class NotificationsCenter extends Themable {
         if (!this._isVisible || !this.notificationsCenterContainer || !this.notificationsList) {
             return;
         }
-        const focusEditor = isAncestor(document.activeElement, this.notificationsCenterContainer);
+        const focusEditor = isAncestorOfActiveElement(this.notificationsCenterContainer);
         this._isVisible = false;
         this.notificationsCenterContainer.classList.remove('visible');
         this.notificationsList.hide();
@@ -211,10 +214,10 @@ let NotificationsCenter = class NotificationsCenter extends Themable {
                 availableWidth = this.workbenchDimensions.width;
                 availableWidth -= (2 * 8);
                 availableHeight = this.workbenchDimensions.height - 35 ;
-                if (this.layoutService.isVisible("workbench.parts.statusbar" )) {
+                if (this.layoutService.isVisible("workbench.parts.statusbar" , mainWindow)) {
                     availableHeight -= 22;
                 }
-                if (this.layoutService.isVisible("workbench.parts.titlebar" )) {
+                if (this.layoutService.isVisible("workbench.parts.titlebar" , mainWindow)) {
                     availableHeight -= 22;
                 }
                 availableHeight -= (2 * 12);
@@ -229,6 +232,7 @@ let NotificationsCenter = class NotificationsCenter extends Themable {
             if (!notification.hasProgress) {
                 notification.close();
             }
+            this.accessibleNotificationService.notify("clear" );
         }
     }
 };
@@ -239,7 +243,8 @@ NotificationsCenter = NotificationsCenter_1 = ( __decorate([
     ( __param(5, IContextKeyService)),
     ( __param(6, IEditorGroupsService)),
     ( __param(7, IKeybindingService)),
-    ( __param(8, INotificationService))
+    ( __param(8, INotificationService)),
+    ( __param(9, IAccessibleNotificationService))
 ], NotificationsCenter));
 
 export { NotificationsCenter };

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsList.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/notificationsList.css.js';
 import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { trackFocus, isAncestor } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { trackFocus, getWindow, isAncestorOfActiveElement } from 'monaco-editor/esm/vs/base/browser/dom.js';
 import { WorkbenchList } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { NOTIFICATIONS_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
@@ -64,7 +64,7 @@ let NotificationsList = class NotificationsList extends Disposable {
         this._register((list.onMouseDblClick(event => event.element.toggle())));
         const listFocusTracker = this._register(trackFocus(list.getHTMLElement()));
         this._register(listFocusTracker.onDidBlur(() => {
-            if (document.hasFocus()) {
+            if (getWindow(this.listContainer).document.hasFocus()) {
                 list.setFocus([]);
             }
         }));
@@ -78,7 +78,7 @@ let NotificationsList = class NotificationsList extends Disposable {
     }
     updateNotificationsList(start, deleteCount, items = []) {
         const [list, listContainer] = assertAllDefined(this.list, this.listContainer);
-        const listHasDOMFocus = isAncestor(document.activeElement, listContainer);
+        const listHasDOMFocus = isAncestorOfActiveElement(listContainer);
         const focusedIndex = list.getFocus()[0];
         const focusedItem = this.viewModel[focusedIndex];
         let focusRelativeTop = null;
@@ -139,7 +139,7 @@ let NotificationsList = class NotificationsList extends Disposable {
         if (!this.listContainer) {
             return false;
         }
-        return isAncestor(document.activeElement, this.listContainer);
+        return isAncestorOfActiveElement(this.listContainer);
     }
     layout(width, maxHeight) {
         if (this.listContainer && this.list) {

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsToasts.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import './media/notificationsToasts.css.js';
 import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { DisposableStore, toDisposable, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Dimension, scheduleAtNextAnimationFrame, addDisposableListener, EventType, isAncestor } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { Dimension, scheduleAtNextAnimationFrame, getWindow, addDisposableListener, EventType, isAncestorOfActiveElement } from 'monaco-editor/esm/vs/base/browser/dom.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { NotificationsList } from './notificationsList.js';
 import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
@@ -18,6 +18,7 @@ import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/h
 import { IntervalCounter } from 'monaco-editor/esm/vs/base/common/async.js';
 import { assertIsDefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { NotificationsToastsVisibleContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
+import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
 
 var NotificationsToasts_1;
 var ToastVisibility;
@@ -60,7 +61,7 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
         this.registerListeners();
     }
     registerListeners() {
-        this._register(this.layoutService.onDidLayout(dimension => this.layout(Dimension.lift(dimension))));
+        this._register(this.layoutService.onDidLayoutMainContainer(dimension => this.layout(Dimension.lift(dimension))));
         this.lifecycleService.when(3 ).then(() => {
             this.model.notifications.forEach(notification => this.addToast(notification));
             this._register(this.model.onDidChangeNotification(e => this.onDidChangeNotification(e)));
@@ -91,7 +92,7 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
         }
         const itemDisposables = ( new DisposableStore());
         this.mapNotificationToDisposable.set(item, itemDisposables);
-        itemDisposables.add(scheduleAtNextAnimationFrame(() => this.doAddToast(item, itemDisposables)));
+        itemDisposables.add(scheduleAtNextAnimationFrame(getWindow(this.container), () => this.doAddToast(item, itemDisposables)));
     }
     doAddToast(item, itemDisposables) {
         let notificationsToastsContainer = this.notificationsToastsContainer;
@@ -210,7 +211,7 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
         let focusEditor = false;
         const notificationToast = this.mapNotificationToToast.get(item);
         if (notificationToast) {
-            const toastHasDOMFocus = isAncestor(document.activeElement, notificationToast.container);
+            const toastHasDOMFocus = isAncestorOfActiveElement(notificationToast.container);
             if (toastHasDOMFocus) {
                 focusEditor = !(this.focusNext() || this.focusPrevious());
             }
@@ -246,7 +247,7 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
         }
     }
     hide() {
-        const focusEditor = this.notificationsToastsContainer ? isAncestor(document.activeElement, this.notificationsToastsContainer) : false;
+        const focusEditor = this.notificationsToastsContainer ? isAncestorOfActiveElement(this.notificationsToastsContainer) : false;
         this.removeToasts();
         if (focusEditor) {
             this.editorGroupService.activeGroup.focus();
@@ -361,10 +362,10 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
             availableWidth = this.workbenchDimensions.width;
             availableWidth -= (2 * 8);
             availableHeight = this.workbenchDimensions.height;
-            if (this.layoutService.isVisible("workbench.parts.statusbar" )) {
+            if (this.layoutService.isVisible("workbench.parts.statusbar" , mainWindow)) {
                 availableHeight -= 22;
             }
-            if (this.layoutService.isVisible("workbench.parts.titlebar" )) {
+            if (this.layoutService.isVisible("workbench.parts.titlebar" , mainWindow)) {
                 availableHeight -= 22;
             }
             availableHeight -= (2 * 12);