govuk_publishing_components 42.0.0 → 43.0.0

data/node_modules/govuk-frontend/dist/govuk/components/radios/template-with-conditional-items.html

@@ -4,39 +4,36 @@
       How do you want to be contacted?
     </legend>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted" name="how-contacted" type="radio" value="email" data-aria-controls="conditional-how-contacted">
-            <label class="govuk-label govuk-radios__label" for="how-contacted">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted" name="how-contacted" type="radio" value="email" data-aria-controls="conditional-how-contacted">
+        <label class="govuk-label govuk-radios__label" for="how-contacted">
           Email
         </label>
-          </div>
-            <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted">
-              <label class="govuk-label" for="context-email">Email address</label>
+      </div>
+      <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted">
+        <label class="govuk-label" for="context-email">Email address</label>
   <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
-  
-            </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2" name="how-contacted" type="radio" value="phone" data-aria-controls="conditional-how-contacted-2">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2" name="how-contacted" type="radio" value="phone" data-aria-controls="conditional-how-contacted-2">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2">
           Phone
         </label>
-          </div>
-            <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-2">
-              <label class="govuk-label" for="contact-phone">Phone number</label>
+      </div>
+      <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-2">
+        <label class="govuk-label" for="contact-phone">Phone number</label>
   <input class="govuk-input govuk-!-width-one-third" name="contact-phone" type="text" id="contact-phone">
-  
-            </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-3" name="how-contacted" type="radio" value="text" data-aria-controls="conditional-how-contacted-3">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-3">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-3" name="how-contacted" type="radio" value="text" data-aria-controls="conditional-how-contacted-3">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-3">
           Text message
         </label>
-          </div>
-            <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-3">
-              <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
+      </div>
+      <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-3">
+        <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
   <input class="govuk-input govuk-!-width-one-third" name="contact-text-message" type="text" id="contact-text-message">
-  
-            </div>
+      </div>
     </div>
   </fieldset>
 </div>

data/node_modules/govuk-frontend/dist/govuk/components/radios/template-with-disabled.html

@@ -6,24 +6,24 @@
       </h1>
     </legend>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="gateway" name="gov" type="radio" value="gateway" aria-describedby="gateway-item-hint">
-            <label class="govuk-label govuk-radios__label" for="gateway">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="gateway" name="gov" type="radio" value="gateway" aria-describedby="gateway-item-hint">
+        <label class="govuk-label govuk-radios__label" for="gateway">
           Sign in with Government Gateway
         </label>
-            <div id="gateway-item-hint" class="govuk-hint govuk-radios__hint">
+        <div id="gateway-item-hint" class="govuk-hint govuk-radios__hint">
           You’ll have a user ID if you’ve registered for Self Assessment or filed a tax return online before.
         </div>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="verify" name="gov" type="radio" value="verify" disabled aria-describedby="verify-item-hint">
-            <label class="govuk-label govuk-radios__label" for="verify">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="verify" name="gov" type="radio" value="verify" disabled aria-describedby="verify-item-hint">
+        <label class="govuk-label govuk-radios__label" for="verify">
           Sign in with GOV.UK Verify
         </label>
-            <div id="verify-item-hint" class="govuk-hint govuk-radios__hint">
+        <div id="verify-item-hint" class="govuk-hint govuk-radios__hint">
           You’ll have an account if you’ve already proved your identity with either Barclays, CitizenSafe, Digidentity, Experian, Post Office, Royal Mail or SecureIdentity.
         </div>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>

data/node_modules/govuk-frontend/dist/govuk/components/radios/template-with-fieldset-and-error-message.html

@@ -7,18 +7,18 @@
       <span class="govuk-visually-hidden">Error:</span> Please select an option
     </p>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="example" name="example" type="radio" value="yes">
