Merge pull request #115 from stevehook/add-expanded-option-to-accordi…

…on-slots Add `expanded` option to accordion slots
x-govuk · Mar 2, 2021 · 254fbc6 · 254fbc6
2 parents a31fe21 + c006429
commit 254fbc6
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 368 deletions.
diff --git a/app/components/govuk_component/accordion.html.erb b/app/components/govuk_component/accordion.html.erb
@@ -3,7 +3,7 @@
     <%= tag.div(id: section.id(suffix: 'section'), class: section.classes, **section.html_attributes) do %>
       <div class="govuk-accordion__section-header">
         <h2 class="govuk-accordion__section-heading">
-          <%= tag.span(section.title, id: section.id, class: "govuk-accordion__section-button") %>
+          <%= tag.span(section.title, id: section.id, class: "govuk-accordion__section-button", aria: { expanded: section.expanded? }) %>
         </h2>
         <% if section.summary.present? %>
           <%= tag.div(section.summary, id: section.id(suffix: 'summary'), class: %w(govuk-accordion__section-summary govuk-body)) %>

diff --git a/app/components/govuk_component/accordion.rb b/app/components/govuk_component/accordion.rb
@@ -19,19 +19,26 @@ def default_classes
   end
 
   class Section < GovukComponent::Slot
-    attr_accessor :title, :summary
+    attr_accessor :title, :summary, :expanded
 
-    def initialize(title:, summary: nil, classes: [], html_attributes: {})
+    alias_method :expanded?, :expanded
+
+    def initialize(title:, summary: nil, expanded: false, classes: [], html_attributes: {})
       super(classes: classes, html_attributes: html_attributes)
 
       self.title   = title
       self.summary = summary
+      self.expanded = expanded
     end
 
     def id(suffix: nil)
       [title.parameterize, suffix].compact.join('-')
     end
 
+    def classes
+      super + (expanded? ? %w(govuk-accordion__section--expanded) : [])
+    end
+
   private
 
     def default_classes