govuk-components 5.0.0b1 → 5.0.0b3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71deff2fbc3e3456d59fe65244041e5b892a2c014967e11cf3a4f5e64a6da596
-  data.tar.gz: 756dfe3c9c96747e25d11e7175f6ae1b15b8cb9db0556f400ac00275c97dbd9a
+  metadata.gz: f18cbe4c3443cef4f1d1bb1bf35fd62d4db164602982710dffc1c6d8dc561d18
+  data.tar.gz: c1f8418c6aa536ffd532ea24dd9718bd949bec77d781cb4a628737f9a0a2618c
 SHA512:
-  metadata.gz: a62ba0fdd881023b79cff29398915f1b37d8b11057bc544fe5bc3df9c7c5336a0c6703360eac1d629ec0c7a7edf8fe1673195478424e86695ad6d273c66527ff
-  data.tar.gz: cbf84f6ea8a76973402d07375b4552661e7316267e1edfd89151f05dc74fe3de38366230c4e498cf66f03111ea180870b05439c79076c89c0fc4b9ca58d5d22d
+  metadata.gz: d97593a2c54aa8fd52de7a518fc60b9f76efbae41881cfed7337e0a8da5f460db1a30ea0114bfc24ee5004bea906b5e9ba56545ecec60d5d36bef1c507d3c595
+  data.tar.gz: ffbaa5ff7ef5eaebe2683cb77a5f35aac5de5f11fd5638742fcb73cb91c76aff6da4d1b982fda1af43ab898811e5d7627f8dc0e751335ae4fefef76c809d9c0d

data/app/helpers/govuk_link_helper.rb

@@ -5,40 +5,48 @@ module GovukLinkHelper
 
   def govuk_link_to(name, href = nil, new_tab: false, inverse: false, muted: false, no_underline: false, no_visited_state: false, text_colour: false, visually_hidden_prefix: nil, visually_hidden_suffix: nil, **kwargs, &block)
     link_args = extract_link_args(new_tab: new_tab, inverse: inverse, muted: muted, no_underline: no_underline, no_visited_state: no_visited_state, text_colour: text_colour, **kwargs)
-    link_text = build_text(name, visually_hidden_prefix: visually_hidden_prefix, visually_hidden_suffix: visually_hidden_suffix, &block)
+    link_text = build_text(name, visually_hidden_prefix: visually_hidden_prefix, visually_hidden_suffix: visually_hidden_suffix)
 
-    link_to(link_text, href, **link_args)
+    if block_given?
+      link_to(link_text, **link_args, &block)
+    else
+      link_to(link_text, href, **link_args)
+    end
   end
 
   def govuk_mail_to(email_address, name = nil, new_tab: false, inverse: false, muted: false, no_underline: false, no_visited_state: false, text_colour: false, visually_hidden_prefix: nil, visually_hidden_suffix: nil, **kwargs, &block)
     link_args = extract_link_args(new_tab: new_tab, inverse: inverse, muted: muted, no_underline: no_underline, no_visited_state: no_visited_state, text_colour: text_colour, **kwargs)
-    link_text = build_text(name, visually_hidden_prefix: visually_hidden_prefix, visually_hidden_suffix: visually_hidden_suffix, &block)
+    link_text = build_text(name, visually_hidden_prefix: visually_hidden_prefix, visually_hidden_suffix: visually_hidden_suffix)
 
-    mail_to(email_address, link_text, **link_args)
+    mail_to(email_address, link_text, **link_args, &block)
   end
 
   def govuk_button_to(name, href = nil, disabled: false, inverse: false, secondary: false, warning: false, visually_hidden_prefix: nil, visually_hidden_suffix: nil, **kwargs, &block)
     button_args = extract_button_args(new_tab: false, disabled: disabled, inverse: inverse, secondary: secondary, warning: warning, **kwargs)
-    button_text = build_text(name, visually_hidden_prefix: visually_hidden_prefix, visually_hidden_suffix: visually_hidden_suffix, &block)
+    button_text = build_text(name, visually_hidden_prefix: visually_hidden_prefix, visually_hidden_suffix: visually_hidden_suffix)
 
-    button_to(button_text, href, **button_args)
+    if block_given?
+      button_to(href, **button_args, &block)
+    else
+      button_to(button_text, href, **button_args)
+    end
   end
 
   def govuk_button_link_to(name, href = nil, new_tab: false, disabled: false, inverse: false, secondary: false, warning: false, visually_hidden_prefix: nil, visually_hidden_suffix: nil, **kwargs, &block)
     button_args = extract_button_link_args(new_tab: new_tab, disabled: disabled, inverse: inverse, secondary: secondary, warning: warning, **kwargs)
-    button_text = build_text(name, visually_hidden_prefix: visually_hidden_prefix, visually_hidden_suffix: visually_hidden_suffix, &block)
+    button_text = build_text(name, visually_hidden_prefix: visually_hidden_prefix, visually_hidden_suffix: visually_hidden_suffix)
 
-    link_to(button_text, href, **button_args)
+    if block_given?
+      link_to(href, **button_args, &block)
+    else
+      link_to(button_text, href, **button_args)
+    end
   end
 
   def govuk_breadcrumb_link_to(name, href = nil, **kwargs, &block)
     link_args = { class: "#{brand}-breadcrumbs--link" }.deep_merge_html_attributes(kwargs)
 
-    if block_given?
-      link_to(block.call, href, **link_args)
-    else
-      link_to(name, href, **link_args)
-    end
+    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)
@@ -123,9 +131,10 @@ private
     Govuk::Components.brand
   end
 
-  def build_text(original, visually_hidden_prefix:, visually_hidden_suffix:, &block)
+  def build_text(text, visually_hidden_prefix:, visually_hidden_suffix:)
+    return nil if text.nil?
+
     prefix = (visually_hidden_prefix.present?) ? visually_hidden_prefix + " " : nil
-    text = (block_given?) ? block.call : original
     suffix = (visually_hidden_suffix.present?) ? " " + visually_hidden_suffix : nil
 
     safe_join([govuk_visually_hidden(prefix), text, govuk_visually_hidden(suffix)].compact)

data/app/helpers/govuk_visually_hidden_helper.rb

@@ -1,13 +1,9 @@
 module GovukVisuallyHiddenHelper
-  def govuk_visually_hidden(text = nil, focusable: false, &block)
-    content = (block_given?) ? block.call : text
+  def govuk_visually_hidden(text = nil, &block)
+    return if text.blank? && block.nil?
 
-    return if content.blank?
-
-    visually_hidden_class = focusable ? "govuk-visually-hidden-focusable" : "govuk-visually-hidden"
-
-    tag.span(content, class: visually_hidden_class)
+    tag.span(text, class: "govuk-visually-hidden", &block)
   end
 end
 
-ActiveSupport.on_load(:action_view) { include GovukSkipLinkHelper }
+ActiveSupport.on_load(:action_view) { include GovukVisuallyHiddenHelper }

data/lib/govuk/components/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 5.0.0b1
+  version: 5.0.0b3
 platform: ruby
 authors:
 - DfE developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-28 00:00:00.000000000 Z
+date: 2023-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils