From ba15ed1517b9f170be914a2e9c7c16dc7452e976 Mon Sep 17 00:00:00 2001 From: t-amqi Date: Thu, 10 Aug 2017 18:41:36 -0700 Subject: [PATCH] Address comments --- src/vs/base/parts/quickopen/browser/quickOpenWidget.ts | 3 ++- src/vs/base/parts/tree/browser/tree.ts | 1 + src/vs/base/parts/tree/browser/treeView.ts | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts b/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts index 540ee7ddccb..f4a91d4cc90 100644 --- a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts +++ b/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts @@ -244,7 +244,8 @@ export class QuickOpenWidget implements IModelProvider { alwaysFocused: true, verticalScrollMode: ScrollbarVisibility.Visible, ariaLabel: nls.localize('treeAriaLabel', "Quick Picker"), - keyboardSupport: this.options.keyboardSupport + keyboardSupport: this.options.keyboardSupport, + preventRootFocus: true }); this.treeElement = this.tree.getHTMLElement(); diff --git a/src/vs/base/parts/tree/browser/tree.ts b/src/vs/base/parts/tree/browser/tree.ts index ab01546278c..090c09e3d60 100644 --- a/src/vs/base/parts/tree/browser/tree.ts +++ b/src/vs/base/parts/tree/browser/tree.ts @@ -670,6 +670,7 @@ export interface ITreeOptions extends ITreeStyles { paddingOnRow?: boolean; ariaLabel?: string; keyboardSupport?: boolean; + preventRootFocus?: boolean; } export interface ITreeStyles { diff --git a/src/vs/base/parts/tree/browser/treeView.ts b/src/vs/base/parts/tree/browser/treeView.ts index afa1d0bbb39..f28d93108af 100644 --- a/src/vs/base/parts/tree/browser/treeView.ts +++ b/src/vs/base/parts/tree/browser/treeView.ts @@ -444,7 +444,9 @@ export class TreeView extends HeightMap { this.domNode = document.createElement('div'); this.domNode.className = `monaco-tree no-focused-item monaco-tree-instance-${this.instance}`; - this.domNode.tabIndex = container.className === 'quick-open-tree' ? -1 : 0; + if (!context.options.preventRootFocus) { + this.domNode.tabIndex = 0; + } this.styleElement = DOM.createStyleSheet(this.domNode); -- GitLab