govuk_publishing_components 61.0.3 → 61.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae1a49b64074fcbbbce599826af44bc090b1ab98005a920e153dc3a4183fd53e
-  data.tar.gz: 1b7aabf01fdae6e731872d5a20367b97a42851178053a574482b38fcd9b5f7a6
+  metadata.gz: ee652fec945b78a8ab3380d6c93010e71a7dde1e1abcde77c69996245f608b53
+  data.tar.gz: d3de57ce6e16dfaacff00e7d129c2c748d4043b825b76b04fd8087f794435104
 SHA512:
-  metadata.gz: 0fbfb1567a35a512306336c930433917e12b259a32ba7d68f69469f03cca0c4ec5620f45f5e0c4c9f27e6458becefdcde31c86fd0a4ad43e7156f6b36dab33d2
-  data.tar.gz: a8b632a21e87b0cf177bbe0cd0beb39766c9f5443dbb99f7087417e075b9a5d95959fa416deb53017046ac4584faf1b1b829e8793161bf546760be086f04ca0d
+  metadata.gz: f462ec25f4372596b7d914a9469aba1b5ee139b0da5dce07c00362373967ecb4fc5f2cfa9775d6bfa702ff23a971cb9cceccdbc4280d7ff982bfcd94779105ad
+  data.tar.gz: b585086d2a8d4a75a0a2769dd47051c701e7d6d3347664c56a659168ecc09b0871f611ee9ac2e6aa484a4b869a226787bf93d252228b4301a66af6db848fe3be

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

@@ -110,16 +110,10 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
       var isTextField = inputTypes.indexOf(inputType) !== -1 || inputNodename === 'TEXTAREA'
       var conditionalField = elem.closest('.govuk-checkboxes__conditional')
-      var conditionalCheckbox = conditionalField && conditionalField.querySelector('[aria-controls="' + conditionalField.id + '"]')
+      var conditionalCheckbox = conditionalField && this.module.querySelector('[aria-controls="' + conditionalField.id + '"]')
       var conditionalCheckboxChecked = conditionalCheckbox && conditionalCheckbox.checked
 
