govuk_publishing_components 64.1.1 → 64.2.0

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

@@ -75,24 +75,20 @@ examples:
           content: |
             <p class="govuk-body-m">Here is a single piece of content, there should be no tabs.</p>
   with_data_attributes:
-    description: |
-      The example shown applies a tracking attribute specifically for use by Google Tag Manager in [Content Publisher](https://github.com/alphagov/content-publisher).
-
-      Other data attributes can also be applied as required. Note that the component does not include built in tracking. If this is required consider using the [GA4 link tracker](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/analytics-ga4/trackers/ga4-link-tracker.md).
     data:
       tabs:
         - id: "tab-with-data-attributes-1"
           label: "First section"
           title: "First section"
           tab_data_attributes:
-            tracking: GTM-123AB
+            hello: world
           content: |
             <p class="govuk-body-m">Fusce at dictum tellus, ac accumsan est. Nulla vitae turpis in nulla gravida tincidunt. Duis lectus felis, tempus id bibendum sit amet, posuere ut elit. Donec enim odio, eleifend in urna a, sagittis egestas est. Proin id ex ultricies, porta eros id, vehicula quam. Morbi non sagittis velit.</p>
         - id: "tab-with-data-attributes-2"
           label: "Second section"
           title: "Second section"
           tab_data_attributes:
-            tracking: GTM-123AB
+            hello: world
           content: |
             <p class="govuk-body-m">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam congue elementum commodo. Vestibulum elit turpis, efficitur quis posuere vitae, commodo vitae augue. Donec ut pharetra ligula. Phasellus ac mauris eu felis bibendum dapibus rutrum sed quam. Pellentesque posuere ante id consequat pretium.</p>
   without_ga4_tracking_on_tabs:

data/lib/govuk_publishing_components/presenters/contents_list_helper.rb

@@ -26,10 +26,9 @@ module GovukPublishingComponents
         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.`
+        # Must contain at least one period
         # May be a decimal `1.2`
-        number = /^\d{1,3}(\.?|\.\d{1,2})(?=\s)/.match(output)
+        number = /^\d{1,3}\.(\d{1,2})?(?=\s)/.match(output)
 
         if number
           words = output.sub(number.to_s, "").strip # remove the number from the text

data/lib/govuk_publishing_components/presenters/pagination_helper.rb

@@ -43,7 +43,7 @@ module GovukPublishingComponents
       def pages_link_helper
         return unless has_pages?
 
-        page_links = @items.each_with_index.map do |item, index|
+        page_links = @items.reject(&:blank?).each_with_index.map do |item, index|
           { href: nil, ellipsis: nil, current: nil, number: nil, visually_hidden_text: nil, **item.symbolize_keys } => { href:, ellipsis:, current:, number:, visually_hidden_text: }
 
           raise ArgumentError, "Number or ellipsis value required for item #{index}" if ellipsis.blank? && number.blank?

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "64.1.1".freeze
+  VERSION = "64.2.0".freeze
 end

data/node_modules/govuk-frontend/dist/govuk/all.bundle.js

@@ -4,7 +4,7 @@
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.GOVUKFrontend = global.GOVUKFrontend || {}));
 })(this, (function (exports) { 'use strict';
 
-  const version = '5.13.0';
+  const version = '5.14.0';
 
   function getBreakpoint(name) {
     const property = `--govuk-breakpoint-${name}`;
@@ -2255,9 +2255,9 @@
       }
       if (this.mql.matches) {
         this.$menu.removeAttribute('hidden');
-        this.$menuButton.setAttribute('hidden', '');
+        setAttributes(this.$menuButton, attributesForHidingButton);
       } else {
-        this.$menuButton.removeAttribute('hidden');
+        removeAttributes(this.$menuButton, Object.keys(attributesForHidingButton));
         this.$menuButton.setAttribute('aria-expanded', this.menuIsOpen.toString());
         if (this.menuIsOpen) {
           this.$menu.removeAttribute('hidden');
@@ -2272,6 +2272,34 @@
     }
   }
   ServiceNavigation.moduleName = 'govuk-service-navigation';
+  const attributesForHidingButton = {
+    hidden: '',
+    'aria-hidden': 'true'
+  };
+
+  /**
+   * Sets a group of attributes on the given element
+   *
+   * @param {Element} $element - The element to set the attribute on
+   * @param {{[attributeName: string]: string}} attributes - The attributes to set
+   */
+  function setAttributes($element, attributes) {
+    for (const attributeName in attributes) {
+      $element.setAttribute(attributeName, attributes[attributeName]);
+    }
+  }
+
+  /**
+   * Removes a list of attributes from the given element
+   *
+   * @param {Element} $element - The element to remove the attributes from
+   * @param {string[]} attributeNames - The names of the attributes to remove
+   */
+  function removeAttributes($element, attributeNames) {
+    for (const attributeName of attributeNames) {
+      $element.removeAttribute(attributeName);
+    }
+  }
 
   /**
    * Skip link component