govuk-components 5.0.0b2 → 5.0.0b4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6c2597cbc2b6db48def0781c11e2173bb2e3a1bf5b661c695145d68ea41fa7f
-  data.tar.gz: c6853251961b9b9e2e102cbdd6439cf20b99d695ba548008c1d68edb1c287158
+  metadata.gz: 9e61252c526732d7919b0fc8c0818af26742357a007b18a0e919448ac8069319
+  data.tar.gz: 4c1271fc9c6ccfb1c15b33e4716841d86f0bbb5d77b2747a4ec2a6a21163448c
 SHA512:
-  metadata.gz: 7d908043c42e33bf274e2d06e8873ec6fe207825b866064fc12dcd46ce9c113db3476dd7ee9537d65b5648e2521da1b7abcaccdd23fdbbf715003d9672390952
-  data.tar.gz: 3595863554678c2eb81f5a286d71257a0340bcb57d9dda6596d6d7efa0e985e8dd59cd72d984cba87cb86ad0c2f49e3280dc918f207970cdd0e9b3246cd793f9
+  metadata.gz: 22eb5f538044e5047270e2ed6cf8b5a93770a46913cf4df3ad259ccd560c6085ddfe257fe93fafbfbe518e05b25c0dbb471a0dd8c12ee2a35a8be44c4496bbfa
+  data.tar.gz: 2aa37663c893724c13382561c3120e754cb49ea0bc7cc9c52846d2cda203beb772e06e3c7b1c03b2c69e18bae8c586f2f12efa0dd4901330d53ed12b9f7de3a2

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(name, **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(name, **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/lib/govuk/components/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 5.0.0b2
+  version: 5.0.0b4
 platform: ruby
 authors:
 - DfE developers