govuk_publishing_components 56.3.1 → 56.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0fcdb89ba039de9b8a67c84076554f0c682edada146c84f81cb22bc8fec2a62
-  data.tar.gz: a7a294bc45bdafd3d9b638c7dbf3a1f6a44d563d0666a49b43f75287441bdf44
+  metadata.gz: 7d76c938f0964afb347980522c6baca92610afaf0d035ffde0f3d8b6bb8fcb03
+  data.tar.gz: d8da458559e80bde908f7d80abcf435df61b0c495bcd2d4348e2c39b49553978
 SHA512:
-  metadata.gz: a93248b11908e91cdabf061cd9171ecaae6ce0a7fb38020518f103e0477841c7e6a8ddca861499e3846c74e7e3c0407fb1a6170483d7d8c0a3adf07835386858
-  data.tar.gz: 97bcab90207d352eaf2602d3604a79f441a993179be1999b482fb86b7ee0fd056c1efb5f72b2ea919531b9ea21e7dd9271223503488b201c5787f95372d9fb6b
+  metadata.gz: fab8b889f851e16fa0bc0d0dfe3e79ca3140d26d10479bc9ebb99ed1395e6d65833ba4c224e85ad751352538731050b9d7408fc27b5265797a0a271b4ddae155
+  data.tar.gz: 5d07560bb97b95bcba67ae3b5fa4744b60994e5dae7c27f80175171df124eee3dab5b9534ce1d1c06b311b641f6b781688124f7e69d8622b84a3d2a5a32d73ae

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

@@ -86,7 +86,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
       if (inputType === 'checkbox' && elem.checked) {
         input.answer = labelText
-      } else if (inputNodename === 'SELECT' && elem.options[elem.selectedIndex].value) {
+      } else if (inputNodename === 'SELECT' && elem.options[elem.selectedIndex] && elem.options[elem.selectedIndex].value) {
         input.answer = elem.options[elem.selectedIndex].text
       } else if (inputTypes.indexOf(inputType) !== -1 && elem.value) {
         if (this.includeTextInputValues || elem.hasAttribute('data-ga4-form-include-input')) {

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

@@ -67,7 +67,11 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
             tool_name: this.getToolName(),
             spelling_suggestion: this.getMetaContent('spelling-suggestion'),
             discovery_engine_attribution_token: this.getMetaContent('discovery-engine-attribution-token'),
-            canonical_url: this.getCanonicalHref()
+            canonical_url: this.getCanonicalHref(),
+
+            user_created_at: this.getMetaContent('user-created-at'),
+            user_organisation_name: this.getMetaContent('user-organisation-name'),
+            user_role: this.getMetaContent('user-role')
           }
         }
         window.GOVUK.analyticsGa4.core.sendData(data)

data/app/assets/javascripts/govuk_publishing_components/lib/govspeak/youtube-link-enhancement.js

@@ -6,6 +6,7 @@
   var YoutubeLinkEnhancement = function ($element, $classOverride) {
     this.$element = $element
     this.$classOverride = typeof $classOverride !== 'undefined' ? $classOverride : 'gem-c-govspeak__youtube-video'
+    this.punctuationRegex = /[\.!\?"']/g // eslint-disable-line no-useless-escape
   }
 
   YoutubeLinkEnhancement.prototype.init = function () {
@@ -18,12 +19,15 @@
     this.startModule()
   }
 
+  YoutubeLinkEnhancement.prototype.paragraphHasOtherContent = function (paragraph, link) {
+    return paragraph.innerHTML.replaceAll(this.punctuationRegex, '') !== link.outerHTML.replaceAll(this.punctuationRegex, '')
+  }
+
   YoutubeLinkEnhancement.prototype.decorateLink = function () {
     var $youtubeLinks = this.$element.querySelectorAll('a[href*="youtube.com"], a[href*="youtu.be"]')
     for (var i = 0; i < $youtubeLinks.length; ++i) {
       var $link = $youtubeLinks[i]
-
-      if (this.hasDisabledEmbed($link)) {
+      if (this.hasDisabledEmbed($link) || $link.getAttribute('href').includes('/playlist')) {
         continue
       }
 
@@ -31,7 +35,8 @@
 
       // Only replace the <p> with a YT embed if the YT link is the only thing in the <p>.
       // This prevents other content in the <p> being lost.
-      if ($linkParent.innerHTML !== $link.outerHTML) {
+      // However, if a <p> exists with only a YT link and punctuation, we do allow the punctuation characters to be lost to the YT embed.
+      if (this.paragraphHasOtherContent($linkParent, $link)) {
         continue
       }
       var href = $link.getAttribute('href')
@@ -102,7 +107,8 @@
 
     // Only replace the <p> with a YT embed if the YT link is the only thing in the <p>.
     // This prevents other content in the <p> being lost.
-    if (parentPara.innerHTML !== $link.outerHTML) {
+    // However, if a <p> exists with only a YT link and punctuation, we do allow the punctuation characters to be lost to the YT embed.
+    if (this.paragraphHasOtherContent(parentPara, $link)) {
       return
     }
 

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

@@ -1027,6 +1027,11 @@ examples:
       block: |
         <p>This content has a YouTube video link, converted to an accessible embedded player by component JavaScript. Bear in mind that the link will not convert if the paragraph it is in contains other content.</p>
         <p><a href="https://www.youtube.com/watch?v=y6hbrS3DheU">Operations: a developer's guide, by Anna Shipman</a></p>
+  youtube_embed_with_punctuation:
+    description: YouTube links should still be enhanced if punctuation is in the same paragraph but outside the YT <a> tag.
+    data:
+      block: |
+        <p>"<a href="https://www.youtube.com/watch?v=y6hbrS3DheU">Operations: a developer's guide, by Anna Shipman</a>."</p>
   youtube_embed_disabled_by_component:
     data:
       disable_youtube_expansions: true

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "56.3.1".freeze
+  VERSION = "56.3.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 56.3.1
+  version: 56.3.2
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -2039,7 +2039,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A gem to document components in GOV.UK frontend applications
 test_files: []