govuk_publishing_components 35.18.0 → 35.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ce473a1a45f47ae5cf925f4de375968f8ad75223ef70a38d442be0160a66172
-  data.tar.gz: 71574933e54084b2ecff4bce0fe09eda6e34003f55fcb7d470300580e35eb54f
+  metadata.gz: d1878b4cfefb05ba090334ac9990ead5cd73b519b0dd5086fa15d48715f7fc13
+  data.tar.gz: 3916e46d02628289d1667218a570c67b7b809c584da24064412cc948be37fd23
 SHA512:
-  metadata.gz: d663be268de23349809eeec83badafb7c24298221b29168df805b332bd757f4fa70d4addc4cbb197f07af00e1ed5bd501060a5c00f918a6f77ddacd7273149f0
-  data.tar.gz: 2b7437b0e9e25cd57b04ffe2e014ce182649fabeb5eaf10d73110f782eb255c7420bd7814273f361e4373687aff2a82fe1049ea3f7d688b05f4b9009dff46673
+  metadata.gz: 764549f50e7ea206131c5cbbbe6ac12e693ed6a8e08c4e27ab2575eac6adf0788a725cda4790b388d58bb3f81884f98e6ff7902b57b906730db6b550cd60acee
+  data.tar.gz: 1d3a83a6d8fb0e602e5b3fdcb54713f79d83e7266b4aa1fe873c41f941489fcac11edac78e03d7ebf655d35aee37c5c4a7cd0c9fe690ec0305b5f4a68567138b

data/app/assets/images/govuk_publishing_components/icon-close.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none"><path fill="#0B0C0C" d="M2 15.435 15.435 2l2.121 2.121L4.121 17.556z"/><path fill="#0B0C0C" d="M15.436 17.557 2 4.122l2.12-2.121 13.436 13.435z"/></svg>

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

@@ -325,6 +325,7 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
           var target = data.event.target
           ecommerceSchema.search_results.ecommerce.items.push({
             item_id: target.getAttribute('data-ga4-ecommerce-path'),
+            item_content_id: target.getAttribute('data-ga4-ecommerce-content-id') || undefined,
             item_name: target.textContent,
             item_list_name: listTitle,
             index: window.GOVUK.analyticsGa4.core.ecommerceHelperFunctions.getIndex(target, startPosition)
@@ -335,6 +336,11 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
           }
         } else {
           for (var i = 0; i < items.length; i++) {
+            // GA4 limits us to 200 items, so we should limit the array to this size.
+            if (i === 200) {
+              break
+            }
+
             var item = items[i]
             var path = item.getAttribute('data-ga4-ecommerce-path')
 
@@ -346,6 +352,7 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
 
             ecommerceSchema.search_results.ecommerce.items.push({
               item_id: path,
+              item_content_id: item.getAttribute('data-ga4-ecommerce-content-id') || undefined,
               item_list_name: listTitle,
               index: window.GOVUK.analyticsGa4.core.ecommerceHelperFunctions.getIndex(item, startPosition)
             })

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

@@ -9,6 +9,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     this.trackingTrigger = 'data-ga4-form' // elements with this attribute get tracked
     this.includeTextInputValues = this.module.hasAttribute('data-ga4-form-include-text')
     this.redacted = false
+    this.useFallbackValue = this.module.hasAttribute('data-ga4-form-no-answer-undefined') ? undefined : 'No answer given'
   }
 
   Ga4FormTracker.prototype.init = function () {
@@ -43,7 +44,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
       var formInputs = this.getFormInputs()
       var formData = this.getInputValues(formInputs)
-      data.text = data.text || (this.combineGivenAnswers(formData) || 'No answer given')
+      data.text = data.text || this.combineGivenAnswers(formData) || this.useFallbackValue
 
       if (data.action === 'search') {
         data.text = data.text.toLowerCase()

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

@@ -95,6 +95,14 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       data.external = trackFunctions.isExternalLink(data.url) ? 'true' : 'false'
       data.index = this.setIndex(data.index, event.target)
 
+      // flatten the attributes in index into the main data
+      if (data.index) {
+        for (var prop in data.index) {
+          data[prop] = data.index[prop]
+        }
+        delete data.index
+      }
+
       if (data.type === 'smart answer' && data.action === 'change response') {
         data.section = this.PIIRemover.stripPIIWithOverride(data.section, true, true)
       }
@@ -117,7 +125,6 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     if (target.getAttribute('data-ga4-index')) {
       try {
         var indexLink = JSON.parse(target.getAttribute('data-ga4-index'))
-
         // Check whether the index object already exists on a parent element, as is the case with tracking accordion links.
         // If true, combine data-ga4-index with the index object. Otherwise, just return indexLink
         index = index ? window.GOVUK.extendObject(index, indexLink) : indexLink
@@ -126,7 +133,6 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
         return
       }
     }
-
     return index
   }
 

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

@@ -20,6 +20,7 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
             referrer: this.getReferrer(referrer),
             title: this.getTitle(),
             status_code: this.getStatusCode(),
+            viewport_size: this.getViewPort(),
 
             ab_test: this.getMetaContent('ab-test'),
             document_type: this.getMetaContent('format'),
@@ -89,6 +90,8 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
       }
 
       searchTerm = searchTerm[0].replace('keywords=', '')
+      searchTerm = searchTerm.replace(/\++/g, ' ')
+      searchTerm = window.GOVUK.analyticsGa4.core.trackFunctions.removeLinesAndExtraSpaces(searchTerm)
       searchTerm = this.PIIRemover.stripPIIWithOverride(searchTerm, true, true)
       return searchTerm
     },
