govuk_publishing_components 37.5.1 → 37.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1d4cee2f111d26f80bca4ca6ba57eff76be7e5f25f6c32a3a08c0e0f75e26ca
-  data.tar.gz: b23a8eba1118486b5838d6e793c79588794a330ac539f0613d644c54aac4cf77
+  metadata.gz: 057a27088f3e56f3de0b207bf272737059e084e11f7ad5d60c9c64f51b36f36c
+  data.tar.gz: 2e7c53dbecff6dcb761c8b181be7c22a051d1e67738f96d6386cc24b08e4a850
 SHA512:
-  metadata.gz: 5ebc5e732611c34a1d044a77f8bcac0d02d996c94b5b65c93f826b4b07200184d3a8ef62fe5c457872a198a81889879c25e5f0e779244426c12b1fd614be7eb9
-  data.tar.gz: dddce989dc4b96776df68c3b3d0f16eec57f834a48f591b7e8d32a1f7858e37374aeb1c4171335c50765412cfec1da04fb6fd9e6a0ef1521703c1326141875c5
+  metadata.gz: 853e1a7952502815cc9cf864feedb258266b06f402c37d8622ce3e2a8550b160bfc676e60221b5e6a0332adca201bc7a8b651d3cee2ff451f9ade26c61a74304
+  data.tar.gz: 54df263cbc3fe4b0a4bf2b7f8e3207e5d0292fb6dd79fddfe87cdcea0b844d0c5b4a73527de5ef7d747991e505af18b25228c8644d6c973a5431fb993707a3f7

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

