Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-08-28 23:58:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #188761

Browse Source
This commit is contained in:
meganrogge
2023-07-26 11:49:28 -07:00
parent 5b4a3822f0
commit 72b6068dfa
2 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/browser/parts/notifications/notificationsList.ts
+30 -16
View File
@@ -8,7 +8,7 @@ import { localize } from 'vs/nls';
import { isAncestor, trackFocus } from 'vs/base/browser/dom';
import { WorkbenchList } from 'vs/platform/list/browser/listService';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IListOptions } from 'vs/base/browser/ui/list/listWidget';
import { IListAccessibilityProvider, IListOptions } from 'vs/base/browser/ui/list/listWidget';
import { NOTIFICATIONS_BACKGROUND } from 'vs/workbench/common/theme';
import { INotificationViewItem } from 'vs/workbench/common/notifications';
import { NotificationsListDelegate, NotificationRenderer } from 'vs/workbench/browser/parts/notifications/notificationsViewer';
@@ -19,6 +19,8 @@ import { NotificationFocusedContext } from 'vs/workbench/common/contextkeys';
import { Disposable } from 'vs/base/common/lifecycle';
import { AriaRole } from 'vs/base/browser/ui/aria/aria';
import { NotificationActionRunner } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
export interface INotificationsListOptions extends IListOptions<INotificationViewItem> {
readonly widgetAriaLabel?: string;
@@ -93,21 +95,7 @@ export class NotificationsList extends Disposable {
overrideStyles: {
listBackground: NOTIFICATIONS_BACKGROUND
},
accessibilityProvider: {
getAriaLabel(element: INotificationViewItem): string {
if (!element.source) {
return localize('notificationAriaLabel', "{0}, notification", element.message.raw);
}
return localize('notificationWithSourceAriaLabel', "{0}, source: {1}, notification", element.message.raw, element.source);
},
getWidgetAriaLabel(): string {
return options.widgetAriaLabel ?? localize('notificationsList', "Notifications List");
},
getRole(): AriaRole {
return 'dialog'; // https://github.com/microsoft/vscode/issues/82728
}
}
accessibilityProvider: this.instantiationService.createInstance(NotificationAccessibilityProvider, options)
}
));
@@ -267,3 +255,29 @@ export class NotificationsList extends Disposable {
super.dispose();
}
}
class NotificationAccessibilityProvider implements IListAccessibilityProvider<INotificationViewItem> {
constructor(
private readonly _options: INotificationsListOptions,
@IKeybindingService private readonly _keybindingService: IKeybindingService,
@IConfigurationService private readonly _configurationService: IConfigurationService
) { }
getAriaLabel(element: INotificationViewItem): string {
let accessibleViewHint: string | undefined;
const keybinding = this._keybindingService.lookupKeybinding('editor.action.accessibleView')?.getAriaLabel();
if (this._configurationService.getValue('accessibility.verbosity.notification')) {
accessibleViewHint = keybinding ? localize('notificationAccessibleViewHint', "Inspect the response in the accessible view with {0}", keybinding) : localize('notificationAccessibleViewHintNoKb', "Inspect the response in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding");
}
if (!element.source) {
return accessibleViewHint ? localize('notificationAriaLabelHint', "{0}, notification, {1}", element.message.raw, accessibleViewHint) : localize('notificationAriaLabel', "{0}, notification", element.message.raw);
}
return accessibleViewHint ? localize('notificationWithSourceAriaLabelHint', "{0}, source: {1}, notification, {2}", element.message.raw, element.source, accessibleViewHint) : localize('notificationWithSourceAriaLabel', "{0}, source: {1}, notification", element.message.raw, element.source);
}
getWidgetAriaLabel(): string {
return this._options.widgetAriaLabel ?? localize('notificationsList', "Notifications List");
}
getRole(): AriaRole {
return 'dialog'; // https://github.com/microsoft/vscode/issues/82728
}
}
src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
+3 -20
View File
@@ -25,8 +25,6 @@ import { IHostService } from 'vs/workbench/services/host/browser/host';
import { IntervalCounter } from 'vs/base/common/async';
import { assertIsDefined } from 'vs/base/common/types';
import { NotificationsToastsVisibleContext } from 'vs/workbench/common/contextkeys';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
interface INotificationToast {
readonly item: INotificationViewItem;
@@ -85,9 +83,7 @@ export class NotificationsToasts extends Themable implements INotificationsToast
@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
@IContextKeyService private readonly contextKeyService: IContextKeyService,
@ILifecycleService private readonly lifecycleService: ILifecycleService,
@IHostService private readonly hostService: IHostService,
@IKeybindingService private readonly _keybindingService: IKeybindingService,
@IConfigurationService private readonly _configurationService: IConfigurationService
@IHostService private readonly hostService: IHostService
) {
super(themeService);
@@ -191,24 +187,11 @@ export class NotificationsToasts extends Themable implements INotificationsToast
const notificationList = this.instantiationService.createInstance(NotificationsList, notificationToast, {
verticalScrollMode: ScrollbarVisibility.Hidden,
widgetAriaLabel: (() => {
let accessibleViewHint: string | undefined;
const keybinding = this._keybindingService.lookupKeybinding('editor.action.accessibleView')?.getAriaLabel();
if (this._configurationService.getValue('accessibility.verbosity.notification')) {
accessibleViewHint = keybinding ? localize('chatAccessibleViewHint', "Inspect the response in the accessible view with {0}", keybinding) : localize('chatAccessibleViewHintNoKb', "Inspect the response in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding");
}
if (!item.source) {
if (accessibleViewHint) {
return localize('notificationAriaLabelViewHint', "{0}, notification {1}", item.message.raw, accessibleViewHint);
} else {
return localize('notificationAriaLabel', "{0}, notification", item.message.raw);
}
}
if (accessibleViewHint) {
return localize('notificationWithSourceAriaLabelViewHint', "{0}, source: {1}, notification {2}", item.message.raw, item.source, accessibleViewHint);
} else {
return localize('notificationWithSourceAriaLabel', "{0}, source: {1}, notification", item.message.raw, item.source);
return localize('notificationAriaLabel', "{0}, notification", item.message.raw);
}
return localize('notificationWithSourceAriaLabel', "{0}, source: {1}, notification", item.message.raw, item.source);
})()
});
itemDisposables.add(notificationList);