Merge branch 'main' into dependency/9/remove-simple-slack-notify

ONSdigital · Oct 19, 2023 · 94a81f7 · 94a81f7
2 parents e66707a + 8935fd8
commit 94a81f7
Show file tree

Hide file tree

Showing 56 changed files with 1,001 additions and 776 deletions.
diff --git a/__snapshots__/layout/_template.spec.js.snap b/__snapshots__/layout/_template.spec.js.snap
diff --git a/...nents_timeout-panel_example-panel-with-timeout-warning_0_document_0_desktop.png b/...nents_timeout-panel_example-panel-with-timeout-warning_0_document_0_desktop.png
diff --git a/...onents_timeout-panel_example-panel-with-timeout-warning_0_document_1_tablet.png b/...onents_timeout-panel_example-panel-with-timeout-warning_0_document_1_tablet.png
diff --git a/...onents_timeout-panel_example-panel-with-timeout-warning_0_document_2_mobile.png b/...onents_timeout-panel_example-panel-with-timeout-warning_0_document_2_mobile.png
diff --git a/...atterns_error-status-pages_example-access-denied-error_0_document_0_desktop.png b/...atterns_error-status-pages_example-access-denied-error_0_document_0_desktop.png
diff --git a/...patterns_error-status-pages_example-access-denied-error_0_document_1_tablet.png b/...patterns_error-status-pages_example-access-denied-error_0_document_1_tablet.png
diff --git a/...patterns_error-status-pages_example-access-denied-error_0_document_2_mobile.png b/...patterns_error-status-pages_example-access-denied-error_0_document_2_mobile.png
diff --git a/..._error-status-pages_example-browser-incompatible-error_0_document_0_desktop.png b/..._error-status-pages_example-browser-incompatible-error_0_document_0_desktop.png
diff --git a/...s_error-status-pages_example-browser-incompatible-error_0_document_1_tablet.png b/...s_error-status-pages_example-browser-incompatible-error_0_document_1_tablet.png
diff --git a/...s_error-status-pages_example-browser-incompatible-error_0_document_2_mobile.png b/...s_error-status-pages_example-browser-incompatible-error_0_document_2_mobile.png
diff --git a/...patterns_error-status-pages_example-maintenance-notice_0_document_0_desktop.png b/...patterns_error-status-pages_example-maintenance-notice_0_document_0_desktop.png
diff --git a/..._patterns_error-status-pages_example-maintenance-notice_0_document_1_tablet.png b/..._patterns_error-status-pages_example-maintenance-notice_0_document_1_tablet.png
diff --git a/..._patterns_error-status-pages_example-maintenance-notice_0_document_2_mobile.png b/..._patterns_error-status-pages_example-maintenance-notice_0_document_2_mobile.png
diff --git a/...or-status-pages_example-page-not-found-error-with-code_0_document_0_desktop.png b/...or-status-pages_example-page-not-found-error-with-code_0_document_0_desktop.png
diff --git a/...ror-status-pages_example-page-not-found-error-with-code_0_document_1_tablet.png b/...ror-status-pages_example-page-not-found-error-with-code_0_document_1_tablet.png
diff --git a/...ror-status-pages_example-page-not-found-error-with-code_0_document_2_mobile.png b/...ror-status-pages_example-page-not-found-error-with-code_0_document_2_mobile.png
diff --git a/...tterns_error-status-pages_example-page-not-found-error_0_document_0_desktop.png b/...tterns_error-status-pages_example-page-not-found-error_0_document_0_desktop.png
diff --git a/...atterns_error-status-pages_example-page-not-found-error_0_document_1_tablet.png b/...atterns_error-status-pages_example-page-not-found-error_0_document_1_tablet.png
diff --git a/...atterns_error-status-pages_example-page-not-found-error_0_document_2_mobile.png b/...atterns_error-status-pages_example-page-not-found-error_0_document_2_mobile.png
diff --git a/...test__patterns_error-status-pages_example-server-error_0_document_0_desktop.png b/...test__patterns_error-status-pages_example-server-error_0_document_0_desktop.png
diff --git a/...-test__patterns_error-status-pages_example-server-error_0_document_1_tablet.png b/...-test__patterns_error-status-pages_example-server-error_0_document_1_tablet.png
diff --git a/...-test__patterns_error-status-pages_example-server-error_0_document_2_mobile.png b/...-test__patterns_error-status-pages_example-server-error_0_document_2_mobile.png
diff --git a/...ror-status-pages_example-timed-out-error-not-signed-in_0_document_0_desktop.png b/...ror-status-pages_example-timed-out-error-not-signed-in_0_document_0_desktop.png
diff --git a/...rror-status-pages_example-timed-out-error-not-signed-in_0_document_1_tablet.png b/...rror-status-pages_example-timed-out-error-not-signed-in_0_document_1_tablet.png
diff --git a/...rror-status-pages_example-timed-out-error-not-signed-in_0_document_2_mobile.png b/...rror-status-pages_example-timed-out-error-not-signed-in_0_document_2_mobile.png
diff --git a/...t__patterns_error-status-pages_example-timed-out-error_0_document_0_desktop.png b/...t__patterns_error-status-pages_example-timed-out-error_0_document_0_desktop.png
diff --git a/...st__patterns_error-status-pages_example-timed-out-error_0_document_1_tablet.png b/...st__patterns_error-status-pages_example-timed-out-error_0_document_1_tablet.png
diff --git a/...st__patterns_error-status-pages_example-timed-out-error_0_document_2_mobile.png b/...st__patterns_error-status-pages_example-timed-out-error_0_document_2_mobile.png
diff --git a/...oduction-page_example-survey-section-introduction-page_0_document_0_desktop.png b/...oduction-page_example-survey-section-introduction-page_0_document_0_desktop.png
diff --git a/...roduction-page_example-survey-section-introduction-page_0_document_1_tablet.png b/...roduction-page_example-survey-section-introduction-page_0_document_1_tablet.png
diff --git a/...roduction-page_example-survey-section-introduction-page_0_document_2_mobile.png b/...roduction-page_example-survey-section-introduction-page_0_document_2_mobile.png
diff --git a/src/components/address-input/_macro.njk b/src/components/address-input/_macro.njk
@@ -110,17 +110,19 @@
                         onsAutosuggest({
                             "id": params.id + "-autosuggest",
                             "classes": "ons-address-input__autosuggest ons-u-mb-no",
-                            "width": "50",
-                            "label": {
-                                "text": params.label.text,
-                                "id": params.label.id,
-                                "classes": "ons-js-autosuggest-label"
+                            "input": {
+                                "width": "50",
+                                "label": {
+                                    "text": params.label.text,
+                                    "id": params.label.id,
+                                    "classes": "ons-js-autosuggest-label"
+                                },
+                                "value": params.value,
+                                "attributes": params.attributes,
+                                "error": params.error,
+                                "name": params.name,
+                                "mutuallyExclusive": params.mutuallyExclusive
                             },
-                            "value": params.value,
-                            "attributes": params.attributes,
-                            "error": params.error,
-                            "name": params.name,
-                            "mutuallyExclusive": params.mutuallyExclusive,
                             "externalInitialiser": true,
                             "APIDomain": params.APIDomain,
                             "APIDomainBearerToken": params.APIDomainBearerToken,

diff --git a/src/components/address-input/_macro.spec.js b/src/components/address-input/_macro.spec.js
@@ -352,17 +352,19 @@ describe('macro: address-input', () => {
       expect(autosuggestSpy.occurrences[0]).toEqual({
         id: 'address-input-example-id-autosuggest',
         classes: 'ons-address-input__autosuggest ons-u-mb-no',
-        width: '50',
-        label: {
-          text: '[params.label.text]',
-          id: '[params.label.id]',
-          classes: 'ons-js-autosuggest-label',
+        input: {
+          width: '50',
+          label: {
+            text: '[params.label.text]',
+            id: '[params.label.id]',
+            classes: 'ons-js-autosuggest-label',
+          },
+          value: '[params.value]',
+          attributes: '[params.attributes]',
+          error: '[params.error]',
+          name: '[params.name]',
+          mutuallyExclusive: '[params.mutuallyExclusive]',
         },
-        value: '[params.value]',
-        attributes: '[params.attributes]',
-        error: '[params.error]',
-        name: '[params.name]',
-        mutuallyExclusive: '[params.mutuallyExclusive]',
         externalInitialiser: true,
         APIDomain: '[params.APIDomain]',
         APIDomainBearerToken: '[params.APIDomainBearerToken]',

diff --git a/src/components/autosuggest/_macro-options.md b/src/components/autosuggest/_macro-options.md
@@ -14,15 +14,5 @@
 | typeMore              | string                                                        | true                             | message to encourage the user to enter more characters to get suggestions                                                                                    |
 | resultsTitle          | string                                                        | true                             | Title of results to be displayed on screen at the top of the results                                                                                         |
 | resultsTitleId        | string                                                        | true                             | ID for the results title. The ID is used in the results `aria-labelledby` to provide context for the results                                                 |
-| mutuallyExclusive     | `MutuallyExclusive` [_(ref)_](/components/mutually-exclusive) | false                            | Configuration object if this is a mutually exclusive input                                                                                                   |
-| label                 | `Label` [_(ref)_](/components/label)                          | false                            | Settings for the input label. `for` will automatically be set to match the input id                                                                          |
-| classes               | string                                                        | false                            | Classes to add to the input.                                                                                                                                 |
-| legend                | string                                                        | Only if mutuallyExclusive is set | Text content for the legend                                                                                                                                  |
-| legendClasses         | string                                                        | false                            | Classes for the legend                                                                                                                                       |
-| error                 | `Error` [_(ref)_](/components/error)                          | false                            | Configuration for validation errors                                                                                                                          |
-| name                  | string                                                        | false                            | The name of the input                                                                                                                                        |
-| value                 | string &#124; number                                          | false                            | The value to set the input to                                                                                                                                |
-| attributes            | object                                                        | false                            | HTML attributes (for example, data attributes) to add to the input                                                                                           |
-| autocomplete          | string                                                        | true                             | Autocomplete attribute used to override the browsers native autocomplete                                                                                     |
-| accessiblePlaceholder | boolean                                                       | false                            | Will add the provided label as an accessible placeholder                                                                                                     |
+| input                 | `Input` [_(ref)_](/components/input)                          | true                             | Configuration object for the input                                                                                                                           |
 | language              | string                                                        | false                            | The ISO 639-1 Code will override the default language in page. Please note that only 'en', 'cy' and 'ni' is currently supported                              |
diff --git a/src/components/autosuggest/_macro.njk b/src/components/autosuggest/_macro.njk
@@ -37,37 +37,50 @@
     >
 
         {% set autosuggestResults %}
-            <div class="ons-autosuggest__results ons-js-autosuggest-results{% if params.width %} ons-input--w-{{ params.width }}{% else %} ons-input--w-20{% endif %}">
+            <div class="ons-autosuggest__results ons-js-autosuggest-results{% if params.input.width %} ons-input--w-{{ params.input.width }}{% else %} ons-input--w-20{% endif %}">
                 <div id="{{ params.resultsTitleId }}" class="ons-autosuggest__results-title ons-u-fs-s">{{ params.resultsTitle }}</div>
                 <ul class="ons-autosuggest__listbox ons-js-autosuggest-listbox" title="{{ params.resultsTitle }}" role="listbox" id="{{ params.id }}-listbox" tabindex="-1"></ul>
             </div>
             <div class="ons-autosuggest__instructions ons-u-vh ons-js-autosuggest-instructions" id="{{ params.id }}-instructions" tabindex="-1">{{ params.instructions }}</div>
             <div class="ons-autosuggest__status ons-u-vh ons-js-autosuggest-aria-status" aria-live="assertive" aria-atomic="true" role="status" tabindex="-1"></div>
         {% endset %}
-            {{ onsInput({
-                "id": params.id,
-                "classes": "ons-js-autosuggest-input " + (params.classes if params.classes else ''),
-                "width": params.width,
-                "label": {
-                    "text": params.label.text,
-                    "description": params.label.description,
-                    "id": params.label.id,
-                    "classes": params.label.classes
-                },
-                "autocomplete": params.autocomplete,
-                "legend": params.legend,
-                "legendClasses": params.legendClasses,
-                "value": params.value,
-                "attributes": params.attributes,
-                "error": params.error,
-                "mutuallyExclusive": params.mutuallyExclusive,
-                "accessiblePlaceholder": params.accessiblePlaceholder,
-                "name": params.name,
-                "autosuggestResults": autosuggestResults
-            }) }}
 
-            {% if not params.mutuallyExclusive %}
-                {{ autosuggestResults | safe }}
-            {% endif %}
+        {{ onsInput({
+            "id": params.id,
+            "type": params.input.type,
+            "classes": "ons-js-autosuggest-input " + (params.input.classes if params.input.classes else ''),
+            "width": params.input.width,
+            "label": params.input.label,
+            "autocomplete": params.input.autocomplete,
+            "legend": params.input.legend,
+            "legendClasses": params.input.legendClasses,
+            "legendIsQuestionTitle": params.input.legendIsQuestionTitle,
+            "value": params.input.value,
+            "attributes": params.input.attributes,
+            "error": params.input.error,
+            "mutuallyExclusive": params.input.mutuallyExclusive,
+            "accessiblePlaceholder": params.input.accessiblePlaceholder,
+            "name": params.input.name,
+            "autosuggestResults": autosuggestResults,
+            "min": params.input.min,
+            "max": params.input.max,
+            "minLength": params.input.minLength,
+            "maxLength": params.input.maxLength,
+            "prefix": params.input.prefix,
+            "suffix": params.input.suffix,
+            "fieldId": params.input.fieldId,
+            "fieldClasses": params.input.fieldClasses,
+            "dontWrap": params.input.dontWrap,
+            "charCheckLimit": params.input.charCheckLimit,
+            "searchButton": params.input.searchButton,
+            "postTextboxLinkText": params.input.postTextboxLinkText,
+            "postTextboxLinkUrl": params.input.postTextboxLinkUrl,
+            "listeners": params.input.listeners
+        }) }}
+
+        {% if not params.mutuallyExclusive %}
+            {{ autosuggestResults | safe }}
+        {% endif %}
+
     </div>
 {% endmacro %}