govuk_publishing_components 35.16.0 → 35.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d631949b7bdb6aa90aff397986118f929cbae4071ef96b3a623c123c6496224d
-  data.tar.gz: ef75a103619c27bc964664673a17475579132d0b909e254fce0afcc6316256d9
+  metadata.gz: f215a358b5348fe905ec3b11ba2d3301dd263bbe5fe6961cdab3586de5f11ead
+  data.tar.gz: fee32e2c6b0b5a587b36577db5f51a731b8c3df67b5d7b30db4089650edf7efd
 SHA512:
-  metadata.gz: '01786b90a26218b6b5dff054852d4e67a77f36d307029ff6fd03f8b15cd005e9264f8719a03f78f05dc776f284c24c972eb6101940e8afd41a44a696c3b404f5'
-  data.tar.gz: 775eb1304962e2349b3e19c8ce7acfb92dc927443a7a01253692909c174f6b5e196129d40104f773794b2ac8e1674e0c65361e605808910f01163b9d69ad5f6a
+  metadata.gz: f687a3d509cc89bd128d4c696f8f504575188b3ade7b6e536587c09be27ce7d0a3733203c52acfb48252ba6655a99b020d64d8ae5d2afbb23994e0f16a6bc2ad
+  data.tar.gz: 82488d3f778c9c3dc22f27eab581965780b695a43ff0585fd191771dbbf6aa05c165616c61d89873342755e9c90b13e638766f116fef25a72baf8c08a265362f

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-page-views.js

@@ -28,7 +28,7 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
             schema_name: this.getMetaContent('schema-name'),
             content_id: this.getMetaContent('content-id'),
 
-            browse_topic: this.getMetaContent('section'),
+            browse_topic: this.getMetaContent('ga4-browse-topic'),
             navigation_page_type: this.getMetaContent('navigation-page-type'),
             navigation_list_type: this.getMetaContent('navigation-list-type'),
             step_navs: this.getMetaContent('stepnavs'),
@@ -57,10 +57,11 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
             emergency_banner: document.querySelector('[data-ga4-emergency-banner]') ? 'true' : undefined,
             phase_banner: this.getElementAttribute('data-ga4-phase-banner') || undefined,
             devolved_nations_banner: this.getElementAttribute('data-ga4-devolved-nations-banner') || undefined,
-            cookie_banner: document.querySelector('[data-ga4-cookie-banner]') ? 'true' : undefined,
-            intervention: this.getInterventionPresence(),
+            cookie_banner: this.getBannerPresence('[data-ga4-cookie-banner]'),
+            intervention: this.getBannerPresence('[data-ga4-intervention-banner]'),
             query_string: this.getQueryString(),
-            search_term: this.getSearchTerm()
+            search_term: this.getSearchTerm(),
+            spelling_suggestion: this.getMetaContent('spelling-suggestion')
           }
         }
         window.GOVUK.analyticsGa4.core.sendData(data)
@@ -68,7 +69,7 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
     },
 
     getLocation: function () {
-      return this.PIIRemover.stripPII(this.stripGaParam(document.location.href))
+      return this.PIIRemover.stripPIIWithOverride(this.stripGaParam(document.location.href), true, true)
     },
 
     getSearch: function () {
@@ -95,8 +96,8 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
     getQueryString: function () {
       var queryString = this.getSearch()
       if (queryString) {
-        queryString = this.PIIRemover.stripPIIWithOverride(queryString, true, true)
         queryString = this.stripGaParam(queryString)
+        queryString = this.PIIRemover.stripPIIWithOverride(queryString, true, true)
         queryString = queryString.substring(1) // removes the '?' character from the start.
         return queryString
       }
@@ -115,7 +116,7 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
     },
 
     getTitle: function () {
-      return this.PIIRemover.stripPII(document.title)
+      return this.PIIRemover.stripPIIWithOverride(document.title, true, true)
     },
 
     // window.httpStatusCode is set in the source of the error page in static
@@ -148,7 +149,10 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
       var content = document.getElementById('content')
       var html = document.querySelector('html')
       if (content) {
-        return content.getAttribute('lang') || this.nullValue
+        var contentLanguage = content.getAttribute('lang')
+        if (contentLanguage) {
+          return contentLanguage
+        }
       }
       // html.getAttribute('lang') is untested - Jasmine would not allow lang to be set on <html>.
       return html.getAttribute('lang') || this.nullValue
@@ -164,18 +168,18 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
       return (withdrawn === 'withdrawn') ? 'true' : 'false'
     },
 
