govuk_publishing_components 32.0.0 → 33.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40c8f5cd0a641b265004d0db4aa4dad79cc1f251bc6510655d69bc7fa954614f
-  data.tar.gz: 80b737085d4e49d8a2d5558472f918ed7632db5932d32c9945ad82d936c3a2d0
+  metadata.gz: 72c594630cfc9f9359ae29eaff51094d512f4060cff0ad23e96319f264b0bae6
+  data.tar.gz: d074f64d7b59bd3657e0e84c2a44f9de23a8a5db99e71e832b2eab98a617fb8e
 SHA512:
-  metadata.gz: c18a6aee8070978fd4f72f29eb7d916d8899a261c3bac0fac075703a18d5c7e7b1854fc56dc3d9ee4bfae10e1c5725aa4693f0488edac5429bb5f9b6ceed3e33
-  data.tar.gz: 2903283d75f095a49ebd6940cb003bc6653bf3e2e96cd990f311b3b113b1925bf042b9bc689a0f01d1f951973aee8f58fd00945e771507477e1ec69fa29eca1b
+  metadata.gz: 77cde1c322a721bc97a30a348e53b84d369c029afa32cd81fc7def30577aea67324f4c60ecc5c6f03e1c77dc3697d6a2ab5339a177c3946276ddcaa26bb72303
+  data.tar.gz: 7134f8030b4d16a4b4e38dc5ba6aa8d9c08aa0bc2ef319e7710b407685a8cbace2ce9c32c5330883cd93412690687387f5960246667a63a8808cc20949c02de1

data/app/assets/javascripts/component_guide/accessibility-test.js

@@ -24,7 +24,6 @@
     })
 
     var axeOptions = {
-      restoreScroll: true,
       include: [selector],
       rules: axeRules
     }

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

@@ -1,3 +1,4 @@
+//= require ../vendor/polyfills/closest.js
 window.GOVUK = window.GOVUK || {}
 window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
 
