@brightspace-ui/core 2.29.5 → 2.29.6

package/components/dialog/dialog-mixin.js

@@ -177,13 +177,35 @@ export const DialogMixin = superclass => class extends RtlMixin(superclass) {
 		}
 	}
 
+	_findAutofocusElement(node) {
+		if (this._useNative) {
+			// Do not override native autofocus attribute implementation
+			return null;
+		}
+
+		const slot = node.querySelector('slot');
+		if (!slot) {
+			// We are in a confirm dialog, autofocus attribute will never be set
+			return null;
+		}
+
+		const content = slot.assignedElements({ flatten: true });
+
+		let autofocusElement = null;
+		for (const el of content) {
+			autofocusElement = el.hasAttribute('autofocus') ? el : el.querySelector('[autofocus]');
+			if (autofocusElement) break;
+		}
+		return autofocusElement;
+	}
+
 	_focusFirst() {
 		if (!this.shadowRoot) return;
 		const content = this.shadowRoot.querySelector('.d2l-dialog-content');
 		if (content) {
-			const firstFocusable = getNextFocusable(content);
-			if (isComposedAncestor(this.shadowRoot.querySelector('.d2l-dialog-inner'), firstFocusable)) {
-				forceFocusVisible(firstFocusable);
+			const elementToFocus = this._findAutofocusElement(content) ?? getNextFocusable(content);
+			if (isComposedAncestor(this.shadowRoot.querySelector('.d2l-dialog-inner'), elementToFocus)) {
+				forceFocusVisible(elementToFocus, false);
 				return;
 			}
 		}

package/components/tooltip/tooltip-help.js

@@ -50,7 +50,6 @@ class TooltipHelp extends FocusMixin(FocusVisiblePolyfillMixin(LitElement)) {
 				border: none;
 				cursor: text;
 				padding: 0;
-				text-decoration-color: var(--d2l-color-galena);
 				text-decoration-line: underline;
 				text-decoration-style: dashed;
 				text-decoration-thickness: 1px;

package/helpers/focus.js

@@ -13,8 +13,8 @@ const focusableElements = {
 	textarea: true
 };
 
-export function forceFocusVisible(elem) {
-	if (!isFocusable(elem)) {
+export function forceFocusVisible(elem, includeTabbablesOnly) {
+	if (!isFocusable(elem, false, includeTabbablesOnly)) {
 		elem = getFirstFocusableDescendant(elem);
 	}
 	if (!elem) return;

package/package.json

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