govuk-components 4.0.0a2 → 4.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/app/components/govuk_component/accordion_component/section_component.rb +7 -4
- data/app/components/govuk_component/accordion_component.rb +4 -2
- data/app/components/govuk_component/header_component.rb +2 -2
- data/app/components/govuk_component/notification_banner_component.rb +1 -1
- data/app/components/govuk_component/summary_list_component/action_component.rb +2 -2
- data/app/components/govuk_component/summary_list_component.rb +1 -1
- data/lib/govuk/components/version.rb +1 -1
- metadata +10 -10
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3620f707aab42099193d2170ea2c22f1ffe97163d3b60d2d64460fe26a419f0b
|
4
|
+
data.tar.gz: 00a243bd3f36e033a6cce0ae5c3532b6233300ae3b4639921b7020feefbae3fc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c0682597760d5f6690cdb5ad012119a7041726599a73a72f13eeb2edc2e7b4c8c314904cec76531375525eaf45084bdae7e6b4f625b47ba7c0d8c066cfcd20d5
|
7
|
+
data.tar.gz: a6765ebe093d7f2513bf12966f29214b9725371952563adc42e7b716d0db8977286e9add8be4c8275d34b35940c9127e0f78030f3f2a0e470a0ed1f19f11a1bb
|
data/README.md
CHANGED
@@ -6,7 +6,7 @@
|
|
6
6
|
[![Gem](https://img.shields.io/gem/dt/govuk-components?logo=rubygems)](https://rubygems.org/gems/govuk-components)
|
7
7
|
[![Test Coverage](https://api.codeclimate.com/v1/badges/cbcbc140f300b920d833/test_coverage)](https://codeclimate.com/github/DFE-Digital/govuk-components/test_coverage)
|
8
8
|
[![GitHub license](https://img.shields.io/github/license/DFE-Digital/govuk-components)](https://github.com/DFE-Digital/govuk-components/blob/main/LICENSE)
|
9
|
-
[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-4.
|
9
|
+
[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-4.6.0-brightgreen)](https://design-system.service.gov.uk)
|
10
10
|
[![Rails](https://img.shields.io/badge/Rails-6.1.7%20%E2%95%B1%207.0.3-E16D6D)](https://weblog.rubyonrails.org/releases/)
|
11
11
|
[![Ruby](https://img.shields.io/badge/Ruby-3.0.5%20%20%E2%95%B1%203.1.3%20%20%E2%95%B1%203.2.0-E16D6D)](https://www.ruby-lang.org/en/downloads/)
|
12
12
|
|
@@ -1,26 +1,29 @@
|
|
1
1
|
class GovukComponent::AccordionComponent::SectionComponent < GovukComponent::Base
|
2
|
-
attr_reader :heading_text, :summary_text, :expanded, :heading_level
|
2
|
+
attr_reader :heading_text, :summary_text, :expanded, :heading_level, :accordion_id
|
3
3
|
|
4
4
|
renders_one :heading_html
|
5
5
|
renders_one :summary_html
|
6
6
|
|
7
7
|
alias_method :expanded?, :expanded
|
8
8
|
|
9
|
-
def initialize(heading_text:, summary_text:, expanded:, heading_level:, classes: [], html_attributes: {})
|
9
|
+
def initialize(heading_text:, summary_text:, expanded:, heading_level:, accordion_id: nil, classes: [], html_attributes: {})
|
10
10
|
@heading_text = heading_text
|
11
11
|
@summary_text = summary_text
|
12
12
|
@expanded = expanded
|
13
13
|
@heading_level = heading_level
|
14
|
+
@accordion_id = accordion_id
|
14
15
|
|
15
16
|
super(classes: classes, html_attributes: html_attributes)
|
16
17
|
end
|
17
18
|
|
18
19
|
def id(suffix: nil)
|
20
|
+
prefix = @accordion_id
|
21
|
+
|
19
22
|
# generate a random number if we don't have heading_text to avoid attempting
|
20
23
|
# to parameterize a potentially-huge chunk of HTML
|
21
|
-
@
|
24
|
+
@unique_identifier ||= heading_text&.parameterize || SecureRandom.hex(4)
|
22
25
|
|
23
|
-
[
|
26
|
+
[prefix, @unique_identifier, suffix].compact.join('-')
|
24
27
|
end
|
25
28
|
|
26
29
|
def heading_content
|
@@ -7,14 +7,16 @@ class GovukComponent::AccordionComponent < GovukComponent::Base
|
|
7
7
|
html_attributes: html_attributes,
|
8
8
|
summary_text: summary_text,
|
9
9
|
heading_text: heading_text,
|
10
|
+
accordion_id: accordion_id,
|
10
11
|
&block
|
11
12
|
)
|
12
13
|
end
|
13
14
|
|
14
|
-
attr_reader :
|
15
|
+
attr_reader :accordion_id, :heading_level
|
15
16
|
|
16
17
|
def initialize(heading_level: 2, classes: [], html_attributes: {})
|
17
18
|
@heading_level = heading_tag(heading_level)
|
19
|
+
@accordion_id = html_attributes[:id]
|
18
20
|
|
19
21
|
super(classes: classes, html_attributes: html_attributes)
|
20
22
|
end
|
@@ -22,7 +24,7 @@ class GovukComponent::AccordionComponent < GovukComponent::Base
|
|
22
24
|
private
|
23
25
|
|
24
26
|
def default_attributes
|
25
|
-
{ class: %w(govuk-accordion), data: { module: 'govuk-accordion' } }
|
27
|
+
{ class: %w(govuk-accordion), data: { module: 'govuk-accordion' } }.compact
|
26
28
|
end
|
27
29
|
|
28
30
|
def heading_tag(level)
|
@@ -125,11 +125,11 @@ private
|
|
125
125
|
end
|
126
126
|
|
127
127
|
def render?
|
128
|
-
name.present? || content
|
128
|
+
name.present? || content?
|
129
129
|
end
|
130
130
|
|
131
131
|
def call
|
132
|
-
if content
|
132
|
+
if content?
|
133
133
|
tag.div(content, **html_attributes)
|
134
134
|
else
|
135
135
|
tag.span(name, **html_attributes)
|
@@ -20,7 +20,7 @@ class GovukComponent::SummaryListComponent::ActionComponent < GovukComponent::Ba
|
|
20
20
|
|
21
21
|
def call
|
22
22
|
link_to(href, **html_attributes) do
|
23
|
-
safe_join([action_text, visually_hidden_span].compact
|
23
|
+
safe_join([action_text, visually_hidden_span].compact)
|
24
24
|
end
|
25
25
|
end
|
26
26
|
|
@@ -37,6 +37,6 @@ private
|
|
37
37
|
end
|
38
38
|
|
39
39
|
def visually_hidden_span
|
40
|
-
tag.span(visually_hidden_text, class: "govuk-visually-hidden") if visually_hidden_text.present?
|
40
|
+
tag.span(%( #{visually_hidden_text}), class: "govuk-visually-hidden") if visually_hidden_text.present?
|
41
41
|
end
|
42
42
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: govuk-components
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.0.
|
4
|
+
version: 4.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- DfE developers
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-
|
11
|
+
date: 2023-04-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: html-attributes-utils
|
@@ -50,14 +50,14 @@ dependencies:
|
|
50
50
|
requirements:
|
51
51
|
- - "~>"
|
52
52
|
- !ruby/object:Gem::Version
|
53
|
-
version: 3.0.
|
53
|
+
version: 3.0.0
|
54
54
|
type: :runtime
|
55
55
|
prerelease: false
|
56
56
|
version_requirements: !ruby/object:Gem::Requirement
|
57
57
|
requirements:
|
58
58
|
- - "~>"
|
59
59
|
- !ruby/object:Gem::Version
|
60
|
-
version: 3.0.
|
60
|
+
version: 3.0.0
|
61
61
|
- !ruby/object:Gem::Dependency
|
62
62
|
name: deep_merge
|
63
63
|
requirement: !ruby/object:Gem::Requirement
|
@@ -218,14 +218,14 @@ dependencies:
|
|
218
218
|
requirements:
|
219
219
|
- - "~>"
|
220
220
|
- !ruby/object:Gem::Version
|
221
|
-
version: 4.
|
221
|
+
version: 4.1.0
|
222
222
|
type: :development
|
223
223
|
prerelease: false
|
224
224
|
version_requirements: !ruby/object:Gem::Requirement
|
225
225
|
requirements:
|
226
226
|
- - "~>"
|
227
227
|
- !ruby/object:Gem::Version
|
228
|
-
version: 4.
|
228
|
+
version: 4.1.0
|
229
229
|
- !ruby/object:Gem::Dependency
|
230
230
|
name: rubypants
|
231
231
|
requirement: !ruby/object:Gem::Requirement
|
@@ -274,14 +274,14 @@ dependencies:
|
|
274
274
|
requirements:
|
275
275
|
- - "~>"
|
276
276
|
- !ruby/object:Gem::Version
|
277
|
-
version:
|
277
|
+
version: 5.1.0
|
278
278
|
type: :development
|
279
279
|
prerelease: false
|
280
280
|
version_requirements: !ruby/object:Gem::Requirement
|
281
281
|
requirements:
|
282
282
|
- - "~>"
|
283
283
|
- !ruby/object:Gem::Version
|
284
|
-
version:
|
284
|
+
version: 5.1.0
|
285
285
|
- !ruby/object:Gem::Dependency
|
286
286
|
name: slim_lint
|
287
287
|
requirement: !ruby/object:Gem::Requirement
|
@@ -395,9 +395,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
395
395
|
version: '0'
|
396
396
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
397
397
|
requirements:
|
398
|
-
- - "
|
398
|
+
- - ">="
|
399
399
|
- !ruby/object:Gem::Version
|
400
|
-
version:
|
400
|
+
version: '0'
|
401
401
|
requirements: []
|
402
402
|
rubygems_version: 3.2.33
|
403
403
|
signing_key:
|