Merge pull request #160 from hlxsites/accordion

95: transition issue fixed
hlxsites · Nov 21, 2023 · 446ecd8 · 446ecd8
2 parents 8c7541f + 82ff0f9
commit 446ecd8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/blocks/accordion/accordion.css b/blocks/accordion/accordion.css
@@ -75,7 +75,7 @@ main .accordion.faq-accordion .faq-answer {
     overflow: hidden;
     font-size: 16px;
     max-height: 0;
-    transition: all 0.5s ease-in-out;
+    transition: all 0.4s ease-in-out;
     text-align: left;
 }
 

diff --git a/blocks/accordion/accordion.js b/blocks/accordion/accordion.js
@@ -63,19 +63,24 @@ export default function decorate(block) {
       const openfaq = block.querySelector('.faq-question.active');
       if (openfaq && !currentFaq) {
         openfaq.classList.toggle('active');
-        openfaq.nextElementSibling.classList.toggle('active');
-      }
-      const faqAnswer = e.currentTarget.nextElementSibling;
-      e.currentTarget.classList.toggle('active');
-      if (e.currentTarget.classList.contains('active')) {
-        faqAnswer.classList.toggle('active');
-        faqAnswer.style.maxHeight = `${faqAnswer.scrollHeight}px`;
-      } else {
-        faqAnswer.style.maxHeight = 0;
+        openfaq.nextElementSibling.style.maxHeight = 0;
         setTimeout(() => {
-          faqAnswer.classList.toggle('active');
+          openfaq.nextElementSibling.classList.toggle('active');
         }, 300);
       }
+      setTimeout(() => {
+        const faqAnswer = e.target.nextElementSibling;
+        e.target.classList.toggle('active');
+        if (e.target.classList.contains('active')) {
+          faqAnswer.classList.toggle('active');
+          faqAnswer.style.maxHeight = `${faqAnswer.scrollHeight}px`;
+        } else {
+          faqAnswer.style.maxHeight = 0;
+          setTimeout(() => {
+            faqAnswer.classList.toggle('active');
+          }, 300);
+        }
+      }, 300, e);
     });
     const faqAnswer = [...row.children][1];
     faqAnswer.classList.add('faq-answer');