-      if (conditionalField && conditionalCheckboxChecked) {
-        var conditionalCheckboxLabel = conditionalField.querySelector('[for="' + conditionalCheckbox.id + '"]')
-
-        if (conditionalCheckboxLabel) {
-          input.parentSection = conditionalCheckboxLabel.innerText
-        }
-      }
+      var isDateField = elem.closest('.govuk-date-input')
 
       if (conditionalCheckbox && !conditionalCheckboxChecked) {
         // don't include conditional field if condition not checked
@@ -141,10 +135,16 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
         }
       } else if (inputNodename === 'SELECT' && elem.querySelectorAll('option:checked')) {
         var selectedOptions = Array.from(elem.querySelectorAll('option:checked')).map(function (element) { return element.text })
-        input.answer = this.useSelectCount ? selectedOptions.length : selectedOptions.join(',')
+
+        if (selectedOptions.length === 1 && !elem.value.length) {
+          // if placeholder value in select, do not include as not filled in
+          inputs.splice(i, 1)
+        } else {
+          input.answer = this.useSelectCount && selectedOptions.length > 1 ? selectedOptions.length : selectedOptions.join(',')
+        }
       } else if (isTextField && elem.value) {
         if (this.includeTextInputValues || elem.hasAttribute('data-ga4-form-include-input')) {
-          if (this.useTextCount) {
+          if (this.useTextCount && !isDateField) {
             input.answer = elem.value.length
           } else {
             var PIIRemover = new window.GOVUK.analyticsGa4.PIIRemover()
@@ -163,6 +163,32 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
         // remove the input from those gathered as it has no value
         inputs.splice(i, 1)
       }
+
+      var parentFieldset
+      var parentLegend
+
+      if (conditionalField && conditionalCheckboxChecked) {
+        parentFieldset = conditionalField.closest('fieldset')
+        parentLegend = parentFieldset && parentFieldset.querySelector('legend')
+
+        if (parentLegend) {
+          input.section = parentLegend.innerText + ' - ' + input.section
+        }
+      } else if (isDateField) {
+        var dateFieldset = elem.closest('.govuk-date-input').closest('fieldset')
+        var dateLegend = dateFieldset && dateFieldset.querySelector('legend')
+
+        parentFieldset = dateFieldset.parentNode.closest('fieldset')
+
+        if (dateLegend) {
+          input.section = dateLegend.innerText + ' - ' + input.section
+        }
+
+        if (parentFieldset) {
+          parentLegend = parentFieldset.querySelector('legend')
+          input.section = parentLegend.innerText + ' - ' + input.section
+        }
+      }
     }
     return inputs
   }
@@ -176,17 +202,10 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       if (answer) {
         if (this.recordJson) {
           var fieldSection = data[i].section
-          var parentFieldSection = data[i].parentSection
 
           if (fieldSection) {
-            if (parentFieldSection) {
-              answers[parentFieldSection] = answers[parentFieldSection] || {}
-              answers[parentFieldSection][fieldSection] = answers[parentFieldSection][fieldSection] || ''
-              answers[parentFieldSection][fieldSection] += ((answers[parentFieldSection][fieldSection] ? ',' : '') + answer)
-            } else {
-              answers[fieldSection] = answers[fieldSection] || ''
-              answers[fieldSection] += ((answers[fieldSection] ? ',' : '') + answer)
-            }
+            answers[fieldSection] = answers[fieldSection] ? (answers[fieldSection] + ',') : ''
+            answers[fieldSection] += answer
           }
         } else {
           answers.push(answer)

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

@@ -36,13 +36,6 @@
   // e.g. 'AB123456A', 'AB 12 34 56 A', 'ab 123456 a', 'ab 12 34 56 a', 'AB+12+34+56+A'
   var NATIONAL_INSURANCE_NUMBER = /[A-CEGHJ-OPR-TW-Z]{2}(\s+|\++)?(\d{2}(\s+|\++)?){3}[A-D]/gi
 
-  var UK_MOBILE_NUMBER = /07\d{3}[\s%20+]?\d{6,8}/g // 07123 123456 or 07123123456 or 07123+123456 or 07123%20123456
-  var UK_MOBILE_NUMBER_INTERNATIONAL = /(\+|%2B)?447\d{3}[\s%20+]?\d{6,8}/gi // +447123 123456 or +447123123456 or +447123%20123456 or +447123+123456 or %2B447123123456. Plus at start is optional.
-  var UK_LANDLINE_NUMBER = /0[1246]\d{1}[\s%20+]?\d{3,6}[\s%20+]?\d{4,6}/g // 020 123 1234 or 020 1234 1234 or 0201231234 or 02012341234 or 020+123+1234 or 020+1234+1234 or 020%20123%201234 or 020%201234%201234
-  var UK_LANDLINE_NUMBER_2 = /0[1246]\d{3}[\s%20+]\d{6,8}/g // 02123 123456 or 02123+123456 or 02123%20123456
-  var UK_LANDLINE_NUMBER_INTERNATIONAL = /(\+|%2B)?44[1246]\d{1}[\s%20+]?\d{3,6}[\s%20+]?\d{4,6}/g // // +4420 123 1234 or +4420 1234 1234 or +4420+123+1234 or +4420%20123%201234 or %2B4420 123 1234. Plus at start is optional.
-  var UK_LANDLINE_NUMBER_INTERNATIONAL_2 = /(\+|%2B)?44[1246]\d{3}[\s%20+]\d{6,8}/g // +442123 123456 or +442123%20123456 or +442123+123456 or %2B442123+123456. Plus at start is optional.
-
   function shouldStripDates () {
     var metas = document.querySelectorAll('meta[name="govuk:ga4-strip-dates"]')
     return metas.length > 0
@@ -116,13 +109,6 @@
     stripped = stripped.replace(VISA_PATTERN_GWF, '[gwf number]')
     stripped = stripped.replace(VISA_PATTERN_GB, '[gb eori number]')
     stripped = stripped.replace(NATIONAL_INSURANCE_NUMBER, '[ni number]')
-    stripped = stripped.replace(UK_LANDLINE_NUMBER, '[phone number]')
-    stripped = stripped.replace(UK_LANDLINE_NUMBER_2, '[phone number]')
-    stripped = stripped.replace(UK_LANDLINE_NUMBER_INTERNATIONAL, '[phone number]')
-    stripped = stripped.replace(UK_LANDLINE_NUMBER_INTERNATIONAL_2, '[phone number]')
-    stripped = stripped.replace(UK_MOBILE_NUMBER, '[phone number]')
-    stripped = stripped.replace(UK_MOBILE_NUMBER_INTERNATIONAL, '[phone number]')
-
     stripped = this.stripQueryStringParameters(stripped)
 
     if (this.stripDatePII === true) {

data/app/assets/stylesheets/govuk_publishing_components/components/_action-link.scss

@@ -12,40 +12,37 @@
   display: table-cell;
   line-height: 1;
   width: 36px;
+  vertical-align: middle;
 
-  svg {
-    height: 28px;
-    vertical-align: middle;
-    width: 28px;
+  @include govuk-media-query($from: tablet) {
+    width: 45px;
+  }
+}
 
-    .gem-c-action-link__icon__circle {
-      fill: #eeefef;
+.gem-c-action-link__svg {
+  height: 28px;
+  vertical-align: middle;
+  width: 28px;
+
+  .gem-c-action-link__icon__circle {
+    fill: #eeefef;
 
-      // stylelint-disable max-nesting-depth
-      @media (forced-colors: active) {
-        fill: LinkText;
-      }
-      // stylelint-enable max-nesting-depth
+    @media (forced-colors: active) {
+      fill: LinkText;
     }
+  }
 
-    .gem-c-action-link__icon__arrow {
-      fill: #000000;
+  .gem-c-action-link__icon__arrow {
+    fill: #000000;
 
-      // stylelint-disable max-nesting-depth
-      @media (forced-colors: active) {
-        fill: Canvas;
-      }
-      // stylelint-enable max-nesting-depth
+    @media (forced-colors: active) {
+      fill: Canvas;
     }
   }
 
   @include govuk-media-query($from: tablet) {
-    width: 45px;
-
-    svg {
-      height: 35px;
-      width: 35px;
-    }
+    height: 35px;
+    width: 35px;
   }
 }
 
@@ -53,18 +50,16 @@
   padding-top: 2px;
   width: 30px;
 
-  svg {
+  .gem-c-action-link__svg {
     height: 25px;
     width: 25px;
+  }
 
-    .gem-c-action-link__icon__arrow {
-      fill: #272828;
+  .gem-c-action-link__icon__arrow {
+    fill: #272828;
 
-      // stylelint-disable max-nesting-depth
-      @media (forced-colors: active) {
-        fill: currentcolor;
-      }
-      // stylelint-enable max-nesting-depth
+    @media (forced-colors: active) {
+      fill: currentcolor;
     }
   }
 }
@@ -75,6 +70,18 @@
   @include govuk-font(19, $weight: bold, $line-height: 1.3);
 }
 
+.gem-c-action-link--large {
+  .gem-c-action-link__icon {
+    height: 40px;
+    width: 56px;
+  }
+
+  .gem-c-action-link__svg {
+    height: 40px;
+    width: 40px;
+  }
+}
+
 @include govuk-media-query($media-type: print) {
   .gem-c-action-link {
     * {

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

@@ -7,6 +7,7 @@
   inverse ||= false
   simple ||= false
   simple_light ||= false
+  large ||= false
 
   link_classes = %w(govuk-link gem-c-action-link__link gem-print-force-link-styles)
   link_classes << "govuk-link--inverse" if inverse
@@ -15,12 +16,13 @@
   component_helper.add_class("gem-c-action-link")
   component_helper.add_class("gem-c-action-link--inverse") if inverse
   component_helper.add_class("gem-c-action-link--simple") if simple
+  component_helper.add_class("gem-c-action-link--large") if large
 %>
 <% if text.present? %>
   <%= tag.div(**component_helper.all_attributes) do %>
     <% if simple || simple_light %>
       <span class="gem-c-action-link__icon gem-c-action-link__icon--simple" hidden>
-        <svg xmlns="http://www.w3.org/2000/svg" focusable="false" aria-hidden="true" viewBox="0 0 23 23">
+        <svg xmlns="http://www.w3.org/2000/svg" focusable="false" aria-hidden="true" viewBox="0 0 23 23" class="gem-c-action-link__svg">
           <g class="gem-c-action-link__icon__arrow">
             <path d="M14.943 11.795 10.44 7.292 11.733 6l5.795 5.795-5.795 5.795-1.293-1.292 4.503-4.503Z" />
             <path d="M3.956 10.881h11.485v1.828H3.956v-1.828Z" />
@@ -29,7 +31,7 @@
       </span>
     <% elsif %>
       <span class="gem-c-action-link__icon" hidden>
-        <svg xmlns="http://www.w3.org/2000/svg" focusable="false" aria-hidden="true" viewBox="0 0 27 27">
+        <svg xmlns="http://www.w3.org/2000/svg" focusable="false" aria-hidden="true" viewBox="0 0 27 27" class="gem-c-action-link__svg">
           <circle class="gem-c-action-link__icon__circle" cx="13.5" cy="13.5" r="13.5" />
           <g class="gem-c-action-link__icon__arrow">
             <path d="m17.701 13.526-3.827-3.828L14.973 8.6l4.926 4.926-4.926 4.926-1.099-1.099 3.827-3.827Z" />

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

@@ -25,3 +25,10 @@ examples:
       text: Getting financial help and keeping your business safe
       href: "/financial-help"
       simple: true
+  large:
+    description: For use on the GOV.UK homepage popular links.
+    data:
+      text: This way for cookies
+      href: "/cookies"
+      large: true
+

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "61.0.3".freeze
+  VERSION = "61.1.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 61.0.3
+  version: 61.1.1
 platform: ruby
 authors:
 - GOV.UK Dev