govuk-components 1.1.3 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e09cd54a51ac03334ecd626e7511d08fb8978a2cbb7b10bbdd6390a0e74fc7a
-  data.tar.gz: f6258410434e206cd0f43352f390f794467fc67ea541ddf2de84d6a5faf29ab5
+  metadata.gz: c829ddc2492475939db14c1ad3af5ead810f8fbff0cf43ed79c747f01b7866cf
+  data.tar.gz: 777a37175936a10048a020be1bd5612607fb6d1db954b5031af8fe5147b3272b
 SHA512:
-  metadata.gz: 639e347636e7bcecf2fdefeba4adfd8b1d1040c90beb083fb52455ecdfc4461531ee7ded5010fdf37291fd8977a1d808d7e92c82c69bb854d2858c12b957a9d0
-  data.tar.gz: 6e0fe55bfd952729a9a65ff5d9cbca76e500e213e448acb964ccc6ae6f0807f8402df3b18ec01926a015321a4fc396f2adad88008670c47306a8c6c030769d9b
+  metadata.gz: ea38981feda270c38323611dcf24440162e0c868de8193501b8b461dc38c8e6533bb17884c60cea42fb75e5b2a855f4ce99dfcf211a9648675d6bd673bd64fdc
+  data.tar.gz: 211d2ce55a3a39dea50606a0a076c02a73e2f05904f0cdaf5ad8540ad0e498aa05d62fa58cc185d17ec4cbfe137e18067e593926b758e6eb76c97c9f63722153

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/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,21 @@
       <% 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>
         <nav>
-          <ul class="govuk-header__navigation " aria-label="Top Level Navigation">
+          <%= tag.ul(class: navigation_classes, aria: { label: "Top Level Navigation" }) 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,24 @@
 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
 
   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: 'Menu', classes: [], navigation_classes: [], 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
   end
 
 private
@@ -21,10 +27,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 +52,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.3'.freeze
+    VERSION = '1.1.8'.freeze
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.8
 platform: ruby
 authors:
 - DfE developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,25 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: view_component
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.22.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.27.0
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.22.1
-    - - "<"
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: view_component
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.20'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.27.0
+        version: '2.20'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement