Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

allow turning on accessibility help from within the help menu #186647

Merged
merged 2 commits into from
Jun 29, 2023
Merged

allow turning on accessibility help from within the help menu #186647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66375a6
fix #186434
meganrogge Jun 29, 2023
e6ed074
Update src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
meganrogge Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { AccessibilityHelpNLS } from 'vs/editor/common/standaloneStrings';
import { LinkDetector } from 'vs/editor/contrib/links/browser/links';
import { localize } from 'vs/nls';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
import { IContextViewDelegate, IContextViewService } from 'vs/platform/contextview/browser/contextView';
import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { IOpenerService } from 'vs/platform/opener/common/opener';
Expand Down Expand Up @@ -56,20 +57,23 @@ export interface IAccessibleViewOptions {
type: AccessibleViewType;
}

export const accessibilityHelpIsShown = new RawContextKey<boolean>('accessibilityHelpIsShown', false, true);
class AccessibleView extends Disposable {
private _editorWidget: CodeEditorWidget;
private _accessiblityHelpIsShown: IContextKey<boolean>;
get editorWidget() { return this._editorWidget; }
private _editorContainer: HTMLElement;
private _keyListener: IDisposable | undefined;

constructor(
@IOpenerService private readonly _openerService: IOpenerService,
@IInstantiationService private readonly _instantiationService: IInstantiationService,
@IConfigurationService private readonly _configurationService: IConfigurationService,
@IModelService private readonly _modelService: IModelService,
@IContextViewService private readonly _contextViewService: IContextViewService
@IContextViewService private readonly _contextViewService: IContextViewService,
@IContextKeyService private readonly _contextKeyService: IContextKeyService
) {
super();
this._accessiblityHelpIsShown = accessibilityHelpIsShown.bindTo(this._contextKeyService);
this._editorContainer = document.createElement('div');
this._editorContainer.classList.add('accessible-view');
const codeEditorWidgetOptions: ICodeEditorWidgetOptions = {
Expand All @@ -96,9 +100,17 @@ class AccessibleView extends Disposable {
getAnchor: () => this._editorContainer,
render: (container) => {
return this._render(provider, container);
},
onHide: () => {
if (provider.options.type === AccessibleViewType.HelpMenu) {
this._accessiblityHelpIsShown.reset();
}
}
};
this._contextViewService.showContextView(delegate);
if (provider.options.type === AccessibleViewType.HelpMenu) {
this._accessiblityHelpIsShown.set(true);
}
}

private _render(provider: IAccessibleContentProvider, container: HTMLElement): IDisposable {
Expand Down
7 changes: 7 additions & 0 deletions src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
import { AccessibilitySupport, IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
import { TabFocus, TabFocusContext } from 'vs/editor/browser/config/tabFocus';
import { accessibilityHelpIsShown } from 'vs/workbench/contrib/accessibility/browser/accessibleView';
import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';

const CONTEXT_ACCESSIBILITY_WIDGET_VISIBLE = new RawContextKey<boolean>('accessibilityHelpWidgetVisible', false);

Expand Down Expand Up @@ -279,6 +281,11 @@ class ToggleScreenReaderMode extends Action2 {
id: 'editor.action.toggleScreenReaderAccessibilityMode',
title: { value: nls.localize('toggleScreenReaderMode', "Toggle Screen Reader Accessibility Mode"), original: 'Toggle Screen Reader Accessibility Mode' },
f1: true,
keybinding: {
primary: KeyMod.CtrlCmd | KeyCode.KeyE,
weight: KeybindingWeight.WorkbenchContrib + 10,
when: accessibilityHelpIsShown
}
});
}

Expand Down