govuk_publishing_components 35.18.0 → 35.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ce473a1a45f47ae5cf925f4de375968f8ad75223ef70a38d442be0160a66172
-  data.tar.gz: 71574933e54084b2ecff4bce0fe09eda6e34003f55fcb7d470300580e35eb54f
+  metadata.gz: b6d8b36d61c9301cb5d969679a14c93b6b43914a3a734d05e4ae5702b0fb0f79
+  data.tar.gz: 49e458e28c81c1368445b4e9948aa31614ec2a506f9f989083780a0ce6de885d
 SHA512:
-  metadata.gz: d663be268de23349809eeec83badafb7c24298221b29168df805b332bd757f4fa70d4addc4cbb197f07af00e1ed5bd501060a5c00f918a6f77ddacd7273149f0
-  data.tar.gz: 2b7437b0e9e25cd57b04ffe2e014ce182649fabeb5eaf10d73110f782eb255c7420bd7814273f361e4373687aff2a82fe1049ea3f7d688b05f4b9009dff46673
+  metadata.gz: 107aa5aee8b2c2c8268342683df0405cc071ada39032d723fd21299a0af1abc6bec4bb5fb7d89879775780bccc32d27b1ac9eb375e28cda218d0016b8cb843d1
+  data.tar.gz: 994233cc78dcaa2ce4a604f3cb2d3be54582bfcfa40b6df323929a808d8d7d56e30e6c1403422a71968d399e27dc6141534f49af06f5713198db721b91d461a1

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

@@ -335,6 +335,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')
 

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-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/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/_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/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/_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,10 @@
         <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[:event_name] = cl_helper.get_ga4_event_name(contents_item[:href]) if contents_item[:href]
               ga4_data[:index] = {
                 "index_link": index_link,
               }
-              ga4_data[:type] = cl_helper.get_ga4_type(contents_item[:href]) if contents_item[:href]
             end
           %>
           <%= link_to_if !contents_item[:active], link_text, contents_item[:href],
@@ -67,10 +68,10 @@
                 <li class="<%= cl_helper.list_item_classes(nested_contents_item, true) %>" <%= "aria-current=true" if nested_contents_item[:active] %>>
                   <%
                     if ga4_tracking
+                      ga4_data[:event_name] = cl_helper.get_ga4_event_name(nested_contents_item[:href]) if nested_contents_item[:href]
                       ga4_data[:index] = {
                         "index_link": index_link,
                       }
-                      ga4_data[:type] = cl_helper.get_ga4_type(nested_contents_item[:href]) if nested_contents_item[:href]
                     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/docs/image_card.yml

@@ -206,11 +206,11 @@ examples:
         <%= component %>
       </div>
   two_thirds_column:
-    description: This variant is used for the featured section on the homepage.
+    description: This variant is used for the featured section on the homepage, the aspect ratio used is 1:1
     data:
       two_thirds: true
       href: "/still-not-a-page"
-      image_src: "https://assets.publishing.service.gov.uk/government/uploads/system/uploads/feature/image/91397/s712_SG_Swear_in_1_.jpg"
+      image_src: "https://www.gov.uk/assets/static/govuk-apple-touch-icon-180x180-026deaa34fa328ae5f1f519a37dbd15e6555c5086e1ba83986cd0827a7209902.png"
       image_alt: "some meaningful alt text please"
       heading_text: "Something has happened nearby possibly"
       description: "Following a news report that something has happened, further details are emerging of the thing that has happened and what that means for you."

data/lib/govuk_publishing_components/presenters/contents_list_helper.rb

@@ -48,10 +48,10 @@ module GovukPublishingComponents
         total
       end
 
-      def get_ga4_type(link)
-        return "select content" if link.start_with?("#")
+      def get_ga4_event_name(link)
+        return "select_content" if link.start_with?("#")
 
-        "contents list"
+        "navigation"
       end
 
     private

data/lib/govuk_publishing_components/presenters/image_card_helper.rb

@@ -63,6 +63,10 @@ module GovukPublishingComponents
       def image
         classes = %w[gem-c-image-card__image-wrapper]
         classes << "gem-c-image-card__image-wrapper--one-third" if @two_thirds
+        height = 200
+        width = 300
+        height = 90 if @two_thirds
+        width = 90 if @two_thirds
 
         if @image_src
           content_tag(:figure, class: classes) do
@@ -73,8 +77,8 @@ module GovukPublishingComponents
               loading: @image_loading,
               sizes: @sizes,
               srcset: @srcset,
-              height: 200,
-              width: 300,
+              height:,
+              width:,
             )
           end
         end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "35.18.0".freeze
+  VERSION = "35.19.0".freeze
 end