Merge pull request #15831 from primefaces/issue-15830

Fixed #15830 - Accessibility: Tree inside an Accordion (arrow navigat…
primefaces · Jun 13, 2024 · bbb9bb2 · bbb9bb2
2 parents f8825b1 + 6a60ba8
commit bbb9bb2
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/src/app/components/accordion/accordion.ts b/src/app/components/accordion/accordion.ts
@@ -466,18 +466,12 @@ export class Accordion implements BlockableUI, AfterContentInit, OnDestroy {
         }
     }
 
-    isInput(event): boolean {
-        const { tagName } = event.target;
-        return tagName?.toLowerCase() === 'input';
-    }
-
-    isTextArea(event): boolean {
-        const { tagName } = event.target;
-        return tagName?.toLowerCase() === 'textarea';
+    focusedElementIsAccordionHeader() {
+        return document.activeElement.tagName.toLowerCase() === 'a' && document.activeElement.classList.contains('p-accordion-header-link');
     }
 
     onTabArrowDownKey(event) {
-        if (!this.isInput(event) && !this.isTextArea(event)) {
+        if (this.focusedElementIsAccordionHeader()) {
             const nextHeaderAction = this.findNextHeaderAction(event.target.parentElement.parentElement.parentElement);
             nextHeaderAction ? this.changeFocusedTab(nextHeaderAction) : this.onTabHomeKey(event);
 
@@ -486,7 +480,7 @@ export class Accordion implements BlockableUI, AfterContentInit, OnDestroy {
     }
 
     onTabArrowUpKey(event) {
-        if (!this.isInput(event) && !this.isTextArea(event)) {
+        if (this.focusedElementIsAccordionHeader()) {
             const prevHeaderAction = this.findPrevHeaderAction(event.target.parentElement.parentElement.parentElement);
             prevHeaderAction ? this.changeFocusedTab(prevHeaderAction) : this.onTabEndKey(event);