govuk_publishing_components 37.2.3 → 37.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2a0a4e155482dc364e89cbd2e7cadcbb47a03517188b2e10442369d3c0fe66e
-  data.tar.gz: ce994348af71283342f29d6ec33a8637c3a0297afb15b5ce80773b2d70008ef9
+  metadata.gz: 2555b277de08ff265823e6d39f556e5b11914ce143737ad5e8cd2d41dce344ff
+  data.tar.gz: 193200e4d2a872523f728817a8ad078f3fbf915a99b0986e10fa6fe1e51b6b5e
 SHA512:
-  metadata.gz: 18179699f08bed1942305e6e81f3a1c5c6a7e580a2cd81746725e7d5a8e150f9147ac976fa7952c2d93ed32ec30bd815870620d7f9cc4c06a4b4a2f6950a4ae1
-  data.tar.gz: e6076a4100b1d371b0701960cbf7c78a0ae6593cfd6ab8011d7e1494d07925a64083e93d01f7cae1c8aa074e2f72357a9fe80348cf5b4da3e79a9edf0b8d7d04
+  metadata.gz: 926c1dbb856d7e056a3bb230ddf74ef83c3a1684287e2ce10133c0d8c869500f7a8124b6dfdbb1d399c415358e34909bcc3ad69b98661f7d39509e4bafa9bfba
+  data.tar.gz: 1c0bd5a48a1d14bcc5850a2be305b5fb2890dc51c6fbe45b02d6adcda587599f6cf4070f02183635083d1224c774543ec138dab23aae6276c133319f6cb09ad1

data/app/assets/javascripts/govuk_publishing_components/analytics/auto-scroll-tracker.js

