Merge pull request #872 from takenet/fix/accordion-events

fix(accordion): resolve problem with event onBdsAccordionOpen
takenet · Aug 30, 2024 · 231aba8 · 231aba8
2 parents 734a989 + 7acb011
commit 231aba8
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 19 deletions.
diff --git a/src/components.d.ts b/src/components.d.ts
@@ -87,10 +87,10 @@ export namespace Components {
         "toggle": () => Promise<void>;
     }
     interface BdsAccordionGroup {
-        "closeAll": (actNumber: any) => Promise<void>;
+        "closeAll": (actNumber?: any) => Promise<void>;
         "collapse"?: collapses;
         "divisor"?: boolean;
-        "openAll": (actNumber: any) => Promise<void>;
+        "openAll": (actNumber?: any) => Promise<void>;
     }
     interface BdsAccordionHeader {
         /**

diff --git a/src/components/accordion/accordion-group.tsx b/src/components/accordion/accordion-group.tsx
@@ -18,7 +18,7 @@ export class AccordionGroup {
   @Event() bdsAccordionOpenAll?: EventEmitter;
 
   @Method()
-  async closeAll(actNumber) {
+  async closeAll(actNumber?) {
     this.bdsAccordionCloseAll.emit();
     for (let i = 0; i < this.accordionsElement.length; i++) {
       if (this.collapse != 'multiple') {
@@ -30,7 +30,7 @@ export class AccordionGroup {
   }
 
   @Method()
-  async openAll(actNumber) {
+  async openAll(actNumber?) {
     this.bdsAccordionOpenAll.emit();
     for (let i = 0; i < this.accordionsElement.length; i++) {
       if (this.collapse != 'multiple') {

diff --git a/src/components/accordion/accordion-header.tsx b/src/components/accordion/accordion-header.tsx
@@ -61,12 +61,20 @@ export class AccordionHeader {
   }
 
   private toggleHeader = (): void => {
-    this.accordionElement?.toggle();
+    if (this.isOpen) {
+      this.accordionElement?.close();
+    } else {
+      this.accordionElement?.open();
+    }
   };
 
   handleKeyDown(event) {
     if (event.key == 'Enter') {
-      this.accordionElement?.toggle();
+      if (this.isOpen) {
+        this.accordionElement?.close();
+      } else {
+        this.accordionElement?.open();
+      }
     }
   }
 

diff --git a/src/components/accordion/accordion.tsx b/src/components/accordion/accordion.tsx
@@ -31,6 +31,8 @@ export class Accordion {
 
   @Method()
   async open() {
+    this.accheaders?.open();
+    this.accBodies?.open();
     this.isOpen = true;
   }
 
@@ -53,20 +55,17 @@ export class Accordion {
 
   @Watch('isOpen')
   isOpenChanged(value): void {
-    if (this.accGroup.collapse == 'single' && this.condition === false) {
-      this.accheaders?.toggle();
-      this.accBodies?.toggle();
-      this.accGroup?.closeAll(this.numberElement);
-    } else {
-      if (value) {
-        this.accheaders?.open();
-        this.accBodies?.open();
-        this.bdsAccordionOpen.emit();
-      } else {
-        this.accheaders?.close();
-        this.accBodies?.close();
-        this.bdsAccordionClose.emit();
+    if (value) {
+      if (this.accGroup.collapse == 'single' && this.condition === false) {
+        this.accGroup?.closeAll(this.numberElement);
       }
+      this.accheaders?.open();
+      this.accBodies?.open();
+      this.bdsAccordionOpen.emit();
+    } else {
+      this.accheaders?.close();
+      this.accBodies?.close();
+      this.bdsAccordionClose.emit();
     }
     this.condition = false;
   }