govuk_publishing_components 57.2.0 → 57.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc35380bef3675b6001b4827358013c9c54218a696fbe7170625d5c0c9f33bdd
-  data.tar.gz: 77f96614f15a6e7978e3265bf3f3275e25826f7cd3a629cc90bbb55cb2675c30
+  metadata.gz: 41a446b912bf0ceb75ba5700eeff0f6d91b976039d175fe9262e44ed75fbd420
+  data.tar.gz: 18c75d217261b9b6793f251cc2020fa785da20f31aa47ada9721dbb642a4ccb8
 SHA512:
-  metadata.gz: 765da3cf1fb7d292acb42f840bc373166360790f30cb869334629750042fe0e7869ff310115e21019757f8bce65f5b3ad6e2ecaca1ac5f06d39f93592370d4ac
-  data.tar.gz: fe864e55147fd9faf3986d951c5af9b91d96c218563b2a1a080fb742c14ed0aca1dddc3ec01e281259a32e628cc0745644c54ab7ed558c87e62066c44818d582
+  metadata.gz: d3ee818d7df8773727db46921ba33a905de236ed76b4a3c00d5aad2394cf26513fbc6a1039926e7ac29466ec98d1e25b98701d49cfcd10e7c663abb1f23aaaf9
+  data.tar.gz: 46bb83df7af008ed114877f485b4888789c1e72b7876692c10a025e631df2391a99ee4c631e5d5ec3325c3a517d8cda520e20fd4c2832d6dc0d900e75577afcd

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

@@ -150,8 +150,8 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
       For example, .csv/preview or .mp4/preview will be matched.
       Regex is used over JS string methods as this should work with anchor links, query string parameters and files that may have 'preview' in their name.
       */
-      var previewRegex = /\.\w+\/preview/i
-      return previewRegex.test(href) || href.startsWith('https://www.gov.uk/csv-preview/')
+      var previewRegex = /\.\w+\/preview|(\/csv-preview\/)/i
+      return previewRegex.test(href)
     },
 
     hrefPointsToDownloadPath: function (href) {

data/app/assets/javascripts/govuk_publishing_components/components/reorderable-list.js

@@ -25,8 +25,9 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
           if (eventData) {
             item.dataset.ga4Event = eventData.dataset.ga4Event
+            item.dataset.indexSection = event.oldIndex
             item.dataset.action = 'drag and drop'
-            item.dataset.text = event.newIndex > event.oldIndex ? 'Up' : 'Down'
+            item.dataset.text = event.newIndex > event.oldIndex ? 'Down' : 'Up'
             this.triggerEvent(item, 'click')
             delete item.dataset.ga4Event
           }

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

@@ -20,7 +20,7 @@
   }
 
   YoutubeLinkEnhancement.prototype.paragraphHasOtherContent = function (paragraph, link) {
-    return paragraph.innerHTML.replaceAll(this.punctuationRegex, '') !== link.outerHTML.replaceAll(this.punctuationRegex, '')
+    return paragraph.innerHTML.replaceAll(this.punctuationRegex, '').trim() !== link.outerHTML.replaceAll(this.punctuationRegex, '').trim()
   }
 
   YoutubeLinkEnhancement.prototype.decorateLink = function () {
@@ -222,6 +222,17 @@
     }
   }
 
+  YoutubeLinkEnhancement.sanitiseVideoId = function (pathname) {
+    // YouTube links can now contain an ?si= param in the URL.
+    // This usually only appears on youtu.be links but it's appearing for us on youtube.com URLs due to some Whitehall regex being outdated.
+    // Therefore we need to use regex to remove it from the path.
+    // E.g. youtube.com/watch?v=[video-id]?si=ABCzJtVWBAZ2o_l3
+    // ?=si in this case isn't a valid query parameter as it isn't using an &, so we can't use JS' native URL API to filter it out.
+    if (pathname) {
+      return pathname.replace(/(\?|&)(.+)=.+/g, '')
+    }
+  }
+
   // This is a public class method so it can be used outside of this embed to
   // check that user input for videos will be supported in govspeak
   YoutubeLinkEnhancement.parseVideoId = function (url) {
@@ -232,9 +243,10 @@
     } catch (e) { return undefined }
 
     if (u.host === 'www.youtube.com' || u.host === 'youtube.com') {
-      return u.searchParams.get('v') || undefined
+      return this.sanitiseVideoId(u.searchParams.get('v')) || undefined
     } else if (u.host === 'youtu.be') {
-      return u.pathname.slice(1) // Trim the leading /
+      var pathName = u.pathname.slice(1) // Trim the leading /
+      return this.sanitiseVideoId(pathName)
     }
   }
 