-    getInterventionPresence: function () {
+    getBannerPresence: function (bannerSelector) {
       /* If the user hides the banner using JS, a cookie is set to hide it on future page loads.
-       * Therefore we need to start the intervention banner early so that it hides if this cookie exists.
+       * Therefore we need to start the banner module early so that it hides if this cookie exists.
        * Without this, our pageview object will track the banner as visible before it gets hidden. */
 
-      var intervention = document.querySelector('[data-ga4-intervention-banner]')
+      var banner = document.querySelector(bannerSelector)
 
-      if (intervention) {
-        window.GOVUK.modules.start(intervention)
-        var interventionHidden = intervention.getAttribute('hidden') === '' || intervention.getAttribute('hidden')
+      if (banner) {
+        window.GOVUK.modules.start(banner)
+        var bannerHidden = banner.getAttribute('hidden') === '' || banner.getAttribute('hidden')
 
-        if (interventionHidden) {
+        if (bannerHidden) {
           return undefined
         }
         return 'true'

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-video-tracker.js

@@ -70,7 +70,7 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
       var data = {}
       data.event_name = 'video_' + event
       data.type = 'video'
-      data.url = player.getVideoUrl()
+      data.url = this.cleanVideoUrl(player.getVideoUrl())
       data.text = player.videoTitle
       data.action = event
       data.video_current_time = Math.round(player.getCurrentTime())
@@ -81,6 +81,12 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
       var schema = schemas.mergeProperties(data, 'event_data')
 
       window.GOVUK.analyticsGa4.core.sendData(schema)
+    },
+
+    cleanVideoUrl: function (url) {
+      url = url.replace(/[?]{1}t=[0-9]+[&]{1}/, '?') // replace ?t=123& with ?
+      url = url.replace(/[&]{1}t=[0-9]+/, '') // replace &t=123 with ''
+      return url
     }
   }
 

data/app/assets/javascripts/govuk_publishing_components/components/option-select.js

@@ -268,32 +268,32 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     return visibleCheckboxes
   }
 
-  OptionSelect.prototype.isFacetsContainerHidden = function isFacetsContainerHidden () {
-    var facetsContent = this.$optionSelect.parentElement
-    var isFacetsContentHidden = false
+  OptionSelect.prototype.isComponentParentHidden = function isComponentParentHidden () {
+    var parentContent = this.$optionSelect.parentElement
+    var isparentContentHidden = false
     // check whether this is hidden by progressive disclosure,
     // because height calculations won't work
     // would use offsetParent === null but for IE10+
-    if (facetsContent) {
-      isFacetsContentHidden = !(facetsContent.offsetWidth || facetsContent.offsetHeight || facetsContent.getClientRects().length)
+    if (parentContent) {
+      isparentContentHidden = !(parentContent.offsetWidth || parentContent.offsetHeight || parentContent.getClientRects().length)
     }
 
-    return isFacetsContentHidden
+    return isparentContentHidden
   }
 
   OptionSelect.prototype.setupHeight = function setupHeight () {
     var initialOptionContainerHeight = this.$optionsContainer.clientHeight
     var height = this.$optionList.offsetHeight
 
-    var isFacetsContainerHidden = this.isFacetsContainerHidden()
+    var isComponentParentHidden = this.isComponentParentHidden()
 
-    if (isFacetsContainerHidden) {
+    if (isComponentParentHidden) {
       initialOptionContainerHeight = 200
       height = 200
     }
 
     // Resize if the list is only slightly bigger than its container
-    // If isFacetsContainerHidden is true, then 200 < 250
+    // If isComponentParentHidden is true, then 200 < 250
     // And the container height is always set to 201px
     if (height < initialOptionContainerHeight + 50) {
       this.setContainerHeight(height + 1)

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

@@ -145,7 +145,7 @@ $gem-guide-border-width: 1px;
   border: 0;
   padding: govuk-spacing(2);
 
-  &:before {
+  &::before {
     display: none;
   }
 }
@@ -187,7 +187,7 @@ $gem-guide-border-width: 1px;
     font-style: italic;
   }
 
-  &:before {
+  &::before {
     @include govuk-font($size: 14);
     content: attr(data-content);
     position: absolute;
@@ -201,7 +201,7 @@ $gem-guide-border-width: 1px;
 .component-guide-preview--warning {
   border-color: govuk-colour("yellow");
 
-  &:before {
+  &::before {
     background-color: govuk-colour("yellow");
   }
 }
@@ -209,7 +209,7 @@ $gem-guide-border-width: 1px;
 .component-guide-preview--violation {
   border-color: govuk-colour("red");
 
-  &:before {
+  &::before {
     background-color: govuk-colour("red");
     color: govuk-colour("white");
   }
@@ -516,11 +516,11 @@ $code-delete-bg: #fadddd;
 }
 
 .component__count {
-  &:before {
+  &::before {
     content: "(";
   }
 
-  &:after {
+  &::after {
     content: ")";
   }
 }

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

@@ -3,7 +3,7 @@
 .gem-c-action-link {
   display: table;
 
-  &:before {
+  &::before {
     content: "";
     display: table-cell;
     width: 60px;
@@ -66,7 +66,7 @@
   .gem-c-action-link__subtext {
     padding: 0;
 
-    &:before {
+    &::before {
       display: none;
     }
   }
@@ -82,7 +82,7 @@
     position: relative;
     padding-left: govuk-spacing(4);
 
-    &:before {
+    &::before {
       content: "";
       position: absolute;
       top: 10%;
@@ -95,14 +95,14 @@
 }
 
 .gem-c-action-link--white-arrow {
-  &:before {
+  &::before {
     background-image: image-url("govuk_publishing_components/action-link-arrow--white.png");
     background-image: image-url("govuk_publishing_components/action-link-arrow--white.svg"), linear-gradient(transparent, transparent);
   }
 }
 
 .gem-c-action-link--blue-arrow {
-  &:before {
+  &::before {
     width: 36px;
     height: 28px;
     background: image-url("govuk_publishing_components/action-link-arrow--blue.png");
@@ -120,7 +120,7 @@
 }
 
 .gem-c-action-link--simple {
-  &:before {
+  &::before {
     width: 30px;
     height: 30px;
     background: image-url("govuk_publishing_components/action-link-arrow--simple.png");
@@ -132,7 +132,7 @@
 }
 
 .gem-c-action-link--simple-light {
-  &:before {
+  &::before {
     width: 30px;
     height: 30px;
     background: image-url("govuk_publishing_components/action-link-arrow--simple-light.png");
@@ -144,14 +144,14 @@
 }
 
 .gem-c-action-link--dark-icon {
-  &:before {
+  &::before {
     background: image-url("govuk_publishing_components/action-link-arrow--dark.png");
     background: image-url("govuk_publishing_components/action-link-arrow--dark.svg"), linear-gradient(transparent, transparent);
   }
 }
 
 .gem-c-action-link--dark-large-icon {
-  &:before {
+  &::before {
     background: image-url("govuk_publishing_components/action-link-arrow--dark.png");
     background: image-url("govuk_publishing_components/action-link-arrow--dark.svg"), linear-gradient(transparent, transparent);
     height: 34px;
@@ -174,7 +174,7 @@
     margin-bottom: govuk-spacing(2);
   }
 
-  &:before {
+  &::before {
     height: 30px;
     width: 35px;
     background-repeat: no-repeat;
@@ -184,7 +184,7 @@
 }
 
 .gem-c-action-link--transparent-icon {
-  &:before {
+  &::before {
     background-image: image-url("govuk_publishing_components/action-link-arrow--transparent.svg");
   }
 }
@@ -192,7 +192,7 @@
 .gem-c-action-link--brexit {
   max-width: none;
 
-  &:before {
+  &::before {
     height: 30px;
     width: 30px;
     background-image: image-url("govuk_publishing_components/action-link-arrow--brexit.svg");
@@ -208,7 +208,7 @@
   @include govuk-media-query($from: tablet) {
     margin-bottom: govuk-spacing(2);
 
-    &:before {
+    &::before {
       width: 35px;
       background-position: 0 4px;
       background-size: 25px auto;
@@ -217,7 +217,7 @@
 }
 
 .gem-c-action-link--nhs {
-  &:before {
+  &::before {
     width: 80px;
     height: 70px;
     background: image-url("govuk_publishing_components/action-link--nhs.png");
@@ -232,7 +232,7 @@
   color: govuk-colour("white");
 
   .gem-c-action-link__subtext {
-    &:before {
+    &::before {
       border-color: govuk-colour("white");
     }
   }

data/app/assets/stylesheets/govuk_publishing_components/components/_big-number.scss

@@ -16,8 +16,9 @@
   @include govuk-font($size: 19, $weight: bold);
 
   // This pseudo element is to bypass an issue with NVDA where block level elements are dictated separately.
-  // What's happening here is that the label and the number technically have an inline relationship but appear to have a block relationship thanks to this element
-  &:before {
+  // What's happening here is that the label and the number technically have an inline relationship
+  // but appear to have a block relationship thanks to this element
+  &::before {
     content: "";
     display: block;
   }

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

@@ -18,7 +18,7 @@
   color: govuk-colour("white");
 }
 
-.gem-c-breadcrumbs--inverse .govuk-breadcrumbs__list-item:before {
+.gem-c-breadcrumbs--inverse .govuk-breadcrumbs__list-item::before {
   border-color: govuk-colour("white");
 }
 
@@ -40,11 +40,11 @@
       padding-bottom: 14px;
     }
 
-    .govuk-breadcrumbs__list-item:before {
+    .govuk-breadcrumbs__list-item::before {
       top: 18px;
     }
 
-    .govuk-breadcrumbs__link:after {
+    .govuk-breadcrumbs__link::after {
       content: "";
       position: absolute;
       top: 0;

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

@@ -65,7 +65,7 @@
     text-decoration: none;
   }
 
-  &:before {
+  &::before {
     content: none;
   }
 }
@@ -97,7 +97,7 @@
     text-decoration: none;
   }
 
-  &:before {
+  &::before {
     content: none;
   }
 }

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

@@ -65,7 +65,7 @@
 
 .gem-c-cards__link {
   // Make the entire list item area clickable
-  &:after {
+  &::after {
     bottom: 0;
     content: "";
     left: 0;
@@ -74,7 +74,7 @@
     top: 0;
   }
 
-  &:before {
+  &::before {
     $dimension: 7px;
     $width: 3px;
 
@@ -90,13 +90,13 @@
   }
 
   &:hover {
-    &:before {
+    &::before {
       border-color: $govuk-link-hover-colour;
     }
   }
 
   &:focus {
-    &:before {
+    &::before {
       border-color: $govuk-focus-text-colour;
     }
   }
@@ -120,7 +120,7 @@
     margin-bottom: govuk-spacing(1);
   }
 
-  .gem-c-cards__link:before {
+  .gem-c-cards__link::before {
     display: none;
   }
 }

data/app/assets/stylesheets/govuk_publishing_components/components/_contents-list.scss

@@ -50,7 +50,7 @@
   padding-left: $contents-spacing;
   padding-right: $contents-spacing;
 
-  &:before {
+  &::before {
     content: "—";
     position: absolute;
     left: 0;

data/app/assets/stylesheets/govuk_publishing_components/components/_contextual-sidebar.scss

@@ -37,7 +37,7 @@
   border-top: 7px solid #fed700;
   position: relative;
 
-  &:before {
+  &::before {
     content: "";
     position: absolute;
     left: 0;

data/app/assets/stylesheets/govuk_publishing_components/components/_document-list.scss

@@ -135,7 +135,7 @@
   padding-left: govuk-spacing(5);
   padding-top: govuk-spacing(2);
 
-  &:before {
+  &::before {
     content: "—";
     position: absolute;
     left: 0;
@@ -146,7 +146,7 @@
     padding: 0;
     padding-bottom: govuk-spacing(2);
 
-    &:before {
+    &::before {
       display: none;
     }
   }

data/app/assets/stylesheets/govuk_publishing_components/components/_image-card.scss

@@ -103,7 +103,7 @@
   // the after element extends the link to cover the image, removing the
   // need for a duplicate link. Other elements apart from the image are given
   // position relative and a higher z-index to put them above the after element
-  &:after {
+  &::after {
     content: "";
     position: absolute;
     z-index: 1;
@@ -117,7 +117,7 @@
   }
 
   @include govuk-media-query($from: mobile, $until: tablet) {
-    &:after {
+    &::after {
       left: govuk-spacing(3);
       right: govuk-spacing(3);
     }
@@ -176,7 +176,7 @@
     .gem-c-image-card__list-item {
       position: relative;
 
-      &:before { // stylelint-disable-line max-nesting-depth
+      &::before { // stylelint-disable-line max-nesting-depth
         content: "-";
         position: absolute;
         left: (- govuk-spacing(3));
@@ -226,7 +226,7 @@
     padding-bottom: govuk-spacing(2);
   }
 
-  .gem-c-image-card__title-link:after {
+  .gem-c-image-card__title-link::after {
     left: 0;
     right: 0;
   }
@@ -289,7 +289,7 @@
 .gem-c-image-card__youtube-thumbnail-image-container {
   position: relative;
 
-  &:before {
+  &::before {
     background: url("govuk_publishing_components/youtube-play-icon.png");
     background: url("govuk_publishing_components/youtube-play-icon.svg"), linear-gradient(transparent, transparent);
     background-repeat: no-repeat;