Merge branch 'master' into tooltip-data

carbon-design-system · Apr 11, 2024 · b9c5fc7 · b9c5fc7
2 parents 3aff875 + fa59676
commit b9c5fc7
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/table/table.component.ts b/src/table/table.component.ts
@@ -289,9 +289,10 @@ export class Table implements AfterViewInit, OnDestroy {
 
 	static focus(element: HTMLElement) {
 		const focusElementList = getFocusElementList(element, tabbableSelectorIgnoreTabIndex);
-		if (element.firstElementChild && element.firstElementChild.classList.contains("cds--table-sort") && focusElementList.length > 1) {
-			focusElementList[1].focus();
-		} else if (focusElementList.length > 0) {
+		if (
+			(element.firstElementChild?.classList.contains("cds--table-sort") && focusElementList.length > 1) ||
+			focusElementList.length > 0
+		) {
 			focusElementList[0].focus();
 		} else {
 			element.focus();