@@ -47,6 +48,180 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
 
     getGemVersion: function () {
       return window.GOVUK.analyticsGa4.vars.gem_version || 'not found'
+    },
+
+    trackFunctions: {
+      findTrackingAttributes: function (clicked, trackingTrigger) {
+        if (clicked.hasAttribute('[' + trackingTrigger + ']')) {
+          return clicked
+        } else {
+          return clicked.closest('[' + trackingTrigger + ']')
+        }
+      },
+
+      // create an object to split up long URLs and get around the 100 character limit on GTM data
+      // this gets reassembled in GA4
+      populateLinkPathParts: function (href) {
+        var path = ''
+        if (this.hrefIsRelative(href) || this.isMailToLink(href)) {
+          path = href
+        } else {
+          // This regex matches a protocol and domain name at the start of a string such as https://www.gov.uk, http://gov.uk, //gov.uk
+          path = href.replace(/^(http:||https:)?(\/\/)([^\/]*)/, '') // eslint-disable-line no-useless-escape
+        }
+
+        if (path === '/' || path.length === 0) {
+          return
+        }
+
+        /*
+        This will create an object with 5 keys that are indexes ("1", "2", etc.)
+        The values will be each part of the link path split every 100 characters, or undefined.
+        For example: {"1": "/hello/world/etc...", "2": "/more/path/text...", "3": undefined, "4": undefined, "5": undefined}
+        Undefined values are needed to override the persistent object in GTM so that any values from old pushes are overwritten.
+        */
+        var parts = path.match(/.{1,100}/g)
+        var obj = {}
+        for (var i = 0; i < 5; i++) {
+          obj[(i + 1).toString()] = parts[i]
+        }
+        return obj
+      },
+
+      hrefIsRelative: function (href) {
+        // Checks that a link is relative, but is not a protocol relative url
+        return href[0] === '/' && href[1] !== '/'
+      },
+
+      hrefIsAnchor: function (href) {
+        return href[0] === '#'
+      },
+
+      isMailToLink: function (href) {
+        return href.substring(0, 7) === 'mailto:'
+      },
+
+      getClickType: function (event) {
+        switch (event.type) {
+          case 'click':
+            if (event.ctrlKey) {
+              return 'ctrl click'
+            } else if (event.metaKey) {
+              return 'command/win click'
+            } else if (event.shiftKey) {
+              return 'shift click'
+            } else {
+              return 'primary click'
+            }
+          case 'mousedown':
+            return 'middle click'
+          case 'contextmenu':
+            return 'secondary click'
+        }
+      },
+
+      isInternalLink: function (href) {
+        var internalDomains = window.GOVUK.analyticsGa4.vars.internalDomains
+        if (this.hrefIsRelative(href) || this.hrefIsAnchor(href)) {
+          return true
+        }
+        var result = false
+        for (var i = 0; i < internalDomains.length; i++) {
+          var internalDomain = internalDomains[i]
+          if (this.hrefPointsToDomain(href, internalDomain)) {
+            result = true
+          }
+        }
+        return result
+      },
+
+      isExternalLink: function (href) {
+        return !this.isInternalLink(href)
+      },
+
+      hrefPointsToDomain: function (href, domain) {
+        /* Add a trailing slash to prevent an edge case such
+        as the href www.gov.uk.domain.co.uk being detected as an internal link,
+        if we were checking for 'www.gov.uk' instead of 'www.gov.uk/' */
+        if (domain.substring(domain.length) !== '/') {
+          domain = domain + '/'
+        }
+
+        /* If the href doesn't end in a slash, we add one.
+        This fixes an edge case where the <a href> is exactly `https://www.gov.uk`
+        but these checks would only look for `https://www.gov.uk/` */
+        if (href.substring(href.length) !== '/') {
+          href = href + '/'
+        }
+        // matches the domain preceded by https:// http:// or //
+        var regex = new RegExp('^((http)*(s)*(:)*//)(' + domain + ')', 'g')
+        return regex.test(href)
+      },
+
+      removeLinesAndExtraSpaces: function (text) {
+        text = text.trim()
+        text = text.replace(/(\r\n|\n|\r)/gm, ' ') // Replace line breaks with 1 space
+        text = text.replace(/\s+/g, ' ') // Replace instances of 2+ spaces with 1 space
+        return text
+      },
+
+      removeCrossDomainParams: function (href) {
+        if (href.indexOf('_ga') !== -1 || href.indexOf('_gl') !== -1) {
+          // _ga & _gl are values needed for cross domain tracking, but we don't want them included in our click tracking.
+          href = href.replaceAll(/_g[al]=([^&]*)/g, '')
+
+          // The following code cleans up inconsistencies such as gov.uk/&&, gov.uk/?&hello=world, gov.uk/?, and gov.uk/&.
+          href = href.replaceAll(/(&&)+/g, '&')
+          href = href.replace('?&', '?')
+          if (this.stringEndsWith(href, '?') || this.stringEndsWith(href, '&')) {
+            href = href.substring(0, href.length - 1)
+          }
+        }
+        return href
+      },
+
+      stringStartsWith: function (string, stringToFind) {
+        return string.substring(0, stringToFind.length) === stringToFind
+      },
+
+      stringEndsWith: function (string, stringToFind) {
+        return string.substring(string.length - stringToFind.length, string.length) === stringToFind
+      },
+
+      populateLinkDomain: function (href) {
+        // We always want mailto links to have an undefined link_domain
+        if (this.isMailToLink(href)) {
+          return undefined
+        }
+
+        if (this.hrefIsRelative(href) || this.hrefIsAnchor(href)) {
+          return this.getProtocol() + '//' + this.getHostname()
+        } else {
+          // This regex matches a protocol and domain name at the start of a string such as https://www.gov.uk, http://gov.uk, //gov.uk
+          var domainRegex = /^(http:||https:)?(\/\/)([^\/]*)/ // eslint-disable-line no-useless-escape
+          var domain = domainRegex.exec(href)[0]
+          return domain
+        }
+      },
+
+      getProtocol: function () {
+        return window.location.protocol
+      },
+
+      getHostname: function () {
+        return window.location.hostname
+      },
+
+      appendDomainsWithoutWWW: function (domainsArrays) {
+        // Add domains with www. removed, in case site hrefs are marked up without www. included.
+        for (var i = 0; i < domainsArrays.length; i++) {
+          var domain = domainsArrays[i]
+          if (this.stringStartsWith(domain, 'www.')) {
+            var domainWithoutWww = domain.replace('www.', '')
+            domainsArrays.push(domainWithoutWww)
+          }
+        }
+      }
     }
   }
 

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

@@ -97,7 +97,7 @@
         })
 
         ecommerceObject.event_data = {
-          external: GOVUK.analyticsGa4.analyticsModules.Ga4LinkTracker.isExternalLink(searchResult.getAttribute('data-ecommerce-path')) ? 'true' : 'false'
+          external: GOVUK.analyticsGa4.core.trackFunctions.isExternalLink(searchResult.getAttribute('data-ecommerce-path')) ? 'true' : 'false'
         }
       } else {
         for (var i = 0; i < ecommerceRows.length; i++) {

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

@@ -1,4 +1,4 @@
-// = require govuk/vendor/polyfills/Element/prototype/closest.js
+//= require ../vendor/polyfills/closest.js
 window.GOVUK = window.GOVUK || {}
 window.GOVUK.Modules = window.GOVUK.Modules || {};
 
@@ -7,7 +7,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
   function Ga4EventTracker (module) {
     this.module = module
-    this.trackingTrigger = 'data-ga4' // elements with this attribute get tracked
+    this.trackingTrigger = 'data-ga4-event' // elements with this attribute get tracked
   }
 
   Ga4EventTracker.prototype.init = function () {
@@ -29,7 +29,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
   }
 
   Ga4EventTracker.prototype.trackClick = function (event) {
-    var target = this.findTrackingAttributes(event.target)
+    var target = window.GOVUK.analyticsGa4.core.trackFunctions.findTrackingAttributes(event.target, this.trackingTrigger)
     if (target) {
       var schema = new window.GOVUK.analyticsGa4.Schemas().eventSchema()
 
@@ -51,8 +51,8 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
         }
       }
 
-      /* Ensure it only tracks aria-expanded in an accordion or element with data-ga4-expandable on it. */
-      if (target.closest('.gem-c-accordion') || target.closest('[data-ga4-expandable]')) {
+      /* Ensure it only tracks aria-expanded in an element with data-ga4-expandable on it. */
+      if (target.closest('[data-ga4-expandable]')) {
         var ariaExpanded = this.getClosestAttribute(target, 'aria-expanded')
       }
 
@@ -88,14 +88,6 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     }
   }
 
-  Ga4EventTracker.prototype.findTrackingAttributes = function (clicked) {
-    if (clicked.hasAttribute('[' + this.trackingTrigger + ']')) {
-      return clicked
-    } else {
-      return clicked.closest('[' + this.trackingTrigger + ']')
-    }
-  }
-
   // check if an attribute exists or contains the attribute
   Ga4EventTracker.prototype.getClosestAttribute = function (clicked, attribute) {
     var isAttributeOnElement = clicked.getAttribute(attribute)

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

@@ -1,331 +1,102 @@
-// = require govuk/vendor/polyfills/Element/prototype/closest.js
+//= require ../vendor/polyfills/closest.js
 window.GOVUK = window.GOVUK || {}
-window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {}
-window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analyticsModules || {};
+window.GOVUK.Modules = window.GOVUK.Modules || {};
 
-(function (analyticsModules) {
+(function (Modules) {
   'use strict'
 
-  var Ga4LinkTracker = {
-    init: function (config) {
-      if (window.dataLayer) {
-        config = config || {}
-        this.internalDomains = config.internalDomains || []
-        this.internalDomains.push(this.getHostname())
-        this.appendDomainsWithoutWWW(this.internalDomains)
-        this.internalDownloadPaths = config.internalDownloadPaths || ['/government/uploads/']
-        this.dedicatedDownloadDomains = config.dedicatedDownloadDomains || ['assets.publishing.service.gov.uk']
-        this.appendDomainsWithoutWWW(this.dedicatedDownloadDomains)
-        this.handleClick = this.handleClick.bind(this)
-        this.handleMousedown = this.handleMousedown.bind(this)
-
-        if (!config.disableListeners) {
-          document.querySelector('body').addEventListener('click', this.handleClick)
-          document.querySelector('body').addEventListener('contextmenu', this.handleClick)
-          document.querySelector('body').addEventListener('mousedown', this.handleMousedown)
-        }
-      }
-    },
-
-    stopTracking: function () {
-      document.querySelector('body').removeEventListener('click', this.handleClick)
-      document.querySelector('body').removeEventListener('contextmenu', this.handleClick)
-      document.querySelector('body').removeEventListener('mousedown', this.handleMousedown)
-    },
-
-    handleClick: function (event) {
-      var element = event.target
-
-      if (element.tagName !== 'A') {
-        element = element.closest('a')
-      }
-
-      if (!element) {
-        return
-      }
-
-      var href = element.getAttribute('href')
-
-      if (!href) {
-        return
-      }
-      var clickData = {}
-      var linkAttributes = element.getAttribute('data-ga4-link')
-      if (linkAttributes) {
-        clickData = JSON.parse(linkAttributes)
-
-        /* Since external links can't be determined in the template, we use populated-via-js as a signal
-        for our JavaScript to determine this value. */
-        if (clickData.external === 'populated-via-js' && clickData.url) {
-          clickData.external = this.isExternalLink(clickData.url) ? 'true' : 'false'
-        }
-
-        if (clickData.method === 'populated-via-js') {
-          clickData.method = this.getClickType(event)
-        }
-
-        if (clickData.index) {
-          clickData.index = parseInt(clickData.index)
-        }
+  function Ga4LinkTracker (module) {
+    this.module = module
+    this.trackingTrigger = 'data-ga4-link' // elements with this attribute get tracked
+    this.trackLinksOnly = this.module.hasAttribute('data-ga4-track-links-only')
+    this.limitToElementClass = this.module.getAttribute('data-ga4-limit-to-element-class')
+  }
 
-        if (clickData.index_total) {
-          clickData.index_total = parseInt(clickData.index_total)
-        }
-      } else if (this.isMailToLink(href)) {
-        clickData.event_name = 'navigation'
-        clickData.type = 'email'
-        clickData.external = 'true'
-        clickData.url = href
-        clickData.text = this.removeLinesAndExtraSpaces(element.textContent)
-        clickData.method = this.getClickType(event)
-      } else if (this.isDownloadLink(href)) {
-        clickData.event_name = 'file_download'
-        clickData.type = this.isPreviewLink(href) ? 'preview' : 'generic download'
-        clickData.external = this.isExternalLink(href) ? 'true' : 'false'
-        clickData.url = href
-        clickData.text = this.removeLinesAndExtraSpaces(element.textContent)
-        clickData.method = this.getClickType(event)
-      } else if (this.isExternalLink(href)) {
-        clickData.event_name = 'navigation'
-        clickData.type = 'generic link'
-        clickData.external = 'true'
-        clickData.url = href
-        clickData.text = this.removeLinesAndExtraSpaces(element.textContent)
-        clickData.method = this.getClickType(event)
-      }
+  Ga4LinkTracker.prototype.init = function () {
+    var consentCookie = window.GOVUK.getConsentCookie()
 
-      if (Object.keys(clickData).length > 0) {
-        if (clickData.url) {
-          clickData.url = this.removeCrossDomainParams(clickData.url)
-          clickData.link_domain = this.populateLinkDomain(clickData.url)
-          clickData.link_path_parts = this.populateLinkPathParts(clickData.url)
-        }
+    if (consentCookie && consentCookie.settings) {
+      this.startModule()
+    } else {
+      this.startModule = this.startModule.bind(this)
+      window.addEventListener('cookie-consent', this.startModule)
+    }
+  }
 
-        var schema = new window.GOVUK.analyticsGa4.Schemas().eventSchema()
-        schema.event = 'event_data'
+  // triggered by cookie-consent event, which happens when users consent to cookies
+  Ga4LinkTracker.prototype.startModule = function () {
+    if (window.dataLayer) {
+      this.handleClick = this.handleClick.bind(this)
+      this.handleMousedown = this.handleMousedown.bind(this)
 
-        // get attributes from the clickData object to send to GA
-        // only allow it if it already exists in the schema
-        for (var property in clickData) {
-          if (property in schema.event_data) {
-            schema.event_data[property] = clickData[property]
-          }
-        }
+      this.module.addEventListener('click', this.handleClick)
+      this.module.addEventListener('contextmenu', this.handleClick)
+      this.module.addEventListener('mousedown', this.handleMousedown)
+    }
+  }
 
-        window.GOVUK.analyticsGa4.core.sendData(schema)
+  Ga4LinkTracker.prototype.handleClick = function (event) {
+    var target = event.target
+    if (!this.trackLinksOnly) {
+      this.trackClick(event)
+    } else if (this.trackLinksOnly && target.closest('a')) {
+      if (!this.limitToElementClass) {
+        this.trackClick(event)
+      } else if (target.closest('.' + this.limitToElementClass)) {
+        this.trackClick(event)
       }
-    },
+    }
+  }
 
-    populateLinkPathParts: function (href) {
-      var path = ''
-      if (this.hrefIsRelative(href) || this.isMailToLink(href)) {
-        path = href
-      } else {
-        // This regex matches a protocol and domain name at the start of a string such as https://www.gov.uk, http://gov.uk, //gov.uk
-        path = href.replace(/^(http:||https:)?(\/\/)([^\/]*)/, '') // eslint-disable-line no-useless-escape
-      }
+  Ga4LinkTracker.prototype.handleMousedown = function (event) {
+    // 1 = middle mouse button
+    if (event.button === 1) {
+      this.handleClick(event)
+    }
+  }
 
-      if (path === '/' || path.length === 0) {
+  Ga4LinkTracker.prototype.trackClick = function (event) {
+    var target = window.GOVUK.analyticsGa4.core.trackFunctions.findTrackingAttributes(event.target, this.trackingTrigger)
+    if (target) {
+      var schema = new window.GOVUK.analyticsGa4.Schemas().eventSchema()
+
+      try {
+        var data = target.getAttribute(this.trackingTrigger)
+        data = JSON.parse(data)
+      } catch (e) {
+        // if there's a problem with the config, don't start the tracker
+        console.error('GA4 configuration error: ' + e.message, window.location)
         return
       }
 
-      /*
-      This will create an object with 5 keys that are indexes ("1", "2", etc.)
-      The values will be each part of the link path split every 100 characters, or undefined.
-      For example: {"1": "/hello/world/etc...", "2": "/more/path/text...", "3": undefined, "4": undefined, "5": undefined}
-      Undefined values are needed to override the persistent object in GTM so that any values from old pushes are overwritten.
-      */
-      var parts = path.match(/.{1,100}/g)
-      var obj = {}
-      for (var i = 0; i < 5; i++) {
-        obj[(i + 1).toString()] = parts[i]
-      }
-      return obj
-    },
-
-    populateLinkDomain: function (href) {
-      // We always want mailto links to have an undefined link_domain
-      if (this.isMailToLink(href)) {
-        return undefined
-      }
-
-      if (this.hrefIsRelative(href)) {
-        return this.getProtocol() + '//' + this.getHostname()
-      } else {
-        // This regex matches a protocol and domain name at the start of a string such as https://www.gov.uk, http://gov.uk, //gov.uk
-        var domainRegex = /^(http:||https:)?(\/\/)([^\/]*)/ // eslint-disable-line no-useless-escape
-        var domain = domainRegex.exec(href)[0]
-        return domain
-      }
-    },
-
-    appendDomainsWithoutWWW: function (domainsArrays) {
-      // Add domains with www. removed, in case site hrefs are marked up without www. included.
-      for (var i = 0; i < domainsArrays.length; i++) {
-        var domain = domainsArrays[i]
-        if (this.stringStartsWith(domain, 'www.')) {
-          var domainWithoutWww = domain.replace('www.', '')
-          domainsArrays.push(domainWithoutWww)
+      schema.event = 'event_data'
+      var text = data.text || event.target.textContent
+      data.text = window.GOVUK.analyticsGa4.core.trackFunctions.removeLinesAndExtraSpaces(text)
+      data.url = window.GOVUK.analyticsGa4.core.trackFunctions.removeCrossDomainParams(this.findLink(event.target).getAttribute('href'))
+      data.link_domain = window.GOVUK.analyticsGa4.core.trackFunctions.populateLinkDomain(data.url)
+      data.link_path_parts = window.GOVUK.analyticsGa4.core.trackFunctions.populateLinkPathParts(data.url)
+      data.method = window.GOVUK.analyticsGa4.core.trackFunctions.getClickType(event)
+      data.external = window.GOVUK.analyticsGa4.core.trackFunctions.isExternalLink(data.url) ? 'true' : 'false'
+
+      // get attributes from the data attribute to send to GA
+      // only allow it if it already exists in the schema
+      for (var property in data) {
+        if (property in schema.event_data) {
+          schema.event_data[property] = data[property]
         }
       }
-    },
-
-    removeLinesAndExtraSpaces: function (text) {
-      text = text.trim()
-      text = text.replace(/(\r\n|\n|\r)/gm, ' ') // Replace line breaks with 1 space
-      text = text.replace(/\s+/g, ' ') // Replace instances of 2+ spaces with 1 space
-      return text
-    },
-
-    getClickType: function (event) {
-      switch (event.type) {
-        case 'click':
-          if (event.ctrlKey) {
-            return 'ctrl click'
-          } else if (event.metaKey) {
-            return 'command/win click'
-          } else if (event.shiftKey) {
-            return 'shift click'
-          } else {
-            return 'primary click'
-          }
-        case 'mousedown':
-          return 'middle click'
-        case 'contextmenu':
-          return 'secondary click'
-      }
-    },
-
-    handleMousedown: function (event) {
-      // 1 = middle mouse button
-      if (event.button === 1) {
-        this.handleClick(event)
-      }
-    },
-
-    isMailToLink: function (href) {
-      return href.substring(0, 7) === 'mailto:'
-    },
-
-    isDownloadLink: function (href) {
-      if (this.isInternalLink(href) && this.hrefPointsToDownloadPath(href)) {
-        return true
-      }
-
-      var result = false
-      for (var i = 0; i < this.dedicatedDownloadDomains.length; i++) {
-        var downloadDomain = this.dedicatedDownloadDomains[i]
-        if (this.hrefPointsToDomain(href, downloadDomain)) {
-          result = true
-        }
-      }
-      return result
-    },
-
-    isInternalLink: function (href) {
-      if (this.hrefIsRelative(href) || this.hrefIsAnchor(href)) {
-        return true
-      }
-      var result = false
-      for (var i = 0; i < this.internalDomains.length; i++) {
-        var internalDomain = this.internalDomains[i]
-        if (this.hrefPointsToDomain(href, internalDomain)) {
-          result = true
-        }
-      }
-      return result
-    },
-
-    isExternalLink: function (href) {
-      return !this.isInternalLink(href)
-    },
 
-    isPreviewLink: function (href) {
-      /*  Regex looks for:
-      1. The file extension period (the character '.')
-      2. any alphanumeric characters (so we can match any file type such as jpg, pdf, mp4.)
-      3. the presence of '/preview'.
-      For example, .csv/preview or .mp4/preview will be matched.
-      Regex is used over JS string methods as this should work with anchor links, query string parameters and files that may have 'preview' in their name.
-      */
-      var previewRegex = /\.\w+\/preview/i
-      return previewRegex.test(href)
-    },
-
-    hrefPointsToDomain: function (href, domain) {
-      /* Add a trailing slash to prevent an edge case such
-      as the href www.gov.uk.domain.co.uk being detected as an internal link,
-      if we were checking for 'www.gov.uk' instead of 'www.gov.uk/' */
-      if (domain.substring(domain.length) !== '/') {
-        domain = domain + '/'
-      }
-
-      /* If the href doesn't end in a slash, we add one.
-      This fixes an edge case where the <a href> is exactly `https://www.gov.uk`
-      but these checks would only look for `https://www.gov.uk/` */
-      if (href.substring(href.length) !== '/') {
-        href = href + '/'
-      }
-      var httpDomain = 'http://' + domain
-      var httpsDomain = 'https://' + domain
-      var schemaRelativeDomain = '//' + domain
-      return this.stringStartsWith(href, domain) ||
-      this.stringStartsWith(href, httpDomain) ||
-      this.stringStartsWith(href, httpsDomain) ||
-      this.stringStartsWith(href, schemaRelativeDomain)
-    },
-
-    hrefPointsToDownloadPath: function (href) {
-      var result = false
-      for (var i = 0; i < this.internalDownloadPaths.length; i++) {
-        var internalDownloadPath = this.internalDownloadPaths[i]
-        if (href.indexOf(internalDownloadPath) !== -1) {
-          result = true
-        }
-      }
-      return result
-    },
-
-    stringStartsWith: function (string, stringToFind) {
-      return string.substring(0, stringToFind.length) === stringToFind
-    },
-
-    stringEndsWith: function (string, stringToFind) {
-      return string.substring(string.length - stringToFind.length, string.length) === stringToFind
-    },
-
-    hrefIsRelative: function (href) {
-      // Checks that a link is relative, but is not a protocol relative url
-      return href[0] === '/' && href[1] !== '/'
-    },
-
-    hrefIsAnchor: function (href) {
-      return href[0] === '#'
-    },
-
-    getHostname: function () {
-      return window.location.hostname
-    },
-
-    getProtocol: function () {
-      return window.location.protocol
-    },
-
-    removeCrossDomainParams: function (href) {
-      if (href.indexOf('_ga') !== -1 || href.indexOf('_gl') !== -1) {
-        // _ga & _gl are values needed for cross domain tracking, but we don't want them included in our click tracking.
-        href = href.replaceAll(/_g[al]=([^&]*)/g, '')
+      window.GOVUK.analyticsGa4.core.sendData(schema)
+    }
+  }
 
-        // The following code cleans up inconsistencies such as gov.uk/&&, gov.uk/?&hello=world, gov.uk/?, and gov.uk/&.
-        href = href.replaceAll(/(&&)+/g, '&')
-        href = href.replace('?&', '?')
-        if (this.stringEndsWith(href, '?') || this.stringEndsWith(href, '&')) {
-          href = href.substring(0, href.length - 1)
-        }
-      }
-      return href
+  Ga4LinkTracker.prototype.findLink = function (target) {
+    if (target.tagName === 'A') {
+      return target
+    } else {
+      return target.closest('a')
     }
   }
 
-  analyticsModules.Ga4LinkTracker = Ga4LinkTracker
-})(window.GOVUK.analyticsGa4.analyticsModules)
+  Modules.Ga4LinkTracker = Ga4LinkTracker
+})(window.GOVUK.Modules)