govuk-components 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bdf0839ecbe0f5046c63a0cca80caa808aa3b0d4f8d5f5280253523742d28d0
-  data.tar.gz: d4d694316d383bdbfe93f0f1974d0ca14daedbe24e7d48371636b75384ddebaf
+  metadata.gz: 6f842d29dfabae4169ed1b2105df65c7f951e53001c3b8850f0f45c1f80f581c
+  data.tar.gz: '048b188612f81942b978fac451b4777f8076f6e459275f84b6eab70effa2f9df'
 SHA512:
-  metadata.gz: b3aec4489d49df3becca14855f389a4479f82393a6aa231e220f7553202252a8c51a0dab7fd4dfa514e879db12b9c12beacf0db0be0694f412510a81e5c2d486
-  data.tar.gz: 6429c8416c30dbd25c4afe381f0991f1b505e20faf74e99ad1fe32784345209da388d86ec980dda52c1d1aa3fd3b0f9a2e09d965cadf929e9fb2d6a65ec3c140
+  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/breadcrumbs.rb

@@ -1,15 +1,20 @@
 class GovukComponent::Breadcrumbs < GovukComponent::Base
   attr_accessor :breadcrumbs
 
-  def initialize(breadcrumbs:, classes: [], html_attributes: {})
+  def initialize(breadcrumbs:, hide_in_print: false, collapse_on_mobile: false, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
-    @breadcrumbs = breadcrumbs
+    @breadcrumbs        = breadcrumbs
+    @hide_in_print      = hide_in_print
+    @collapse_on_mobile = collapse_on_mobile
   end
 
 private
 
   def default_classes
-    %w(govuk-breadcrumbs)
+    %w(govuk-breadcrumbs).tap do |classes|
+      classes << "govuk-!-display-none-print" if @hide_in_print
+      classes << "govuk-breadcrumbs--collapse-on-mobile" if @collapse_on_mobile
+    end
   end
 end

data/app/components/govuk_component/cookie_banner.rb

@@ -1,5 +1,6 @@
 class GovukComponent::CookieBanner < GovukComponent::Base
-  with_content_areas :body, :actions
+  renders_one :body
+  renders_one :actions
 
   attr_accessor :title, :aria_label
 

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

@@ -5,6 +5,6 @@
     </span>
   </summary>
   <div class="govuk-details__text">
-    <%= @description || content %>
+    <%= content.presence || @description %>
   </div>
 <% end %>

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

@@ -11,6 +11,15 @@
             <%= @logo %>
           </span>
         </span>
+        <% if @product_name.present? %>
+          <span class="govuk-header__product-name">
+            <%= @product_name %>
+          </span>
+        <% end %>
+
+        <% if product_description.present? %>
+          <%= product_description.content %>
+        <% end %>
       </a>
     </div>
     <div class="govuk-header__content">
@@ -21,16 +30,19 @@
       <% end %>
 
       <% if items.any? %>
+        <button type="button" class="govuk-header__menu-button govuk-js-header-toggle" aria-controls="navigation" aria-label="<%= menu_button_label %>">Menu</button>
         <nav>
-          <ul class="govuk-header__navigation " aria-label="Top Level Navigation">
+          <%= 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 %>
-                <a class="govuk-header__link" href="<%= item.href %>">
+                <% if item.link? %>
+                  <%= link_to(item.title, item.href, class: "govuk-header__link") %>
+                <% else %>
                   <%= item.title %>
-                </a>
+                <% end %>
               <% end %>
             <% end %>
-          </ul>
+          <% end %>
         </nav>
       <% end %>
     </div>

data/app/components/govuk_component/header.rb

@@ -1,18 +1,25 @@
 class GovukComponent::Header < GovukComponent::Base
   include ViewComponent::Slotable
 
-  attr_accessor :logo, :logo_href, :service_name, :service_name_href
+  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
 
-  def initialize(logo: 'GOV.UK', logo_href: '/', service_name: nil, service_name_href: '/', classes: [], html_attributes: {})
+  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: 'Show or hide navigation menu', classes: [], navigation_classes: [], navigation_label: 'Navigation menu', html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
-    @logo              = logo
-    @logo_href         = logo_href
-    @service_name      = service_name
-    @service_name_href = service_name_href
+    @logo               = logo
+    @logo_href          = logo_href
+    @service_name       = service_name
+    @service_name_href  = service_name_href
+    @product_name       = product_name
+    @menu_button_label  = menu_button_label
+    @navigation_classes = navigation_classes
+    @navigation_label   = navigation_label
   end
 
 private
@@ -21,10 +28,16 @@ private
     %w(govuk-header)
   end
 
+  def navigation_classes
+    %w(govuk-header__navigation).tap { |nc|
+      nc.concat(@navigation_classes.is_a?(String) ? @navigation_classes.split : @navigation_classes)
+    }.uniq
+  end
+
   class Item < GovukComponent::Slot
     attr_accessor :title, :href, :active
 
-    def initialize(title:, href:, active: false, classes: [], html_attributes: {})
+    def initialize(title:, href: nil, active: false, classes: [], html_attributes: {})
       super(classes: classes, html_attributes: html_attributes)
 
       self.title  = title
@@ -40,6 +53,10 @@ private
       %w(govuk-header__navigation-item--active) if active?
     end
 
+    def link?
+      href.present?
+    end
+
   private
 
     def default_classes

data/app/components/govuk_component/inset_text.rb

@@ -1,14 +1,18 @@
 class GovukComponent::InsetText < GovukComponent::Base
   attr_accessor :text
 
-  def initialize(text:, classes: [], html_attributes: {})
+  def initialize(text: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @text = text
   end
 
   def call
-    tag.div(class: classes, **html_attributes) { @text }
+    tag.div(class: classes, **html_attributes) { content.presence || @text }
+  end
+
+  def render?
+    @text.present? || content.present?
   end
 
 private

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

@@ -1,9 +1,13 @@
 <%= tag.div(class: classes, **html_attributes) do %>
-  <h1 class="govuk-panel__title">
-    <%= @title %>
-  </h1>
+  <% if display_title? %>
+    <h1 class="govuk-panel__title">
+      <%= @title %>
+    </h1>
+  <% end %>
 
-  <div class="govuk-panel__body">
-    <%= @body %>
-  </div>
+  <% if display_body? %>
+    <div class="govuk-panel__body">
+      <%= content.presence || @body %>
+    </div>
+  <% end %>
 <% end %>

data/app/components/govuk_component/panel.rb

@@ -1,7 +1,7 @@
 class GovukComponent::Panel < GovukComponent::Base
   attr_accessor :title, :body
 
-  def initialize(title:, body:, classes: [], html_attributes: {})
+  def initialize(title: nil, body: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @title = title
@@ -13,4 +13,16 @@ private
   def default_classes
     %w(govuk-panel govuk-panel--confirmation)
   end
+
+  def display_title?
+    @title.present?
+  end
+
+  def display_body?
+    [@body, content].any?(&:present?)
+  end
+
+  def render?
+    display_title? || display_body?
+  end
 end

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

@@ -1,10 +1,8 @@
 <%= tag.div(class: classes, **html_attributes) do %>
   <p class="govuk-phase-banner__content">
-    <strong class="govuk-tag govuk-phase-banner__content__tag">
-      <%= @phase %>
-    </strong>
+    <%= render(phase_tag) %>
     <span class="govuk-phase-banner__text">
-      <%= @text || content %>
+      <%= content.presence || @text %>
     </span>
   </p>
 <% end %>

data/app/components/govuk_component/phase_banner.rb

@@ -1,11 +1,11 @@
 class GovukComponent::PhaseBanner < GovukComponent::Base
-  attr_accessor :phase, :text
+  attr_accessor :phase_tag, :text
 
-  def initialize(phase:, text: nil, classes: [], html_attributes: {})
+  def initialize(phase_tag: nil, text: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
-    @phase = phase
-    @text  = text
+    @phase_tag = GovukComponent::Tag.new(classes: "govuk-phase-banner__content__tag", **phase_tag)
+    @text      = text
   end
 
 private

data/lib/govuk/components/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '1.1.5'.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.5
+  version: 1.2.0
 platform: ruby
 authors:
 - DfE developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties