Merge pull request #2693 from ONSdigital/fix/2351/checkboxeslebel-sho…

…uld-not-be-required-for-nested-checkboxes make checkboxeslabel not required for radios
ONSdigital · Jun 26, 2023 · 1a9d818 · 1a9d818
2 parents 4a2fcf9 + b8b7178
commit 1a9d818
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/...onents_checkboxes_example-checkboxes-with-descriptions_0_document_0_desktop.png b/...onents_checkboxes_example-checkboxes-with-descriptions_0_document_0_desktop.png
diff --git a/...ponents_checkboxes_example-checkboxes-with-descriptions_0_document_1_tablet.png b/...ponents_checkboxes_example-checkboxes-with-descriptions_0_document_1_tablet.png
diff --git a/...ponents_checkboxes_example-checkboxes-with-descriptions_0_document_2_mobile.png b/...ponents_checkboxes_example-checkboxes-with-descriptions_0_document_2_mobile.png
diff --git a/src/components/checkboxes/_macro-options.md b/src/components/checkboxes/_macro-options.md
@@ -6,7 +6,7 @@
 | legendClasses          | string                                                        | false                           | Classes to add to the fieldset‘s legend                                                                                                           |
 | description            | string                                                        | false                           | Hint text following the fieldset‘s legend to help users answer                                                                                    |
 | attributes             | object                                                        | false                           | HTML attributes (for example, data attributes) to add to the fieldset                                                                             |
-| checkboxesLabel        | string                                                        | true                            | A prompt for the checkboxes, for example, “Select all that apply”                                                                                 |
+| checkboxesLabel        | string                                                        | true (unless inside a radio)    | A prompt for the checkboxes, for example, “Select all that apply”                                                                                 |
 | checkboxesLabelClasses | string                                                        | false                           | Classes to add to the checkboxes prompt element (`checkboxesLabel`)                                                                               |
 | checkboxes             | array`<Checkbox>`                                             | true                            | Settings for each [checkbox](#checkbox)                                                                                                           |
 | borderless             | boolean                                                       | false                           | Set to “true” to remove the border surrounding the input and label                                                                                |

diff --git a/src/components/checkboxes/_macro.njk b/src/components/checkboxes/_macro.njk
@@ -5,7 +5,9 @@
     {% from "components/button/_macro.njk" import onsButton %}
 
     {% set fields %}
+    {% if params.checkboxesLabel is defined %}
         <p class="ons-checkboxes__label{{ " " + params.checkboxesLabelClasses if params.checkboxesLabelClasses }}">{{ params.checkboxesLabel }}</p>
+    {% endif %}    
         {% set hasOther = false %}
         {% for checkbox in params.checkboxes %}
             {% if checkbox.other %}

diff --git a/src/components/checkboxes/example-checkboxes-with-descriptions.njk b/src/components/checkboxes/example-checkboxes-with-descriptions.njk
@@ -8,6 +8,7 @@
 }) %}
     {{
         onsCheckboxes({
+            "checkboxesLabel": "Select all that apply",
             "dontWrap": true,
             "name": "central-heating",
             "checkboxes": [