Treeview reveal 'select/focus' option problem when trying to keep foc…

…us in original panel. (microsoft#178044) Fixes microsoft#174811
mwerschy · Mar 22, 2023 · ae32037 · ae32037
1 parent 37dcb72
commit ae32037
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/vs/workbench/api/browser/mainThreadTreeViews.ts b/src/vs/workbench/api/browser/mainThreadTreeViews.ts
@@ -154,7 +154,9 @@ export class MainThreadTreeViews extends Disposable implements MainThreadTreeVie
 			if (select) {
 				treeView.setSelection([item]);
 			}
-			if (focus) {
+			if (focus === false) {
+				treeView.setFocus();
+			} else if (focus) {
 				treeView.setFocus(item);
 			}
 			let itemsToExpand = [item];

diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts
@@ -917,10 +917,14 @@ abstract class AbstractTreeView extends Disposable implements ITreeView {
 		return this.tree?.getSelection() ?? [];
 	}
 
-	setFocus(item: ITreeItem): void {
+	setFocus(item?: ITreeItem): void {
 		if (this.tree) {
-			this.focus(true, item);
-			this.tree.setFocus([item]);
+			if (item) {
+				this.focus(true, item);
+				this.tree.setFocus([item]);
+			} else {
+				this.tree.setFocus([]);
+			}
 		}
 	}
 

diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts
@@ -703,7 +703,7 @@ export interface ITreeView extends IDisposable {
 
 	getSelection(): ITreeItem[];
 
-	setFocus(item: ITreeItem): void;
+	setFocus(item?: ITreeItem): void;
 
 	show(container: any): void;
 }