-            <label class="govuk-label govuk-radios__label" for="example">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="example" name="example" type="radio" value="yes">
+        <label class="govuk-label govuk-radios__label" for="example">
           Yes
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="example-2" name="example" type="radio" value="no" checked>
-            <label class="govuk-label govuk-radios__label" for="example-2">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="example-2" name="example" type="radio" value="no" checked>
+        <label class="govuk-label govuk-radios__label" for="example-2">
           No
         </label>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>

data/node_modules/govuk-frontend/dist/govuk/components/radios/template-with-hints-on-items.html

@@ -6,24 +6,24 @@
       </h1>
     </legend>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="gateway" name="gov" type="radio" value="gateway" aria-describedby="gateway-item-hint">
-            <label class="govuk-label govuk-radios__label" for="gateway">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="gateway" name="gov" type="radio" value="gateway" aria-describedby="gateway-item-hint">
+        <label class="govuk-label govuk-radios__label" for="gateway">
           Sign in with Government Gateway
         </label>
-            <div id="gateway-item-hint" class="govuk-hint govuk-radios__hint">
+        <div id="gateway-item-hint" class="govuk-hint govuk-radios__hint">
           You’ll have a user ID if you’ve registered for Self Assessment or filed a tax return online before.
         </div>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="verify" name="gov" type="radio" value="verify" aria-describedby="verify-item-hint">
-            <label class="govuk-label govuk-radios__label" for="verify">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="verify" name="gov" type="radio" value="verify" aria-describedby="verify-item-hint">
+        <label class="govuk-label govuk-radios__label" for="verify">
           Sign in with GOV.UK Verify
         </label>
-            <div id="verify-item-hint" class="govuk-hint govuk-radios__hint">
+        <div id="verify-item-hint" class="govuk-hint govuk-radios__hint">
           You’ll have an account if you’ve already proved your identity with either Barclays, CitizenSafe, Digidentity, Experian, Post Office, Royal Mail or SecureIdentity.
         </div>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>

data/node_modules/govuk-frontend/dist/govuk/components/radios/template-with-idprefix.html

@@ -1,16 +1,16 @@
 <div class="govuk-form-group">
   <div class="govuk-radios" data-module="govuk-radios">
-        <div class="govuk-radios__item">
-          <input class="govuk-radios__input" id="example-id-prefix" name="example-radio" type="radio" value="yes">
-          <label class="govuk-label govuk-radios__label" for="example-id-prefix">
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="example-id-prefix" name="example-radio" type="radio" value="yes">
+      <label class="govuk-label govuk-radios__label" for="example-id-prefix">
         Yes
       </label>
-        </div>
-        <div class="govuk-radios__item">
-          <input class="govuk-radios__input" id="example-id-prefix-2" name="example-radio" type="radio" value="no">
-          <label class="govuk-label govuk-radios__label" for="example-id-prefix-2">
+    </div>
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="example-id-prefix-2" name="example-radio" type="radio" value="no">
+      <label class="govuk-label govuk-radios__label" for="example-id-prefix-2">
         No
       </label>
-        </div>
+    </div>
   </div>
 </div>

data/node_modules/govuk-frontend/dist/govuk/components/radios/template-with-legend-as-page-heading.html

@@ -9,18 +9,18 @@
       Select one of the options below.
     </div>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="housing-act" name="housing-act" type="radio" value="part-2">
-            <label class="govuk-label govuk-radios__label" for="housing-act">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="housing-act" name="housing-act" type="radio" value="part-2">
+        <label class="govuk-label govuk-radios__label" for="housing-act">
           <span class="govuk-heading-s govuk-!-margin-bottom-1">Part 2 of the Housing Act 2004</span> For properties that are 3 or more stories high and occupied by 5 or more people
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="housing-act-2" name="housing-act" type="radio" value="part-3">
-            <label class="govuk-label govuk-radios__label" for="housing-act-2">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="housing-act-2" name="housing-act" type="radio" value="part-3">
+        <label class="govuk-label govuk-radios__label" for="housing-act-2">
           <span class="govuk-heading-s govuk-!-margin-bottom-1">Part 3 of the Housing Act 2004</span> For properties that are within a geographical area defined by a local council
         </label>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>

