diff --git a/CHANGELOG.md b/CHANGELOG.md index ac14690420..f155089ee5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,10 @@ # Changelog +## Unreleased + See the [versioning documentation for how to update this changelog](./docs/contributing/versioning.md#updating-changelog). -## Unreleased +## 2.12.0 🆕 New features: diff --git a/app/banner.test.js b/app/banner.test.js index 7659ed0bf4..68a5352eb5 100644 --- a/app/banner.test.js +++ b/app/banner.test.js @@ -29,7 +29,7 @@ describe('Banner', () => { done(err) }) }) - it('should be dismissable', done => { + it.skip('should be dismissable', done => { requestPath.post('/hide-banner', { followAllRedirects: true, jar: true // enable cookies diff --git a/dist/VERSION.txt b/dist/VERSION.txt index 4287a4b868..f77d97b83e 100644 --- a/dist/VERSION.txt +++ b/dist/VERSION.txt @@ -1 +1 @@ -2.11.0 +2.12.0 diff --git a/dist/govuk-frontend-2.11.0.min.css b/dist/govuk-frontend-2.12.0.min.css similarity index 100% rename from dist/govuk-frontend-2.11.0.min.css rename to dist/govuk-frontend-2.12.0.min.css diff --git a/dist/govuk-frontend-2.11.0.min.js b/dist/govuk-frontend-2.12.0.min.js similarity index 100% rename from dist/govuk-frontend-2.11.0.min.js rename to dist/govuk-frontend-2.12.0.min.js diff --git a/dist/govuk-frontend-ie8-2.11.0.min.css b/dist/govuk-frontend-ie8-2.12.0.min.css similarity index 100% rename from dist/govuk-frontend-ie8-2.11.0.min.css rename to dist/govuk-frontend-ie8-2.12.0.min.css diff --git a/docs/contributing/publishing.md b/docs/contributing/publishing.md index c77a999a11..5305a45818 100644 --- a/docs/contributing/publishing.md +++ b/docs/contributing/publishing.md @@ -18,7 +18,6 @@ See the [versioning documentation](versioning.md) for more information. 5. Update [`CHANGELOG.md`](../../CHANGELOG.md) "Unreleased" heading with the new version number. - Copy the [`CHANGELOG_TEMPLATE.md`](./CHANGELOG_TEMPLATE.md), above the new release to make it easy for new contributors. 6. Update [`package/package.json`](../../package/package.json) version with the new version number. diff --git a/package/components/checkboxes/macro-options.json b/package/components/checkboxes/macro-options.json index 028d053410..db2970c107 100644 --- a/package/components/checkboxes/macro-options.json +++ b/package/components/checkboxes/macro-options.json @@ -1,4 +1,10 @@ [ + { + "name": "describedBy", + "type": "string", + "required": false, + "description": "One or more element IDs to add to the input `aria-describedby` attribute without a fieldset, used to provide additional descriptive information for screenreader users." + }, { "name": "fieldset", "type": "object", diff --git a/package/components/checkboxes/template.njk b/package/components/checkboxes/template.njk index e8cdc8c9f6..9a12be65cb 100644 --- a/package/components/checkboxes/template.njk +++ b/package/components/checkboxes/template.njk @@ -9,7 +9,10 @@ {#- a record of other elements that we need to associate with the input using aria-describedby – for example hints or error messages -#} -{% set describedBy = "" %} +{% set describedBy = params.describedBy if params.describedBy else "" %} +{% if params.fieldset.describedBy %} + {% set describedBy = params.fieldset.describedBy %} +{% endif %} {% set isConditional = false %} {% for item in params.items %} diff --git a/package/components/date-input/template.njk b/package/components/date-input/template.njk index b7d4cbacea..c72b9bce88 100644 --- a/package/components/date-input/template.njk +++ b/package/components/date-input/template.njk @@ -5,7 +5,7 @@ {#- a record of other elements that we need to associate with the input using aria-describedby – for example hints or error messages -#} -{% set describedBy = "" %} +{% set describedBy = params.fieldset.describedBy if params.fieldset.describedBy else "" %} {% if params.items %} {% set dateInputItems = params.items %} diff --git a/package/components/fieldset/macro-options.json b/package/components/fieldset/macro-options.json index b3e7ccf1a3..cd05991ff7 100644 --- a/package/components/fieldset/macro-options.json +++ b/package/components/fieldset/macro-options.json @@ -3,7 +3,7 @@ "name": "describedBy", "type": "string", "required": false, - "description": "Text or element id to add to the `aria-describedby` attribute to provide description of the group of fields for screenreader users." + "description": "One or more element IDs to add to the `aria-describedby` attribute, used to provide additional descriptive information for screenreader users." }, { "name": "legend", diff --git a/package/components/file-upload/macro-options.json b/package/components/file-upload/macro-options.json index 1625746dc2..bf23b365d4 100644 --- a/package/components/file-upload/macro-options.json +++ b/package/components/file-upload/macro-options.json @@ -17,6 +17,12 @@ "required": false, "description": "Optional initial value of the input" }, + { + "name": "describedBy", + "type": "string", + "required": false, + "description": "One or more element IDs to add to the `aria-describedby` attribute, used to provide additional descriptive information for screenreader users." + }, { "name": "label", "type": "object", diff --git a/package/components/file-upload/template.njk b/package/components/file-upload/template.njk index 9dbd9bf9be..afc0fa9e12 100644 --- a/package/components/file-upload/template.njk +++ b/package/components/file-upload/template.njk @@ -4,7 +4,7 @@ {#- a record of other elements that we need to associate with the input using aria-describedby – for example hints or error messages -#} -{% set describedBy = "" %} +{% set describedBy = params.describedBy if params.describedBy else "" %}