govuk_publishing_components 21.34.0 → 21.34.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06d7757dbcd28fd92634c297a0aa7dab4552cc8c37566ace976ae6b875ebdcd5
-  data.tar.gz: d509b6519a31c7440d9348fbaad487178ffe1031743467e8ca2bb360824c6bdd
+  metadata.gz: 4e520e8f4d8396e3e7b6abd02a2b4e5c35af1a491909c010c003654cbffd7815
+  data.tar.gz: f36c4843d284f739f868ef8286089872464568a79500efebc8a9f4cd161b15f6
 SHA512:
-  metadata.gz: dda8b26697d586bc62b2ee47349fa52839ecc608e5e2c21b9cca5347903b4677f6dddaec48d72c3075a1f0bf890642d010bd395fc5555eb082026026947a956d
-  data.tar.gz: 1c09c5b51fcb0a25498a6715f81073e13ade337f56f04bf9df35de79061ace7fb48f912d6cb69667a02fb4bd6f9f721cb923e21fc2ee76eb98a723ea3572d3fc
+  metadata.gz: 8ee4f82df1fecd0979a2f7b557340443af3acd12a917174a36ad369378e469541e39616639d341b654a706bdecc3a332e785b8554abe085343d2d553707532c3
+  data.tar.gz: 76e2ed627dd262c031ec78b0990d2deab975cca1ec8441a8c125609a0d9a3d08b3f41feed463a8fe258ee57647c8e029d18c2f18bd390e9a536892a3f9b89a41

data/app/views/govuk_publishing_components/components/docs/checkboxes.yml

@@ -285,9 +285,26 @@ examples:
         - label: "Phone"
           value: "phone"
           conditional: <div class="govuk-form-group"><label class="govuk-label" for="contact-by-phone">Phone number</label><input class="govuk-input govuk-!-width-one-third" id="contact-by-phone" name="contactingme" type="tel"></div>
-        - label: "Other"
-          value: "other"
-          conditional: "See no styling."
+        - label: "Text message"
+          value: "text"
+          conditional: <div class="govuk-form-group"><label class="govuk-label" for="contact-by-text">Mobile phone number</label><input class="govuk-input govuk-!-width-one-third" id="contact-by-text" name="contactingme" type="tel"></div>
+  checkbox_items_with_conditional_reveal_checked:
+    data:
+      name: "contacting-checked"
+      id: "contacting-checked"
+      heading: "How would you like to be contacted?"
+      hint_text: "Please select all options that are relevant to you."
+      items:
+        - label: "Email"
+          value: "email"
+          conditional: <div class="govuk-form-group"><label class="govuk-label" for="contact-by-email">Email address</label><input class="govuk-input govuk-!-width-one-third" id="contact-by-email" name="contactingme" type="email"></div>
+          checked: true
+        - label: "Phone"
+          value: "phone"
+          conditional: <div class="govuk-form-group"><label class="govuk-label" for="contact-by-phone">Phone number</label><input class="govuk-input govuk-!-width-one-third" id="contact-by-phone" name="contactingme" type="tel"></div>
+        - label: "Text message"
+          value: "text"
+          conditional: <div class="govuk-form-group"><label class="govuk-label" for="contact-by-text">Mobile phone number</label><input class="govuk-input govuk-!-width-one-third" id="contact-by-text" name="contactingme" type="tel"></div>
   checkbox_items_with_checked_items:
     data:
       name: "nationality"

data/app/views/govuk_publishing_components/components/docs/radio.yml

@@ -313,6 +313,18 @@ examples:
       - value: "govuk-verify"
         text: "Use GOV.UK Verify"
         conditional: "You’ll need to prove your identity using GOV.UK Verify"
+  conditional_checked:
+    data:
+      name: "radio-group-conditional"
+      id_prefix: "conditional-checked"
+      items:
+      - value: "government-gateway"
+        text: "Use Government Gateway"
+        conditional: "You’ll need to prove your identity using Government Gateway"
+        checked: true
+      - value: "govuk-verify"
+        text: "Use GOV.UK Verify"
+        conditional: "You’ll need to prove your identity using GOV.UK Verify"
   tracking-url:
     data:
       name: "radio-group-tracking-url"

data/lib/govuk_publishing_components/presenters/checkboxes_helper.rb

@@ -70,11 +70,13 @@ module GovukPublishingComponents
 
       def checkbox_markup(checkbox, index)
         checkbox_id = checkbox[:id] || "#{@id}-#{index}"
-        controls = checkbox[:conditional].present? ? "#{checkbox_id}-conditional-#{index || rand(1..100)}" : checkbox[:controls]
+        controls = checkbox[:controls]
+        aria_controls = "#{checkbox_id}-conditional-#{index || rand(1..100)}" if checkbox[:conditional].present?
         checkbox_name = checkbox[:name].present? ? checkbox[:name] : @name
         checked = true if checkbox[:checked].present?
         data = checkbox[:data_attributes] || {}
         data[:controls] = controls
+        data["aria-controls"] = aria_controls
 
         capture do
           concat check_box_tag checkbox_name, checkbox[:value], checked, class: "govuk-checkboxes__input", id: checkbox_id, data: data

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "21.34.0".freeze
+  VERSION = "21.34.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 21.34.0
+  version: 21.34.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters