@brightspace-ui/core 2.45.4 → 2.45.5

package/components/list/list-item-generic-layout.js

@@ -208,17 +208,13 @@ class ListItemGenericLayout extends RtlMixin(LitElement) {
 		if (!cell) return;
 
 		const firstFocusable = getFirstFocusableDescendant(cell);
-		if (!firstFocusable) {
-			const listItem = findComposedAncestor(this, node => node.role === 'rowgroup');
-			if (listItem) {
-				const nextFocusable = previous ? getPreviousFocusable(listItem) : getNextFocusable(listItem);
-				if (nextFocusable) nextFocusable.focus();
-			}
-			return;
-		}
+		if (!firstFocusable) return;
 
-		if (itemNum === 1 || !this._focusNextWithinCell(firstFocusable, itemNum)) {
+		if (itemNum === 1) {
 			firstFocusable.focus();
+			return firstFocusable;
+		} else {
+			return this._focusNextWithinCell(firstFocusable, itemNum);
 		}
 	}
 
@@ -290,7 +286,16 @@ class ListItemGenericLayout extends RtlMixin(LitElement) {
 
 		if (!listItem) return;
 		const listItemRow = listItem.shadowRoot.querySelector('[role="gridrow"]');
-		listItemRow._focusCellItem(previous, this._cellNum, this._cellFocusedItem);
+		const focusedCellItem = listItemRow._focusCellItem(previous, this._cellNum, this._cellFocusedItem);
+
+		if (!focusedCellItem) {
+			// could not focus on same cell in adjacent list-item so try general focus on item
+			if (!listItem._tryFocus()) {
+				// ultimate fallback to generic method for getting next/previous focusable
+				const nextFocusable = previous ? getPreviousFocusable(listItem) : getNextFocusable(listItem);
+				if (nextFocusable) nextFocusable.focus();
+			}
+		}
 
 	}
 

package/components/list/list-item-mixin.js

@@ -398,8 +398,7 @@ export const ListItemMixin = superclass => class extends LocalizeCoreElement(Lis
 	}
 
 	focus() {
-		const node = getFirstFocusableDescendant(this);
-		if (node) node.focus();
+		this._tryFocus();
 	}
 
 	async highlight() {
@@ -623,4 +622,11 @@ export const ListItemMixin = superclass => class extends LocalizeCoreElement(Lis
 		`;
 	}
 
+	_tryFocus() {
+		const node = getFirstFocusableDescendant(this);
+		if (!node) return false;
+		node.focus();
+		return true;
+	}
+
 };

package/package.json

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