govuk-components 2.1.2 → 3.0.0b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a251ce9b412d46a7fd70155a08ba3cc2f6e9830baca832622bdeb459936b791f
-  data.tar.gz: 85cccf721573ce9c734d7156de9da9c1ceefc22cac05888d8163d9441420be7b
+  metadata.gz: 9916c5fc5a9e7cc9929b62cb227c0a0b39fdf5cb5d3c9108fc95cb6184ce3ea8
+  data.tar.gz: 6b9da5d40f0966423d06e68c948cb71d8ead87335dbcb5ce4f8a9131bd8980a2
 SHA512:
-  metadata.gz: c94357e58eee8a5ee0ae6e059f3177e340340d7af7cd19cfc3de607cc3b04e52d62e689a9291cc94ae568a1e1de809e224c566cb82a9b148986346773b45064b
-  data.tar.gz: 89494b6d782f7aaf2e4453fc317c917bb87e6dafabd21cd8b6d0d363ebba546ae2ffbdef43f129d8eaff875f0a3cd1b804a99f271f5a33779fca3ec8fddf2d0b
+  metadata.gz: d42827c400d5747af53352388f928d546919be9a74d88dcbcb657cbe12c8b7fb924c59df73bde3936760e4596cbacd62b23252a70b45574c3c27f216be0d5b55
+  data.tar.gz: ac8158fdd29aa936270a833ea3c351a6e8374dd932456610532b070fc70af4e8f1e0e22eff32a1c6d75dbdfa939269a1c9e297c52823c397bea1ea00c7fff858

data/app/components/govuk_component/accordion_component/section_component.rb

@@ -34,8 +34,6 @@ class GovukComponent::AccordionComponent::SectionComponent < GovukComponent::Bas
 private
 
   def default_classes
-    %w(govuk-accordion__section).tap do |classes|
-      classes.append("govuk-accordion__section--expanded") if expanded?
-    end
+    class_names("govuk-accordion__section", "govuk-accordion__section--expanded" => expanded?).split
   end
 end

data/app/components/govuk_component/back_link_component.rb

@@ -1,7 +1,7 @@
 class GovukComponent::BackLinkComponent < GovukComponent::Base
   attr_reader :text, :href
 