data/node_modules/govuk-frontend/dist/govuk/components/radios/template-with-optional-form-group-classes-showing-group-error.html

@@ -4,40 +4,37 @@
       How do you want to be contacted?
     </legend>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2" name="how-contacted-2" type="radio" value="email" data-aria-controls="conditional-how-contacted-2">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2" name="how-contacted-2" type="radio" value="email" data-aria-controls="conditional-how-contacted-2">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2">
           Email
         </label>
-          </div>
-            <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-2">
-              <label class="govuk-label" for="context-email">Email address</label>
+      </div>
+      <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-2">
+        <label class="govuk-label" for="context-email">Email address</label>
   <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
-  
-            </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2-2" name="how-contacted-2" type="radio" value="phone" checked data-aria-controls="conditional-how-contacted-2-2">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2-2">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2-2" name="how-contacted-2" type="radio" value="phone" checked data-aria-controls="conditional-how-contacted-2-2">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2-2">
           Phone
         </label>
-          </div>
-            <div class="govuk-radios__conditional" id="conditional-how-contacted-2-2">
-              <label class="govuk-label" for="contact-phone">Phone number</label>
+      </div>
+      <div class="govuk-radios__conditional" id="conditional-how-contacted-2-2">
+        <label class="govuk-label" for="contact-phone">Phone number</label>
   <span id="contact-phone-error" class="govuk-error-message">Problem with input</span>
   <input class="govuk-input govuk-input--error govuk-!-width-one-third" name="contact-phone" type="text" id="contact-phone" aria-describedby="contact-phone-error">
-  
-            </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2-3" name="how-contacted-2" type="radio" value="text" data-aria-controls="conditional-how-contacted-2-3">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2-3">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2-3" name="how-contacted-2" type="radio" value="text" data-aria-controls="conditional-how-contacted-2-3">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2-3">
           Text message
         </label>
-          </div>
-            <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-2-3">
-              <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
+      </div>
+      <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-2-3">
+        <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
   <input class="govuk-input govuk-!-width-one-third" name="contact-text-message" type="text" id="contact-text-message">
-  
-            </div>
+      </div>
     </div>
   </fieldset>
 </div>

data/node_modules/govuk-frontend/dist/govuk/components/radios/template-with-very-long-option-text.html

@@ -10,24 +10,24 @@
       <span class="govuk-visually-hidden">Error:</span> Lorem ipsum dolor sit amet, consectetur adipiscing elit.
     </p>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="waste" name="waste" type="radio" value="nullam">
-            <label class="govuk-label govuk-radios__label" for="waste">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="waste" name="waste" type="radio" value="nullam">
+        <label class="govuk-label govuk-radios__label" for="waste">
           Nullam id dolor id nibh ultricies vehicula ut id elit. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas faucibus mollis interdum. Donec id elit non mi porta gravida at eget metus.
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="waste-2" name="waste" type="radio" value="aenean">
-            <label class="govuk-label govuk-radios__label" for="waste-2">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="waste-2" name="waste" type="radio" value="aenean">
+        <label class="govuk-label govuk-radios__label" for="waste-2">
           Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Donec sed odio dui. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Cras mattis consectetur purus sit amet fermentum.
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="waste-3" name="waste" type="radio" value="fusce">
-            <label class="govuk-label govuk-radios__label" for="waste-3">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="waste-3" name="waste" type="radio" value="fusce">
+        <label class="govuk-label govuk-radios__label" for="waste-3">
           Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Etiam porta sem malesuada magna mollis euismod. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. Sed posuere consectetur est at lobortis.
         </label>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>

data/node_modules/govuk-frontend/dist/govuk/components/radios/template-without-fieldset.html

@@ -1,22 +1,22 @@
 <div class="govuk-form-group">
   <div class="govuk-radios" data-module="govuk-radios">
