Merge branch 'main' into dependabot/npm_and_yarn/gulp-sass-6.0.0

nhsuk · Jan 20, 2025 · eaee955 · eaee955
2 parents ddf4ebb + 36fa4e9
commit eaee955
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -39,7 +39,9 @@ jobs:
 
   tests:
     name: Javascript unit tests
-    runs-on: ubuntu-latest
+    # Ubuntu version is currently pinned to 22
+    # as later versions break tests relying on Chromium
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
@@ -53,7 +55,9 @@ jobs:
 
   ui_tests:
     name: Visual regression tests
-    runs-on: ubuntu-latest
+    # Ubuntu version is currently pinned to 22
+    # as later versions break tests relying on Chromium
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 - Fix appearance of disabled warning buttons ([Issue 1034]([https://github.com/nhsuk/nhsuk-service-manual-community-backlog/issues/1034]))
 - Fix reverse button text colour ([PR 1080]([https://github.com/nhsuk/nhsuk-frontend/pull/1080]))
+- Fix details component requiring html param in uppercase ([PR 1090](https://github.com/nhsuk/nhsuk-frontend/pull/1090), [Issue 1089](https://github.com/nhsuk/nhsuk-frontend/issues/1089))
 
 ## 9.1.0 - 4 November 2024
 

diff --git a/app/components/details/index.njk b/app/components/details/index.njk
@@ -13,7 +13,7 @@
 
         {{ details({
           "text": "Where can I find my NHS number?",
-          "HTML": "
+          "html": "
           <p>An NHS number is a 10 digit number, like 485 777 3456.</p>
           <p>You can find your NHS number on any document sent to you by the NHS. This may include:</p>
           <ul>

diff --git a/packages/components/details/README.md b/packages/components/details/README.md
@@ -45,7 +45,7 @@ For this component to be accessible and compatible with older browsers, include
 
 {{ details({
   "text": "Where can I find my NHS number?",
-  "HTML": "
+  "html": "
   <p>An NHS number is a 10 digit number, like 485 777 3456.</p>
   <p>You can find your NHS number on any document sent to you by the NHS. This may include:</p>
   <ul>
@@ -259,7 +259,7 @@ The details Nunjucks macro takes the following arguments:
 | Name       | Type    | Required | Description                                                                             |
 | ---------- | ------- | -------- | --------------------------------------------------------------------------------------- |
 | text       | string  | Yes      | Text to be displayed on the expander component.                                         |
-| HTML       | string  | Yes      | HTML content to be displayed within the expander component                              |
+| html       | string  | Yes      | HTML content to be displayed within the expander component                              |
 | id         | string  | false    | Id to add to the details element.                                                       |
 | open       | boolean | false    | If true, details element will be expanded.                                              |
 | classes    | string  | No       | Optional additional classes to add to the anchor tag. Separate each class with a space. |

diff --git a/packages/components/details/template.njk b/packages/components/details/template.njk
@@ -9,6 +9,7 @@
     </span>
   </summary>
   <div class="nhsuk-details__text">
-    {{- params.HTML | safe }}
+    {# params.HTML supported for backwards compatibility - see issue #1089 #}
+    {{- (params.html or params.HTML) | safe }}
   </div>
 </details>