govuk_publishing_components 59.1.1 → 59.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bf3ab25ab42797830c9959305eb90b72e2d5cb4850ffe2f9d0a0092b84ee784
-  data.tar.gz: bc7546e1616973abe9f4bafb0b244bd0e483f977122a626e5debe39a15fa59c7
+  metadata.gz: 7417948ab55013ddbb82d195f372b4a68010acc0859b7afff3f04ad23968a2db
+  data.tar.gz: 81f599c8fd2535efb10a130941d2226a7f2738ab79ae1066a7341b687d326ae6
 SHA512:
-  metadata.gz: 7241b5c9233ab7df264c4ddc82e4a4533fb8b336d7afd5e952ea13f0a7dcaf673ad66658c8333324bf99025a92c8f549b606660d936c1230db6522f8670520dd
-  data.tar.gz: f551678d5847390efcae700a1cf6678d5eeb7604224fb428e0f0cf9aa170b9b36fbd2228bc28692c14283fb8374e43301691b9e62d99d245899d0687aabffad0
+  metadata.gz: ae96349a76eabcf7bdc895efbb6fc9dc96fab3b09879f5a0da5ea86b0b4c165bb1a1b569fcb6102939f3e158d5e2294e877af4b9c7c343bf23b2a950bcc1cabc
+  data.tar.gz: 9a7913f2b23f58f8b82a27cdc47f55c20ea158b9212fa2eecd7642bd747e56aa7e42275274c97dae8043c5b79ab8d1221bdd84ef8f27003a359fefb66db63943

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/pii-remover.js

@@ -36,12 +36,12 @@
   // e.g. 'AB123456A', 'AB 12 34 56 A', 'ab 123456 a', 'ab 12 34 56 a', 'AB+12+34+56+A'
   var NATIONAL_INSURANCE_NUMBER = /[A-CEGHJ-OPR-TW-Z]{2}(\s+|\++)?(\d{2}(\s+|\++)?){3}[A-D]/gi
 
