govuk-components 5.0.0b2 → 5.0.0b4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d6c2597cbc2b6db48def0781c11e2173bb2e3a1bf5b661c695145d68ea41fa7f
4
- data.tar.gz: c6853251961b9b9e2e102cbdd6439cf20b99d695ba548008c1d68edb1c287158
3
+ metadata.gz: 9e61252c526732d7919b0fc8c0818af26742357a007b18a0e919448ac8069319
4
+ data.tar.gz: 4c1271fc9c6ccfb1c15b33e4716841d86f0bbb5d77b2747a4ec2a6a21163448c
5
5
  SHA512:
6
- metadata.gz: 7d908043c42e33bf274e2d06e8873ec6fe207825b866064fc12dcd46ce9c113db3476dd7ee9537d65b5648e2521da1b7abcaccdd23fdbbf715003d9672390952
7
- data.tar.gz: 3595863554678c2eb81f5a286d71257a0340bcb57d9dda6596d6d7efa0e985e8dd59cd72d984cba87cb86ad0c2f49e3280dc918f207970cdd0e9b3246cd793f9
6
+ metadata.gz: 22eb5f538044e5047270e2ed6cf8b5a93770a46913cf4df3ad259ccd560c6085ddfe257fe93fafbfbe518e05b25c0dbb471a0dd8c12ee2a35a8be44c4496bbfa
7
+ data.tar.gz: 2aa37663c893724c13382561c3120e754cb49ea0bc7cc9c52846d2cda203beb772e06e3c7b1c03b2c69e18bae8c586f2f12efa0dd4901330d53ed12b9f7de3a2
@@ -5,40 +5,48 @@ module GovukLinkHelper
5
5
 
6
6
  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)
7
7
  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)
8
- link_text = build_text(name, visually_hidden_prefix: visually_hidden_prefix, visually_hidden_suffix: visually_hidden_suffix, &block)
8
+ link_text = build_text(name, visually_hidden_prefix: visually_hidden_prefix, visually_hidden_suffix: visually_hidden_suffix)
9
9
 
10
- link_to(link_text, href, **link_args)
10
+ if block_given?
11
+ link_to(link_text, **link_args, &block)
12
+ else
13
+ link_to(link_text, href, **link_args)
14
+ end
11
15
  end
12
16
 
13
17
  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)
14
18
  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)
15
- link_text = build_text(name, visually_hidden_prefix: visually_hidden_prefix, visually_hidden_suffix: visually_hidden_suffix, &block)
19
+ link_text = build_text(name, visually_hidden_prefix: visually_hidden_prefix, visually_hidden_suffix: visually_hidden_suffix)
16
20
 
17
- mail_to(email_address, link_text, **link_args)
21
+ mail_to(email_address, link_text, **link_args, &block)
18
22
  end
19
23
 
20
24
  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)
21
25
  button_args = extract_button_args(new_tab: false, disabled: disabled, inverse: inverse, secondary: secondary, warning: warning, **kwargs)
22
- button_text = build_text(name, visually_hidden_prefix: visually_hidden_prefix, visually_hidden_suffix: visually_hidden_suffix, &block)
26
+ button_text = build_text(name, visually_hidden_prefix: visually_hidden_prefix, visually_hidden_suffix: visually_hidden_suffix)
23
27
 
24
- button_to(button_text, href, **button_args)
28
+ if block_given?
29
+ button_to(name, **button_args, &block)
30
+ else
31
+ button_to(button_text, href, **button_args)
32
+ end
25
33
  end
26
34
 
27
35
  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)
28
36
  button_args = extract_button_link_args(new_tab: new_tab, disabled: disabled, inverse: inverse, secondary: secondary, warning: warning, **kwargs)
29
- button_text = build_text(name, visually_hidden_prefix: visually_hidden_prefix, visually_hidden_suffix: visually_hidden_suffix, &block)
37
+ button_text = build_text(name, visually_hidden_prefix: visually_hidden_prefix, visually_hidden_suffix: visually_hidden_suffix)
30
38
 
31
- link_to(button_text, href, **button_args)
39
+ if block_given?
40
+ link_to(name, **button_args, &block)
41
+ else
42
+ link_to(button_text, href, **button_args)
43
+ end
32
44
  end
33
45
 
34
46
  def govuk_breadcrumb_link_to(name, href = nil, **kwargs, &block)
35
47
  link_args = { class: "#{brand}-breadcrumbs--link" }.deep_merge_html_attributes(kwargs)
36
48
 
37
- if block_given?
38
- link_to(block.call, href, **link_args)
39
- else
40
- link_to(name, href, **link_args)
41
- end
49
+ link_to(name, href, **link_args, &block)
42
50
  end
43
51
 
44
52
  def govuk_link_classes(inverse: false, muted: false, no_underline: false, no_visited_state: false, text_colour: false)
@@ -123,9 +131,10 @@ private
123
131
  Govuk::Components.brand
124
132
  end
125
133
 
126
- def build_text(original, visually_hidden_prefix:, visually_hidden_suffix:, &block)
134
+ def build_text(text, visually_hidden_prefix:, visually_hidden_suffix:)
135
+ return nil if text.nil?
136
+
127
137
  prefix = (visually_hidden_prefix.present?) ? visually_hidden_prefix + " " : nil
128
- text = (block_given?) ? block.call : original
129
138
  suffix = (visually_hidden_suffix.present?) ? " " + visually_hidden_suffix : nil
130
139
 
131
140
  safe_join([govuk_visually_hidden(prefix), text, govuk_visually_hidden(suffix)].compact)
@@ -1,5 +1,5 @@
1
1
  module Govuk
2
2
  module Components
3
- VERSION = '5.0.0b2'.freeze
3
+ VERSION = '5.0.0b4'.freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: govuk-components
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.0.0b2
4
+ version: 5.0.0b4
5
5
  platform: ruby
6
6
  authors:
7
7
  - DfE developers