govuk_publishing_components 29.8.0 → 29.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cef8771d15136a9e4ebbe4fc0cbedb616731c433ea12db09af6fa12c1613594
-  data.tar.gz: 721a1fb8532f1952e49aa9ff61a6aa075d3719f8a774c387319858da6c153edf
+  metadata.gz: 4908ab95bb70e9f55096b46cae08b0ea6fff5f168da24aa427c810a39de96e4a
+  data.tar.gz: 99873d158278fbbf30eb341558a5424b9957054b0711486312bd4e18b9c45b35
 SHA512:
-  metadata.gz: f1544190ffc2c00a4f1576c84c74c89e1bc647d4916bccd72deb7f571a9b3f010ebba18abec66a1d67868b86de280dd83cbe4c5bc34677b5a1150bf1a54fdf16
-  data.tar.gz: 868c8e7d02ab075e08fa196c526c39f02e6583dada12cfbb70f0384326a22728471cffe310d16692712d985960c4f78ec1e0f3ad5e8daeae84a4596398cf21a9
+  metadata.gz: 7c6a51b33e3f4fccb750bdc8ab05171bb7d3e877f5ee8e9f0a601be977baa390162cfbab07a94facf2905d7eadd5f504640e25e86260d5b756e82959a8532522
+  data.tar.gz: 5531061592b4e1db78a34d8ecf15f613f05140585df1d5edb76224e82b317a62be16fb7ae4345d75c075297f164b3eb1569c794a7337a09d7345fee4061e0daf

data/app/assets/javascripts/govuk_publishing_components/analytics/page-content.js

@@ -15,8 +15,8 @@
         return document.querySelectorAll('.document-collection .group-title').length
       case isNewBrowsePageLevelTwo():
         // if there are no accordion sections on the browse level 2 page
-        // then it is a default page with only one section
-        return document.querySelectorAll('[data-track-count="accordionSection"]').length || 1
+        // then it is a default page with one or two lists
+        return document.querySelectorAll('[data-track-count="accordionSection"]').length || document.querySelectorAll('main .govuk-list').length
       case isNewBrowsePage():
         return document.querySelectorAll('[data-track-count="cardList"]').length
       case isMainstreamBrowsePage():
@@ -77,7 +77,6 @@
   var metaApplicationSelector = 'meta[name="govuk:rendering-application"]'
   var metaFormatSelector = 'meta[name="govuk:format"]'
   var metaNavigationTypeSelector = 'meta[name="govuk:navigation-page-type"]'