@@ -129,10 +132,20 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
       }
     },
 
+    getViewPort: function () {
+      var vw = Math.max(document.documentElement.clientWidth || 0, window.innerWidth || 0)
+      var vh = Math.max(document.documentElement.clientHeight || 0, window.innerHeight || 0)
+      return vw + 'x' + vh
+    },
+
     getMetaContent: function (name) {
       var tag = document.querySelector('meta[name="govuk:' + name + '"]')
       if (tag) {
-        return tag.getAttribute('content')
+        var contentAttribute = tag.getAttribute('content')
+        if (contentAttribute === '') {
+          return undefined
+        }
+        return contentAttribute
       } else {
         return this.nullValue
       }

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

@@ -0,0 +1,24 @@
+window.GOVUK = window.GOVUK || {}
+window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {}
+window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analyticsModules || {};
+
+(function (analyticsModules) {
+  'use strict'
+
+  var Ga4PrintIntentTracker = {
+    init: function () {
+      window.addEventListener('beforeprint', function () {
+        var data = {
+          event_name: 'print_page',
+          type: 'print page',
+          method: 'browser print'
+        }
+        var schema = new window.GOVUK.analyticsGa4.Schemas()
+        schema = schema.mergeProperties(data, 'event_data')
+        window.GOVUK.analyticsGa4.core.sendData(schema)
+      })
+    }
+  }
+
+  analyticsModules.Ga4PrintIntentTracker = Ga4PrintIntentTracker
+})(window.GOVUK.analyticsGa4.analyticsModules)

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

@@ -118,7 +118,8 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
         // following will be undefined if tracking percentages
         data.text = node.eventData.text
         data.section = node.eventData.text
-        data.index = node.eventData.index
+        data.index_section = node.eventData.index_section
+        data.index_section_count = node.eventData.index_section_count
         // following will be undefined if tracking headings
         data.percent_scrolled = node.eventData.percent_scrolled
 
@@ -165,10 +166,8 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
           eventData: {
             type: type,
             text: heading.textContent.replace(/\s+/g, ' ').trim(),
-            index: {
-              index_section: i + 1,
-              index_section_count: totalHeadings
-            }
+            index_section: i + 1,
+            index_section_count: totalHeadings
           }
         })
       }

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

@@ -3,6 +3,7 @@
 //= require ./analytics-ga4/ga4-schemas
 //= require ./analytics-ga4/pii-remover
 //= require ./analytics-ga4/ga4-page-views
+//= require ./analytics-ga4/ga4-print-intent-tracker
 //= require ./analytics-ga4/ga4-specialist-link-tracker
 //= require ./analytics-ga4/ga4-link-tracker
 //= require ./analytics-ga4/ga4-event-tracker

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

