Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-02 14:31:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

first cut commands for up/down/left/right (for #11517)

Browse Source
This commit is contained in:
Benjamin Pasero
2017-02-08 18:32:19 +01:00
parent e56ea2f412
commit 7a5b24d333
16 changed files with 394 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/vs/base/browser/ui/list/listWidget.ts
View File

@@ -122,8 +122,7 @@ class FocusTrait<T> extends Trait<T> {
}
}
class Controller<T> implements IDisposable {
class KeyboardController<T> implements IDisposable {
private disposables: IDisposable[];
constructor(
@@ -131,9 +130,6 @@ class Controller<T> implements IDisposable {
private view: ListView<T>
) {
this.disposables = [];
this.disposables.push(view.addListener('mousedown', e => this.onMouseDown(e)));
this.disposables.push(view.addListener('click', e => this.onPointer(e)));
this.disposables.push(view.addListener(TouchEventType.Tap, e => this.onPointer(e)));
const onKeyDown = chain(domEvent(view.domNode, 'keydown'))
.map(e => new StandardKeyboardEvent(e));
@@ -145,19 +141,6 @@ class Controller<T> implements IDisposable {
onKeyDown.filter(e => e.keyCode === KeyCode.PageDown).on(this.onPageDownArrow, this, this.disposables);
}
private onMouseDown(e: IListMouseEvent<T>) {
e.preventDefault();
e.stopPropagation();
}
private onPointer(e: IListMouseEvent<T>) {
e.preventDefault();
e.stopPropagation();
this.view.domNode.focus();
this.list.setFocus([e.index]);
this.list.setSelection([e.index]);
}
private onEnter(e: StandardKeyboardEvent): void {
e.preventDefault();
e.stopPropagation();
@@ -201,11 +184,47 @@ class Controller<T> implements IDisposable {
}
}
export interface IListOptions extends IListViewOptions {
ariaLabel?: string;
class MouseController<T> implements IDisposable {
private disposables: IDisposable[];
constructor(
private list: List<T>,
private view: ListView<T>
) {
this.disposables = [];
this.disposables.push(view.addListener('mousedown', e => this.onMouseDown(e)));
this.disposables.push(view.addListener('click', e => this.onPointer(e)));
this.disposables.push(view.addListener(TouchEventType.Tap, e => this.onPointer(e)));
}
private onMouseDown(e: IListMouseEvent<T>) {
e.preventDefault();
e.stopPropagation();
}
private onPointer(e: IListMouseEvent<T>) {
e.preventDefault();
e.stopPropagation();
this.view.domNode.focus();
this.list.setFocus([e.index]);
this.list.setSelection([e.index]);
}
dispose() {
this.disposables = dispose(this.disposables);
}
}
const DefaultOptions: IListOptions = {};
export interface IListOptions extends IListViewOptions {
ariaLabel?: string;
mouseSupport?: boolean;
keyboardSupport?: boolean;
}
const DefaultOptions: IListOptions = {
keyboardSupport: true,
mouseSupport: true
};
export class List<T> implements IDisposable {
@@ -216,7 +235,8 @@ export class List<T> implements IDisposable {
private selection: Trait<T>;
private eventBufferer: EventBufferer;
private view: ListView<T>;
private controller: Controller<T>;
private mouseController: MouseController<T>;
private keyboardController: KeyboardController<T>;
private disposables: IDisposable[];
@memoize
@@ -262,13 +282,22 @@ export class List<T> implements IDisposable {
this.view = new ListView(container, delegate, renderers, options);
this.view.domNode.setAttribute('role', 'tree');
this.view.domNode.tabIndex = 0;
this.controller = new Controller(this, this.view);
this._onDOMFocus = domEvent(this.view.domNode, 'focus');
this._onDOMBlur = domEvent(this.view.domNode, 'blur');
this._onDispose = new Emitter<void>();
this.disposables = [this.focus, this.selection, this.view, this.controller, this._onDispose];
this.disposables = [this.focus, this.selection, this.view, this._onDispose];
if (typeof options.keyboardSupport !== 'boolean' || options.keyboardSupport) {
this.keyboardController = new KeyboardController(this, this.view);
this.disposables.push(this.keyboardController);
}
if (typeof options.mouseSupport !== 'boolean' || options.mouseSupport) {
this.mouseController = new MouseController(this, this.view);
this.disposables.push(this.mouseController);
}
this.onFocusChange(this._onFocusChange, this, this.disposables);