Prevent Nunjucks size params overriding class

Author: colinrotherham

packages/nhsuk-frontend/src/nhsuk/components/fieldset/fixtures.mjs

@@ -104,6 +104,25 @@ export const examples = {
       }
     ]
   },
+  'with legend size class': {
+    context: {
+      legend: {
+        text: 'What is your address?',
+        classes: 'nhsuk-fieldset__legend--l',
+        isPageHeading: true
+      }
+    }
+  },
+  'with legend size class overriding size param': {
+    context: {
+      legend: {
+        text: 'What is your address?',
+        classes: 'nhsuk-fieldset__legend--l',
+        size: 's',
+        isPageHeading: true
+      }
+    }
+  },
   'without page heading': {
     context: {
       legend: {

packages/nhsuk-frontend/src/nhsuk/components/label/fixtures.mjs

@@ -49,6 +49,21 @@ export const examples = {
       viewports: ['tablet']
     }
   },
+  'size class': {
+    context: {
+      text: 'What is your full name?',
+      classes: 'nhsuk-label--l',
+      isPageHeading: true
+    }
+  },
+  'size class overriding size param': {
+    context: {
+      text: 'What is your full name?',
+      classes: 'nhsuk-label--l',
+      size: 's',
+      isPageHeading: true
+    }
+  },
   'without page heading': {
     context: {
       text: 'What is your full name?'

packages/nhsuk-frontend/src/nhsuk/components/label/template.njk

@@ -3,7 +3,16 @@
 {#- Set classes for this component #}
 {%- set classNames = "nhsuk-label" -%}
 
-{%- if params.size and params.size in ["s", "m", "l", "xl"] %}
+{%- if params.size and
+  params.size in ["s", "m", "l", "xl"] and (
+    not params.classes or (
+      not "nhsuk-label--s" in params.classes and
+      not "nhsuk-label--m" in params.classes and
+      not "nhsuk-label--l" in params.classes and
+      not "nhsuk-label--xl" in params.classes
+    )
+  )
+%}
   {% set classNames = classNames ~ " nhsuk-label--" ~ params.size %}
 {% endif %}
 

packages/nhsuk-frontend/src/nhsuk/components/legend/template.njk

@@ -3,7 +3,16 @@
 {#- Set classes for this component #}
 {%- set classNames = "nhsuk-fieldset__legend" -%}
 
-{%- if params.size and params.size in ["s", "m", "l", "xl"] %}
+{%- if params.size and
+  params.size in ["s", "m", "l", "xl"] and (
+    not params.classes or (
+      not "nhsuk-fieldset__legend--s" in params.classes and
+      not "nhsuk-fieldset__legend--m" in params.classes and
+      not "nhsuk-fieldset__legend--l" in params.classes and
+      not "nhsuk-fieldset__legend--xl" in params.classes
+    )
+  )
+%}
   {% set classNames = classNames ~ " nhsuk-fieldset__legend--" ~ params.size %}
 {% endif %}
 

packages/nhsuk-frontend/src/nhsuk/components/tables/template.njk

@@ -4,7 +4,16 @@
 {%- set classNames = "nhsuk-table" if not params.responsive else "nhsuk-table-responsive" -%}
 {%- set classNamesCaption = "nhsuk-table__caption" -%}
 
-{%- if params.captionSize %}
+{%- if params.captionSize and
+  params.captionSize in ["s", "m", "l", "xl"] and (
+    not params.captionClasses or (
+      not "nhsuk-label--s" in params.captionClasses and
+      not "nhsuk-label--m" in params.captionClasses and
+      not "nhsuk-label--l" in params.captionClasses and
+      not "nhsuk-label--xl" in params.captionClasses
+    )
+  )
+%}
   {% set classNamesCaption = classNamesCaption ~ " nhsuk-table__caption--" ~ params.captionSize %}
 {% endif %}