@@ -62,7 +62,7 @@ window.GOVUK.Modules.GovukAccordion = window.GOVUKFrontend.Accordion;
     var isGa4Enabled = dataModule ? dataModule.indexOf('ga4-event-tracker') !== -1 : false
     if (isGa4Enabled) {
       var indexTotal = this.$module.querySelectorAll('.govuk-accordion__section').length
-      var showAllAttributesGa4 = { event_name: 'select_content', type: 'accordion', index: { index_section: 0, index_section_count: indexTotal } }
+      var showAllAttributesGa4 = { event_name: 'select_content', type: 'accordion', index_section: 0, index_section_count: indexTotal }
       showAll = this.$module.querySelector(this.showAllControls)
       showAll.setAttribute('data-ga4-event', JSON.stringify(showAllAttributesGa4))
     }

data/app/assets/javascripts/govuk_publishing_components/components/step-by-step-nav.js

@@ -84,7 +84,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
     // if GA4 is enabled, set attributes on 'show all sections' for tracking using ga4-event-tracker
     if (this.$module.isGa4Enabled) {
-      var showAllAttributesGa4 = { event_name: 'select_content', type: 'step by step', index: { index_section: 0, index_section_count: this.$module.totalSteps } }
+      var showAllAttributesGa4 = { event_name: 'select_content', type: 'step by step', index_section: 0, index_section_count: this.$module.totalSteps }
       this.$module.showOrHideAllButton.setAttribute('data-ga4-event', JSON.stringify(showAllAttributesGa4))
     }
   }
@@ -196,10 +196,8 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
           event_name: 'select_content',
           type: 'step by step',
           text: titleText.trim(),
-          index: {
-            index_section: i + 1,
-            index_section_count: this.$module.totalSteps
-          },
+          index_section: i + 1,
+          index_section_count: this.$module.totalSteps,
           index_total: thisel.querySelectorAll('a').length
         }
 

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

@@ -366,11 +366,9 @@
     if (!entry.hadRecentInput) {
       var firstEntry = sessionEntries[0];
       var latestEntry = sessionEntries[sessionEntries.length - 1];
-      if (sessionEntries.length &&
-        (entry.startTime - latestEntry.startTime >= 1000 ||
-          entry.startTime - firstEntry.startTime >= 5000)) {
-          sessionValue = entry.value;
-          sessionEntries = [entry];
+      if (sessionEntries.length && (entry.startTime - latestEntry.startTime >= 1000 || entry.startTime - firstEntry.startTime >= 5000)) {
+        sessionValue = entry.value;
+        sessionEntries = [entry];
       }
       else {
         sessionValue += entry.value;
@@ -445,7 +443,8 @@
 
   var ALL_ENTRIES = [];
   function observe(type, callback, options) {
-    if (typeof PerformanceObserver === "function" && PerformanceObserver.supportedEntryTypes.includes(type)) {
+    if (typeof PerformanceObserver === "function" &&
+    PerformanceObserver.supportedEntryTypes.includes(type)) {
       var po = new PerformanceObserver(function (list) {
         list.getEntries().forEach(function (entry) { return callback(entry); });
       });
@@ -547,7 +546,7 @@
     // -------------------------------------------------------------------------
     /// End
     // -------------------------------------------------------------------------
-    var SCRIPT_VERSION = "311";
+    var SCRIPT_VERSION = "312";
     var logger = new Logger();
     var globalConfig = fromObject(LUX);
     logger.logEvent(LogEvent.EvaluationStart, [SCRIPT_VERSION]);
@@ -695,7 +694,7 @@
     // Record the FIRST input delay.
     function recordDelay(delay) {
       if (!gFirstInputDelay) {
-        gFirstInputDelay = delay;
+        gFirstInputDelay = floor(delay);
         // remove event listeners
         gaEventTypes.forEach(function (eventType) {
           removeEventListener(eventType, onInput, ghListenerOptions);
@@ -1265,10 +1264,7 @@
       var num = 0;
       for (var i = 0, len = aElems.length; i < len; i++) {
         var e = aElems[i];
-        if (e.src &&
-          !e.async &&
-          !e.defer &&
-          0 !== (e.compareDocumentPosition(lastViewportElem) & 4)) {
+        if (e.src && !e.async && !e.defer && 0 !== (e.compareDocumentPosition(lastViewportElem) & 4)) {
           // If the script has a SRC and async is false and it occurs BEFORE the last viewport element,
           // then increment the counter.
           num++;
@@ -1498,8 +1494,6 @@
       }
       return getHighPercentileINP();
     }
-    // function simplified for our use, original would get the customerid from the script src URL
-    // but we set it inside the code in this file, so this function just returns that
     function getCustomerId() {
       return LUX.customerid || "";
     }
@@ -1609,12 +1603,7 @@
       var vw = document.documentElement.clientWidth;
       // Return true if the top-left corner is in the viewport and it has width & height.
       var lt = findPos(e);
-      return (lt[0] >= 0 &&
-        lt[1] >= 0 &&
-        lt[0] < vw &&
-        lt[1] < vh &&
-        e.offsetWidth > 0 &&
-        e.offsetHeight > 0);
+      return (lt[0] >= 0 && lt[1] >= 0 && lt[0] < vw && lt[1] < vh && e.offsetWidth > 0 && e.offsetHeight > 0);
     }
     // Return an array containing the top & left coordinates of the element.
     // from http://www.quirksmode.org/js/findpos.html
@@ -1838,7 +1827,7 @@
         !gSyncId ||
         !_sample() || // OUTSIDE the sampled range
         !gbLuxSent // LUX has NOT been sent yet, so wait to include it there
-        ) {
+      ) {
         return;
       }
       var sCustomerData = valuesToString(getUpdatedCustomData());
@@ -2083,6 +2072,14 @@
     // Set "LUX.auto=false" to disable send results automatically and
     // instead you must call LUX.send() explicitly.
     if (globalConfig.auto) {
+      var sendBeaconWhenVisible_1 = function () {
+        if (globalConfig.trackHiddenPages) {
+          _sendLux();
+        }
+        else {
+          onVisible(_sendLux);
+        }
+      };
       var sendBeaconAfterMinimumMeasureTime_1 = function () {
         var elapsedTime = _now();
         var timeRemaining = globalConfig.minMeasureTime - elapsedTime;
@@ -2093,12 +2090,12 @@
           ]);
           if (document.readyState === "complete") {
             // If onload has already passed, send the beacon now.
-            _sendLux();
+            sendBeaconWhenVisible_1();
           }
           else {
             // Ow, send the beacon slightly after window.onload.
             addListener("load", function () {
-              setTimeout(_sendLux, 200);
+              setTimeout(sendBeaconWhenVisible_1, 200);
             });
           }
         }
@@ -2107,14 +2104,7 @@
           setTimeout(sendBeaconAfterMinimumMeasureTime_1, timeRemaining);
         }
       };
-      if (globalConfig.trackHiddenPages) {
-        // The trackHiddenPages config forces the beacon to be sent even when the page is not visible.
-        sendBeaconAfterMinimumMeasureTime_1();
-      }
-      else {
-        // Otherwise we only send the beacon when the page is visible.
-        onVisible(sendBeaconAfterMinimumMeasureTime_1);
-      }
+      sendBeaconAfterMinimumMeasureTime_1();
     }
     // When newBeaconOnPageShow = true, we initiate a new page view whenever a page is restored from
     // bfcache. Since we have no "onload" event to hook into after a bfcache restore, we rely on the

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

@@ -14,8 +14,8 @@ $thumbnail-icon-border-colour: govuk-colour("mid-grey", $legacy: "grey-3");
   @include govuk-clearfix;
   position: relative;
 
-  .govuk-details__summary {
-    @include govuk-font($size: 14);
+  .govuk-details {
+    margin: govuk-spacing(3) 0;
   }
 }
 

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

@@ -41,13 +41,6 @@
   }
 }
 
-@include govuk-media-query($from: tablet) {
-  .gem-c-image-card.gem-c-image-card--two-thirds {
-    margin: 0 (- govuk-spacing(3)) govuk-spacing(6) (- govuk-spacing(3));
-    display: block;
-  }
-}
-
 @include govuk-media-query($from: mobile, $until: tablet) {
   .gem-c-image-card {
     margin: 0 (- govuk-spacing(3)) govuk-spacing(6) (- govuk-spacing(3));
@@ -77,7 +70,6 @@
 
   .gem-c-image-card__text-wrapper.gem-c-image-card__text-wrapper--two-thirds {
     @include govuk-grid-column($width: two-thirds, $float: right, $at: tablet);
-    padding-left: 0;
   }
 }
 
@@ -91,6 +83,37 @@
   border-bottom: none;
 }
 
+.gem-c-image-card.gem-c-image-card--two-thirds {
+  // Change default flex-direction from column-reverse
+  // so that the image and text appear in the same row,
+  // with the image to the left
+  flex-direction: row-reverse;
+  -ms-flex-direction: row-reverse;
+  // Wrap flex items onto a new line and ensure
+  // that items are aligned correctly
+  flex-wrap: wrap-reverse;
+  -ms-flex-wrap: wrap-reverse;
+  justify-content: flex-end;
+  align-items: flex-end;
+}
+
+.gem-c-image-card__image-wrapper.gem-c-image-card__image-wrapper--one-third {
+  // The first two values set flex-grow and flex-basis to 0
+  // This ensures that the flex item does not grow or shrink
+  // The the last value, sets flex-basis to 95px
+  // padding-left is set to 15px and the image used is 80px wide
+  flex: 0 0 95px;
+  padding-right: 0;
+}
+
+.gem-c-image-card__text-wrapper.gem-c-image-card__text-wrapper--two-thirds {
+  // The first two values set flex-grow and flex-basis to 1
+  // This allows the flex item contain the image card text to grow or shrink
+  // The last value, sets flex-basis to 70%
+  // If the width of the flex-item shrinks below 70%, it will wrap onto a new line
+  flex: 1 1 70%;
+}
+
 .gem-c-image-card__title {
   margin: 0;
 }

data/app/assets/stylesheets/govuk_publishing_components/components/_layout-super-navigation-header.scss

@@ -877,6 +877,13 @@ $after-button-padding-left: govuk-spacing(4);
   }
 }
 
+// Ensure the total space to the left of the logo for mobile screen sizes is 24px (margin is 15px)
+@include govuk-media-query($until: tablet) {
+  .gem-c-layout-super-navigation-header__header-logo--large-navbar {
+    padding-left: 9px;
+  }
+}
+
 @include govuk-media-query($from: desktop) {
   // can't use govuk-spacing here because the navbar height
   // isn't a multiple of 5 :(

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

@@ -91,6 +91,19 @@ $large-input-size: 50px;
   &:focus {
     @include gem-c-search-input-focus;
   }
+
+  // Note: this is a non-standard CSS feature and will not do anything in Firefox. https://bugzilla.mozilla.org/show_bug.cgi?id=1417753
+  &::-webkit-search-cancel-button {
+    -webkit-appearance: none;
+    background-image: image-url("govuk_publishing_components/icon-close.svg");
+    background-position: center;
+    background-repeat: no-repeat;
+    cursor: pointer;
+    height: 20px;
+    margin-left: 0;
+    margin-right: 0;
+    width: 20px;
+  }
 }
 
 @mixin icon-positioning($container-size) {

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_attachment.scss

@@ -12,6 +12,7 @@
   // Scope attachment and attachment-link component styles to gem-c-govspeak
   @import "../attachment-link";
   @import "../attachment";
+  @import "../details";
 
   // This block is duplicated from Whitehall as a transitional step, see the
   // commit message for 2d893c10ee3f2cab27162b9aba38b12379a71d07 before making

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

@@ -46,14 +46,12 @@
             event_name: "select_content",
             type: "accordion",
             text: heading_text,
-            index: {
-              index_section: index,
-              index_section_count: items.length,
-            },
+            index_section: index,
+            index_section_count: items.length,
           }.to_json
 
-          # These attributes have been created separately from the item[:data_attributes] 
-          # object in order to keep them from colliding with GA4 event tracking and UA 
+          # These attributes have been created separately from the item[:data_attributes]
+          # object in order to keep them from colliding with GA4 event tracking and UA
           # tracking attributes
           ga4_link_data_attributes = {}
           ga4_link_data_attributes[:module] = "ga4-link-tracker"
@@ -63,10 +61,8 @@
             event_name: "navigation",
             type: "accordion",
             section: heading_text,
-            index: {
-              index_section: index,
-              index_section_count: (items.length),
-            }
+            index_section: index,
+            index_section_count: (items.length),
           }.to_json
         end
 
