hmrc-frontend 6.49.0 → 6.51.0

package/hmrc/VERSION.txt

@@ -1 +1 @@
-6.49.0
+6.51.0

package/hmrc/{accessible-autocomplete-6.49.0.css → accessible-autocomplete-6.51.0.css}

@@ -1,2 +1,2 @@
 .autocomplete__wrapper{position:relative}.autocomplete__hint,.autocomplete__input{-webkit-appearance:none;-moz-appearance:none;appearance:none;border:2px solid #0b0c0c;border-radius:0;-webkit-box-sizing:border-box;box-sizing:border-box;height:2.5rem;line-height:1.25;margin-bottom:0;width:100%}.autocomplete__input{background-color:rgba(0,0,0,0);position:relative}.autocomplete__hint{color:#505a5f;position:absolute}.autocomplete__input--default{padding:5px}.autocomplete__input--focused{-webkit-box-shadow:inset 0 0 0 2px;box-shadow:inset 0 0 0 2px;outline:3px solid #fd0;outline-offset:0}.autocomplete__input--show-all-values{cursor:pointer;padding:5px 35px 5px 5px}.autocomplete__dropdown-arrow-down{display:inline-block;height:24px;position:absolute;right:8px;top:10px;width:24px;z-index:-1}.autocomplete__menu{background-color:#fff;border:2px solid #0b0c0c;border-top:0;color:#0b0c0c;margin:0;max-height:342px;overflow-x:hidden;padding:0;width:100%;width:calc(100% - 4px)}.autocomplete__menu--visible{display:block}.autocomplete__menu--hidden{display:none}.autocomplete__menu--overlay{-webkit-box-shadow:0 2px 6px rgba(0,0,0,.257);box-shadow:0 2px 6px rgba(0,0,0,.257);left:0;position:absolute;top:100%;z-index:100}.autocomplete__menu--inline{position:relative}.autocomplete__option{border-bottom:1px solid #b1b4b6;border-left-width:0;border-right-width:0;border-top-width:1px;cursor:pointer;display:block;position:relative}.autocomplete__option>*{pointer-events:none}.autocomplete__option:first-of-type{border-top-width:0}.autocomplete__option:last-of-type{border-bottom-width:0}.autocomplete__option--odd{background-color:#f3f2f1}.autocomplete__option--focused,.autocomplete__option:hover{background-color:#1d70b8;border-color:#1d70b8;color:#fff;outline:none}@media (-ms-high-contrast:active),(forced-colors:active){.autocomplete__menu{border-color:FieldText}.autocomplete__option{background-color:Field;color:FieldText}.autocomplete__option--focused,.autocomplete__option:hover{background-color:Highlight;background-color:SelectedItem;border-color:SelectedItem;color:HighlightText;color:SelectedItemText;forced-color-adjust:none;outline-color:SelectedItemText}}.autocomplete__option--no-results{background-color:#f3f2f1;color:#505a5f;cursor:not-allowed}.autocomplete__hint,.autocomplete__input,.autocomplete__option{font-size:1rem;font-weight:400}.autocomplete__hint,.autocomplete__option{padding:5px}@media (min-width:641px){.autocomplete__hint,.autocomplete__input,.autocomplete__option{font-size:1.1875rem;line-height:1.3157894737}}.autocomplete__hint,.autocomplete__input,.autocomplete__option,.autocomplete__wrapper{font-family:GDS Transport,arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:1rem;line-height:1.25}@media print{.autocomplete__hint,.autocomplete__input,.autocomplete__option,.autocomplete__wrapper{font-family:sans-serif}}@media (min-width:40.0625em){.autocomplete__hint,.autocomplete__input,.autocomplete__option,.autocomplete__wrapper{font-size:1.1875rem;line-height:1.3157894737}}@media print{.autocomplete__hint,.autocomplete__input,.autocomplete__option,.autocomplete__wrapper{font-size:14pt;line-height:1.15}}.govuk-form-group--error div:has(+.govuk-select--error[data-module=hmrc-accessible-autocomplete])>.autocomplete__wrapper .autocomplete__input{border-color:#d4351c}.autocomplete__dropdown-arrow-down{z-index:0;pointer-events:none}
-/*# sourceMappingURL=maps/accessible-autocomplete-6.49.0.css.map */
+/*# sourceMappingURL=maps/accessible-autocomplete-6.51.0.css.map */

package/hmrc/{accessible-autocomplete-6.49.0.js → accessible-autocomplete-6.51.0.js}

@@ -2899,15 +2899,34 @@
 	    window.HMRCAccessibleAutocomplete.enhanceSelectElement(configurationOptions);
 	    var selectElementAriaDescribedBy = selectElement.getAttribute('aria-describedby') || '';
 	    var autocompleteElement = document.getElementById(autocompleteId);
-	    var autocompleteElementAriaDescribedBy = autocompleteElement && autocompleteElement.getAttribute('aria-describedby') || '';
+	    var autocompleteElementAriaDescribedBy = (autocompleteElement === null || autocompleteElement === void 0 ? void 0 : autocompleteElement.getAttribute('aria-describedby')) || '';
 	    var autocompleteElementMissingAriaDescribedAttrs = autocompleteElement && autocompleteElement.tagName !== 'select' && !autocompleteElementAriaDescribedBy.includes(selectElementAriaDescribedBy);
 	    if (autocompleteElementMissingAriaDescribedAttrs) {
 	      // if there is a hint and/or error then the autocomplete element
-	      // needs to be aria-describedby these, which it isn't be default
-	      // we need to check if it hasn't already been done to avoid
+	      // needs to be aria-describedby these, which it isn't be default.
+	      // we need to check if it hasn't already been done to avoid adding
+	      // them twice if someone has added a separate patch.
 	      autocompleteElement.setAttribute('aria-describedby', "".concat(selectElementAriaDescribedBy, " ").concat(autocompleteElementAriaDescribedBy));
+	      if (window.MutationObserver != null) {
+	        // when the input is empty, the autocomplete adds a link to a hint
+	        // that explains how to interact with the input via aria-describedby
+	        // and when it's not empty it removes it. These changes cause the
+	        // removal of the links to the error and hint, so we need to add
+	        // those links back, as well as maintain the link to the hint if it
+	        // was present because the input is empty.
+	        new MutationObserver(function () {
+	          var currentAriaDescribedBy = autocompleteElement.getAttribute('aria-describedby') || '';
+	          if (!(currentAriaDescribedBy !== null && currentAriaDescribedBy !== void 0 && currentAriaDescribedBy.includes(selectElementAriaDescribedBy))) {
+	            autocompleteElement.setAttribute('aria-describedby', "".concat(selectElementAriaDescribedBy, " ").concat(currentAriaDescribedBy));
+	          }
+	        }).observe(autocompleteElement, {
+	          attributes: true,
+	          attributeFilter: ['aria-describedby']
+	        });
+	      }
+
 	      // and in case page is still using adam's patch, this should stop
-	      // the select elements aria described by being added to the
+	      // the select elements aria-describedby from being added to the
 	      // autocomplete element twice when that runs (though unsure if a
 	      // screen reader would actually announce the elements twice if same
 	      // element was listed twice in the aria-describedby attribute)

package/hmrc/all.js

@@ -489,12 +489,6 @@
         }
       });
     };
