govuk_publishing_components 38.3.0 → 38.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a962544f5f3b684f7f946008d73fc0c4d266147adeb86761b2fafbdf9f77713
-  data.tar.gz: 3c14a82d4308f941d8dc7ac0990c8a504b1ada7dcd84666b2140a4bcdba01b79
+  metadata.gz: 174edc8aff1507967b48ea3efcec2a79d56c22adbf64f5414d2d758603fb0ef5
+  data.tar.gz: 0ce85ca601099c9341c2e956fef04e5fb1dbea78ffdc298a997e287423d21c8e
 SHA512:
-  metadata.gz: 2b237ac3408f80f1fd42d810e48a8d30e164d0fbd61b0e1e8314bf16d4b6e17809a0d3dc5a0c4ee4dbb4369a80f402244ed5ff6201779426e02e459c416567fe
-  data.tar.gz: 7c74c53993d223235c04646f52f5e894f077486ce04d7cf82ddedf73b3e0800d225ea69b75cb0516a6bdfa0c6bdabe1690594aef0643d55b1c1b88cc8db98960
+  metadata.gz: d47f8dd957ff9d95f2c118aa7d747e4c43ef7dbf95dc80636d6c2583e925235370ca0f246d1be53bb83bf8bf90633e46e859c79fadf303779a886567c76e1528
+  data.tar.gz: 9e38d46ac5722147f3f48ffecb1d5d08b3ae93ca4117c48792a3e8903561a84947e7c1d5e32d3d66ef1413519bf7c30e8bb8424b54d2af0b3d005c5cd93a6bca

data/app/assets/javascripts/govuk_publishing_components/components/feedback.js

@@ -161,8 +161,10 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     this.prompt.hidden ? this.prompt.hidden = false : this.prompt.hidden = true
 
     if (!this.activeForm.hidden) {
-      this.activeForm.querySelectorAll('.gem-c-textarea .govuk-textarea, .gem-c-input.govuk-input')[0]
-        .focus()
+      var input = this.activeForm.querySelectorAll('.gem-c-textarea .govuk-textarea, .gem-c-input.govuk-input')
+      if (input.length > 0) {
+        input[0].focus()
+      }
     } else {
       this.activeForm = false
       clearInterval(this.timerInterval)

data/app/views/govuk_publishing_components/components/metadata/_sentence.html.erb

@@ -7,7 +7,7 @@
   end
 %>
 <% if remaining.any? %>
-  <%= items.to_sentence(last_word_connector: ', ').html_safe %>
+  <%= items.to_sentence(last_word_connector: ' and ').html_safe %>
   <div class="gem-c-metadata__toggle-wrap govuk-!-display-none-print">
     <a href="#"
        class="gem-c-metadata__definition-link govuk-!-display-none-print"
@@ -21,5 +21,5 @@
   </div>
   <span id="toggle-<%= toggle_id %>" class="gem-c-metadata__toggle-items js-hidden"><%= remaining.to_sentence.html_safe %></span>
 <% else %>
-  <%= items.to_sentence.html_safe %>
+  <%= items.to_sentence(last_word_connector: ' and ').html_safe %>
 <% end %>

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "38.3.0".freeze
+  VERSION = "38.3.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 38.3.0
+  version: 38.3.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-10 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config