govuk_publishing_components 56.3.0 → 56.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67d7750a4af75be256720a227401885c736d2af67113acfa16889fc5dc599a5d
-  data.tar.gz: a312eca2e3699de90c89bf5e256a09bca8eedffeb3e00657738ec21fb8fa3059
+  metadata.gz: 7d76c938f0964afb347980522c6baca92610afaf0d035ffde0f3d8b6bb8fcb03
+  data.tar.gz: d8da458559e80bde908f7d80abcf435df61b0c495bcd2d4348e2c39b49553978
 SHA512:
-  metadata.gz: 1ae3113f4320e8ce93b70ec08a9b9581101d59c3eddff0444ec1ec42b551cf14f593e085fb919c7a70d634e47aeb49ec7f463c50195c40e56fe9a42636c864db
-  data.tar.gz: ebc820fe837ad54b2539fbe6c9baed82438c4ad254b9680d1c7716b2d34c6ffcbcfac49f516b5da883f74084116d72c70621b689af5a8adff314d4a9f63f2e04
+  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,11 +19,26 @@
     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) || $link.getAttribute('href').includes('/playlist')) {
+        continue
+      }
+
       var $linkParent = $link.closest('p')
+
+      // 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.
+      // 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')
       var text = $link.textContent
       var placeholder = document.createElement('p')
@@ -89,6 +105,13 @@
     var parentPara = $link.parentNode
     var parentContainer = parentPara.parentNode
 
+    // 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.
+    // 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
+    }
+
     var youtubeVideoContainer = document.createElement('div')
     youtubeVideoContainer.className += this.$classOverride
     youtubeVideoContainer.innerHTML = '<span id="' + elementId + '" data-video-id="' + id + '"></span>'

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

@@ -1025,16 +1025,31 @@ examples:
   youtube_embed:
     data:
       block: |
-        <p>This content has a YouTube video link, converted to an accessible embedded player by component JavaScript.</p>
+        <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_disabled:
+  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
       block: |
-        <p>This content has a YouTube video link, where the govspeak expansion has been disabled</p>
+        <p>This content has a YouTube video link, where the govspeak expansion has been disabled by the render statement for the component.</p>
         <p><a href="https://www.youtube.com/watch?v=y6hbrS3DheU">Operations: a developer's guide, by Anna Shipman</a></p>
+  youtube_embed_disabled_by_content:
+    description: YouTube links should not become an embed if the YouTube link is in a paragraph with other content.
+    data:
+      block: |
+        <p>This youtube video titled <a href="https://www.youtube.com/watch?v=y6hbrS3DheU">Operations: a developer's guide, by Anna Shipman</a> should stay as a link due to this non-link text existing in the paragraph.</p>
+  youtube_embed_disabled_by_editors:
+    description: Editors can disable YouTube link enhancement by using the `data-youtube-player="off"` HTML attribute.
+    data:
+      block: |
+        <p><a href="https://www.youtube.com/watch?v=y6hbrS3DheU" data-youtube-player="off">Operations: a developer's guide, by Anna Shipman</a></p>
   youtube_livestream:
     data:
       block: |
-        <p>This content has a YouTube livestream link, converted to an accessible embedded player by component JavaScript.</p>
+        <p>This content has a YouTube livestream 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/embed/live_stream?channel=UCoMdktPbSTixAyNGwb-UYkQ">Livestream video</a></p>

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "56.3.0".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.0
+  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: []