@@ -21,6 +21,11 @@
   Analytics.PIISafe = PIISafe
 
   Analytics.prototype.sendToTrackers = function (method, args) {
+    // Allows us to stop sending tracking at the moment a user sets their usage cookies to "false" on the cookie settings page.
+    if (window.GOVUK.stopSendingAnalytics) {
+      return false
+    }
+
     for (var i = 0, l = this.trackers.length; i < l; i++) {
       var tracker = this.trackers[i]
       var fn = tracker[method]
@@ -49,7 +54,7 @@
   Analytics.prototype.trackPageview = function (path, title, options) {
     arguments[0] = arguments[0] || this.defaultPathForTrackPageview(window.location)
     if (arguments.length === 0) { arguments.length = 1 }
-    this.sendToTrackers('trackPageview', this.pii.stripPII(arguments))
+    return this.sendToTrackers('trackPageview', this.pii.stripPII(arguments))
   }
 
   /*
@@ -59,11 +64,11 @@
     options.nonInteraction – Prevent event from impacting bounce rate
   */
   Analytics.prototype.trackEvent = function (category, action, options) {
-    this.sendToTrackers('trackEvent', this.pii.stripPII(arguments))
+    return this.sendToTrackers('trackEvent', this.pii.stripPII(arguments))
   }
 
   Analytics.prototype.trackShare = function (network, options) {
-    this.sendToTrackers('trackSocial', this.pii.stripPII([network, 'share', global.location.pathname, options]))
+    return this.sendToTrackers('trackSocial', this.pii.stripPII([network, 'share', global.location.pathname, options]))
   }
 
   /*
@@ -71,14 +76,14 @@
     Universal Analytics profile
    */
   Analytics.prototype.setDimension = function (index, value) {
-    this.sendToTrackers('setDimension', this.pii.stripPII(arguments))
+    return this.sendToTrackers('setDimension', this.pii.stripPII(arguments))
   }
 
   /*
    Add a beacon to track a page in another GA account on another domain.
    */
   Analytics.prototype.addLinkedTrackerDomain = function (trackerId, name, domain) {
-    this.sendToTrackers('addLinkedTrackerDomain', arguments)
+    return this.sendToTrackers('addLinkedTrackerDomain', arguments)
   }
 
   GOVUK.Analytics = Analytics

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

@@ -39,6 +39,11 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
     },
 
     sendData: function (data) {
+      // Allows us to stop sending tracking at the moment a user sets their usage cookies to "false" on the cookie settings page.
+      if (window.GOVUK.stopSendingAnalytics) {
+        return false
+      }
+
       data.govuk_gem_version = this.getGemVersion()
       data.timestamp = this.getTimestamp()
 

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

@@ -164,7 +164,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
           bottom: pos.bottom + document.documentElement.scrollTop,
           eventData: {
             type: type,
-            text: heading.textContent.replace(/\s+/g, ' ').trim(),
+            text: heading.getAttribute('data-ga4-text') || heading.textContent.replace(/\s+/g, ' ').trim(),
             index_section: i + 1,
             index_section_count: totalHeadings
           }

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

@@ -10,10 +10,17 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
   CookieBanner.prototype.init = function () {
     this.$module.hideCookieMessage = this.hideCookieMessage.bind(this)
+    this.$module.showCookieMessage = this.showCookieMessage.bind(this)
     this.$module.showConfirmationMessage = this.showConfirmationMessage.bind(this)
     this.$module.setCookieConsent = this.setCookieConsent.bind(this)
     this.$module.rejectCookieConsent = this.rejectCookieConsent.bind(this)
     this.setupCookieMessage()
+
+    if (window.GOVUK.useSingleConsentApi) {
+      window.addEventListener('hide-cookie-banner', this.$module.hideCookieMessage)
+      window.addEventListener('show-cookie-banner', this.$module.showCookieMessage)
+      window.GOVUK.singleConsent.init()
+    }
   }
 
   CookieBanner.prototype.setupCookieMessage = function () {
@@ -34,10 +41,13 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       this.$rejectCookiesButton.addEventListener('click', this.$module.rejectCookieConsent)
     }
 
-    this.showCookieMessage()
+    if (!window.GOVUK.useSingleConsentApi) {
+      this.showCookieMessage()
+    }
   }
 
   CookieBanner.prototype.showCookieMessage = function () {
+    window.removeEventListener('show-cookie-banner', this.$module.showCookieMessage)
     // Show the cookie banner if not in the cookie settings page or in an iframe
     if (!this.isInCookiesPage() && !this.isInIframe()) {
       var shouldHaveCookieMessage = (this.$module && window.GOVUK.cookie('cookies_preferences_set') !== 'true')
@@ -47,7 +57,9 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
         // Set the default consent cookie if it isn't already present
         if (!window.GOVUK.cookie('cookies_policy')) {
-          window.GOVUK.setDefaultConsentCookie()
+          if (!window.GOVUK.useSingleConsentApi) {
+            window.GOVUK.setDefaultConsentCookie()
+          }
         }
 
         window.GOVUK.deleteUnconsentedCookies()
@@ -56,9 +68,12 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
   }
 
   CookieBanner.prototype.hideCookieMessage = function (event) {
+    window.removeEventListener('hide-cookie-banner', this.$module.hideCookieMessage)
     if (this.$module) {
       this.$module.hidden = true
-      window.GOVUK.cookie('cookies_preferences_set', 'true', { days: 365 })
+      if (!window.GOVUK.useSingleConsentApi) {
+        window.GOVUK.cookie('cookies_preferences_set', 'true', { days: 365 })
+      }
     }
 
     if (event.target) {
@@ -70,25 +85,37 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     if (this.$acceptCookiesButton.getAttribute('data-cookie-types') === 'all') {
       this.$module.querySelector('.gem-c-cookie-banner__confirmation-message--accepted').hidden = false
     }
-    window.GOVUK.approveAllCookieTypes()
+    if (window.GOVUK.useSingleConsentApi) {
+      window.GOVUK.singleConsent.setPreferences('accept')
+    } else {
+      window.GOVUK.approveAllCookieTypes()
+      window.GOVUK.cookie('cookies_preferences_set', 'true', { days: 365 })
+    }
+
     this.$module.showConfirmationMessage()
     this.$module.cookieBannerConfirmationMessage.focus()
-    window.GOVUK.cookie('cookies_preferences_set', 'true', { days: 365 })
+
     if (window.GOVUK.analyticsInit) {
       window.GOVUK.analyticsInit()
     }
     if (window.GOVUK.globalBarInit) {
       window.GOVUK.globalBarInit.init()
     }
-    window.GOVUK.triggerEvent(window, 'cookie-consent')
+    if (!window.GOVUK.useSingleConsentApi) {
+      window.GOVUK.triggerEvent(window, 'cookie-consent')
+    }
   }
 
   CookieBanner.prototype.rejectCookieConsent = function () {
     this.$module.querySelector('.gem-c-cookie-banner__confirmation-message--rejected').hidden = false
     this.$module.showConfirmationMessage()
     this.$module.cookieBannerConfirmationMessage.focus()
-    window.GOVUK.cookie('cookies_preferences_set', 'true', { days: 365 })
-    window.GOVUK.setDefaultConsentCookie()
+    if (window.GOVUK.useSingleConsentApi) {
+      window.GOVUK.singleConsent.setPreferences('reject')
+    } else {
+      window.GOVUK.setDefaultConsentCookie()
+      window.GOVUK.cookie('cookies_preferences_set', 'true', { days: 365 })
+    }
   }
 
   CookieBanner.prototype.showConfirmationMessage = function () {

data/app/assets/javascripts/govuk_publishing_components/domain-config.js

@@ -0,0 +1,73 @@
+window.GOVUK = window.GOVUK || {}
+window.GOVUK.vars = window.GOVUK.vars || {}
+window.GOVUK.vars.domains = [
+  {
+    // need to have this one at the start, see loadGa4 function
+    name: 'development',
+    domains: [
+      'localhost',
+      '127.0.0.1',
+      '0.0.0.0',
+      'dev.gov.uk'
+    ],
+    initialiseGA4: true,
+    id: 'GTM-MG7HG5W',
+    auth: 'bRiZ-jiEHtw6hHpGd6dF9w',
+    preview: 'env-3',
+    gaProperty: 'UA-UNSET',
+    gaPropertyCrossDomain: 'UA-UNSET',
+    consentApiUrl: 'staging'
+  },
+  {
+    name: 'production',
+    domains: [
+      'www.gov.uk',
+      'www-origin.publishing.service.gov.uk',
+      'assets.publishing.service.gov.uk'
+    ],
+    initialiseGA4: true,
+    id: 'GTM-MG7HG5W',
+    gaProperty: 'UA-26179049-1',
+    gaPropertyCrossDomain: 'UA-145652997-1',
+    consentApiUrl: 'production'
+  },
+  {
+    name: 'staging',
+    domains: [
+      'www.staging.publishing.service.gov.uk',
+      'www-origin.staging.publishing.service.gov.uk',
+      'assets.staging.publishing.service.gov.uk'
+    ],
+    initialiseGA4: true,
+    id: 'GTM-MG7HG5W',
+    auth: 'oJWs562CxSIjZKn_GlB5Bw',
+    preview: 'env-5',
+    gaProperty: 'UA-26179049-20',
+    gaPropertyCrossDomain: 'UA-145652997-1',
+    consentApiUrl: 'staging'
+  },
+  {
+    name: 'integration',
+    domains: [
+      'www.integration.publishing.service.gov.uk',
+      'www-origin.integration.publishing.service.gov.uk',
+      'assets.integration.publishing.service.gov.uk'
+    ],
+    initialiseGA4: true,
+    id: 'GTM-MG7HG5W',
+    auth: 'C7iYdcsOlYgGmiUJjZKrHQ',
+    preview: 'env-4',
+    gaProperty: 'UA-26179049-22',
+    gaPropertyCrossDomain: 'UA-145652997-1',
+    consentApiUrl: 'staging'
+  },
+  {
+    name: 'devdocs',
+    domains: [
+      'docs.publishing.service.gov.uk'
+    ],
+    initialiseGA4: true,
+    id: 'GTM-TNKCK97',
+    consentApiUrl: 'production'
+  }
+]

data/app/assets/javascripts/govuk_publishing_components/lib/cookie-settings.js

@@ -12,31 +12,39 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     document.querySelector('form[data-module=cookie-settings]')
       .addEventListener('submit', this.$module.submitSettingsForm)
 
-    this.setInitialFormValues()
+    if (window.GOVUK.useSingleConsentApi) {
+      window.GOVUK.singleConsent.init(this.setInitialFormValues.bind(this))
+    } else {
+      this.setInitialFormValues()
+    }
   }
 
   CookieSettings.prototype.setInitialFormValues = function () {
     if (!window.GOVUK.cookie('cookies_policy')) {
-      window.GOVUK.setDefaultConsentCookie()
+      if (!window.GOVUK.useSingleConsentApi) {
+        window.GOVUK.setDefaultConsentCookie()
+      }
     }
 
     var currentConsentCookie = window.GOVUK.cookie('cookies_policy')
-    var currentConsentCookieJSON = JSON.parse(currentConsentCookie)
+    if (currentConsentCookie) {
+      var currentConsentCookieJSON = JSON.parse(currentConsentCookie)
 
-    // We don't need the essential value as this cannot be changed by the user
-    delete currentConsentCookieJSON.essential
+      // We don't need the essential value as this cannot be changed by the user
+      delete currentConsentCookieJSON.essential
 
-    for (var cookieType in currentConsentCookieJSON) {
-      var radioButton
+      for (var cookieType in currentConsentCookieJSON) {
+        var radioButton
 
-      if (currentConsentCookieJSON[cookieType]) {
-        radioButton = document.querySelector('input[name=cookies-' + cookieType + '][value=on]')
-      } else {
-        radioButton = document.querySelector('input[name=cookies-' + cookieType + '][value=off]')
-      }
+        if (currentConsentCookieJSON[cookieType]) {
+          radioButton = document.querySelector('input[name=cookies-' + cookieType + '][value=on]')
+        } else {
+          radioButton = document.querySelector('input[name=cookies-' + cookieType + '][value=off]')
+        }
 
-      if (radioButton) {
-        radioButton.checked = true
+        if (radioButton) {
+          radioButton.checked = true
+        }
       }
     }
   }
@@ -54,16 +62,23 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
         var value = input.value === 'on'
 
         options[name] = value
+
+        if (name === 'usage' && !value) {
+          window.GOVUK.stopSendingAnalytics = true
+          window.GOVUK.LUX = {}
+        }
       }
     }
 
-    window.GOVUK.setConsentCookie(options)
-    window.GOVUK.setCookie('cookies_preferences_set', true, { days: 365 })
+    if (window.GOVUK.useSingleConsentApi) {
+      window.GOVUK.singleConsent.setPreferences(null, options)
+    } else {
+      window.GOVUK.setConsentCookie(options)
+      window.GOVUK.setCookie('cookies_preferences_set', true, { days: 365 })
+    }
 
     this.fireAnalyticsEvent(options)
-
     this.showConfirmationMessage()
-
     return false
   }
 
@@ -102,7 +117,13 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
   }
 
   CookieSettings.prototype.getReferrerLink = function () {
-    return document.referrer ? new URL(document.referrer).pathname : false
+    var documentReferrer = false
+    try {
+      documentReferrer = document.referrer || new URL(document.referrer).pathname
+    } catch (e) {
+      console.error('Error grabbing referrer for cookie settings', window.location, e)
+    }
+    return documentReferrer
   }
 
   Modules.CookieSettings = CookieSettings

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

@@ -163,7 +163,7 @@
 
   YoutubeLinkEnhancement.prototype.campaignCookiesAllowed = function () {
     var cookiePolicy = window.GOVUK.getConsentCookie()
-    return cookiePolicy !== null ? cookiePolicy.campaigns : true
+    return cookiePolicy !== null ? cookiePolicy.campaigns : false
   }
 
   YoutubeLinkEnhancement.nextId = function () {

data/app/assets/javascripts/govuk_publishing_components/lib/single-consent-functions.js

@@ -0,0 +1,59 @@
+/* global GovSingleConsent */
+// = require govuk-single-consent/dist/singleconsent.iife.js
+
+(function (root) {
+  'use strict'
+  window.GOVUK = window.GOVUK || {}
+
+  window.GOVUK.singleConsent = {
+    init: function (callback) {
+      if (!window.GOVUK.useSingleConsentApi) {
+        return
+      }
+      callback = callback || this.apiCallback
+      // determine where we are and set the consent api URL accordingly
+      if (!this.url) {
+        this.url = 'staging'
+        var environment = window.GOVUK.loadAnalytics.getEnvironment(window.GOVUK.analyticsGa4.core.trackFunctions.getHostname())
+        if (environment) {
+          this.url = environment.consentApiUrl
+        }
+      }
+      // create the consent API object
+      this.consentApiObj = new GovSingleConsent(callback, this.url)
+    },
+
+    apiCallback: function (consents, consentsPreferencesSet, error) {
+      if (error) {
+        console.error('Single consent error: ', error, window.location)
+        return
+      }
+      if (consentsPreferencesSet) {
+        if (consents && consents.usage) {
+          window.GOVUK.triggerEvent(window, 'cookie-consent')
+        }
+      } else {
+        window.GOVUK.triggerEvent(window, 'show-cookie-banner')
+      }
+    },
+
+    setPreferences: function (type, options) {
+      if (window.GOVUK.useSingleConsentApi) {
+        try {
+          switch (type) {
+            case 'accept':
+              this.consentApiObj.setConsents(GovSingleConsent.ACCEPT_ALL)
+              break
+            case 'reject':
+              this.consentApiObj.setConsents(GovSingleConsent.REJECT_ALL)
+              break
+            default:
+              this.consentApiObj.setConsents(options)
+          }
+        } catch (e) {
+          console.error('Single consent ' + type + ' error: ', e, window.location)
+        }
+      }
+    }
+  }
+}(window))

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

@@ -1,78 +1,12 @@
 //= require govuk_publishing_components/analytics
 //= require govuk_publishing_components/analytics-ga4
 //= require govuk_publishing_components/analytics/linked-domains
+//= require govuk_publishing_components/domain-config
 
 window.GOVUK.loadAnalytics = {
-  domains: [
-    {
-      // need to have this one at the start, see loadGa4 function
-      name: 'development',
-      domains: [
-        'localhost',
-        '127.0.0.1',
-        '0.0.0.0',
-        'dev.gov.uk'
-      ],
-      initialiseGA4: true,
-      id: 'GTM-MG7HG5W',
-      auth: 'bRiZ-jiEHtw6hHpGd6dF9w',
-      preview: 'env-3',
-      gaProperty: 'UA-UNSET',
-      gaPropertyCrossDomain: 'UA-UNSET'
-    },
-    {
-      name: 'production',
-      domains: [
-        'www.gov.uk',
-        'www-origin.publishing.service.gov.uk',
-        'assets.publishing.service.gov.uk'
-      ],
-      initialiseGA4: true,
-      id: 'GTM-MG7HG5W',
-      gaProperty: 'UA-26179049-1',
-      gaPropertyCrossDomain: 'UA-145652997-1'
-    },
-    {
-      name: 'staging',
-      domains: [
-        'www.staging.publishing.service.gov.uk',
-        'www-origin.staging.publishing.service.gov.uk',
-        'assets.staging.publishing.service.gov.uk'
-      ],
-      initialiseGA4: true,
-      id: 'GTM-MG7HG5W',
-      auth: 'oJWs562CxSIjZKn_GlB5Bw',
-      preview: 'env-5',
-      gaProperty: 'UA-26179049-20',
-      gaPropertyCrossDomain: 'UA-145652997-1'
-    },
-    {
-      name: 'integration',
-      domains: [
-        'www.integration.publishing.service.gov.uk',
-        'www-origin.integration.publishing.service.gov.uk',
-        'assets.integration.publishing.service.gov.uk'
-      ],
-      initialiseGA4: true,
-      id: 'GTM-MG7HG5W',
-      auth: 'C7iYdcsOlYgGmiUJjZKrHQ',
-      preview: 'env-4',
-      gaProperty: 'UA-26179049-22',
-      gaPropertyCrossDomain: 'UA-145652997-1'
-    },
-    {
-      name: 'devdocs',
-      domains: [
-        'docs.publishing.service.gov.uk'
-      ],
-      initialiseGA4: true,
-      id: 'GTM-TNKCK97'
-    }
-  ],
-
   loadExtraDomains: function () {
-    if (Array.isArray(window.GOVUK.analyticsGa4Domains)) {
-      this.domains = this.domains.concat(window.GOVUK.analyticsGa4Domains)
+    if (Array.isArray(window.GOVUK.vars.extraDomains)) {
+      window.GOVUK.vars.domains = window.GOVUK.vars.domains.concat(window.GOVUK.vars.extraDomains)
     }
   },
 
@@ -89,8 +23,8 @@ window.GOVUK.loadAnalytics = {
     window.GOVUK.analyticsVars.gaProperty = 'UA-UNSET'
     window.GOVUK.analyticsVars.gaPropertyCrossDomain = 'UA-UNSET'
 
-    for (var i = 0; i < this.domains.length; i++) {
-      var current = this.domains[i]
+    for (var i = 0; i < window.GOVUK.vars.domains.length; i++) {
+      var current = window.GOVUK.vars.domains[i]
       if (this.arrayContains(currentDomain, current.domains)) {
         window.GOVUK.analyticsVars.gaProperty = current.gaProperty
         window.GOVUK.analyticsVars.gaPropertyCrossDomain = current.gaPropertyCrossDomain
@@ -135,11 +69,11 @@ window.GOVUK.loadAnalytics = {
   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]
+      return window.GOVUK.vars.domains[0]
     } else {
-      for (var i = 0; i < this.domains.length; i++) {
-        if (this.arrayContains(currentDomain, this.domains[i].domains)) {
-          return this.domains[i]
+      for (var i = 0; i < window.GOVUK.vars.domains.length; i++) {
+        if (this.arrayContains(currentDomain, window.GOVUK.vars.domains[i].domains)) {
+          return window.GOVUK.vars.domains[i]
         }
       }
     }

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

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

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

@@ -17,7 +17,7 @@ $large-input-size: 50px;
     height: $large-input-size;
 
     .gem-c-search__icon {
-      @include icon-positioning($large-input-size);
+      transform: scale(.4);
     }
   }
 }
@@ -106,19 +106,6 @@ $large-input-size: 50px;
   }
 }
 
-@mixin icon-positioning($container-size) {
-  $icon-dimension: 20px;
-  $icon-position: calc(($container-size - $icon-dimension) / 2);
-
-  display: block;
-  pointer-events: none;
-  position: absolute;
-  height: $icon-dimension;
-  width: $icon-dimension;
-  top: $icon-position;
-  left: $icon-position;
-}
-
 .gem-c-search__submit {
   border: 0;
   cursor: pointer;
@@ -135,7 +122,13 @@ $large-input-size: 50px;
   overflow: hidden;
 
   .gem-c-search__icon {
-    @include icon-positioning($input-size);
+    pointer-events: none;
+    position: absolute;
+    height: 100%;
+    width: 100%;
+    top: 0;
+    left: 0;
+    transform: scale(.5);
   }
 
   &:focus {

data/app/controllers/govuk_publishing_components/audit_controller.rb

@@ -13,7 +13,6 @@ module GovukPublishingComponents
         frontend
         government-frontend
         govspeak-preview
-        info-frontend
         release
         search-admin
         signon

data/app/models/govuk_publishing_components/audit_comparer.rb

@@ -11,7 +11,6 @@ module GovukPublishingComponents
           finder-frontend
           frontend
           government-frontend
-          info-frontend
           service-manual-frontend
           smart-answers
         ]

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

@@ -41,6 +41,7 @@
       <% index_link = 1 unless disable_ga4 %>
       <% contents.each.with_index(1) do |contents_item, position| %>
         <li class="<%= cl_helper.list_item_classes(contents_item, false) %>" <%= "aria-current=true" if contents_item[:active] %>>
+          <span aria-hidden="true"></span>
           <% link_text = format_numbers ? cl_helper.wrap_numbers_with_spans(contents_item[:text]) : contents_item[:text]
             unless disable_ga4
               ga4_data[:event_name] = cl_helper.get_ga4_event_name(contents_item[:href]) if contents_item[:href]
@@ -64,6 +65,7 @@
             <ol class="gem-c-contents-list__nested-list">
               <% contents_item[:items].each.with_index(1) do |nested_contents_item, nested_position| %>
                 <li class="<%= cl_helper.list_item_classes(nested_contents_item, true) %>" <%= "aria-current=true" if nested_contents_item[:active] %>>
+                  <span aria-hidden="true"></span>
                   <%
                     unless disable_ga4
                       ga4_data[:event_name] = cl_helper.get_ga4_event_name(nested_contents_item[:href]) if nested_contents_item[:href]

data/app/views/govuk_publishing_components/components/docs/contents_list.yml

@@ -18,6 +18,7 @@ accessibility_criteria: |
   - convey the content structure
   - indicate the current page when contents span different pages, and not link to itself
   - include an aria-label to contextualise the list
+  - ensure dashes before each list item are hidden from screen readers
 
   Links with formatted numbers must separate the number and text with a space for correct screen reader pronunciation. This changes pronunciation from "1 dot Item" to "1 Item".
 shared_accessibility_criteria:

data/config/locales/en.yml

@@ -234,8 +234,8 @@ en:
       popular_links:
       - label: Get support with the cost of living
         href: "/cost-of-living"
-      - label: Find out about the Energy Bills Support Scheme
-        href: "/guidance/getting-the-energy-bills-support-scheme-discount"
+      - label: Find out about help you can get with your energy bills
+        href: "/get-help-energy-bills"
       - label: Find a job
         href: "/find-a-job"
       - label: 'Universal Credit account: sign in'

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "37.5.1".freeze
+  VERSION = "37.6.1".freeze
 end