data/app/models/govuk_publishing_components/audit_comparer.rb

@@ -6,7 +6,6 @@ module GovukPublishingComponents
       if gem_data[:gem_found]
         @applications_using_static = %w[
           collections
-          feedback
           finder-frontend
           frontend
           government-frontend

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

@@ -7,12 +7,16 @@
   name ||= id
   is_page_heading ||= false
   data_attributes ||= {}
+  aria_controls ||= nil
 
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
   heading_size = false unless shared_helper.valid_heading_size?(heading_size)
   select_helper = GovukPublishingComponents::Presenters::SelectHelper.new(local_assigns)
 
-  aria_describedby = { describedby: select_helper.describedby }
+  aria_attributes = {
+    controls: aria_controls,
+    describedby: select_helper.describedby
+  }
 %>
 <% if select_helper.options.any? && id && label %>
   <%= content_tag :div, class: select_helper.css_classes do %>
@@ -40,6 +44,6 @@
       } %>
     <% end %>
 
-    <%= select_tag name, options_for_select(select_helper.option_markup, select_helper.selected_option), id: id, class: select_helper.select_classes, aria: aria_describedby, data: data_attributes %>
+    <%= select_tag name, options_for_select(select_helper.option_markup, select_helper.selected_option), id: id, class: select_helper.select_classes, aria: aria_attributes, data: data_attributes %>
   <% end %>
 <% end %>

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

@@ -150,7 +150,7 @@ examples:
         url: '/government/organisations/hm-prison-service'
         brand: 'ministry-of-justice'
         image:
-          url: 'https://assets.publishing.service.gov.uk/government/uploads/system/uploads/organisation/logo/321/HMPS.jpg'
+          url: 'https://assets.publishing.service.gov.uk/media/6850134301d3b0e7b62da740/hmps_25_gov_240x188.png'
           alt_text: 'HM Prison Service'
   without_a_link:
     data:

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

@@ -42,6 +42,19 @@ examples:
         selected: true
       - text: Option three
         value: option3
+  with_disabled_options:
+    description: Options can be disabled using the `disabled` parameter. Note that it is possible to have an option that is both disabled and selected.
+    data:
+      id: dropdown2-0
+      label: Option 3 disabled
+      options:
+      - text: Option one
+        value: option1
+      - text: Option two
+        value: option2
+      - text: Option three
+        value: option3
+        disabled: true
   with_hint:
     description: When a hint is included the `aria-describedby` attribute of the select is included to point to the hint. When an error and a hint are present, that attribute includes the IDs of both the hint and the error.
     data:
@@ -54,6 +67,18 @@ examples:
         value: option1
       - text: Something else
         value: option2
+  with_aria_controls:
+    data:
+      id: dropdown4-4
+      label: My Dropdown
+      aria_controls: dropdown4-3
+      options:
+      - text: Option one
+        value: option1
+      - text: Option two
+        value: option2
+      - text: Option three
+        value: option3
   with_data_attributes:
     description: Data attributes can be passed to the select component if needed.
     data:

data/lib/govuk_publishing_components/presenters/select_helper.rb

@@ -44,13 +44,15 @@ module GovukPublishingComponents
           [
             option[:text],
             option[:value],
-            options_data_attribute(option[:data_attributes]),
+            options_extra_attributes(option[:data_attributes], option[:disabled]),
           ]
         end
       end
 
-      def options_data_attribute(attributes)
-        return {} if attributes.nil?
+      def options_extra_attributes(attributes, disabled)
+        attrs = {}
+        attrs[:disabled] = true if disabled
+        return attrs if attributes.nil?
 
         attrs = {}
         attributes.each do |key, value|

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "57.2.0".freeze
+  VERSION = "57.3.1".freeze
 end

metadata

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