@@ -94,9 +90,9 @@
           <%= tag.div(item[:summary][:text], id: "#{id}-summary-#{index}", class: summary_classes) if item[:summary].present? %>
         <% end %>
         <%= tag.div(
-          item[:content][:html], 
-          id: "#{id}-content-#{index}", 
-          class: "govuk-accordion__section-content", 
+          item[:content][:html],
+          id: "#{id}-content-#{index}",
+          class: "govuk-accordion__section-content",
           'aria-labelledby': "#{id}-heading-#{index}",
           data: ga4_link_data_attributes
         ) %>

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

@@ -16,7 +16,8 @@
   ga4_data = {
     event_name: "navigation",
     section: t("components.contents_list.contents", locale: :en) || "",
-    index_total: cl_helper.get_index_total
+    type: "contents list",
+    index_total: cl_helper.get_index_total,
   } if ga4_tracking
   local_assigns[:aria] ||= {}
   component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
@@ -42,10 +43,8 @@
         <li class="<%= cl_helper.list_item_classes(contents_item, false) %>" <%= "aria-current=true" if contents_item[:active] %>>
           <% link_text = format_numbers ? cl_helper.wrap_numbers_with_spans(contents_item[:text]) : contents_item[:text]
             if ga4_tracking
-              ga4_data[:index] = {
-                "index_link": index_link,
-              }
-              ga4_data[:type] = cl_helper.get_ga4_type(contents_item[:href]) if contents_item[:href]
+              ga4_data[:event_name] = cl_helper.get_ga4_event_name(contents_item[:href]) if contents_item[:href]
+              ga4_data[:index_link] = index_link
             end
           %>
           <%= link_to_if !contents_item[:active], link_text, contents_item[:href],
@@ -67,10 +66,8 @@
                 <li class="<%= cl_helper.list_item_classes(nested_contents_item, true) %>" <%= "aria-current=true" if nested_contents_item[:active] %>>
                   <%
                     if ga4_tracking
-                      ga4_data[:index] = {
-                        "index_link": index_link,
-                      }
-                      ga4_data[:type] = cl_helper.get_ga4_type(nested_contents_item[:href]) if nested_contents_item[:href]
+                      ga4_data[:event_name] = cl_helper.get_ga4_event_name(nested_contents_item[:href]) if nested_contents_item[:href]
+                      ga4_data[:index_link] = index_link
                     end
                   %>
                   <%= link_to_if !nested_contents_item[:active], nested_contents_item[:text], nested_contents_item[:href],

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

@@ -1,5 +1,6 @@
 <%
   add_gem_component_stylesheet("govspeak")
+
   inverse ||= false
   direction_class = "direction-#{direction}" if local_assigns.include?(:direction)
   disable_youtube_expansions = local_assigns.fetch(:disable_youtube_expansions) if local_assigns.include?(:disable_youtube_expansions)

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

@@ -34,7 +34,7 @@
 
   ga4_tracking ||= false
   suggestion_data_attributes[:module] = "#{suggestion_data_attributes[:module]} ga4-link-tracker".strip if ga4_tracking
-  suggestion_data_attributes[:ga4_link] = { event_name: "navigation", type: "intervention", section: suggestion_text, index: 1, index_total: 1 }.to_json if ga4_tracking
+  suggestion_data_attributes[:ga4_link] = { event_name: "navigation", type: "intervention", section: suggestion_text, index_link: 1, index_total: 1 }.to_json if ga4_tracking
   data_attributes[:ga4_intervention_banner] = "" if ga4_tracking # Added to the parent element for the GA4 pageview object to use
 
   suggestion_tag_options = {

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

@@ -107,11 +107,9 @@
           data-ga4-link="<%= {
             "event_name": "navigation",
             "section": "Licence",
-            "index": {
-              "index_section": layout_footer_helper.ga4_ogl_link_index_section.to_s,
-              "index_link": "1",
-              "index_section_count": layout_footer_helper.ga4_index_section_count.to_s,
-            },
+            "index_section": layout_footer_helper.ga4_ogl_link_index_section.to_s,
+            "index_link": "1",
+            "index_section_count": layout_footer_helper.ga4_index_section_count.to_s,
             "text": "Open Government Licence v3.0",
             "index_total": "1",
             "type": "footer",
@@ -132,11 +130,9 @@
         data-ga4-link="<%= {
           "event_name": "navigation",
           "section": "Copyright",
-          "index": {
-            "index_section": layout_footer_helper.ga4_copyright_link_index_section.to_s,
-            "index_link": "1",
-            "index_section_count": layout_footer_helper.ga4_index_section_count.to_s,
-          },
+          "index_section": layout_footer_helper.ga4_copyright_link_index_section.to_s,
+          "index_link": "1",
+          "index_section_count": layout_footer_helper.ga4_index_section_count.to_s,
           "text": "© Crown copyright",
           "index_total": "1",
           "type": "footer",