govuk_publishing_components 35.20.1 → 35.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '096ada32d1ecced73348563a12eaa51f1f722c75f11791baba32d24de329b4ad'
-  data.tar.gz: 7c905c2babbe3a999a4a44d2441506b5b38b48edbb78593a9b9212b55549d8da
+  metadata.gz: 7d50686dad9cdda4ba4f752558bea505240bbf6114d87adb622f0c5979311fc6
+  data.tar.gz: d742933a7c501d815ffcde551a5b2fddad3c67cd7e6e24efae03bf6273df1408
 SHA512:
-  metadata.gz: 7bca767187c1d88419a6c36c90a6cfb763773ef81cd1106bf24f2298142bf7f247ca293c05a4bc9c76fe567f326ff36a7cbb7986bc671995512c22b4f2f67461
-  data.tar.gz: 715869ba54a39828637ded7125d39462716247acec55b3c71507975fbcbb567a01dfd2ab152a2fe19fac3044ca4c7c0e0b1ea56c9dca6b074ac440abdf4c3e28
+  metadata.gz: d0364bb2803a05e97bc0e52596dd6a952e2697dea2584d2a8e40b2d65abf132c190259dd7b1934f437c3ac70fed9eed2c2b72130f3a4f68b1ff0f3cfeeee21bc
+  data.tar.gz: 13829c743b74ddb4d384803b760dfc24d3d89fffe15427740d14c0b2e35352a985da5e43b63a98ca55930d253b655bfd33ba6a5fd336d0d1638dbec768aa5231

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

@@ -30,7 +30,16 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
       firstScript.parentNode.insertBefore(newScript, firstScript)
     },
 
+    getUserAgent: function () {
+      return navigator.userAgent
+    },
+
     sendData: function (data) {
+      // Prevent any GA4 data being sent during Smokey tests
+      if (this.getUserAgent() === 'Smokey Test / Ruby') {
+        return
+      }
+
       data.govuk_gem_version = this.getGemVersion()
       // set this in the console as a debugging aid
       if (window.GOVUK.analyticsGa4.showDebug) {
@@ -272,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
@@ -298,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()
@@ -306,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'
@@ -344,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/javascripts/govuk_publishing_components/analytics-ga4/ga4-form-tracker.js

@@ -46,7 +46,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       var formData = this.getInputValues(formInputs)
       data.text = data.text || this.combineGivenAnswers(formData) || this.useFallbackValue
 
-      if (data.action === 'search') {
+      if (data.action === 'search' && data.text) {
         data.text = data.text.toLowerCase()
         data.text = window.GOVUK.analyticsGa4.core.trackFunctions.removeLinesAndExtraSpaces(data.text)
       }

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

@@ -880,6 +880,10 @@ $after-button-padding-left: govuk-spacing(4);
   width: 68px;
 }
 
+.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);

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

@@ -25,11 +25,14 @@
 .gem-c-metadata--inverse {
   background-color: govuk-colour("blue");
   color: govuk-colour("white");
-  padding: govuk-spacing(2);
 
   a {
     @include govuk-link-style-inverse;
   }
+}
+
+.gem-c-metadata--inverse-padded {
+  padding: govuk-spacing(2);
 
   .gem-c-metadata__list {
     margin: govuk-spacing(2);

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

@@ -9,6 +9,7 @@
 
   other ||= nil
   inverse ||= false
+  inverse_compress ||= false
 
   direction_class = ""
   direction_class = " direction-#{direction}" if local_assigns.include?(:direction)
@@ -16,7 +17,13 @@
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
   classes = %w(gem-c-metadata)
   classes << "direction-#{direction}" if local_assigns.include?(:direction)
-  classes << "gem-c-metadata--inverse" if inverse
+
+  if inverse && inverse_compress
+    classes << "gem-c-metadata--inverse"
+  elsif inverse
+    classes << "gem-c-metadata--inverse gem-c-metadata--inverse-padded"
+  end
+
   classes << shared_helper.get_margin_bottom if local_assigns[:margin_bottom]
 
   ga4_tracking ||= false

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

@@ -355,6 +355,26 @@ examples:
       see_updates_link: true
       other:
         Applies to: England, Scotland, and Wales (see detailed guidance for <a href="http://www.dardni.gov.uk/news-dard-pa022-a-13-new-procedure-for" rel="external">Northern Ireland</a>)
+  on_a_dark_background_without_padding:
+    description: By default the inverse option includes extra spacing around the component. This option removes this padding. Note that both the `inverse` and `inverse_compress` options must be supplied.
+    data:
+      inverse: true
+      inverse_compress: true
+      from: [
+        "<a href='/government/organisations/ministry-of-defence'>Ministry of Defence</a>",
+        "<a href='/government/organisations/cabinet-office'>Cabinet Office</a>",
+        "<a href=\"/government/organisations/department-for-business-energy-and-industrial-strategy\">Department for Business, Energy &amp; Industrial Strategy</a>",
+        "<a href=\"/government/organisations/foreign-commonwealth-office\">Foreign &amp; Commonwealth Office</a>",
+        "<a href=\"/government/people/william-hague\">The Rt Hon William Hague</a>",
+        "<a href=\"/government/organisations/department-for-environment-food-rural-affairs\">Department for Environment, Food &amp; Rural Affairs</a>",
+        "<a href=\"/government/organisations/department-for-work-pensions\">Department for work and pensions</a>",
+        "<a href=\"/government/organisations/foreign-commonwealth-office\">Foreign and Commonwealth Office</a>"
+      ]
+      first_published: 14 June 2014
+      last_updated: 10 September 2015
+      see_updates_link: true
+      other:
+        Applies to: England, Scotland, and Wales (see detailed guidance for <a href="http://www.dardni.gov.uk/news-dard-pa022-a-13-new-procedure-for" rel="external">Northern Ireland</a>)
   with_custom_margin_bottom:
     description: |
       The component accepts a number for margin bottom from `0` to `9` (`0px` to `60px`) using the [GOV.UK Frontend spacing scale](https://design-system.service.gov.uk/styles/spacing/#the-responsive-spacing-scale). It defaults to the `margin-bottom` values defined in the [responsive-bottom-margin mixin](https://github.com/alphagov/govuk_publishing_components/blob/main/app/assets/stylesheets/govuk_publishing_components/components/mixins/_margins.scss#L1)

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.20.1".freeze
+  VERSION = "35.21.1".freeze
 end

metadata

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