pull AccessibleBuffer out of AccessibilityManager (#4400)

This commit is contained in:
Megan Rogge
2023-02-03 18:59:30 +00:00
committed by GitHub
parent c05d0f650c
commit 6daadc4c55
3 changed files with 88 additions and 73 deletions
+5 -1
View File
@@ -33,6 +33,7 @@ import * as Browser from 'common/Platform';
import { addDisposableDomListener } from 'browser/Lifecycle';
import * as Strings from 'browser/LocalizableStrings';
import { AccessibilityManager } from './AccessibilityManager';
import { AccessibleBuffer } from './AccessibleBuffer';
import { ITheme, IMarker, IDisposable, ILinkProvider, IDecorationOptions, IDecoration } from 'xterm';
import { DomRenderer } from 'browser/renderer/dom/DomRenderer';
import { KeyboardResultType, CoreMouseEventType, CoreMouseButton, CoreMouseAction, ITerminalOptions, ScrollSource, IColorEvent, ColorIndex, ColorRequestType } from 'common/Types';
@@ -71,6 +72,7 @@ export class Terminal extends CoreTerminal implements ITerminal {
private _viewportElement: HTMLElement | undefined;
private _helperContainer: HTMLElement | undefined;
private _compositionView: HTMLElement | undefined;
private _accessibleBuffer: AccessibleBuffer | undefined;
private _overviewRulerRenderer: OverviewRulerRenderer | undefined;
@@ -576,6 +578,8 @@ export class Terminal extends CoreTerminal implements ITerminal {
// Listen for mouse events and translate
// them into terminal mouse protocols.
this.bindMouse();
this._accessibleBuffer = this._instantiationService.createInstance(AccessibleBuffer, this);
}
private _createRenderer(): IRenderer {
@@ -767,7 +771,7 @@ export class Terminal extends CoreTerminal implements ITerminal {
*/
this.register(addDisposableDomListener(el, 'mousedown', (ev: MouseEvent) => {
ev.preventDefault();
if (this._accessibilityManager?.isAccessibilityBufferActive) {
if (this._accessibleBuffer?.isAccessibilityBufferActive) {
return;
}
this.focus();