-  var metaSectionSelector = 'meta[name="govuk:section"]'
 
   function getMetaAttribute (selector) {
     var element = document.querySelector(selector)
@@ -111,7 +110,8 @@
 
   function isNewBrowsePage () {
     return getMetaAttribute(metaApplicationSelector) === 'collections' &&
-      getMetaAttribute(metaSectionSelector) === 'new_browse_page' &&
+      (getMetaAttribute(metaNavigationTypeSelector) === 'browse level 0' ||
+       getMetaAttribute(metaNavigationTypeSelector) === 'browse level 1') &&
       getMetaAttribute(metaFormatSelector) === 'mainstream_browse_page'
   }
 

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/gtm-click-tracking.js

@@ -1,3 +1,4 @@
+// = require govuk/vendor/polyfills/Element/prototype/closest.js
 window.GOVUK = window.GOVUK || {}
 window.GOVUK.Modules = window.GOVUK.Modules || {};
 
@@ -10,38 +11,47 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
   }
 
   GtmClickTracking.prototype.init = function () {
-    var trackClicksOn = [this.module]
-    if (!this.module.getAttribute(this.trackingTrigger)) {
-      trackClicksOn = this.module.querySelectorAll('[' + this.trackingTrigger + ']')
-    }
-
-    for (var i = 0; i < trackClicksOn.length; i++) {
-      trackClicksOn[i].addEventListener('click', this.trackClick.bind(this))
-    }
+    this.module.addEventListener('click', this.trackClick.bind(this), true) // useCapture must be true
   }
 
   GtmClickTracking.prototype.trackClick = function (event) {
     if (window.dataLayer) {
-      var target = event.currentTarget
-      var data = {
-        event: 'analytics',
-        event_name: target.getAttribute('data-gtm-event-name'),
-        // get entire URL apart from domain
-        link_url: window.location.href.substring(window.location.origin.length),
-        ui: JSON.parse(target.getAttribute('data-gtm-attributes'))
-      }
-      var ariaExpanded = this.checkExpandedState(target)
-      if (ariaExpanded) {
-        data.ui.state = ariaExpanded === 'false' ? 'opened' : 'closed'
+      var target = this.findTrackingAttributes(event.target)
+      if (target) {
+        var data = {
+          event: 'analytics',
+          event_name: target.getAttribute('data-gtm-event-name'),
+          // get entire URL apart from domain
+          link_url: window.location.href.substring(window.location.origin.length),
+          ui: JSON.parse(target.getAttribute('data-gtm-attributes')) || {}
+        }
+        var ariaExpanded = this.checkExpandedState(target)
+        if (ariaExpanded) {
+          data.ui.state = ariaExpanded === 'false' ? 'opened' : 'closed'
+          data.ui.text = data.ui.text || target.innerText
+        }
+        window.dataLayer.push(data)
       }
-      window.dataLayer.push(data)
     }
   }
 
+  GtmClickTracking.prototype.findTrackingAttributes = function (clicked) {
+    if (clicked.hasAttribute('[' + this.trackingTrigger + ']')) {
+      return clicked
+    } else {
+      return clicked.closest('[' + this.trackingTrigger + ']')
+    }
+  }
+
+  // check either element is expandable or contains expandable element
   GtmClickTracking.prototype.checkExpandedState = function (clicked) {
-    var expanded = clicked.querySelector('[aria-expanded]')
-    if (expanded) {
-      return expanded.getAttribute('aria-expanded')
+    var isExpandable = clicked.getAttribute('aria-expanded')
+    var containsExpandable = clicked.querySelector('[aria-expanded]')
+
+    if (isExpandable) {
+      return isExpandable
+    } else if (containsExpandable) {
+      return containsExpandable.getAttribute('aria-expanded')
     }
   }
 

data/app/assets/javascripts/govuk_publishing_components/components/accordion.js

@@ -45,6 +45,21 @@ window.GOVUK.Modules.GovukAccordion = window.GOVUKFrontend.Accordion;
     if (this.$module.getAttribute('data-track-sections') === 'true') {
       this.addEventListenerSections()
     }
+
+    // look for data attributes to put onto the 'show/hide all' link
+    var showAllAttributes = this.$module.getAttribute('data-show-all-attributes')
+    if (showAllAttributes) {
+      try {
+        var showAll = this.$module.querySelector('.' + this.showAllControls)
+        var values = JSON.parse(showAllAttributes)
+        var keys = Object.keys(values)
+        for (var i = 0; i < keys.length; i++) {
+          showAll.setAttribute('data-' + keys[i], values[keys[i]])
+        }
+      } catch (e) {
+        console.error('Could not read accordion data attributes error: ' + e.message, window.location)
+      }
+    }
   }
 
   // Navigate to and open accordions with anchored content on page load if a hash is present

data/app/assets/javascripts/govuk_publishing_components/vendor/lux/lux-measurer.js

@@ -171,16 +171,25 @@ if (
 // `DOMContentReady` event before we can see what the HTTP version is.
 //
 // [1]: https://github.com/alphagov/govuk-rfcs/pull/148
-try {
-  if (typeof performance !== 'undefined') {
-    document.addEventListener('DOMContentLoaded', function () {
-      var getEntriesByType = performance.getEntriesByType('navigation')
 
-      if (getEntriesByType.length > 0) {
-        var httpProtocol = performance.getEntriesByType('navigation')[0].nextHopProtocol
-        LUX.addData("http-protocol", httpProtocol)
-      }
-    })
+var measureHTTPProtocol = function () {
+  var getEntriesByType = performance.getEntriesByType('navigation')
+
+  if (getEntriesByType.length > 0) {
+    var httpProtocol = JSON.parse(JSON.stringify(performance.getEntriesByType('navigation')[0].nextHopProtocol))
+    LUX.addData("http-protocol", httpProtocol)
+  }
+}
+
+try {
+  if (typeof performance !== 'undefined' && typeof performance.getEntriesByType !== 'undefined') {
+    if (document.readyState === 'complete') {
+      measureHTTPProtocol()
+    } else {
+      window.addEventListener('load', function() {
+        measureHTTPProtocol()
+      })
+    }
   }
 } catch (e) {
   console.error('Error in LUX reporting the HTTP protocol (' + window.location + '):', e)