Return early for elements we've created

alphagov · Oct 3, 2023 · 7a8d3c2 · 7a8d3c2
1 parent 7f0f4b1
commit 7a8d3c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/packages/govuk-frontend/src/govuk/components/accordion/accordion.mjs b/packages/govuk-frontend/src/govuk/components/accordion/accordion.mjs
@@ -414,10 +414,13 @@ export class Accordion extends GOVUKFrontendComponent {
     const $button = $section.querySelector(`.${this.sectionButtonClass}`)
     const $content = $section.querySelector(`.${this.sectionContentClass}`)
 
-    if (!$showHideIcon || !$showHideText || !$button || !$content) {
+    // Return early for elements created during set up
+    if (!$showHideIcon || !$showHideText) {
+      return
+    }
+
+    if (!$button || !$content) {
       const [check] = /** @type {const} */ ([
-        [$showHideIcon, this.upChevronIconClass],
-        [$showHideText, this.sectionShowHideTextClass],
         [$button, this.sectionButtonClass],
         [$content, this.sectionContentClass]
       ])

diff --git a/packages/govuk-frontend/src/govuk/components/accordion/accordion.puppeteer.test.js b/packages/govuk-frontend/src/govuk/components/accordion/accordion.puppeteer.test.js
@@ -830,8 +830,6 @@ describe('/components/accordion', () => {
           })
 
           const toggleButtonElements = [
-            '.govuk-accordion-nav__chevron',
-            '.govuk-accordion__section-toggle-text',
             '.govuk-accordion__section-button',
             '.govuk-accordion__section-content'
           ]