Add classlist check (microsoft#153346)

rzhao271 · web-flow · commit 8721752a3c4e · 2022-06-27T11:55:48.000-07:00
Fixes microsoft#148427
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
@@ -907,7 +907,8 @@ export class SettingsEditor2 extends EditorPane {
 		}));
 
 		this._register(this.settingsTree.onDidFocus(() => {
-			if (document.activeElement?.classList.contains('monaco-list')) {
+			const classList = document.activeElement?.classList;
+			if (classList && classList.contains('monaco-list') && classList.contains('settings-editor-tree')) {
 				this._currentFocusContext = SettingsFocusContext.SettingTree;
 				this.settingRowFocused.set(true);
 			}

Original file line number	Diff line number	Diff line change
`@@ -907,7 +907,8 @@ export class SettingsEditor2 extends EditorPane {`
`907`	`907`	`}));`
`908`	`908`
`909`	`909`	`this._register(this.settingsTree.onDidFocus(() => {`
`910`		`- if (document.activeElement?.classList.contains('monaco-list')) {`
	`910`	`+ const classList = document.activeElement?.classList;`
	`911`	`+ if (classList && classList.contains('monaco-list') && classList.contains('settings-editor-tree')) {`
`911`	`912`	`this._currentFocusContext = SettingsFocusContext.SettingTree;`
`912`	`913`	`this.settingRowFocused.set(true);`
`913`	`914`	`}`