@brightspace-ui/core 2.43.2 → 2.43.5

package/components/dropdown/dropdown-content-mixin.js

@@ -320,7 +320,7 @@ export const DropdownContentMixin = superclass => class extends LocalizeCoreElem
 	firstUpdated(changedProperties) {
 		super.firstUpdated(changedProperties);
 
-		this.__content = this.__getContentContainer();
+		this.__content = this.getContentContainer();
 		this.addEventListener('d2l-dropdown-close', this.__onClose);
 		this.addEventListener('d2l-dropdown-position', this.__toggleScrollStyles);
 	}
@@ -363,6 +363,10 @@ export const DropdownContentMixin = superclass => class extends LocalizeCoreElem
 	 */
 	forceRender() {}
 
+	getContentContainer() {
+		return this.shadowRoot && this.shadowRoot.querySelector('.d2l-dropdown-content-container');
+	}
+
 	/**
 	 * Private.
 	 */
@@ -435,10 +439,6 @@ export const DropdownContentMixin = superclass => class extends LocalizeCoreElem
 		return this.shadowRoot && this.shadowRoot.querySelector('.d2l-dropdown-content-bottom');
 	}
 
-	__getContentContainer() {
-		return this.shadowRoot && this.shadowRoot.querySelector('.d2l-dropdown-content-container');
-	}
-
 	__getContentTop() {
 		return this.shadowRoot && this.shadowRoot.querySelector('.d2l-dropdown-content-top');
 	}
@@ -473,7 +473,7 @@ export const DropdownContentMixin = superclass => class extends LocalizeCoreElem
 			return;
 		}
 		const rootTarget = e.composedPath()[0];
-		const clickInside = isComposedAncestor(this.__getContentContainer(), rootTarget) ||
+		const clickInside = isComposedAncestor(this.getContentContainer(), rootTarget) ||
 			isComposedAncestor(this.__getContentTop(), rootTarget) ||
 			isComposedAncestor(this.__getContentBottom(), rootTarget);
 		if (clickInside) {
@@ -533,7 +533,7 @@ export const DropdownContentMixin = superclass => class extends LocalizeCoreElem
 	async __openedChanged(newValue) {
 
 		// DE44538: wait for dropdown content to fully render,
-		// otherwise this.__getContentContainer() can return null.
+		// otherwise this.getContentContainer() can return null.
 		await this.updateComplete;
 
 		this.__previousFocusableAncestor =
@@ -543,7 +543,7 @@ export const DropdownContentMixin = superclass => class extends LocalizeCoreElem
 
 		const doOpen = async() => {
 
-			const content = this.__getContentContainer();
+			const content = this.getContentContainer();
 
 			if (!this.noAutoFit) {
 				content.scrollTop = 0;
@@ -611,7 +611,7 @@ export const DropdownContentMixin = superclass => class extends LocalizeCoreElem
 			return;
 		}
 
-		const content = this.__getContentContainer();
+		const content = this.getContentContainer();
 		const header = this.__getContentTop();
 		const footer = this.__getContentBottom();
 
@@ -1043,7 +1043,7 @@ export const DropdownContentMixin = superclass => class extends LocalizeCoreElem
 
 	_handleFocusTrapEnter() {
 		if (this.__applyFocus && !this.noAutoFocus) {
-			const content = this.__getContentContainer();
+			const content = this.getContentContainer();
 			const focusable = getFirstFocusableDescendant(content);
 			if (focusable) {
 				// Removing the rAF call can allow infinite focus looping to happen in content using a focus trap

package/components/switch/switch-mixin.js

@@ -39,6 +39,7 @@ export const SwitchMixin = superclass => class extends FocusMixin(RtlMixin(Focus
 		return css`
 			:host {
 				display: inline-block;
+				user-select: none;
 				white-space: nowrap;
 			}
 			:host([hidden]) {

package/components/switch/switch-visibility.js

@@ -88,7 +88,8 @@ class VisibilitySwitch extends LocalizeCoreElement(SwitchMixin(LitElement)) {
 	}
 
 	_handleConditionsSlotChange(e) {
-		this._hasConditions = e.target.assignedNodes({ flatten: true }).length > 0;
+		const nodes = e.target.assignedNodes({ flatten: true });
+		this._hasConditions = !!nodes[0]?.textContent?.trim();
 	}
 }
 

package/helpers/demo/prism.html

@@ -928,7 +928,7 @@ export const DropdownContentMixin = superclass => class extends LocalizeCoreE
 	firstUpdated(changedProperties) {
 		super.firstUpdated(changedProperties);
 
-		this.__content = this.__getContentContainer();
+		this.__content = this.getContentContainer();
 		this.addEventListener('d2l-dropdown-close', this.__onClose);
 		this.addEventListener('d2l-dropdown-position', this.__toggleScrollStyles);
 	}
@@ -971,6 +971,10 @@ export const DropdownContentMixin = superclass => class extends LocalizeCoreE
 	 */
 	forceRender() {}
 
+	getContentContainer() {
+		return this.shadowRoot && this.shadowRoot.querySelector('.d2l-dropdown-content-container');
+	}
+
 	/**
 	 * Private.
 	 */
@@ -1043,10 +1047,6 @@ export const DropdownContentMixin = superclass => class extends LocalizeCoreE
 		return this.shadowRoot && this.shadowRoot.querySelector('.d2l-dropdown-content-bottom');
 	}
 
-	__getContentContainer() {
-		return this.shadowRoot && this.shadowRoot.querySelector('.d2l-dropdown-content-container');
-	}
-
 	__getContentTop() {
 		return this.shadowRoot && this.shadowRoot.querySelector('.d2l-dropdown-content-top');
 	}
@@ -1081,7 +1081,7 @@ export const DropdownContentMixin = superclass => class extends LocalizeCoreE
 			return;
 		}
 		const rootTarget = e.composedPath()[0];
-		const clickInside = isComposedAncestor(this.__getContentContainer(), rootTarget) ||
+		const clickInside = isComposedAncestor(this.getContentContainer(), rootTarget) ||
 			isComposedAncestor(this.__getContentTop(), rootTarget) ||
 			isComposedAncestor(this.__getContentBottom(), rootTarget);
 		if (clickInside) {
@@ -1141,7 +1141,7 @@ export const DropdownContentMixin = superclass => class extends LocalizeCoreE
 	async __openedChanged(newValue) {
 
 		// DE44538: wait for dropdown content to fully render,
-		// otherwise this.__getContentContainer() can return null.
+		// otherwise this.getContentContainer() can return null.
 		await this.updateComplete;
 
 		this.__previousFocusableAncestor =
@@ -1151,7 +1151,7 @@ export const DropdownContentMixin = superclass => class extends LocalizeCoreE
 
 		const doOpen = async() => {
 
-			const content = this.__getContentContainer();
+			const content = this.getContentContainer();
 
 			if (!this.noAutoFit) {
 				content.scrollTop = 0;
@@ -1219,7 +1219,7 @@ export const DropdownContentMixin = superclass => class extends LocalizeCoreE
 			return;
 		}
 
-		const content = this.__getContentContainer();
+		const content = this.getContentContainer();
 		const header = this.__getContentTop();
 		const footer = this.__getContentBottom();
 
@@ -1651,7 +1651,7 @@ export const DropdownContentMixin = superclass => class extends LocalizeCoreE
 
 	_handleFocusTrapEnter() {
 		if (this.__applyFocus && !this.noAutoFocus) {
-			const content = this.__getContentContainer();
+			const content = this.getContentContainer();
 			const focusable = getFirstFocusableDescendant(content);
 			if (focusable) {
 				// Removing the rAF call can allow infinite focus looping to happen in content using a focus trap

package/package.json

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