Merge branch 'master' into akerr/expand-collapse/dev

BrightspaceUI · May 15, 2020 · 0a76373 · 0a76373
2 parents 00ae590 + cf22c10
commit 0a76373
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/components/list/list-item-checkbox-mixin.js b/components/list/list-item-checkbox-mixin.js
@@ -56,6 +56,8 @@ export const ListItemCheckboxMixin = superclass => class extends superclass {
 		event.preventDefault();
 		if (this.disabled) return;
 		this.setSelected(!this.selected);
+		const checkbox = this.shadowRoot.querySelector(`#${this._checkboxId}`);
+		if (checkbox) checkbox.focus();
 	}
 
 	_handleCheckboxChange(event) {