setindex

microsoft · Jan 17, 2024 · 40552ee · 40552ee
1 parent 1b29f6b
commit 40552ee
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/packages/web-components/fast-foundation/src/tabs/tabs.ts b/packages/web-components/fast-foundation/src/tabs/tabs.ts
@@ -157,9 +157,12 @@ export class FASTTabs extends FASTElement {
         ) {
             return;
         }
-        const targetTab = this.tabs.find(tab => tab.id === this.activeid);
-        if (targetTab) {
-            this.activeid = targetTab.id;
+        const targetTabId: string = this.tabOrder[index];
+        const tabElement: HTMLElement | undefined = this.tabs.find(
+            (tab: HTMLElement) => tab.id === targetTabId
+        );
+        if (tabElement && this.isFocusableElement(tabElement)) {
+            this.activeid = tabElement.id;
         }
     }