-  var UK_MOBILE_NUMBER = /07\d{3}\s?\d{6}/g // 07123 123456 or 07123123456
-  var UK_MOBILE_NUMBER_INTERNATIONAL = /\+447\d{3}\s?\d{6}/g // +447123 123456 or +447123123456
-  var UK_LANDLINE_NUMBER = /0[1246]\d{1}\s?\d{3,4}\s?\d{4}/g // 020 123 1234 or 020 1234 1234 or 0201231234 or 02012341234
-  var UK_LANDLINE_NUMBER_2 = /0[1246]\d{3}\s\d{6}/g // 02123 123456
-  var UK_LANDLINE_NUMBER_INTERNATIONAL = /\+44[1246]\d{1}\s?\d{3,4}\s?\d{4}/g // +4420 123 1234 or +4420 1234 1234
-  var UK_LANDLINE_NUMBER_INTERNATIONAL_2 = /\+44[1246]\d{3}\s\d{6}/g // +442123 123456
+  var UK_MOBILE_NUMBER = /07\d{3}[\s%20+]?\d{6,8}/g // 07123 123456 or 07123123456 or 07123+123456 or 07123%20123456
+  var UK_MOBILE_NUMBER_INTERNATIONAL = /(\+|%2B)?447\d{3}[\s%20+]?\d{6,8}/gi // +447123 123456 or +447123123456 or +447123%20123456 or +447123+123456 or %2B447123123456. Plus at start is optional.
+  var UK_LANDLINE_NUMBER = /0[1246]\d{1}[\s%20+]?\d{3,6}[\s%20+]?\d{4,6}/g // 020 123 1234 or 020 1234 1234 or 0201231234 or 02012341234 or 020+123+1234 or 020+1234+1234 or 020%20123%201234 or 020%201234%201234
+  var UK_LANDLINE_NUMBER_2 = /0[1246]\d{3}[\s%20+]\d{6,8}/g // 02123 123456 or 02123+123456 or 02123%20123456
+  var UK_LANDLINE_NUMBER_INTERNATIONAL = /(\+|%2B)?44[1246]\d{1}[\s%20+]?\d{3,6}[\s%20+]?\d{4,6}/g // // +4420 123 1234 or +4420 1234 1234 or +4420+123+1234 or +4420%20123%201234 or %2B4420 123 1234. Plus at start is optional.
+  var UK_LANDLINE_NUMBER_INTERNATIONAL_2 = /(\+|%2B)?44[1246]\d{3}[\s%20+]\d{6,8}/g // +442123 123456 or +442123%20123456 or +442123+123456 or %2B442123+123456. Plus at start is optional.
 
   function shouldStripDates () {
     var metas = document.querySelectorAll('meta[name="govuk:ga4-strip-dates"]')

data/app/assets/javascripts/govuk_publishing_components/components/add-another.js

@@ -5,7 +5,6 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
   function AddAnother (module) {
     this.module = module
     this.disableGa4 = this.module.dataset.disableGa4
-    this.emptyFieldset = undefined
     this.addAnotherButton = undefined
     this.startIndex = Number(this.module.dataset.ga4StartIndex) || 1
     this.indexSectionCount = Number(this.module.dataset.ga4IndexSectionCount)
@@ -94,8 +93,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
   }
 
   AddAnother.prototype.removeEmptyFieldset = function () {
-    this.emptyFieldset = this.module.querySelector('.js-add-another__empty')
-    this.emptyFieldset.remove()
+    this.module.querySelector('.js-add-another__empty').remove()
   }
 
   AddAnother.prototype.updateFieldsetsAndButtons = function () {
@@ -129,15 +127,18 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
   AddAnother.prototype.addNewFieldset = function (event) {
     var button = event.target
-    var newFieldset = this.emptyFieldset.cloneNode(true)
-    newFieldset.classList.remove('js-add-another__empty')
+    var newFieldsetTemplate = this.module.querySelector('.js-add-another__empty-template')
+    var newFieldset = newFieldsetTemplate.content.cloneNode(true).children[0]
     newFieldset.classList.add('js-add-another__fieldset')
     this.createRemoveButton(newFieldset, this.removeNewFieldset.bind(this))
     button.before(newFieldset)
 
-    this.incrementAttributes(this.emptyFieldset)
+    this.incrementAttributes(newFieldsetTemplate.content)
     this.updateFieldsetsAndButtons()
 
+    // Initialise any modules included in new fieldset
+    window.GOVUK.modules.start(newFieldset)
+
     // Move focus to first visible field in new set
     newFieldset
       .querySelector('input:not([type="hidden"]), select, textarea')

data/app/assets/stylesheets/component_guide/application.scss

@@ -1,5 +1,5 @@
 // This file contains the styles for the Component Guide.
-
+@use "sass:color";
 @import "govuk_publishing_components/govuk_frontend_support";
 @import "govuk_publishing_components/component_support";
 
@@ -267,10 +267,10 @@ html {
 // Rouge syntax highlighting
 // Based on https://github.com/alphagov/tech-docs-template/blob/master/template/source/stylesheets/palette/_syntax-highlighting.scss
 
-$code-00: scale-color(govuk-colour("light-grey"), $lightness: 50%); // Default Background
+$code-00: color.scale(govuk-colour("light-grey"), $lightness: 50%); // Default Background
 $code-01: #f5f5f5; // Lighter Background (Unused)
 $code-02: #bfc1c3; // Selection Background
-$code-03: darken($govuk-secondary-text-colour, 2%); // Comments, Invisibles, Line Highlighting
+$code-03: color.adjust($govuk-secondary-text-colour, $lightness: -2%); // Comments, Invisibles, Line Highlighting
 $code-04: #e8e8e8; // Dark Foreground (Unused)
 $code-05: $govuk-text-colour; // Default Foreground, Caret, Delimiters, Operators
 $code-06: #ffffff; // Light Foreground (Unused)

data/app/assets/stylesheets/govuk_publishing_components/components/_accordion.scss

@@ -1,5 +1,4 @@
 @import "govuk_publishing_components/individual_component_support";
-@import "mixins/prefixed-transform";
 @import "govuk/components/accordion/accordion";
 
 // Prevent elements inside the button from receiving click events

data/app/assets/stylesheets/govuk_publishing_components/components/_action-link.scss

@@ -6,49 +6,73 @@
   @include govuk-media-query($until: tablet) {
     max-width: 410px;
   }
+}
+
+.gem-c-action-link__icon {
+  display: table-cell;
+  line-height: 1;
+  width: 36px;
 
-  &::before {
-    content: "";
-    display: table-cell;
-    width: 36px;
+  svg {
     height: 28px;
-    background: url("govuk_publishing_components/action-link-arrow--light.svg");
-    background-repeat: no-repeat;
-    background-size: 28px auto;
-    background-position: 0 0;
+    vertical-align: middle;
+    width: 28px;
+
+    .gem-c-action-link__icon__circle {
+      fill: #eeefef;
+
+      // stylelint-disable max-nesting-depth
+      @media (forced-colors: active) {
+        fill: LinkText;
+      }
+      // stylelint-enable max-nesting-depth
+    }
 
-    @include govuk-media-query($from: tablet) {
-      width: 45px;
+    .gem-c-action-link__icon__arrow {
+      fill: #000000;
+
+      // stylelint-disable max-nesting-depth
+      @media (forced-colors: active) {
+        fill: Canvas;
+      }
+      // stylelint-enable max-nesting-depth
+    }
+  }
+
+  @include govuk-media-query($from: tablet) {
+    width: 45px;
+
+    svg {
       height: 35px;
-      background-size: 35px auto;
+      width: 35px;
     }
   }
 }
 
-.gem-c-action-link__link-wrapper {
-  display: table-cell;
-  vertical-align: middle;
-  @include govuk-font(19, $weight: bold, $line-height: 1.3);
-}
+.gem-c-action-link__icon--simple {
+  padding-top: 2px;
+  width: 30px;
+
+  svg {
+    height: 25px;
+    width: 25px;
 
-.gem-c-action-link__link {
-  color: inherit;
+    .gem-c-action-link__icon__arrow {
+      fill: #272828;
 
-  &:focus {
-    text-decoration: none;
-    color: $govuk-focus-text-colour;
+      // stylelint-disable max-nesting-depth
+      @media (forced-colors: active) {
+        fill: currentcolor;
+      }
+      // stylelint-enable max-nesting-depth
+    }
   }
 }
 
-.gem-c-action-link--simple {
-  &::before {
-    width: 30px;
-    height: 30px;
-    background: url("govuk_publishing_components/action-link-arrow--simple.svg");
-    background-repeat: no-repeat;
-    background-size: 25px auto;
-    background-position: 0 2px;
-  }
+.gem-c-action-link__link-wrapper {
+  display: table-cell;
+  vertical-align: middle;
+  @include govuk-font(19, $weight: bold, $line-height: 1.3);
 }
 
 @include govuk-media-query($media-type: print) {
@@ -57,7 +81,7 @@
       color: $govuk-print-text-colour !important; // stylelint-disable-line declaration-no-important
     }
 
-    &::before {
+    .gem-c-action-link__icon {
       display: none;
     }
   }

data/app/assets/stylesheets/govuk_publishing_components/components/_attachment.scss

@@ -77,8 +77,8 @@ $thumbnail-icon-border-colour: govuk-colour("mid-grey");
 .govspeak,
 .gem-c-govspeak {
   .gem-c-attachment__title {
-    @include govuk-font($size: 27, $weight: regular);
     margin: 0 0 govuk-spacing(3) 0;
+    @include govuk-font($size: 27, $weight: regular);
   }
 
   .gem-c-attachment__metadata {