-    var wrapLink = function wrapLink($elem) {
-      var $wrapper = document.createElement('div');
-      $wrapper.classList.add('hmrc-timeout-dialog__link-wrapper');
-      $wrapper.appendChild($elem);
-      return $wrapper;
-    };
     var setupDialog = function setupDialog(signoutTime) {
       var $element = utils.generateDomElementFromString('<div>');
       if (settings.title) {
@@ -511,17 +505,20 @@
         $visualMessge.appendChild(document.createTextNode(" ".concat(settings.messageSuffix)));
       }
       var $staySignedInButton = utils.generateDomElementFromStringAndAppendText('<button id="hmrc-timeout-keep-signin-btn" class="govuk-button">', settings.keepAliveButtonText);
+      var $wrapper = document.createElement('div');
+      $wrapper.classList.add('govuk-button-group');
+      $wrapper.appendChild($staySignedInButton);
       $element.appendChild($visualMessge);
       $element.appendChild($audibleMessage);
-      $element.appendChild($staySignedInButton);
       $staySignedInButton.addEventListener('click', keepAliveAndClose);
       $element.appendChild(document.createTextNode(' '));
       if (!settings.hideSignOutButton) {
         var $signOutButton = utils.generateDomElementFromStringAndAppendText('<a id="hmrc-timeout-sign-out-link" class="govuk-link hmrc-timeout-dialog__link">', settings.signOutButtonText);
         $signOutButton.addEventListener('click', signOut);
         $signOutButton.setAttribute('href', settings.signOutUrl);
-        $element.appendChild(wrapLink($signOutButton));
+        $wrapper.appendChild($signOutButton);
       }
+      $element.appendChild($wrapper);
       var dialogControl = dialog.displayDialog($element);
       cleanupFunctions.push(function () {
         dialogControl.closeDialog();

package/hmrc/components/accessible-autocomplete/accessible-autocomplete.js

@@ -52,7 +52,7 @@ AccessibleAutoComplete.prototype.init = function init() {
 
     const selectElementAriaDescribedBy = selectElement.getAttribute('aria-describedby') || '';
     const autocompleteElement = document.getElementById(autocompleteId);
-    const autocompleteElementAriaDescribedBy = (autocompleteElement && autocompleteElement.getAttribute('aria-describedby')) || '';
+    const autocompleteElementAriaDescribedBy = (autocompleteElement?.getAttribute('aria-describedby')) || '';
     const autocompleteElementMissingAriaDescribedAttrs = (
       autocompleteElement
       && autocompleteElement.tagName !== 'select'
@@ -60,14 +60,34 @@ AccessibleAutoComplete.prototype.init = function init() {
     );
     if (autocompleteElementMissingAriaDescribedAttrs) {
       // if there is a hint and/or error then the autocomplete element
-      // needs to be aria-describedby these, which it isn't be default
-      // we need to check if it hasn't already been done to avoid
+      // needs to be aria-describedby these, which it isn't be default.
+      // we need to check if it hasn't already been done to avoid adding
+      // them twice if someone has added a separate patch.
       autocompleteElement.setAttribute(
         'aria-describedby',
         `${selectElementAriaDescribedBy} ${autocompleteElementAriaDescribedBy}`,
       );
+
+      if (window.MutationObserver != null) {
+        // when the input is empty, the autocomplete adds a link to a hint
+        // that explains how to interact with the input via aria-describedby
+        // and when it's not empty it removes it. These changes cause the
+        // removal of the links to the error and hint, so we need to add
+        // those links back, as well as maintain the link to the hint if it
+        // was present because the input is empty.
+        new MutationObserver(() => {
+          const currentAriaDescribedBy = autocompleteElement.getAttribute('aria-describedby') || '';
+          if (!currentAriaDescribedBy?.includes(selectElementAriaDescribedBy)) {
+            autocompleteElement.setAttribute('aria-describedby', `${selectElementAriaDescribedBy} ${currentAriaDescribedBy}`);
+          }
+        }).observe(autocompleteElement, {
+          attributes: true,
+          attributeFilter: ['aria-describedby'],
+        });
+      }
+
       // and in case page is still using adam's patch, this should stop
-      // the select elements aria described by being added to the
+      // the select elements aria-describedby from being added to the
       // autocomplete element twice when that runs (though unsure if a
       // screen reader would actually announce the elements twice if same
       // element was listed twice in the aria-describedby attribute)

package/hmrc/components/timeout-dialog/_timeout-dialog.scss

@@ -40,6 +40,10 @@ html {
   @include govuk-media-query($from: tablet) {
     width: 435px;
   }
+
+  &:focus {
+    outline: $govuk-focus-width solid $govuk-focus-colour;
+  }
 }
 
 .hmrc-timeout-dialog__message {
@@ -54,25 +58,13 @@ html {
   white-space: nowrap;
 }
 
-.hmrc-timeout-dialog__link-wrapper {
-  @include govuk-media-query($from: tablet) {
-    display: inline-block;
-    line-height: 2.5em;
-    vertical-align: baseline;
-  }
-}
-
 .hmrc-timeout-dialog__link {
   @include govuk-font($size: 24);
 
-  display: inline-block;
-
   @include govuk-media-query($from: tablet) {
     @include govuk-font($size: 19);
 
-    position: relative;
-    top: 2px;
-    padding: 0.526315em 0.789473em 0.263157em;
-    line-height: 1.5;
+    // Same padding as govuk-button
+    padding: (govuk-spacing(2) - $govuk-border-width-form-element) govuk-spacing(2) (govuk-spacing(2) - $govuk-border-width-form-element - ($govuk-border-width-form-element / 2));
   }
 }

package/hmrc/components/timeout-dialog/timeout-dialog.js

@@ -141,14 +141,6 @@ function TimeoutDialog($module, $sessionActivityService) {
     });
   };
 
-  const wrapLink = ($elem) => {
-    const $wrapper = document.createElement('div');
-    $wrapper.classList.add('hmrc-timeout-dialog__link-wrapper');
-    $wrapper.appendChild($elem);
-
-    return $wrapper;
-  };
-
   const setupDialog = (signoutTime) => {
     const $element = utils.generateDomElementFromString('<div>');
 
@@ -181,9 +173,12 @@ function TimeoutDialog($module, $sessionActivityService) {
       settings.keepAliveButtonText,
     );
 
+    const $wrapper = document.createElement('div');
+    $wrapper.classList.add('govuk-button-group');
+    $wrapper.appendChild($staySignedInButton);
+
     $element.appendChild($visualMessge);
     $element.appendChild($audibleMessage);
-    $element.appendChild($staySignedInButton);
     $staySignedInButton.addEventListener('click', keepAliveAndClose);
     $element.appendChild(document.createTextNode(' '));
 
@@ -195,9 +190,11 @@ function TimeoutDialog($module, $sessionActivityService) {
       $signOutButton.addEventListener('click', signOut);
       $signOutButton.setAttribute('href', settings.signOutUrl);
 
-      $element.appendChild(wrapLink($signOutButton));
+      $wrapper.appendChild($signOutButton);
     }
 
+    $element.appendChild($wrapper);
+
     const dialogControl = dialog.displayDialog($element);
 
     cleanupFunctions.push(() => {