@@ -19,15 +19,16 @@ window.GOVUK.analyticsVars = window.GOVUK.analyticsVars || {};
   AutoScrollTracker.prototype.init = function () {
     var consentCookie = window.GOVUK.getConsentCookie()
 
-    if (consentCookie && consentCookie.settings) {
+    if (consentCookie && consentCookie.usage) {
       this.startModule()
     } else {
-      this.startModule = this.startModule.bind(this)
-      window.addEventListener('cookie-consent', this.startModule)
+      this.start = this.startModule.bind(this)
+      window.addEventListener('cookie-consent', this.start)
     }
   }
 
   AutoScrollTracker.prototype.startModule = function () {
+    window.removeEventListener('cookie-consent', this.start)
     if (window.GOVUK.analyticsVars.scrollTrackerStarted) {
       return
     }

data/app/assets/javascripts/govuk_publishing_components/analytics/init.js

@@ -11,25 +11,6 @@ var analyticsInit = function () {
     var crossDomainLinkedDomains = window.GOVUK.analyticsVars.linkedDomains || false
   }
 
-  window.GOVUK.Analytics.checkDigitalIdentityConsent = function (location) {
-    if (!location || !location.search) return
-    // this checks for the presence of the Digital Identity cookie consent query parameter and updates our consent cookie accordingly
-    // This is so that users don't see multiple cookie banners when they move between the different account management pages, as some will be on GOV.UK and others will be on the DI domain.
-    var digitalIdentityConsent = /([?&]cookie_consent=)(accept|reject)/.exec(location.search)
-    if (digitalIdentityConsent) {
-      if (digitalIdentityConsent[2] === 'accept') {
-        window.GOVUK.setConsentCookie({ usage: true })
-        // set cookies_preferences_set to true to prevent cookie banner showing
-        window.GOVUK.cookie('cookies_preferences_set', 'true')
-      } else if (digitalIdentityConsent[2] === 'reject') {
-        window.GOVUK.setConsentCookie({ usage: false })
-        window.GOVUK.cookie('cookies_preferences_set', 'true')
-      }
-    }
-  }
-
-  window.GOVUK.Analytics.checkDigitalIdentityConsent(window.location)
-
   var consentCookie = window.GOVUK.getConsentCookie()
   var dummyAnalytics = {
     addLinkedTrackerDomain: function () {},

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

@@ -13,11 +13,11 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
   Ga4AutoTracker.prototype.init = function () {
     var consentCookie = window.GOVUK.getConsentCookie()
 
-    if (consentCookie && consentCookie.settings) {
+    if (consentCookie && consentCookie.usage) {
       this.startModule()
     } else {
-      this.startModule = this.startModule.bind(this)
-      window.addEventListener('cookie-consent', this.startModule)
+      this.start = this.startModule.bind(this)
+      window.addEventListener('cookie-consent', this.start)
     }
   }
 
@@ -27,6 +27,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
   Ga4AutoTracker.prototype.sendEvent = function () {
     if (window.dataLayer) {
+      window.removeEventListener('cookie-consent', this.start)
       try {
         var data = this.module.getAttribute(this.trackingTrigger)
         data = JSON.parse(data) || {}

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-core.js

@@ -268,7 +268,7 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
           module.setAttribute('data-ga4-link', JSON.stringify(ga4LinkData))
         } catch (e) {
           // if there's a problem with the config, don't start the tracker
-          console.error('Unable to JSON.parse or JSON.stringify index: ' + e.message, window.location)
+          console.error('Unable to JSON.parse or JSON.stringify index: ', e, window.location)
         }
       },
 

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

@@ -13,17 +13,18 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
   Ga4EventTracker.prototype.init = function () {
     var consentCookie = window.GOVUK.getConsentCookie()
 
-    if (consentCookie && consentCookie.settings) {
+    if (consentCookie && consentCookie.usage) {
       this.startModule()
     } else {
-      this.startModule = this.startModule.bind(this)
-      window.addEventListener('cookie-consent', this.startModule)
+      this.start = this.startModule.bind(this)
+      window.addEventListener('cookie-consent', this.start)
     }
   }
 
   // triggered by cookie-consent event, which happens when users consent to cookies
   Ga4EventTracker.prototype.startModule = function () {
     if (window.dataLayer) {
+      window.removeEventListener('cookie-consent', this.start)
       this.module.addEventListener('click', this.trackClick.bind(this), true) // useCapture must be true
     }
   }

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

@@ -15,17 +15,18 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
   Ga4FormTracker.prototype.init = function () {
     var consentCookie = window.GOVUK.getConsentCookie()
 
-    if (consentCookie && consentCookie.settings) {
+    if (consentCookie && consentCookie.usage) {
       this.startModule()
     } else {
-      this.startModule = this.startModule.bind(this)
-      window.addEventListener('cookie-consent', this.startModule)
+      this.start = this.startModule.bind(this)
+      window.addEventListener('cookie-consent', this.start)
     }
   }
 
   // triggered by cookie-consent event, which happens when users consent to cookies
   Ga4FormTracker.prototype.startModule = function () {
     if (window.dataLayer) {
+      window.removeEventListener('cookie-consent', this.start)
       this.module.addEventListener('submit', this.trackFormSubmit.bind(this))
     }
   }
@@ -88,7 +89,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       } else if (inputNodename === 'SELECT' && elem.options[elem.selectedIndex].value) {
         input.answer = elem.options[elem.selectedIndex].text
       } else if (inputTypes.indexOf(inputType) !== -1 && elem.value) {
-        if (this.includeTextInputValues) {
+        if (this.includeTextInputValues || elem.hasAttribute('data-ga4-form-include-input')) {
           var PIIRemover = new window.GOVUK.analyticsGa4.PIIRemover()
           input.answer = PIIRemover.stripPIIWithOverride(elem.value, true, true)
         } else {

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

@@ -16,17 +16,18 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
   Ga4LinkTracker.prototype.init = function () {
     var consentCookie = window.GOVUK.getConsentCookie()
 
-    if (consentCookie && consentCookie.settings) {
+    if (consentCookie && consentCookie.usage) {
       this.startModule()
     } else {
-      this.startModule = this.startModule.bind(this)
-      window.addEventListener('cookie-consent', this.startModule)
+      this.start = this.startModule.bind(this)
+      window.addEventListener('cookie-consent', this.start)
     }
   }
 
   // triggered by cookie-consent event, which happens when users consent to cookies
   Ga4LinkTracker.prototype.startModule = function () {
     if (window.dataLayer) {
+      window.removeEventListener('cookie-consent', this.start)
       this.handleClick = this.handleClick.bind(this)
       this.handleMousedown = this.handleMousedown.bind(this)
 
@@ -47,8 +48,18 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     } else if (this.trackLinksOnly && target.closest('a')) {
       if (!this.limitToElementClass) {
         this.trackClick(event)
-      } else if (target.closest('.' + this.limitToElementClass)) {
-        this.trackClick(event)
+      } else {
+        var classes = this.limitToElementClass.split(',')
+
+        for (var i = 0; i < classes.length; i++) {
+          if (target.closest('.' + classes[i].trim())) {
+            // Stops the link tracker firing twice if the link itself has data-ga4-link, and the parent element does as well.
+            if (target.closest('[data-ga4-link]') !== target.closest('[data-ga4-limit-to-element-class]')) {
+              return
+            }
+            this.trackClick(event)
+          }
+        }
       }
     }
   }

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

@@ -80,18 +80,26 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
     },
 
     getSearchTerm: function () {
-      var queryString = window.GOVUK.analyticsGa4.core.trackFunctions.getSearch()
-
-      if (!queryString) {
-        return undefined
-      }
-
-      var searchTerm = queryString.match(/keywords=([^&]*)/)
+      // Using the data-attribute has the benefit that none of the characters are URI encoded i.e. [] remains [] instead of %5B%5D.
+      var searchTerm = this.getElementAttribute('data-ga4-search-query')
+
+      /*
+        Fallback to the keywords URL parameter if the attribute does not exist.
+        There is a small downside to this method. If the user uses an & in their search term, it breaks as we can't determine
+        if this & is a part of their search term or the start of another query parameter.
+        The potential solution may be to URL encode the keywords parameter in finder-frontend.
+      */
       if (!searchTerm) {
-        return undefined
+        var queryString = window.GOVUK.analyticsGa4.core.trackFunctions.getSearch()
+
+        searchTerm = queryString.match(/keywords=([^&]*)/)
+        if (!searchTerm) {
+          return undefined
+        }
+        searchTerm = searchTerm[0].replace('keywords=', '')
+        searchTerm = decodeURIComponent(searchTerm).replace(/'"'/g, '"')
       }
 
-      searchTerm = searchTerm[0].replace('keywords=', '')
       searchTerm = window.GOVUK.analyticsGa4.core.trackFunctions.standardiseSearchTerm(searchTerm)
 
       return searchTerm

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

@@ -19,15 +19,16 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
   Ga4ScrollTracker.prototype.init = function () {
     var consentCookie = window.GOVUK.getConsentCookie()
 
-    if (consentCookie && consentCookie.settings) {
+    if (consentCookie && consentCookie.usage) {
       this.startModule()
     } else {
-      this.startModule = this.startModule.bind(this)
-      window.addEventListener('cookie-consent', this.startModule)
+      this.start = this.startModule.bind(this)
+      window.addEventListener('cookie-consent', this.start)
     }
   }
 
   Ga4ScrollTracker.prototype.startModule = function () {
+    window.removeEventListener('cookie-consent', this.start)
     if (window.GOVUK.analyticsGa4.vars.scrollTrackerStarted) {
       return
     }

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-smart-answer-results-tracker.js

@@ -12,11 +12,11 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
   Ga4SmartAnswerResultsTracker.prototype.init = function () {
     var consentCookie = window.GOVUK.getConsentCookie()
 
-    if (consentCookie && consentCookie.settings) {
+    if (consentCookie && consentCookie.usage) {
       this.startModule()
     } else {
-      this.startModule = this.startModule.bind(this)
-      window.addEventListener('cookie-consent', this.startModule)
+      this.start = this.startModule.bind(this)
+      window.addEventListener('cookie-consent', this.start)
     }
   }
 
@@ -25,6 +25,7 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
     // only run this code if the dataLayer exists and an element with a data-ga4-ecommerce-path
     // attribute exists as this indicates that ecommerce tracking is required
     if (window.dataLayer && this.module.querySelector('[data-ga4-ecommerce-path]')) {
+      window.removeEventListener('cookie-consent', this.start)
       this.trackResults()
       this.module.addEventListener('click', this.handleClick.bind(this))
     }

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/init-ga4.js

@@ -2,6 +2,7 @@ window.GOVUK = window.GOVUK || {}
 window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {}
 
 var initFunction = function () {
+  window.removeEventListener('cookie-consent', window.GOVUK.analyticsGa4.init)
   var consentCookie = window.GOVUK.getConsentCookie()
 
   if (consentCookie && consentCookie.usage) {

data/app/assets/javascripts/govuk_publishing_components/components/cookie-banner.js

@@ -26,13 +26,11 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
     this.$acceptCookiesButton = this.$module.querySelector('button[data-accept-cookies]')
     if (this.$acceptCookiesButton) {
-      this.$acceptCookiesButton.style.display = 'block'
       this.$acceptCookiesButton.addEventListener('click', this.$module.setCookieConsent)
     }
 
     this.$rejectCookiesButton = this.$module.querySelector('button[data-reject-cookies]')
     if (this.$rejectCookiesButton) {
-      this.$rejectCookiesButton.style.display = 'block'
       this.$rejectCookiesButton.addEventListener('click', this.$module.rejectCookieConsent)
     }
 
@@ -45,7 +43,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       var shouldHaveCookieMessage = (this.$module && window.GOVUK.cookie('cookies_preferences_set') !== 'true')
 
       if (shouldHaveCookieMessage) {
-        this.$module.style.display = 'block'
+        this.$module.removeAttribute('hidden')
 
         // Set the default consent cookie if it isn't already present
         if (!window.GOVUK.cookie('cookies_policy')) {
@@ -53,18 +51,13 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
         }
 
         window.GOVUK.deleteUnconsentedCookies()
-      } else {
-        this.$module.style.display = 'none'
       }
-    } else {
-      this.$module.style.display = 'none'
     }
   }
 
   CookieBanner.prototype.hideCookieMessage = function (event) {
     if (this.$module) {
       this.$module.hidden = true
-      this.$module.style.display = 'none'
       window.GOVUK.cookie('cookies_preferences_set', 'true', { days: 365 })
     }
 

data/app/assets/javascripts/govuk_publishing_components/components/cross-service-header.js

@@ -11,9 +11,6 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     this.$header = $module
     this.$navigation = $module && $module.querySelectorAll('[data-one-login-header-nav]')
     this.$numberOfNavs = this.$navigation && this.$navigation.length
-    if (this.$header) {
-      this.$header.classList.add('js-enabled')
-    }
   }
   /**
   * Initialise header
@@ -40,9 +37,12 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       $nav.$menu = $nav.$menuButton && $nav.querySelector(
         '#' + $nav.$menuButton.getAttribute('aria-controls')
       )
-      if (!$nav.$menuButton || !$nav.$menu) {
+      $nav.menuItems = $nav.$menu && $nav.$menu.querySelectorAll('li')
+      if (!$nav.$menuButton || !$nav.$menu || $nav.menuItems.length < 2) {
         return
       }
+
+      $nav.classList.add('toggle-enabled')
       $nav.$menuOpenClass = $nav.$menu && $nav.$menu.dataset.openClass
       $nav.$menuButtonOpenClass = $nav.$menuButton && $nav.$menuButton.dataset.openClass
       $nav.$menuButtonOpenLabel = $nav.$menuButton && $nav.$menuButton.dataset.labelForShow

data/app/assets/javascripts/govuk_publishing_components/dependencies.js

@@ -10,6 +10,7 @@ document.addEventListener('DOMContentLoaded', function () {
 
   // if statements ensure these functions don't execute during testing
   if (typeof window.GOVUK.loadAnalytics !== 'undefined') {
+    window.GOVUK.loadAnalytics.loadExtraDomains()
     if (typeof window.GOVUK.analyticsGa4.vars === 'undefined') {
       window.GOVUK.loadAnalytics.loadGa4()
     }

data/app/assets/javascripts/govuk_publishing_components/lib/govspeak/youtube-link-enhancement.js

@@ -10,15 +10,15 @@
 
   YoutubeLinkEnhancement.prototype.init = function () {
     if (!this.campaignCookiesAllowed()) {
-      this.startModule = this.startModule.bind(this)
-      window.addEventListener('cookie-consent', this.startModule)
+      this.start = this.startModule.bind(this)
+      window.addEventListener('cookie-consent', this.start)
       return
     }
     this.startModule()
   }
 
   YoutubeLinkEnhancement.prototype.startModule = function () {
-    window.removeEventListener('cookie-consent', this.startModule)
+    window.removeEventListener('cookie-consent', this.start)
     var $youtubeLinks = this.$element.querySelectorAll('a[href*="youtube.com"], a[href*="youtu.be"]')
 
     if ($youtubeLinks.length > 0) {

data/app/assets/javascripts/govuk_publishing_components/load-analytics.js

@@ -70,6 +70,12 @@ window.GOVUK.loadAnalytics = {
     }
   ],
 
+  loadExtraDomains: function () {
+    if (Array.isArray(window.GOVUK.analyticsGa4Domains)) {
+      this.domains = this.domains.concat(window.GOVUK.analyticsGa4Domains)
+    }
+  },
+
   // For Universal Analytics' cross domain tracking. linkedDomains is defined by the require statement at the top of the file.
   linkedDomains: window.GOVUK.analytics.linkedDomains,
 
@@ -99,18 +105,7 @@ window.GOVUK.loadAnalytics = {
 
   loadGa4: function (currentDomain) {
     currentDomain = currentDomain || window.location.hostname
-    var environment = false
-    // lots of dev domains, so simplify the matching process
-    if (currentDomain.match(/\/{2}[a-zA-Z0-9.]+dev\.gov\.uk/)) {
-      environment = this.domains[0]
-    } else {
-      for (var i = 0; i < this.domains.length; i++) {
-        if (this.arrayContains(currentDomain, this.domains[i].domains)) {
-          environment = this.domains[i]
-          break
-        }
-      }
-    }
+    var environment = this.getEnvironment(currentDomain)
 
     // If we recognise the environment (i.e. the string isn't empty), load in GA4
     if (environment) {
@@ -135,5 +130,18 @@ window.GOVUK.loadAnalytics = {
 
   arrayContains: function (valueToFind, array) {
     return array.indexOf(valueToFind) !== -1
+  },
+
+  getEnvironment: function (currentDomain) {
+    // lots of dev domains, so simplify the matching process
+    if (currentDomain.match(/[a-zA-Z0-9.-]+dev\.gov\.uk/)) {
+      return this.domains[0]
+    } else {
+      for (var i = 0; i < this.domains.length; i++) {
+        if (this.arrayContains(currentDomain, this.domains[i].domains)) {
+          return this.domains[i]
+        }
+      }
+    }
   }
 }

data/app/assets/javascripts/govuk_publishing_components/modules.js

@@ -43,7 +43,7 @@
                 element.setAttribute('data-' + moduleNames[j] + '-module-started', true)
               } catch (e) {
                 // if there's a problem with the module, catch the error to allow other modules to start
-                console.error('Error starting ' + moduleName + ' component JS: ' + e.message, window.location)
+                console.error('Error starting ' + moduleName + ' component JS: ', e, window.location)
               }
             }
           }

data/app/assets/javascripts/govuk_publishing_components/rum-loader.js

@@ -19,6 +19,7 @@
   })()
 
   var insertScript = function () {
+    window.removeEventListener('cookie-consent', insertScript)
     var marker = document.querySelector('script[data-lux-reporter-script]')
 
     if (!marker) {
@@ -37,8 +38,6 @@
   if (parsedCookie.usage === true) {
     insertScript()
   } else {
-    window.addEventListener('cookie-consent', function () {
-      insertScript()
-    })
+    window.addEventListener('cookie-consent', insertScript)
   }
 })()

data/app/assets/stylesheets/govuk_publishing_components/components/_cookie-banner.scss

@@ -1,25 +1,14 @@
 @import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/cookie-banner/cookie-banner";
 
-.gem-c-cookie-banner .govuk-button-group[hidden] {
-  display: none;
-}
-
-.govuk-cookie-banner .govuk-cookie-banner__heading[hidden] {
-  display: none;
-}
-
-.js-enabled {
-  .gem-c-cookie-banner {
-    display: none; // shown with JS, always on for non-JS
+.gem-c-cookie-banner {
+  [hidden],
+  .govuk-button-group[hidden],
+  .govuk-cookie-banner__heading[hidden] {
+    display: none;
   }
 }
 
-// can't be used without js so implement there
-.gem-c-cookie-banner .gem-c-button {
-  display: none;
-}
-
 .gem-c-cookie-banner__confirmation {
   // This element is focused using JavaScript so that it's being read out by screen readers
   // for this reason we don't want to show the default outline or emphasise it visually using `govuk-focused-text`

data/app/assets/stylesheets/govuk_publishing_components/components/_cross-service-header.scss

@@ -27,7 +27,7 @@ $govuk-header-link-underline-thickness: 3px;
 @mixin nav-style($nav-open-class) {
   display: block;
   // if JS is unavailable, the nav links are expanded and the toggle button is hidden
-  .gem-c-cross-service-header.js-enabled & {
+  .toggle-enabled & {
     display: none;
 
     &#{$nav-open-class} {
@@ -48,7 +48,7 @@ $govuk-header-link-underline-thickness: 3px;
 .gem-c-cross-service-header__button {
   display: none;
 
-  .gem-c-cross-service-header.js-enabled & {
+  .toggle-enabled & {
     display: inline;
     display: flex;
 

data/app/models/govuk_publishing_components/audit_comparer.rb

@@ -14,7 +14,6 @@ module GovukPublishingComponents
           info-frontend
           service-manual-frontend
           smart-answers
-          whitehall
         ]
 
         @static_data = find_static(results)

data/app/views/govuk_publishing_components/components/_attachment.html.erb

@@ -7,6 +7,7 @@
   hide_order_copy_link ||= false
   attributes = []
   data_attributes ||= {}
+  details_ga4_attributes ||= {}
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
 
   container_class_names = %w[gem-c-attachment govuk-!-display-none-print]
@@ -118,7 +119,8 @@
     <% if attachment.alternative_format_contact_email %>
       <%= tag.p t("components.attachment.request_format_text"), class: "gem-c-attachment__metadata" %>
       <%= render "govuk_publishing_components/components/details", {
-        title: t("components.attachment.request_format_cta")
+        title: t("components.attachment.request_format_cta"),
+        ga4_attributes: details_ga4_attributes,
       } do %>
         <%= t("components.attachment.request_format_details_html", alternative_format_contact_email: attachment.alternative_format_contact_email) %>
       <% end %>

data/app/views/govuk_publishing_components/components/_back_link.html.erb

@@ -2,11 +2,21 @@
   add_gem_component_stylesheet("back-link")
 
   text ||= t('components.back_link.back')
-  data_attributes ||= nil
+  data_attributes ||= {}
+  disable_ga4 ||= false
+
+  component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
+  component_helper.add_class("gem-c-back-link govuk-back-link govuk-!-display-none-print")
+  unless disable_ga4
+    ga4_link = {
+      event_name: "navigation",
+      type: "back",
+      url: href,
+    }
+    component_helper.add_data_attribute({ module: "ga4-link-tracker" })
+    component_helper.add_data_attribute({ ga4_link: ga4_link })
+  end
 %>
-<%= link_to(
-  text,
-  href,
-  class: %w(gem-c-back-link govuk-back-link govuk-!-display-none-print),
-  data: data_attributes
-) %>
+<%= tag.a(**component_helper.all_attributes.merge!({ href: href })) do %>
+  <%= text %>
+<% end %>

data/app/views/govuk_publishing_components/components/_cookie_banner.html.erb

@@ -34,7 +34,7 @@
   disable_ga4 ||= false
 %>
 
-<div id="<%= id %>" class="<%= css_classes.join(' ') %>" data-module="cookie-banner" data-nosnippet role="region" aria-label="<%= title %>">
+<div id="<%= id %>" class="<%= css_classes.join(' ') %>" data-module="cookie-banner" data-nosnippet role="region" aria-label="<%= title %>" hidden>
   <div class="govuk-cookie-banner__message govuk-width-container">
     <div class="govuk-grid-row">
       <div class="govuk-grid-column-two-thirds">

data/app/views/govuk_publishing_components/components/_govspeak.html.erb

@@ -9,9 +9,24 @@
   classes << direction_class if direction_class
   classes << "disable-youtube" if disable_youtube_expansions
   classes << "gem-c-govspeak--inverse" if inverse
+
+  disable_ga4 ||= false
+
+  data_modules = "govspeak"
+  data_modules << " ga4-link-tracker" unless disable_ga4
+  data_attributes = { module: data_modules }
+
+  unless disable_ga4
+    data_attributes.merge!({
+      ga4_track_links_only: "",
+      ga4_limit_to_element_class: "call-to-action, info-notice, help-notice, advisory",
+      ga4_link: { "event_name": "navigation", "type": "callout" }.to_json,
+    })
+  end
+
 %>
 
-<div class="gem-c-govspeak govuk-govspeak <%= classes.join(" ") %>" data-module="govspeak">
+<%= tag.div(class: "gem-c-govspeak govuk-govspeak " + classes.join(" "), data: data_attributes) do %>
   <% if local_assigns.include?(:content) %>
     <% if content.html_safe? %>
       <%= content %>
@@ -32,4 +47,4 @@
   <% elsif block_given? %>
     <%= yield %>
   <% end %>
-</div>
+<% end %>

data/app/views/govuk_publishing_components/components/_warning_text.html.erb

@@ -14,9 +14,18 @@
   text_classes << "gem-c-warning-text__text--no-indent" if text_icon.empty?
   text_classes << "gem-c-warning-text__text--large" if large_font
   text_classes << "gem-c-warning-text__text--highlight" if highlight_text
+
+  disable_ga4 ||= false
+
+  ga4_data_attributes = {
+    "module": "ga4-link-tracker",
+    "ga4-track-links-only": "",
+    "ga4-link": { "event_name": "navigation", "type": "callout" }.to_json
+  } unless disable_ga4
+
 %>
 
-<%= tag.div id: id, class: "gem-c-warning-text govuk-warning-text" do %>
+<%= tag.div id: id, class: "gem-c-warning-text govuk-warning-text", data: ga4_data_attributes do %>
   <% unless text_icon.empty? %>
     <%= tag.span text_icon, class: "govuk-warning-text__icon", "aria-hidden": "true" %>
   <% end %>