govuk-components 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f49a8caa87e838e21d85b219d5344a50aa8d8ce70145d7c209c11f29d1fc96df
-  data.tar.gz: 468c1bb30d836cbff55c1407f6fd83378ba384f9430e90e93fad94b48853b1b2
+  metadata.gz: b22deb7323c7532776a46557ba64d5a4aba958e1a684dc7d4a8eff188a1ed3ee
+  data.tar.gz: 235dbcf62c374970390c483532998f18480c74cfb3a746413e4bb6e0a277f557
 SHA512:
-  metadata.gz: fa4e8e53212aa8b898954585dc9c96076499343325d967aea5896eb8c3e68b89ca3c56e1c8d0788b0d2a71a5b1aa1316bbb9b3cb4112d69ed4f6b2f1e3c16f2b
-  data.tar.gz: 1fcaf8d663e7021a99bb4d55077772e5e33c9c10a0baad938d8895f504c191c6600b807ad30506fd9394ef404daf0210fae07c7dd756e007ab020748608738df
+  metadata.gz: 5122fe37f57d769672a1155a6f5c2cdc6ad63bf3216d35997869a2c48391d8741917cac02928532808db421c2b9a242a2948b0fc3bee835256f8a20407f615ab
+  data.tar.gz: 4fcdd601d78c4f03dc71d2ff33d6749d5166d8416acd1624e36a6101ec6554880ec7085ad4eefc4515046d44a01f5028225b85c6618d9e449f134ce36e4a4bbf

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

@@ -5,7 +5,7 @@
         <%= navigation %>
       </div>
 
-      <hr class="<% brand %>-footer__section-break">
+      <%= tag.hr(class: "#{brand}-footer__section-break") %>
     <% end %>
 
     <%= tag.div(class: meta_classes, **meta_html_attributes) do %>
@@ -15,7 +15,7 @@
         <div class="<%= brand %>-footer__meta-item <%= brand %>-footer__meta-item--grow">
           <% if meta_items.any? %>
             <h2 class="<%= brand %>-visually-hidden"><%= meta_items_title %></h2>
-
+            <%= content_before_meta_items %>
             <ul class="<%= brand %>-footer__inline-list">
               <% @meta_items.each do |hyperlink| %>
                 <li class="<%= brand %>-footer__inline-list-item">
@@ -23,6 +23,13 @@
                 </li>
               <% end %>
             </ul>
+            <%= content_after_meta_items %>
+          <% end %>
+
+          <% if meta_content.present? %>
+            <div class="<%= brand %>-footer__meta-custom">
+              <%= meta_content %>
+            </div>
           <% end %>
 
           <% if meta_licence.nil? %>
@@ -34,12 +41,6 @@
           <% elsif meta_licence.present? %>
             <%= tag.span(meta_licence, class: "#{brand}-footer__licence-description") %>
           <% end %>
-
-          <% if meta_content.present? %>
-            <div class="<%= brand %>-footer__meta-custom">
-              <%= meta_content %>
-            </div>
-          <% end %>
         </div>
 
         <%= tag.div(copyright, class: "#{brand}-footer__meta-item") %>

data/app/components/govuk_component/footer_component.rb

@@ -4,8 +4,10 @@ class GovukComponent::FooterComponent < GovukComponent::Base
   renders_one :meta_html
   renders_one :meta
   renders_one :navigation
+  renders_one :content_before_meta_items
+  renders_one :content_after_meta_items
 
-  attr_reader :meta_items, :meta_text, :meta_items_title, :meta_licence, :copyright, :custom_container_classes
+  attr_reader :meta_items, :meta_text, :meta_items_title, :meta_licence, :copyright_text, :copyright_url, :custom_container_classes
 
   def initialize(
     classes: [],
@@ -27,7 +29,8 @@ class GovukComponent::FooterComponent < GovukComponent::Base
     @meta_licence                     = meta_licence
     @custom_meta_classes              = meta_classes
     @custom_meta_html_attributes      = meta_html_attributes
-    @copyright                        = build_copyright(copyright_text, copyright_url)
+    @copyright_text                   = copyright_text
+    @copyright_url                    = copyright_url
     @custom_container_classes         = container_classes
     @custom_container_html_attributes = container_html_attributes
 
@@ -67,9 +70,9 @@ private
 
     case links
     when Array
-      links.map { |link| raw(link_to(link[:text], link[:href], class: "#{brand}-footer__link", **link.fetch(:attr, {}))) }
+      links.map { |link| govuk_footer_link_to(link[:text], link[:href], **link.fetch(:attr, {})) }
     when Hash
-      links.map { |text, href| raw(link_to(text, href, class: "#{brand}-footer__link")) }
+      links.map { |text, href| govuk_footer_link_to(text, href) }
     else
       fail(ArgumentError, 'meta links must be a hash or array of hashes') unless links.is_a?(Hash)
     end
@@ -81,7 +84,7 @@ private
     raw(%(All content is available under the #{link}, except where otherwise stated))
   end
 
-  def build_copyright(text, url)
-    link_to(text, url, class: "#{brand}-footer__link #{brand}-footer__copyright-logo")
+  def copyright
+    link_to(copyright_text, copyright_url, class: "#{brand}-footer__link #{brand}-footer__copyright-logo")
   end
 end

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

@@ -1,4 +1,4 @@
-<%= tag.header(role: 'banner', data: { module: "#{brand}-header" }, **html_attributes) do %>
+<%= tag.header(data: { module: "#{brand}-header" }, **html_attributes) do %>
   <%= tag.div(**container_html_attributes) do %>
     <div class="<%= brand %>-header__logo">
       <%= link_to(homepage_url, class: ["#{brand}-header__link", "#{brand}-header__link--homepage"]) do %>

data/app/components/govuk_component/pagination_component.rb

@@ -85,7 +85,7 @@ class GovukComponent::PaginationComponent < GovukComponent::Base
 private
 
   def default_attributes
-    { role: "navigation", aria: { label: landmark_label }, class: "#{brand}-pagination" }
+    { aria: { label: landmark_label }, class: "#{brand}-pagination" }
   end
 
   def build_previous

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

@@ -1,5 +1,5 @@
 <%= tag.div(**html_attributes) do %>
-  <%= tag.h2(title, class: "#{brand}-tabs__title") %>
+  <%= tag.h2(title, class: "#{brand}-tabs__title") if title %>
   <ul class="<%= brand %>-tabs__list">
     <% tabs.each.with_index do |tab, i| %>
       <%= tag.li(tab.li_link, class: tab.li_classes(i)) %>

data/app/components/govuk_component/tab_component.rb

@@ -5,7 +5,7 @@ class GovukComponent::TabComponent < GovukComponent::Base
 
   attr_reader :title, :id
 
-  def initialize(title:, id: nil, classes: [], html_attributes: {})
+  def initialize(title: 'Contents', id: nil, classes: [], html_attributes: {})
     @title = title
     @id    = id
 

data/app/helpers/govuk_link_helper.rb

@@ -57,6 +57,12 @@ module GovukLinkHelper
     link_to(name, href, **link_args, &block)
   end
 
+  def govuk_footer_link_to(name, href = nil, **kwargs, &block)
+    link_args = { class: "#{brand}-footer__link" }.deep_merge_html_attributes(kwargs)
+
+    link_to(name, href, **link_args, &block)
+  end
+
   def govuk_link_classes(inverse: false, muted: false, no_underline: false, no_visited_state: false, text_colour: false)
     if [text_colour, inverse, muted].count(true) > 1
       fail("links can be only be one of text_colour, inverse or muted")
@@ -109,14 +115,16 @@ private
     Rails.logger.warn(controller_warning_message(kwargs.fetch(:controller))) if kwargs.key?(:controller)
 
     button_classes = extract_button_classes(inverse:, secondary:, warning:)
+    data_attributes = build_data_attributes("#{brand}-button")
 
-    { **button_classes, **button_attributes(disabled), **new_tab_args(new_tab) }.deep_merge_html_attributes(kwargs)
+    { **button_classes, **data_attributes, **button_attributes(disabled), **new_tab_args(new_tab) }.deep_merge_html_attributes(kwargs)
   end
 
-  def extract_button_args(disabled: false, inverse: false, secondary: false, warning: false, **kwargs)
+  def extract_button_args(disabled: false, inverse: false, secondary: false, warning: false, prevent_double_click: nil, **kwargs)
     button_classes = extract_button_classes(inverse:, secondary:, warning:)
+    data_attributes = build_data_attributes("#{brand}-button", prevent_double_click:)
 
-    { **button_classes, **button_attributes(disabled) }.deep_merge_html_attributes(kwargs)
+    { **button_classes, **data_attributes, **button_attributes(disabled) }.deep_merge_html_attributes(kwargs)
   end
 
   def extract_link_classes(inverse: false, muted: false, no_underline: false, no_visited_state: false, text_colour: false)
@@ -177,6 +185,13 @@ private
   def controller_warning_message(value)
     "controller: '#{value}' parameter detected. Support for old style controller/action links has been removed. See https://github.com/x-govuk/govuk-components/releases/tag/v5.0.0"
   end
+
+  def build_data_attributes(data_module, prevent_double_click: nil)
+    {
+      "data-module": data_module,
+      "data-prevent-double-click": prevent_double_click
+    }.compact
+  end
 end
 
 ActiveSupport.on_load(:action_view) { include GovukLinkHelper }

data/app/helpers/govuk_list_helper.rb

@@ -0,0 +1,29 @@
+module GovukListHelper
+  def govuk_list(array = nil, type: nil, spaced: nil, classes: nil, html_attributes: {}, &block)
+    type = type.to_s
+
+    fail "Unrecognised type for govuk_list - should be :bullet or :number or nil" unless type.in?(["bullet", "number", ""])
+
+    tag_type = (type == "number") ? "ol" : "ul"
+
+    html_classes = class_names(
+      "#{brand}-list",
+      *classes,
+      "#{brand}-list--bullet" => (type == "bullet"),
+      "#{brand}-list--number" => (type == "number"),
+      "#{brand}-list--spaced" => spaced
+    )
+
+    if block_given?
+      content_tag(tag_type, class: html_classes, **html_attributes, &block)
+    else
+      content_tag(tag_type, class: html_classes, **html_attributes) do
+        array.each do |item|
+          concat tag.li(item)
+        end
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load(:action_view) { include GovukListHelper }

data/app/helpers/govuk_rails_compatible_link_helper.rb

@@ -44,7 +44,7 @@ module GovukRailsCompatibleLinkHelper
   def govuk_button_to(name = nil, options = nil, extra_options = {}, &block)
     extra_options = options if block_given?
     html_options = {
-      data: { module: "govuk-button" }
+      data: { module: "#{brand}-button" }
     }
 
     if extra_options && extra_options[:prevent_double_click]

data/lib/govuk/components/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '5.2.0'.freeze
+    VERSION = '5.3.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - DfE developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-22 00:00:00.000000000 Z
+date: 2024-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils
@@ -34,16 +34,22 @@ dependencies:
   name: pagy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: view_component
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +59,7 @@ dependencies:
         version: '3.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +69,7 @@ dependencies:
         version: '3.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -384,6 +390,7 @@ files:
 - app/helpers/govuk_components_helper.rb
 - app/helpers/govuk_exit_this_page_link_helper.rb
 - app/helpers/govuk_link_helper.rb
+- app/helpers/govuk_list_helper.rb
 - app/helpers/govuk_rails_compatible_link_helper.rb
 - app/helpers/govuk_skip_link_helper.rb
 - app/helpers/govuk_visually_hidden_helper.rb