-        <div class="govuk-radios__item">
-          <input class="govuk-radios__input" id="colours" name="colours" type="radio" value="red">
-          <label class="govuk-label govuk-radios__label" for="colours">
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="colours" name="colours" type="radio" value="red">
+      <label class="govuk-label govuk-radios__label" for="colours">
         Red
       </label>
-        </div>
-        <div class="govuk-radios__item">
-          <input class="govuk-radios__input" id="colours-2" name="colours" type="radio" value="green">
-          <label class="govuk-label govuk-radios__label" for="colours-2">
+    </div>
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="colours-2" name="colours" type="radio" value="green">
+      <label class="govuk-label govuk-radios__label" for="colours-2">
         Green
       </label>
-        </div>
-        <div class="govuk-radios__item">
-          <input class="govuk-radios__input" id="colours-3" name="colours" type="radio" value="blue">
-          <label class="govuk-label govuk-radios__label" for="colours-3">
+    </div>
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="colours-3" name="colours" type="radio" value="blue">
+      <label class="govuk-label govuk-radios__label" for="colours-3">
         Blue
       </label>
-        </div>
+    </div>
   </div>
 </div>

data/node_modules/govuk-frontend/dist/govuk/components/radios/template.njk

@@ -1,3 +1,4 @@
+{% from "../../macros/attributes.njk" import govukAttributes %}
 {% from "../error-message/macro.njk" import govukErrorMessage %}
 {% from "../fieldset/macro.njk" import govukFieldset %}
 {% from "../hint/macro.njk" import govukHint %}
@@ -14,6 +15,49 @@
 {#- fieldset is false by default -#}
 {% set hasFieldset = true if params.fieldset else false %}
 
+{%- macro _radioItem(params, item, index) %}
+  {#- If the user explicitly sets an id, use this instead of the regular idPrefix -#}
+  {#- The first id should not have a number suffix so it's easy to link to from the error summary component -#}
+  {% set itemId = item.id if item.id else idPrefix + ("-" + index if index > 1 else "") %}
+  {% set conditionalId = "conditional-" + itemId %}
+  {%- if item.divider %}
+    <div class="govuk-radios__divider">{{ item.divider }}</div>
+  {% else %}
+    {% set isChecked = item.checked | default((item.value == params.value and item.checked != false) if params.value else false, true) %}
+    {% set hasHint = true if item.hint.text or item.hint.html %}
+    {% set itemHintId = itemId + '-item-hint' %}
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="{{ itemId }}" name="{{ params.name }}" type="radio" value="{{ item.value }}"
+        {{-" checked" if isChecked }}
+        {{-" disabled" if item.disabled }}
+        {%- if item.conditional.html %} data-aria-controls="{{ conditionalId }}"{% endif -%}
+        {%- if hasHint %} aria-describedby="{{ itemHintId }}"{% endif -%}
+        {{- govukAttributes(item.attributes) }}>
+      {{ govukLabel({
+        html: item.html,
+        text: item.text,
+        classes: 'govuk-radios__label' + (' ' + item.label.classes if item.label.classes),
+        attributes: item.label.attributes,
+        for: itemId
+      }) | trim | indent(6) }}
+      {% if hasHint %}
+      {{ govukHint({
+        id: itemHintId,
+        classes: 'govuk-radios__hint' + (' ' + item.hint.classes if item.hint.classes),
+        attributes: item.hint.attributes,
+        html: item.hint.html,
+        text: item.hint.text
+      }) | trim | indent(6) }}
+      {% endif %}
+    </div>
+    {% if item.conditional.html %}
+    <div class="govuk-radios__conditional {%- if not isChecked %} govuk-radios__conditional--hidden{% endif %}" id="{{ conditionalId }}">
+      {{ item.conditional.html | safe | trim }}
+    </div>
+    {% endif %}
+  {% endif %}
+{%- endmacro %}
+
 {#- Capture the HTML so we can optionally nest it in a fieldset -#}
 {% set innerHtml %}
 {% if params.hint %}
@@ -40,63 +84,23 @@
   }) | trim | indent(2) }}
 {% endif %}
   <div class="govuk-radios {%- if params.classes %} {{ params.classes }}{% endif %}"
