Move Character count attributes to formGroup wrapper

alphagov · Jan 10, 2024 · 341017b · 341017b
1 parent 58e92b6
commit 341017b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/packages/govuk-frontend/src/govuk/components/character-count/template.njk b/packages/govuk-frontend/src/govuk/components/character-count/template.njk
@@ -18,6 +18,10 @@
 #}
 {%- set attributes = [] -%}
 
+{% for attribute, value in params.formGroup.attributes %}
+  {% set attributes = (attributes.push([attribute, value]), attributes) %}
+{% endfor %}
+
 {%- if params.maxlength %}{% set attributes = (attributes.push(["data-maxlength", params.maxlength]), attributes) %}{% endif -%}
 {%- if params.threshold %}{% set attributes = (attributes.push(["data-threshold", params.threshold]), attributes) %}{% endif -%}
 {%- if params.maxwords %}{% set attributes = (attributes.push(["data-maxwords", params.maxwords]), attributes) %}{% endif -%}
@@ -72,7 +76,7 @@
   }) }}
 {% endset -%}
 
-<div class="govuk-character-count" data-module="govuk-character-count" {%- for attribute, value in attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
+<div class="govuk-character-count" data-module="govuk-character-count">
   {{ govukTextarea({
     id: params.id,
     name: params.name,
@@ -82,7 +86,7 @@
     value: params.value,
     formGroup: {
       classes: params.formGroup.classes,
-      attributes: params.formGroup.attributes,
+      attributes: attributes,
       afterHtml: countMessageHtml
     },
     classes: 'govuk-js-character-count' + (' ' + params.classes if params.classes),