@brightspace-ui/core 3.28.5 → 3.28.6

package/components/list/demo/list-nested.html

@@ -29,7 +29,6 @@
 
 		<d2l-demo-page page-title="d2l-list (nested)">
 
-			<h2>Nested</h2>
 
 			<d2l-demo-snippet>
 				<template>

package/components/selection/selection-mixin.js

@@ -12,13 +12,19 @@ const keyCodes = {
 
 export class SelectionInfo {
 
-	constructor(keys, state) {
+	constructor(keys, state, allEnabledSelected) {
+		if (!allEnabledSelected) allEnabledSelected = false;
 		if (!keys) keys = [];
 		if (!state) state = SelectionInfo.states.none;
+		this._allEnabledSelected = allEnabledSelected;
 		this._keys = keys;
 		this._state = state;
 	}
 
+	get allEnabledSelected() {
+		return this._allEnabledSelected;
+	}
+
 	get keys() {
 		return this._keys;
 	}
@@ -87,6 +93,7 @@ export const SelectionMixin = superclass => class extends RtlMixin(CollectionMix
 	}
 
 	getSelectionInfo() {
+		let allEnabledSelected = true;
 		let state = SelectionInfo.states.none;
 		const keys = [];
 
@@ -95,6 +102,7 @@ export const SelectionMixin = superclass => class extends RtlMixin(CollectionMix
 		} else {
 			this._selectionSelectables.forEach(selectable => {
 				if (selectable.selected) keys.push(selectable.key);
+				if (!selectable.disabled && !selectable.selected) allEnabledSelected = false;
 				if (selectable._indeterminate) state = SelectionInfo.states.some;
 			});
 
@@ -104,19 +112,23 @@ export const SelectionMixin = superclass => class extends RtlMixin(CollectionMix
 			}
 		}
 
-		return new SelectionInfo(keys, state);
+		return new SelectionInfo(keys, state, allEnabledSelected);
 	}
 
 	setSelectionForAll(selected, selectAllPages) {
 		if (this.selectionSingle && selected) return;
-
 		this._selectAllPages = (selected && selectAllPages);
 
+		const { allEnabledSelected } = this.getSelectionInfo();
+
 		this._selectionSelectables.forEach(selectable => {
-			if (!selectable.disabled && !!selectable.selected !== selected) {
-				selectable.selected = selected;
+			if (this.selectionSingle || this._selectAllPages) {
+				if (selectable.selected !== selected) selectable.selected = selected;
+			} else if (!selectable.disabled && selectable.selected !== !allEnabledSelected) {
+				selectable.selected = !allEnabledSelected;
 			}
 		});
+
 		this._updateSelectionObservers();
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brightspace-ui/core",
-  "version": "3.28.5",
+  "version": "3.28.6",
   "description": "A collection of accessible, free, open-source web components for building Brightspace applications",
   "type": "module",
   "repository": "https://github.com/BrightspaceUI/core.git",