-    {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %} data-module="govuk-radios">
+    {{- govukAttributes(params.attributes) }} data-module="govuk-radios">
+    {% if params.formGroup.beforeInputs %}
+    {{ params.formGroup.beforeInputs.html | safe | trim | indent(4) if params.formGroup.beforeInputs.html else params.formGroup.beforeInputs.text }}
+    {% endif %}
     {% for item in params.items %}
       {% if item %}
-        {#- If the user explicitly sets an id, use this instead of the regular idPrefix -#}
-        {%- if item.id -%}
-          {%- set id = item.id -%}
-        {%- else -%}
-          {#- The first id should not have a number suffix so it's easy to link to from the error summary component -#}
-          {%- if loop.first -%}
-            {%- set id = idPrefix %}
-          {% else %}
-            {%- set id = idPrefix + "-" + loop.index -%}
-          {%- endif -%}
-        {%- endif -%}
-        {% set conditionalId = "conditional-" + id %}
-        {%- if item.divider %}
-        <div class="govuk-radios__divider">{{ item.divider }}</div>
-        {%- else %}
-        {% set isChecked = item.checked | default((item.value == params.value and item.checked != false) if params.value else false, true) %}
-        {% set hasHint = true if item.hint.text or item.hint.html %}
-        {% set itemHintId = id + '-item-hint' %}
-        <div class="govuk-radios__item">
-          <input class="govuk-radios__input" id="{{ id }}" name="{{ params.name }}" type="radio" value="{{ item.value }}"
-          {{-" checked" if isChecked }}
-          {{-" disabled" if item.disabled }}
-          {%- if item.conditional.html %} data-aria-controls="{{ conditionalId }}"{% endif -%}
-          {%- if hasHint %} aria-describedby="{{ itemHintId }}"{% endif -%}
-          {%- for attribute, value in item.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
-          {{ govukLabel({
-            html: item.html,
-            text: item.text,
-            classes: 'govuk-radios__label' + (' ' + item.label.classes if item.label.classes),
-            attributes: item.label.attributes,
-            for: id
-          }) | trim | indent(6) }}
-          {% if hasHint %}
-          {{ govukHint({
-            id: itemHintId,
-            classes: 'govuk-radios__hint' + (' ' + item.hint.classes if item.hint.classes),
-            attributes: item.hint.attributes,
-            html: item.hint.html,
-            text: item.hint.text
-          }) | trim | indent(6) }}
-          {% endif %}
-        </div>
-        {% if item.conditional.html %}
-          <div class="govuk-radios__conditional {%- if not isChecked %} govuk-radios__conditional--hidden{% endif %}" id="{{ conditionalId }}">
-            {{ item.conditional.html | safe }}
-          </div>
-        {% endif %}
-        {% endif %}
+        {{- _radioItem(params, item, loop.index) -}}
       {% endif %}
     {% endfor %}
+    {% if params.formGroup.afterInputs %}
+    {{ params.formGroup.afterInputs.html | safe | trim | indent(4) if params.formGroup.afterInputs.html else params.formGroup.afterInputs.text }}
+    {% endif %}
   </div>
 {% endset -%}
 
-<div class="govuk-form-group {%- if params.errorMessage %} govuk-form-group--error{% endif %} {%- if params.formGroup.classes %} {{ params.formGroup.classes }}{% endif %}" {%- for attribute, value in params.formGroup.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
+<div class="govuk-form-group {%- if params.errorMessage %} govuk-form-group--error{% endif %} {%- if params.formGroup.classes %} {{ params.formGroup.classes }}{% endif %}"
+  {{- govukAttributes(params.formGroup.attributes) }}>
 {% if hasFieldset %}
   {{ govukFieldset({
     describedBy: describedBy,

data/node_modules/govuk-frontend/dist/govuk/components/select/_index.scss

@@ -6,16 +6,16 @@
   .govuk-select {
     @include govuk-font($size: 19, $line-height: 1.25);
 
-    box-sizing: border-box; // should this be global?
+    box-sizing: border-box;
 
     // This min-width was chosen because:
-    // - it makes the Select noticeably wider than it is taller (which is what users expect)
+    // - it makes the Select wider than it is tall (which is what users expect)
     // - 11.5em matches the 'length-10' variant of the input component
     // - it fits comfortably on screens as narrow as 240px wide
     min-width: 11.5em;
     max-width: 100%;
     height: govuk-px-to-rem(40px);
-    padding: govuk-spacing(1); // was 5px 4px 4px - size of it should be adjusted to match other form elements
+    padding: govuk-spacing(1);
     border: $govuk-border-width-form-element solid $govuk-input-border-colour;
 
     // Default user agent colours for selects can have low contrast,
@@ -28,8 +28,8 @@
       // Ensure outline appears outside of the element
       outline-offset: 0;
       // Double the border by adding its width again. Use `box-shadow` to do
-      // this instead of changing `border-width` (which changes element size) and
-      // since `outline` is already used for the yellow focus state.
+      // this instead of changing `border-width` (which changes element size)
+      // and since `outline` is already used for the yellow focus state.
       box-shadow: inset 0 0 0 $govuk-border-width-form-element;
     }
 

data/node_modules/govuk-frontend/dist/govuk/components/select/_index.scss.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/govuk/components/select/_index.scss"],"names":[],"mappings":"AAAA,gCAAgC;AAChC,uBAAuB;AACvB,wBAAwB;;AAExB;EACE;IACE,kDAAkD;;IAElD,sBAAsB,EAAE,wBAAwB;;IAEhD,oCAAoC;IACpC,uFAAuF;IACvF,iEAAiE;IACjE,0DAA0D;IAC1D,iBAAiB;IACjB,eAAe;IACf,6BAA6B;IAC7B,yBAAyB,EAAE,8EAA8E;IACzG,yEAAyE;;IAEzE,+DAA+D;IAC/D,+BAA+B;IAC/B,yBAAyB;IACzB,uCAAuC;;IAEvC;MACE,qDAAqD;MACrD,+CAA+C;MAC/C,iBAAiB;MACjB,qEAAqE;MACrE,0EAA0E;MAC1E,6DAA6D;MAC7D,wDAAwD;IAC1D;;IAEA;MACE,YAAY;MACZ,cAAc;MACd,mBAAmB;IACrB;EACF;;EAEA;;;IAGE,4BAA4B;IAC5B,sCAAsC;EACxC;;EAEA;IACE,iCAAiC;;IAEjC;MACE,wCAAwC;IAC1C;EACF;AACF","file":"_index.scss","sourcesContent":["@import \"../error-message/index\";\n@import \"../hint/index\";\n@import \"../label/index\";\n\n@include govuk-exports(\"govuk/component/select\") {\n  .govuk-select {\n    @include govuk-font($size: 19, $line-height: 1.25);\n\n    box-sizing: border-box; // should this be global?\n\n    // This min-width was chosen because:\n    // - it makes the Select noticeably wider than it is taller (which is what users expect)\n    // - 11.5em matches the 'length-10' variant of the input component\n    // - it fits comfortably on screens as narrow as 240px wide\n    min-width: 11.5em;\n    max-width: 100%;\n    height: govuk-px-to-rem(40px);\n    padding: govuk-spacing(1); // was 5px 4px 4px - size of it should be adjusted to match other form elements\n    border: $govuk-border-width-form-element solid $govuk-input-border-colour;\n\n    // Default user agent colours for selects can have low contrast,\n    // and may look disabled (#2435)\n    color: $govuk-text-colour;\n    background-color: govuk-colour(\"white\");\n\n    &:focus {\n      outline: $govuk-focus-width solid $govuk-focus-colour;\n      // Ensure outline appears outside of the element\n      outline-offset: 0;\n      // Double the border by adding its width again. Use `box-shadow` to do\n      // this instead of changing `border-width` (which changes element size) and\n      // since `outline` is already used for the yellow focus state.\n      box-shadow: inset 0 0 0 $govuk-border-width-form-element;\n    }\n\n    &:disabled {\n      opacity: 0.5;\n      color: inherit;\n      cursor: not-allowed;\n    }\n  }\n\n  .govuk-select option:active,\n  .govuk-select option:checked,\n  .govuk-select:focus::-ms-value {\n    color: govuk-colour(\"white\");\n    background-color: govuk-colour(\"blue\");\n  }\n\n  .govuk-select--error {\n    border-color: $govuk-error-colour;\n\n    &:focus {\n      border-color: $govuk-input-border-colour;\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../../../../src/govuk/components/select/_index.scss"],"names":[],"mappings":"AAAA,gCAAgC;AAChC,uBAAuB;AACvB,wBAAwB;;AAExB;EACE;IACE,kDAAkD;;IAElD,sBAAsB;;IAEtB,oCAAoC;IACpC,0EAA0E;IAC1E,iEAAiE;IACjE,0DAA0D;IAC1D,iBAAiB;IACjB,eAAe;IACf,6BAA6B;IAC7B,yBAAyB;IACzB,yEAAyE;;IAEzE,+DAA+D;IAC/D,+BAA+B;IAC/B,yBAAyB;IACzB,uCAAuC;;IAEvC;MACE,qDAAqD;MACrD,+CAA+C;MAC/C,iBAAiB;MACjB,qEAAqE;MACrE,sEAAsE;MACtE,iEAAiE;MACjE,wDAAwD;IAC1D;;IAEA;MACE,YAAY;MACZ,cAAc;MACd,mBAAmB;IACrB;EACF;;EAEA;;;IAGE,4BAA4B;IAC5B,sCAAsC;EACxC;;EAEA;IACE,iCAAiC;;IAEjC;MACE,wCAAwC;IAC1C;EACF;AACF","file":"_index.scss","sourcesContent":["@import \"../error-message/index\";\n@import \"../hint/index\";\n@import \"../label/index\";\n\n@include govuk-exports(\"govuk/component/select\") {\n  .govuk-select {\n    @include govuk-font($size: 19, $line-height: 1.25);\n\n    box-sizing: border-box;\n\n    // This min-width was chosen because:\n    // - it makes the Select wider than it is tall (which is what users expect)\n    // - 11.5em matches the 'length-10' variant of the input component\n    // - it fits comfortably on screens as narrow as 240px wide\n    min-width: 11.5em;\n    max-width: 100%;\n    height: govuk-px-to-rem(40px);\n    padding: govuk-spacing(1);\n    border: $govuk-border-width-form-element solid $govuk-input-border-colour;\n\n    // Default user agent colours for selects can have low contrast,\n    // and may look disabled (#2435)\n    color: $govuk-text-colour;\n    background-color: govuk-colour(\"white\");\n\n    &:focus {\n      outline: $govuk-focus-width solid $govuk-focus-colour;\n      // Ensure outline appears outside of the element\n      outline-offset: 0;\n      // Double the border by adding its width again. Use `box-shadow` to do\n      // this instead of changing `border-width` (which changes element size)\n      // and since `outline` is already used for the yellow focus state.\n      box-shadow: inset 0 0 0 $govuk-border-width-form-element;\n    }\n\n    &:disabled {\n      opacity: 0.5;\n      color: inherit;\n      cursor: not-allowed;\n    }\n  }\n\n  .govuk-select option:active,\n  .govuk-select option:checked,\n  .govuk-select:focus::-ms-value {\n    color: govuk-colour(\"white\");\n    background-color: govuk-colour(\"blue\");\n  }\n\n  .govuk-select--error {\n    border-color: $govuk-error-colour;\n\n    &:focus {\n      border-color: $govuk-input-border-colour;\n    }\n  }\n}\n"]}