diff --git a/app/templates/components/components/checkboxes/template.njk b/app/templates/components/components/checkboxes/template.njk index 48a6b0b86..4932f3eb7 100644 --- a/app/templates/components/components/checkboxes/template.njk +++ b/app/templates/components/components/checkboxes/template.njk @@ -49,7 +49,7 @@ visuallyHiddenText: params.errorMessage.visuallyHiddenText }) | indent(2) | trim }} {% endif %} -
{% for item in params.items %} @@ -60,8 +60,8 @@ {% set itemHintId = id + "-item-hint" if hasHint else "" %} {% set itemDescribedBy = describedBy if not hasFieldset else "" %} {% set itemDescribedBy = (itemDescribedBy + " " + itemHintId) | trim %} -
- + {% if item.conditional %} -
+
{{ item.conditional.html | safe }}
{% endif %} diff --git a/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png index c4154f252..9a985d5e1 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_Delivery_Status_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Delivery_Status_0_document_0_desktop.png index c35b3a5c4..361d9b482 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_Delivery_Status_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Delivery_Status_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_Invite_User_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Invite_User_0_document_0_desktop.png index abf40a01c..2c427b325 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_Invite_User_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Invite_User_0_document_0_desktop.png differ diff --git a/package-lock.json b/package-lock.json index 27f23c68f..76eadc840 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2176,22 +2176,6 @@ "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, - "node_modules/@jest/environment": { - "version": "30.0.2", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-30.0.2.tgz", - "integrity": "sha512-hRLhZRJNxBiOhxIKSq2UkrlhMt3/zVFQOAi5lvS8T9I03+kxsbflwHJEF+eXEYXCrRGRhHwECT7CDk6DyngsRA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/fake-timers": "30.0.2", - "@jest/types": "30.0.1", - "@types/node": "*", - "jest-mock": "30.0.2" - }, - "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" - } - }, "node_modules/@jest/environment-jsdom-abstract": { "version": "30.0.4", "resolved": "https://registry.npmjs.org/@jest/environment-jsdom-abstract/-/environment-jsdom-abstract-30.0.4.tgz", @@ -2276,24 +2260,6 @@ "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" } }, - "node_modules/@jest/fake-timers": { - "version": "30.0.2", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-30.0.2.tgz", - "integrity": "sha512-jfx0Xg7l0gmphTY9UKm5RtH12BlLYj/2Plj6wXjVW5Era4FZKfXeIvwC67WX+4q8UCFxYS20IgnMcFBcEU0DtA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jest/types": "30.0.1", - "@sinonjs/fake-timers": "^13.0.0", - "@types/node": "*", - "jest-message-util": "30.0.2", - "jest-mock": "30.0.2", - "jest-util": "30.0.2" - }, - "engines": { - "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0" - } - }, "node_modules/@jest/get-type": { "version": "30.0.1", "resolved": "https://registry.npmjs.org/@jest/get-type/-/get-type-30.0.1.tgz", diff --git a/tests/javascripts/collapsibleCheckboxes.test.js b/tests/javascripts/collapsibleCheckboxes.test.js index 9920f9b92..3d6c6bc1b 100644 --- a/tests/javascripts/collapsibleCheckboxes.test.js +++ b/tests/javascripts/collapsibleCheckboxes.test.js @@ -20,9 +20,9 @@ describe('Collapsible fieldset', () => { for (let num = start; num <= end; num++) { let id = `folder-permissions-${num}`; - result += `
  • - -
  • + +
  • `; @@ -49,7 +49,7 @@ describe('Collapsible fieldset', () => {
    -
      +
        ${_checkboxes(1, 10)}
      @@ -59,7 +59,7 @@ describe('Collapsible fieldset', () => { wrapper = document.querySelector('.selection-wrapper'); formGroup = wrapper.querySelector('.usa-form-group'); fieldset = formGroup.querySelector('fieldset'); - checkboxesContainer = fieldset.querySelector('.govuk-checkboxes'); + checkboxesContainer = fieldset.querySelector('.usa-checkbox-group'); checkboxes = checkboxesContainer.querySelectorAll('input[type=checkbox]'); }); @@ -323,7 +323,7 @@ describe('Collapsible fieldset', () => { const nestedCheckboxes = document.createElement('div'); nestedCheckboxes.className = 'usa-form-group usa-form-group--nested'; nestedCheckboxes.innerHTML = _checkboxes(11, 20); - checkboxesContainer.querySelector('.govuk-checkboxes__item').appendChild(nestedCheckboxes); + checkboxesContainer.querySelector('.usa-checkbox').appendChild(nestedCheckboxes); // start module window.GOVUK.modules.start();