govuk-components 1.1.9 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58f95bba6b6806470b1963b8e9d62aa69eb0b09c98c0d6ec0e8416ac9412d14e
-  data.tar.gz: 053dab8628ad0849dd16c01649c6cef559b277612f0766d25061e691bcc574b5
+  metadata.gz: 6f842d29dfabae4169ed1b2105df65c7f951e53001c3b8850f0f45c1f80f581c
+  data.tar.gz: '048b188612f81942b978fac451b4777f8076f6e459275f84b6eab70effa2f9df'
 SHA512:
-  metadata.gz: 21f9795a2058a029949d179df03227f05c10cf7d41c2e0645566aff872886ec2c5293b1d91c7472a61c9496fad12174d15f2985568b06427942261db4912084d
-  data.tar.gz: 883d695f40a82e58ed96fd1ee78a9426fe62e5772cf10a182165f31fc6781b8ecccdd606388ee5725aad9f02077e2940f969c05271766ab9cf7e64b46aa79254
+  metadata.gz: 52fc5f481b7daf4472a3b25a98d588b4195071063b3c2283e7c6da75ec818ac4561bd41f1e33689d96bf4e98415c8bb7f3f836e4303075ca9af1a9020377ce97
+  data.tar.gz: 2c3ad6f877a3466a0407567c0eaa3c181f37ea3b657dd79633ec7b1fde020bf4d9b9aa9212943d190620e26ff80723726f0b50ffb6c6a7c60f7812dbd1c33edb

data/README.md

@@ -99,7 +99,11 @@ To setup the dummy app:
 `bin/rails db:migrate`
 `bin/rails s`
 
-After adding a new component update the examples page by cd-ing into the dummy app `cd spec/dummy` and running the rake task `bin/rake generate_examples_page`.
+After changing a component or adding a new one:
+
+* add or update the corresponding specs, and check they pass by running `bundle exec rspec`.
+
+* update the examples page by cd-ing into the dummy app `cd spec/dummy` and running the rake task `bin/rake generate_examples_page`.
 
 ## License
 

data/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", aria: { expanded: section.expanded? }) %>
+          <%= tag.span(section.title, id: section.id, class: "govuk-accordion__section-button", aria: { expanded: section.expanded?, controls: section.id(suffix: 'content') }) %>
         </h2>
         <% if section.summary.present? %>
           <%= tag.div(section.summary, id: section.id(suffix: 'summary'), class: %w(govuk-accordion__section-summary govuk-body)) %>

data/app/components/govuk_component/header.html.erb

@@ -30,11 +30,9 @@
       <% end %>
 
       <% if items.any? %>
-        <button type="button" class="govuk-header__menu-button govuk-js-header-toggle" aria-controls="navigation" aria-label="Show or hide navigation menu">
-          <%= menu_button_label %>
-        </button>
+        <button type="button" class="govuk-header__menu-button govuk-js-header-toggle" aria-controls="navigation" aria-label="<%= menu_button_label %>">Menu</button>
         <nav>
-          <%= tag.ul(class: navigation_classes, aria: { label: "Top Level Navigation" }) do %>
+          <%= tag.ul(class: navigation_classes, id: "navigation", aria: { label: navigation_label }) do %>
             <% items.each do |item| %>
               <%= tag.li(class: item.classes.append(item.active_class), **item.html_attributes) do %>
                 <% if item.link? %>

data/app/components/govuk_component/header.rb

@@ -1,7 +1,7 @@
 class GovukComponent::Header < GovukComponent::Base
   include ViewComponent::Slotable
 
-  attr_accessor :logo, :logo_href, :service_name, :service_name_href, :product_name, :menu_button_label
+  attr_accessor :logo, :logo_href, :service_name, :service_name_href, :product_name, :menu_button_label, :navigation_label
 
   with_slot :item, collection: true, class_name: 'Item'
   wrap_slot :item
@@ -9,7 +9,7 @@ class GovukComponent::Header < GovukComponent::Base
   with_slot :product_description
   wrap_slot :product_description
 
-  def initialize(logo: 'GOV.UK', logo_href: '/', service_name: nil, service_name_href: '/', product_name: nil, menu_button_label: 'Menu', classes: [], navigation_classes: [], html_attributes: {})
+  def initialize(logo: 'GOV.UK', logo_href: '/', service_name: nil, service_name_href: '/', product_name: nil, menu_button_label: 'Show or hide navigation menu', classes: [], navigation_classes: [], navigation_label: 'Navigation menu', html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @logo               = logo
@@ -19,6 +19,7 @@ class GovukComponent::Header < GovukComponent::Base
     @product_name       = product_name
     @menu_button_label  = menu_button_label
     @navigation_classes = navigation_classes
+    @navigation_label   = navigation_label
   end
 
 private

data/lib/govuk/components/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '1.1.9'.freeze
+    VERSION = '1.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors:
 - DfE developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties