govuk_publishing_components 35.21.0 → 35.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bc95850fa0d38a7b0783eed1d3e5b1fd846c9b11c8ae5562d8fa8f7111696f4
-  data.tar.gz: edafc5b87bd54a90cce6cfe616589eddb820eb6dc3d0d4d0e8f17953ad51a74f
+  metadata.gz: bb0f9b39701d51e7c540675b4edcd276a9ee485b4c277c7d2fbbdcdf913933d0
+  data.tar.gz: 1b3148fd18a2211bee6c0ff59686e074a15970116b8216649fadb71018d38c86
 SHA512:
-  metadata.gz: 576b4d036af878138116870dcf1045cf91cdb9ba31a9f68b1b8571fac840f7728d177f9d3293c83e921a3f93a5a3110b19e681568367706ca89280dc995abe8d
-  data.tar.gz: bf87713f8b29033d63800bd4851bbca0778968a4318432b828a907a60e83a85da966307394ef77c43b3bb715ee14a23ebe81b9984303bf11a1fe5e1b2f5550f1
+  metadata.gz: a432b034c1f6de19813d82e68394fe4637d0b851d7617933dd1fc4f56b820ac5f7d2e3320f1dc15aebd1c2e2ec5896de41d7bac4a7244e398d5a0bb30f51e45e
+  data.tar.gz: ba80773b85de541a717533b35c438e7c4e2500363c8477c00c371bd638cec74f9f14d38f2820f6778d92f89680c949b27ceedc4dea98bf2d53ddd916a56fe865

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

@@ -281,7 +281,7 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
       },
 
       getIndex: function (element, startPosition) {
-        var index = element.getAttribute('data-ecommerce-index')
+        var index = element.getAttribute('data-ga4-ecommerce-index')
 
         if (!index) {
           return null
@@ -307,7 +307,7 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
         var element = data.element
         var resultsId = data.resultsId
         var isClickEvent = data.event !== undefined
-        var isSearchResult = element.getAttribute('data-search-query')
+        var isSearchResult = element.getAttribute('data-ga4-search-query')
 
         var ecommerceSchema = new window.GOVUK.analyticsGa4.Schemas().ecommerceSchema()
         var PIIRemover = new window.GOVUK.analyticsGa4.PIIRemover()
@@ -315,14 +315,14 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
 
         if (isSearchResult) {
           // Limiting to 100 characters to avoid noise from extra long search queries and to stop the size of the payload going over 8k limit.
-          var searchQuery = PIIRemover.stripPII(element.getAttribute('data-search-query')).substring(0, 100).toLowerCase()
-          var variant = element.getAttribute('data-ecommerce-variant')
+          var searchQuery = PIIRemover.stripPII(element.getAttribute('data-ga4-search-query')).substring(0, 100).toLowerCase()
+          var variant = element.getAttribute('data-ga4-ecommerce-variant')
           DEFAULT_LIST_TITLE = 'Site search results'
         }
 
         var items = element.querySelectorAll('[data-ga4-ecommerce-path]')
-        var listTitle = element.getAttribute('data-list-title') || DEFAULT_LIST_TITLE
-        var startPosition = parseInt(element.getAttribute('data-ecommerce-start-index'), 10)
+        var listTitle = element.getAttribute('data-ga4-list-title') || DEFAULT_LIST_TITLE
+        var startPosition = parseInt(element.getAttribute('data-ga4-ecommerce-start-index'), 10)
 
         ecommerceSchema.event = 'search_results'
         ecommerceSchema.search_results.event_name = isClickEvent ? 'select_item' : 'view_item_list'
@@ -353,10 +353,10 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
             var item = items[i]
             var path = item.getAttribute('data-ga4-ecommerce-path')
 
-            // If the element does not have a data-ecommerce-index attribute, we set one so that we can use it later when setting the index property
+            // If the element does not have a data-ga4-ecommerce-index attribute, we set one so that we can use it later when setting the index property
             // on the ecommerce object.
-            if (!item.getAttribute('data-ecommerce-index')) {
-              item.setAttribute('data-ecommerce-index', i + 1)
+            if (!item.getAttribute('data-ga4-ecommerce-index')) {
+              item.setAttribute('data-ga4-ecommerce-index', i + 1)
             }
 
             ecommerceSchema.search_results.ecommerce.items.push({

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

@@ -851,11 +851,6 @@ $after-button-padding-left: govuk-spacing(4);
   }
 }
 
-.gem-c-layout-super-navigation-header__navigation-dropdown-menu--large-navbar .gem-c-layout-super-navigation-header__navigation-second-item-link {
-  font-size: 19px;
-  font-size: govuk-px-to-rem(19px);
-}
-
 .gem-c-layout-super-navigation-header__navigation-second-item-link--with-description {
   font-size: 16px;
   font-size: govuk-px-to-rem(16px);
@@ -881,13 +876,11 @@ $after-button-padding-left: govuk-spacing(4);
 }
 
 .gem-c-layout-super-navigation-header__navigation-second-item-description {
-  margin-top: govuk-spacing(1);
-}
-
-.gem-c-layout-super-navigation-header__navigation-dropdown-menu--large-navbar .gem-c-layout-super-navigation-header__navigation-second-item-description {
-  font-size: 19px;
-  font-size: govuk-px-to-rem(19px);
-  margin-top: govuk-spacing(2);
+  @include govuk-typography-common;
+  font-size: 16px;
+  font-size: govuk-px-to-rem(16px);
+  font-weight: normal;
+  margin: govuk-spacing(1) 0 0 0;
 }
 
 .gem-c-layout-super-navigation-header__search-form {
@@ -911,11 +904,6 @@ $after-button-padding-left: govuk-spacing(4);
   }
 }
 
-.gem-c-layout-super-navigation-header__navigation-dropdown-menu--large-navbar .gem-c-layout-super-navigation-header__popular-link {
-  font-size: 19px;
-  font-size: govuk-px-to-rem(19px);
-}
-
 .gem-c-layout-super-navigation-header__width-container {
   @include govuk-media-query($until: "desktop") {
     margin: 0;

data/lib/govuk_publishing_components/presenters/contents_list_helper.rb

@@ -24,13 +24,13 @@ module GovukPublishingComponents
 
       def wrap_numbers_with_spans(content_item_link)
         content_item_text = strip_tags(content_item_link) # just the text of the link
-
+        content_item_text_stripped = content_item_text.strip # strip trailing spaces for the regex. Keep original content_item_text for the string replacement.
         # Must start with a number
         # Number must be between 1 and 999 (ie not 2014)
         # Must be followed by a space
         # May contain a period `1.`
         # May be a decimal `1.2`
-        number = /^\d{1,3}(\.?|\.\d{1,2})(?=\s)/.match(content_item_text)
+        number = /^\d{1,3}(\.?|\.\d{1,2})(?=\s)/.match(content_item_text_stripped)
 
         if number
           words = content_item_text.sub(number.to_s, "").strip # remove the number from the text

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "35.21.0".freeze
+  VERSION = "35.21.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 35.21.0
+  version: 35.21.2
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-26 00:00:00.000000000 Z
+date: 2023-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config