-  def initialize(href:, text: nil, classes: nil, html_attributes: {})
+  def initialize(href:, text: 'Back', classes: nil, html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @text = text
@@ -15,7 +15,7 @@ class GovukComponent::BackLinkComponent < GovukComponent::Base
 private
 
   def link_content
-    text || content || fail(ArgumentError, "no text or content")
+    content || text || fail(ArgumentError, "no text or content")
   end
 
   def default_classes

data/app/components/govuk_component/breadcrumbs_component.rb

@@ -12,10 +12,11 @@ class GovukComponent::BreadcrumbsComponent < GovukComponent::Base
 private
 
   def default_classes
-    %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
+    class_names(
+      "govuk-breadcrumbs",
+      "govuk-!-display-none-print" => hide_in_print,
+      "govuk-breadcrumbs--collapse-on-mobile" => collapse_on_mobile
+    ).split
   end
 
   def build_list(breadcrumbs)

data/app/components/govuk_component/cookie_banner_component/message_component.rb

@@ -51,7 +51,7 @@ private
   def wrap_in_p(message_text)
     return if message_text.blank?
 
-    tag.p(message_text)
+    tag.p(message_text, class: "govuk-body")
   end
 
   def actions_element

data/app/components/govuk_component/cookie_banner_component.rb

@@ -1,17 +1,18 @@
 class GovukComponent::CookieBannerComponent < GovukComponent::Base
   renders_many :messages, GovukComponent::CookieBannerComponent::MessageComponent
 
-  attr_accessor :aria_label, :hidden
+  attr_accessor :aria_label, :hidden, :hide_in_print
 
-  def initialize(aria_label: "Cookie banner", hidden: false, classes: [], html_attributes: {})
+  def initialize(aria_label: "Cookie banner", hidden: false, hide_in_print: true, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
-    @aria_label = aria_label
-    @hidden     = hidden
+    @aria_label    = aria_label
+    @hidden        = hidden
+    @hide_in_print = hide_in_print
   end
 
   def call
-    tag.div(class: classes, role: "region", aria: { label: aria_label }, hidden: hidden, **html_attributes) do
+    tag.div(class: classes, role: "region", aria: { label: aria_label }, data: { nosnippet: true }, hidden: hidden, **html_attributes) do
       safe_join(messages)
     end
   end
@@ -19,6 +20,6 @@ class GovukComponent::CookieBannerComponent < GovukComponent::Base
 private
 
   def default_classes
-    %w(govuk-cookie-banner)
+    class_names("govuk-cookie-banner", "govuk-!-display-none-print" => hide_in_print).split
   end
 end

data/app/components/govuk_component/details_component.rb

@@ -3,7 +3,7 @@ class GovukComponent::DetailsComponent < GovukComponent::Base
 
   renders_one :summary_html
 
-  def initialize(summary_text:, text: nil, classes: [], id: nil, open: nil, html_attributes: {})
+  def initialize(summary_text: nil, text: nil, classes: [], id: nil, open: nil, html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @summary_text = summary_text

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

@@ -1,5 +1,13 @@
 <%= tag.footer(class: classes, role: 'contentinfo', **html_attributes) do %>
   <%= tag.div(class: container_classes, **container_html_attributes) do %>
+    <% if navigation.present? %>
+      <div class="govuk-footer__navigation">
+        <%= navigation %>
+      </div>
+
+      <hr class="govuk-footer__section-break">
+    <% end %>
+
     <%= tag.div(class: meta_classes, **meta_html_attributes) do %>
       <% if meta.present? %>
         <%= meta %>
@@ -28,12 +36,13 @@
           <% end %>
 
           <% if meta_content.present? %>
-            <%= meta_content %>
+            <div class="govuk-footer__meta-custom">
+              <%= meta_content %>
+            </div>
           <% end %>
         </div>
-        <div class="govuk-footer__meta">
-          <%= tag.div(copyright, class: "govuk-footer__meta-item") %>
-        </div>
+
+        <%= tag.div(copyright, class: "govuk-footer__meta-item") %>
       <% end %>
     <% end %>
   <% end %>

data/app/components/govuk_component/footer_component.rb

@@ -1,6 +1,7 @@
 class GovukComponent::FooterComponent < GovukComponent::Base
   renders_one :meta_html
   renders_one :meta
+  renders_one :navigation
 
   attr_reader :meta_items, :meta_text, :meta_items_title, :meta_licence, :copyright, :custom_container_classes
 
@@ -76,7 +77,7 @@ private
   end
 
   def default_copright_text
-    raw(%(&copy Crown copyright))
+    raw(%(© Crown copyright))
   end
 
   def default_copyright_url

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

@@ -7,11 +7,19 @@
             <%= custom_logo %>
           <% else %>
             <% if crown %>
+              <!--[if gt IE 8]><!-->
               <svg aria-hidden="true" focusable="false" class="govuk-header__logotype-crown" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 132 97" height="30" width="36">
                 <path fill="currentColor" fill-rule="evenodd" d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"></path>
-                <image src="/assets/images/govuk-logotype-crown.png" xlink:href="" class="govuk-header__logotype-crown-fallback-image" width="36" height="32"></image>
               </svg>
+              <!--<![endif]-->
             <% end %>
+
+            <% if crown_fallback_image_path.present? %>
+              <!--[if IE 8]>
+                <%= image_tag(crown_fallback_image_path, **crown_fallback_image_attributes) %>
+              <![endif]-->
+            <% end %>
+
             <%= tag.span(logotype, class: "govuk-header__logotype-text") %>
           <% end %>
         </span>
@@ -28,16 +36,14 @@
         <% end %>
 
         <% if navigation_items.any? %>
-          <%= tag.button("Menu", type: "button", class: %w(govuk-header__menu-button govuk-js-header-toggle), aria: { controls: "navigation", label: menu_button_label }) %>
-          <nav>
-            <%= tag.ul(class: navigation_classes, id: "navigation", aria: { label: navigation_label }) do %>
+          <%= tag.nav(class: navigation_classes, aria: { label: navigation_label }) do %>
+            <%= tag.button("Menu", type: "button", class: %w(govuk-header__menu-button govuk-js-header-toggle), aria: { controls: "navigation", label: menu_button_label }) %>
+            <ul id="navigation" class="govuk-header__navigation-list">
               <% navigation_items.each do |item| %>
-                <%= tag.li(class: item.classes.append(item.active_class), **item.html_attributes) do %>
-                  <%= item %>
-                <% end %>
+                <%= item %>
               <% end %>
-            <% end %>
-          </nav>
+            </ul>
+          <% end %>
         <% end %>
       </div>
     <% end %>

data/app/components/govuk_component/header_component.rb

@@ -5,6 +5,7 @@ class GovukComponent::HeaderComponent < GovukComponent::Base
 
   attr_reader :logotype,
               :crown,
+              :crown_fallback_image_path,
               :homepage_url,
               :service_name,
               :service_url,
@@ -17,6 +18,7 @@ class GovukComponent::HeaderComponent < GovukComponent::Base
                  html_attributes: {},
                  logotype: 'GOV.UK',
                  crown: true,
+                 crown_fallback_image_path: nil,
                  homepage_url: '/',
                  menu_button_label: 'Show or hide navigation menu',
                  navigation_classes: [],
@@ -29,6 +31,7 @@ class GovukComponent::HeaderComponent < GovukComponent::Base
 
     @logotype                  = logotype
     @crown                     = crown
+    @crown_fallback_image_path = crown_fallback_image_path
     @homepage_url              = homepage_url
     @service_name              = service_name
     @service_url               = service_url
@@ -52,6 +55,14 @@ private
     combine_classes(%w(govuk-header__container govuk-width-container), custom_container_classes)
   end
 
+  def crown_fallback_image_attributes
+    {
+      class: "govuk-header__logotype-crown-fallback-image",
+      width: "36",
+      height: "32",
+    }
+  end
+
   class NavigationItem < GovukComponent::Base
     attr_reader :text, :href, :options, :active
 
@@ -61,17 +72,16 @@ private
       @text    = text
       @href    = href
       @options = options
-      @active  = active
-    end
 
-    def active?
-      return current_page?(href) if active.nil?
+      @active_override = active
+    end
 
-      active
+    def before_render
+      @active = active?(@active_override)
     end
 
     def active_class
-      %w(govuk-header__navigation-item--active) if active?
+      %w(govuk-header__navigation-item--active) if @active
     end
 
     def link?
@@ -79,15 +89,23 @@ private
     end
 
     def call
-      if link?
-        link_to(text, href, **options, class: "govuk-header__link")
-      else
-        text
+      tag.li(class: classes.append(active_class), **html_attributes) do
+        if link?
+          link_to(text, href, **options, class: "govuk-header__link")
+        else
+          text
+        end
       end
     end
 
   private
 
+    def active?(active_override)
+      return current_page?(href) if active_override.nil?
+
+      active_override
+    end
+
     def default_classes
       %w(govuk-header__navigation-item)
     end

data/app/components/govuk_component/phase_banner_component.rb

@@ -9,7 +9,7 @@ class GovukComponent::PhaseBannerComponent < GovukComponent::Base
   end
 
   def phase_tag_component
-    GovukComponent::TagComponent.new(classes: "govuk-phase-banner__content__tag", **phase_tag)
+    GovukComponent::TagComponent.new(**phase_tag.deep_merge(classes: "govuk-phase-banner__content__tag"))
   end
 
 private

data/app/components/govuk_component/tab_component.rb

@@ -35,9 +35,7 @@ private
     end
 
     def li_classes(i = nil)
-      %w(govuk-tabs__list-item).tap do |c|
-        c.append("govuk-tabs__list-item--selected") if i&.zero?
-      end
+      class_names("govuk-tabs__list-item", "govuk-tabs__list-item--selected" => i&.zero?).split
     end
 
     def li_link

data/app/components/govuk_component/table_component/caption_component.rb

@@ -26,9 +26,7 @@ private
   end
 
   def default_classes
-    %w(govuk-table__caption).tap do |c|
-      c << caption_size_class if @size
-    end
+    class_names("govuk-table__caption", caption_size_class => size).split
   end
 
   def caption_size_class

data/app/components/govuk_component/table_component/cell_component.rb

@@ -37,19 +37,13 @@ private
 
   def default_classes
     if header
-      %w(govuk-table__header).tap do |c|
-        c << "govuk-table__header--numeric" if numeric?
-        c << width_class if width?
-      end
+      class_names("govuk-table__header", "govuk-table__header--numeric" => numeric?, width_class => width?).split
     else
-      %w(govuk-table__cell).tap do |c|
-        c << "govuk-table__cell--numeric" if numeric?
-        c << width_class if width?
-      end
+      class_names("govuk-table__cell", "govuk-table__cell--numeric" => numeric?, width_class => width?).split
     end
   end
 
   def width_class
-    WIDTHS.fetch(width)
+    WIDTHS.fetch(width, nil)
   end
 end

data/app/components/govuk_component/warning_text_component.rb

@@ -3,7 +3,7 @@ class GovukComponent::WarningTextComponent < GovukComponent::Base
 
   ICON = '!'.freeze
 
-  def initialize(text:, icon_fallback_text: 'Warning', classes: [], html_attributes: {})
+  def initialize(text: nil, icon_fallback_text: 'Warning', classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @text = text
@@ -12,7 +12,7 @@ class GovukComponent::WarningTextComponent < GovukComponent::Base
 
   def call
     tag.div(class: classes, **html_attributes) do
-      safe_join([icon, (content || strong)])
+      safe_join([icon, warning_text])
     end
   end
 
@@ -22,9 +22,9 @@ private
     tag.span(ICON, class: 'govuk-warning-text__icon', aria: { hidden: true })
   end
 
-  def strong
+  def warning_text
     tag.strong(class: 'govuk-warning-text__text') do
-      safe_join([assistive, text])
+      safe_join([assistive, (content || text)])
     end
   end
 

data/lib/govuk/components/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '2.1.2'.freeze
+    VERSION = '3.0.0b1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.0.0b1
 platform: ruby
 authors:
 - DfE developers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -220,7 +220,7 @@ homepage: https://github.com/DFE-Digital/govuk-components
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -231,12 +231,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Lightweight set of reusable GOV.UK Design System components
 test_files: []