@brightspace-ui/core 3.151.3 → 3.151.5

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

@@ -114,7 +114,8 @@ export const DropdownOpenerMixin = superclass => class extends superclass {
 		this.addEventListener('d2l-dropdown-open', this.__onOpened);
 		this.addEventListener('d2l-dropdown-close', this.__onClosed);
 		const content = this.__getContentElement();
-		this._setOpenerElementAttribute(content?.opened || false);
+		const contentRole = content?.tagName === 'D2L-DROPDOWN-MENU' ? 'menu' : 'true';
+		this._setOpenerElementAttribute(content?.opened || false, false, contentRole);
 	}
 
 	updated(changedProperties) {
@@ -190,7 +191,7 @@ export const DropdownOpenerMixin = superclass => class extends superclass {
 	__getContentElement() {
 		if (!this.shadowRoot) return undefined;
 		return this.shadowRoot.querySelector('slot:not([name])').assignedNodes()
-			.filter(node => node.hasAttribute && node.hasAttribute('dropdown-content'))[0];
+			.filter(node => node.hasAttribute && (node._dropdownContent || node.hasAttribute('dropdown-content')))[0];
 	}
 
 	__onClosed() {
@@ -331,11 +332,12 @@ export const DropdownOpenerMixin = superclass => class extends superclass {
 		}
 	}
 
-	_setOpenerElementAttribute(val, setActive = false) {
+	_setOpenerElementAttribute(val, setActive = false, hasPopup) {
 		const opener = this.getOpenerElement();
 		if (!opener) return false;
 		const attribute = opener.isButtonMixin ? 'expanded' : 'aria-expanded';
 		opener.setAttribute(attribute, val.toString());
+		if (hasPopup) opener.setAttribute('aria-haspopup', hasPopup);
 		if (setActive) {
 			if (val) opener.setAttribute('active', 'true');
 			else opener.removeAttribute('active');

package/components/overflow-group/demo/demo-overflow-group.js

@@ -1,5 +1,8 @@
 
 import '../../button/button.js';
+import '../../button/button-icon.js';
+import '../../button/button-subtle.js';
+import '../../selection/selection-action.js';
 import '../overflow-group.js';
 import { html, LitElement } from 'lit';
 import { LocalizeCoreElement } from '../../../helpers/localize-core-element.js';
@@ -15,7 +18,10 @@ class DemoOverflowGroup extends LocalizeCoreElement(LitElement) {
 				<d2l-button>${this.localize('components.more-less.more')}</d2l-button>
 				<d2l-button>${this.localize('components.more-less.less')}</d2l-button>
 				<d2l-button> ${this.localize('components.more-less.more')}</d2l-button>
-				<d2l-button> ${this.localize('components.more-less.less')}</d2l-button>
+				<button>${this.localize('components.more-less.less')}</button>
+				<d2l-button-icon icon="tier1:gear" text="${this.localize('components.more-less.more')}"></d2l-button-icon>
+				<d2l-button-subtle text="${this.localize('components.more-less.less')}"></d2l-button-subtle>
+				<d2l-selection-action icon="tier1:bookmark-hollow" text="${this.localize('components.more-less.more')}"></d2l-selection-action>
 			</d2l-overflow-group>
 		`;
 	}

package/components/overflow-group/overflow-group.js

@@ -20,7 +20,18 @@ const OPENER_STYLE = {
 };
 
 function createMenuItem(node) {
-	const childText = node.text || node.firstChild && (node.firstChild.label || node.firstChild.text || node.firstChild.textContent.trim());
+	let childText = node.text;
+	if (!childText) {
+		const childNode = Array.from(node.childNodes).find(childNode => {
+			if (childNode.nodeType === Node.COMMENT_NODE) return false;
+			if (childNode.nodeType === Node.TEXT_NODE && !childNode.textContent.trim()) return false;
+			return true;
+		});
+		if (childNode) {
+			childText = childNode.label || childNode.text || childNode.textContent.trim();
+		}
+	}
+
 	const disabled = !!node.disabled;
 	const handleItemSelect = () => {
 		node.dispatchEvent(new CustomEvent('d2l-button-ghost-click'));

package/package.json

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