govuk_publishing_components 39.2.0 → 39.2.1

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

@@ -42,7 +42,7 @@
       <% contents.each.with_index(1) do |contents_item, position| %>
         <li class="<%= cl_helper.list_item_classes(contents_item, false) %>" <%= "aria-current=true" if contents_item[:active] %>>
           <span aria-hidden="true"></span>
-          <% link_text = format_numbers ? cl_helper.wrap_numbers_with_spans(contents_item[:text]) : contents_item[:text]
+          <% link_text = format_numbers ? cl_helper.wrap_numbers_with_spans(contents_item[:text]) : cl_helper.clean_string(contents_item[:text])
             unless disable_ga4
               ga4_data[:event_name] = cl_helper.get_ga4_event_name(contents_item[:href]) if contents_item[:href]
               ga4_data[:index_link] = index_link

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

@@ -88,7 +88,7 @@ examples:
       format_numbers: true
       contents:
         - href: "#first-thing"
-          text: 1. First thing
+          text: 1. First thing
         - href: "#two"
           active: true
           text: 2. Second thing

data/lib/govuk_publishing_components/presenters/contents_list_helper.rb

@@ -22,24 +22,31 @@ module GovukPublishingComponents
         list_item_classes
       end
 
-      def wrap_numbers_with_spans(content_item_link)
-        content_item_text = strip_tags(content_item_link) # just the text of the link
-        content_item_text_stripped = content_item_text.strip # strip trailing spaces for the regex. Keep original content_item_text for the string replacement.
+      def wrap_numbers_with_spans(link_text)
+        output = clean_string(link_text)
         # Must start with a number
         # Number must be between 1 and 999 (ie not 2014)
         # Must be followed by a space
         # May contain a period `1.`
         # May be a decimal `1.2`
-        number = /^\d{1,3}(\.?|\.\d{1,2})(?=\s)/.match(content_item_text_stripped)
+        number = /^\d{1,3}(\.?|\.\d{1,2})(?=\s)/.match(output)
 
         if number
-          words = content_item_text.sub(number.to_s, "").strip # remove the number from the text
-          content_item_link.sub(content_item_text, "<span class=\"gem-c-contents-list__number\">#{number} </span><span class=\"gem-c-contents-list__numbered-text\">#{words}</span>").squish.html_safe
+          words = output.sub(number.to_s, "").strip # remove the number from the text
+          # the space in the first span is needed for screen readers
+          "<span class=\"gem-c-contents-list__number\">#{number} </span><span class=\"gem-c-contents-list__numbered-text\">#{words}</span>".squish.html_safe
         else
-          content_item_link
+          output
         end
       end
 
+      def clean_string(text)
+        text = text.gsub(/&nbsp;/, " ")
+        text = text.gsub("/\u00a0/", " ")
+        text = text.gsub(160.chr("UTF-8"), " ")
+        strip_tags(text.tr("\n", "")).strip
+      end
+
       def get_index_total
         total = @contents.length
         @contents.each do |parent|

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "39.2.0".freeze
+  VERSION = "39.2.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 39.2.0
+  version: 39.2.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-01 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config