From 183321e8f99e3e34e823ec07067c7eedc4ddc695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mehmet=20=C3=87etin?=
 <92744169+mehmetcetin01140@users.noreply.github.com>
Date: Thu, 13 Jun 2024 11:01:06 +0300
Subject: [PATCH] Fixed #15837 - Accessibility: Buttons within an accordion
 header template (keyboard accessibility)

---
 src/app/components/accordion/accordion.ts | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/app/components/accordion/accordion.ts b/src/app/components/accordion/accordion.ts
index 333a5de89aa..206257c702d 100755
--- a/src/app/components/accordion/accordion.ts
+++ b/src/app/components/accordion/accordion.ts
@@ -230,11 +230,7 @@ export class AccordionTab implements AfterContentInit, OnDestroy {
 
     accordion: Accordion;
 
-    constructor(
-        @Inject(forwardRef(() => Accordion)) accordion: Accordion,
-        public el: ElementRef,
-        public changeDetector: ChangeDetectorRef
-    ) {
+    constructor(@Inject(forwardRef(() => Accordion)) accordion: Accordion, public el: ElementRef, public changeDetector: ChangeDetectorRef) {
         this.accordion = accordion as Accordion;
         this.id = UniqueComponentId();
     }
@@ -262,7 +258,9 @@ export class AccordionTab implements AfterContentInit, OnDestroy {
     }
 
     toggle(event?: MouseEvent | KeyboardEvent) {
-        if (this.disabled) {
+        const target = event.target as HTMLElement;
+
+        if (this.disabled || !(target.tagName.toLowerCase() === 'a' && target.classList.contains('p-accordion-header-link'))) {
             return false;
         }
 
@@ -441,10 +439,7 @@ export class Accordion implements BlockableUI, AfterContentInit, OnDestroy {
 
     public tabs: AccordionTab[] = [];
 
-    constructor(
-        public el: ElementRef,
-        public changeDetector: ChangeDetectorRef
-    ) {}
+    constructor(public el: ElementRef, public changeDetector: ChangeDetectorRef) {}
 
     @HostListener('keydown', ['$event'])
     onKeydown(event) {