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 for terminal arrow navigation when in accessibility mode #152255

Merged
merged 3 commits into from
Jun 17, 2022
Merged

allow for terminal arrow navigation when in accessibility mode #152255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18bb7de
fix #149882
meganrogge Jun 15, 2022
d10fb9d
Revert "fix #149882"
meganrogge Jun 16, 2022
64be2ad
when navigation mode is entered, allow up and down navigation
meganrogge Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions src/vs/workbench/contrib/terminal/browser/terminalActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,14 +733,22 @@ export function registerTerminalActions() {
title: { value: localize('workbench.action.terminal.navigationModeFocusPrevious', "Focus Previous Line (Navigation Mode)"), original: 'Focus Previous Line (Navigation Mode)' },
f1: true,
category,
keybinding: {
keybinding: [{
primary: KeyCode.UpArrow,
when: ContextKeyExpr.or(
ContextKeyExpr.and(TerminalContextKeys.a11yTreeFocus, CONTEXT_ACCESSIBILITY_MODE_ENABLED, TerminalContextKeys.navigationModeActive),
ContextKeyExpr.and(TerminalContextKeys.focus, CONTEXT_ACCESSIBILITY_MODE_ENABLED, TerminalContextKeys.navigationModeActive),
),
weight: KeybindingWeight.WorkbenchContrib
},
{
primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
when: ContextKeyExpr.or(
ContextKeyExpr.and(TerminalContextKeys.a11yTreeFocus, CONTEXT_ACCESSIBILITY_MODE_ENABLED),
ContextKeyExpr.and(TerminalContextKeys.focus, CONTEXT_ACCESSIBILITY_MODE_ENABLED)
),
weight: KeybindingWeight.WorkbenchContrib
},
}],
precondition: TerminalContextKeys.processSupported
});
}
Expand All @@ -755,14 +763,22 @@ export function registerTerminalActions() {
title: { value: localize('workbench.action.terminal.navigationModeFocusNext', "Focus Next Line (Navigation Mode)"), original: 'Focus Next Line (Navigation Mode)' },
f1: true,
category,
keybinding: {
keybinding: [{
primary: KeyCode.DownArrow,
when: ContextKeyExpr.or(
ContextKeyExpr.and(TerminalContextKeys.a11yTreeFocus, CONTEXT_ACCESSIBILITY_MODE_ENABLED, TerminalContextKeys.navigationModeActive),
ContextKeyExpr.and(TerminalContextKeys.focus, CONTEXT_ACCESSIBILITY_MODE_ENABLED, TerminalContextKeys.navigationModeActive),
),
weight: KeybindingWeight.WorkbenchContrib
},
{
primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
when: ContextKeyExpr.or(
ContextKeyExpr.and(TerminalContextKeys.a11yTreeFocus, CONTEXT_ACCESSIBILITY_MODE_ENABLED),
ContextKeyExpr.and(TerminalContextKeys.focus, CONTEXT_ACCESSIBILITY_MODE_ENABLED)
),
weight: KeybindingWeight.WorkbenchContrib
},
}],
precondition: TerminalContextKeys.processSupported
});
}
Expand Down
4 changes: 3 additions & 1 deletion src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
private _horizontalScrollbar: DomScrollableElement | undefined;
private _terminalHasTextContextKey: IContextKey<boolean>;
private _terminalA11yTreeFocusContextKey: IContextKey<boolean>;
private _navigationModeActiveContextKey: IContextKey<boolean>;
private _cols: number = 0;
private _rows: number = 0;
private _fixedCols: number | undefined;
Expand Down Expand Up @@ -407,6 +408,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {

this._terminalHasTextContextKey = TerminalContextKeys.textSelected.bindTo(this._contextKeyService);
this._terminalA11yTreeFocusContextKey = TerminalContextKeys.a11yTreeFocus.bindTo(this._contextKeyService);
this._navigationModeActiveContextKey = TerminalContextKeys.navigationModeActive.bindTo(this._contextKeyService);
this._terminalAltBufferActiveContextKey = TerminalContextKeys.altBufferActive.bindTo(this._contextKeyService);

this._logService.trace(`terminalInstance#ctor (instanceId: ${this.instanceId})`, this._shellLaunchConfig);
Expand Down Expand Up @@ -1818,7 +1820,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
updateAccessibilitySupport(): void {
const isEnabled = this._accessibilityService.isScreenReaderOptimized();
if (isEnabled) {
this._navigationModeAddon = new NavigationModeAddon(this._terminalA11yTreeFocusContextKey);
this._navigationModeAddon = new NavigationModeAddon(this._terminalA11yTreeFocusContextKey, this._navigationModeActiveContextKey);
this.xterm!.raw.loadAddon(this._navigationModeAddon);
} else {
this._navigationModeAddon?.dispose();
Expand Down
8 changes: 5 additions & 3 deletions src/vs/workbench/contrib/terminal/browser/xterm/navigationModeAddon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ export class NavigationModeAddon implements INavigationMode, ITerminalAddon {
private _terminal: Terminal | undefined;

constructor(
private _navigationModeContextKey: IContextKey<boolean>
private _navigationModeContextKey: IContextKey<boolean>,
private _navigationModeActiveContextKey: IContextKey<boolean>
) { }

activate(terminal: Terminal): void {
Expand All @@ -27,13 +28,14 @@ export class NavigationModeAddon implements INavigationMode, ITerminalAddon {
}
this._terminal.scrollToBottom();
this._terminal.focus();
this._navigationModeActiveContextKey.set(false);
}

focusPreviousLine(): void {
if (!this._terminal || !this._terminal.element) {
return;
}

this._navigationModeActiveContextKey.set(true);
// Focus previous row if a row is already focused
if (document.activeElement && document.activeElement.parentElement && document.activeElement.parentElement.classList.contains('xterm-accessibility-tree')) {
const element = <HTMLElement | null>document.activeElement.previousElementSibling;
Expand Down Expand Up @@ -76,7 +78,7 @@ export class NavigationModeAddon implements INavigationMode, ITerminalAddon {
if (!this._terminal || !this._terminal.element) {
return;
}

this._navigationModeActiveContextKey.set(true);
// Focus previous row if a row is already focused
if (document.activeElement && document.activeElement.parentElement && document.activeElement.parentElement.classList.contains('xterm-accessibility-tree')) {
const element = <HTMLElement | null>document.activeElement.nextElementSibling;
Expand Down
6 changes: 6 additions & 0 deletions src/vs/workbench/contrib/terminal/common/terminalContextKey.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export const enum TerminalContextKeyStrings {
TabsMouse = 'terminalTabsMouse',
AltBufferActive = 'terminalAltBufferActive',
A11yTreeFocus = 'terminalA11yTreeFocus',
NavigationModeActive = 'terminalNavigationModeActive',
ViewShowing = 'terminalViewShowing',
TextSelected = 'terminalTextSelected',
FindVisible = 'terminalFindVisible',
Expand Down Expand Up @@ -84,6 +85,11 @@ export namespace TerminalContextKeys {
/** Whether the user is navigating a terminal's the accessibility tree. */
export const a11yTreeFocus = new RawContextKey<boolean>(TerminalContextKeyStrings.A11yTreeFocus, false, true);

/**
* Whether the user is currently in navigation mode
*/
export const navigationModeActive = new RawContextKey<boolean>(TerminalContextKeyStrings.NavigationModeActive, false, true);

/** Whether text is selected in the active terminal. */
export const textSelected = new RawContextKey<boolean>(TerminalContextKeyStrings.TextSelected, false, localize('terminalTextSelectedContextKey', "Whether text is selected in the active terminal."));

Expand Down