govuk-components 2.1.6 → 3.0.0b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14fa3254f2a6cfe00069f3342241b165dbf00f746a6bff31170f291977614f32
-  data.tar.gz: a61d4942fa381ee173bc0f397517485f0b0617e5eff7b7a015bbdb9c7ab2fd5f
+  metadata.gz: 9916c5fc5a9e7cc9929b62cb227c0a0b39fdf5cb5d3c9108fc95cb6184ce3ea8
+  data.tar.gz: 6b9da5d40f0966423d06e68c948cb71d8ead87335dbcb5ce4f8a9131bd8980a2
 SHA512:
-  metadata.gz: 163dc576f943962d3730e505b131a98963231b3ae95d3bfdf0d78409c5aa35f9198c518978dfbfc16e8dbadc99ae19fcde97a7b318e782fbb476190eb810dad1
-  data.tar.gz: 05a0b60347a348e4f006d0c5e4dad3e2afe3a603b0a6fae3150d2ef34ff200f6f83ab6dce65bd009dcf897ca649aaaca1fc7e66ac59044ba1bd40c0aef884bf5
+  metadata.gz: d42827c400d5747af53352388f928d546919be9a74d88dcbcb657cbe12c8b7fb924c59df73bde3936760e4596cbacd62b23252a70b45574c3c27f216be0d5b55
+  data.tar.gz: ac8158fdd29aa936270a833ea3c351a6e8374dd932456610532b070fc70af4e8f1e0e22eff32a1c6d75dbdfa939269a1c9e297c52823c397bea1ea00c7fff858

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/cookie_banner_component.rb

@@ -12,7 +12,7 @@ class GovukComponent::CookieBannerComponent < GovukComponent::Base
   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

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

@@ -36,7 +36,9 @@
           <% end %>
 
           <% if meta_content.present? %>
-            <%= meta_content %>
+            <div class="govuk-footer__meta-custom">
+              <%= meta_content %>
+            </div>
           <% end %>
         </div>
 

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

@@ -36,14 +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| %>
                 <%= item %>
               <% end %>
-            <% end %>
-          </nav>
+            </ul>
+          <% end %>
         <% end %>
       </div>
     <% 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/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.6'.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.6
+  version: 3.0.0b1
 platform: ruby
 authors:
 - DfE developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-09 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.49.1
+        version: 2.39.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.49.1
+        version: 2.39.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -231,11 +231,11 @@ 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.3.3
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Lightweight set of reusable GOV.UK Design System components