govuk_publishing_components 46.1.0 → 46.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f03b029ded187ef6bc1d3636720d1b32d082a568588faeccb69723311c06360
-  data.tar.gz: 197e40d2e9dbc9ef47e76ae1c72b7d63a7b4255fdbb01f31dcc21bd234bb6099
+  metadata.gz: 8a75bcb074cc5edf15955ec4a071e6d74e6984ee21d6d3e72293d587427da46a
+  data.tar.gz: 52fa477353b3ea17d59cb2c0ab27fef05a84b8850b3161faf68502d5e7873393
 SHA512:
-  metadata.gz: 7eede3b4acf9222bef3047b69fa3fe9c5190fb63277416188ed516990723ae35eec50fdc88594c6199e287500746fadf1181122f8bdbb95608382451a1f1f8ab
-  data.tar.gz: fe53d16fc472cb5dbee4e80b76eb61b5619d16224afdfd7ea751514d30a6604a82aa4c84ed7c8e057268e66be6a500618c37c0e42a6d8db17b17b8a2bc2f60ff
+  metadata.gz: bc69bdcd45eaa41ee2a5a9bd42b969b8d1344e0eb232d09268d93da2ff28eb57737c8baaa127531fe9763cd4fb29e94ad609ec538ca99c37512d609604adbcdf
+  data.tar.gz: ba7b791951b7fe631e8ededa5309fcf5caf0d43a2481b15bce8a308c9f22b04db24e54048fca93ac0c740a0f55ecd6136a30a8cbecad8c004a163a58f79b6394

data/app/models/govuk_publishing_components/audit_components.rb

@@ -262,12 +262,6 @@ module GovukPublishingComponents
           match: /(GovukPublishingComponents::Presenters::ComponentWrapperHelper.new)/,
           used_by: [],
         },
-        {
-          name: "Heading helper",
-          link: "lib/govuk_publishing_components/presenters/heading_helper.rb",
-          match: /(GovukPublishingComponents::Presenters::HeadingHelper.new)/,
-          used_by: [],
-        },
         {
           name: "Shared helper",
           link: "lib/govuk_publishing_components/presenters/shared_helper.rb",

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

@@ -2,16 +2,15 @@
   add_gem_component_stylesheet("previous-and-next-navigation")
   disable_ga4 ||= false
 
+  component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
+  component_helper.add_class("govuk-pagination govuk-pagination--block")
+  component_helper.add_role("navigation")
+  component_helper.add_aria_attribute({ label: t("components.previous_and_next_navigation.pagination") })
+  component_helper.add_data_attribute({ module: "ga4-link-tracker" }) unless disable_ga4
+
   if local_assigns.include?(:next_page) || local_assigns.include?(:previous_page)
 %>
-  <nav
-    class="govuk-pagination govuk-pagination--block"
-    role="navigation"
-    aria-label="<%= t("components.previous_and_next_navigation.pagination") %>"
-    <% unless disable_ga4 %>
-      data-module="ga4-link-tracker"
-    <% end %>
-  >
+  <%= tag.nav(**component_helper.all_attributes) do %>
     <% if local_assigns.include?(:previous_page) %>
       <%
         title = previous_page[:title] || t("components.previous_and_next_navigation.previous")
@@ -73,5 +72,5 @@
         </a>
       </div>
     <% end %>
-  </nav>
+  <% end %>
 <% end %>

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

@@ -3,16 +3,18 @@
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
   disable_ga4 ||= false
   ga4_type = local_assigns[:context] == :footer ? "contextual footer" : "related content"
-  data = {}
-  data[:module] = "ga4-link-tracker" unless disable_ga4
   ga4_tracking_counts ||= OpenStruct.new(index_section_count: 0)
   ga4_tracking_counts.index_section_count += related_nav_helper.index_section_count
 
+  component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
+  component_helper.add_class("gem-c-related-navigation govuk-!-display-none-print")
+  component_helper.add_data_attribute({ module: "ga4-link-tracker" }) unless disable_ga4
+
   add_gem_component_stylesheet("related-navigation")
 %>
 <% if related_nav_helper.related_navigation? %>
   <% random = SecureRandom.hex(4) %>
-  <%= tag.div(class: "gem-c-related-navigation govuk-!-display-none-print", data: data) do %>
+  <%= tag.div(**component_helper.all_attributes) do %>
     <% if local_assigns[:context] != :footer %>
       <h2 id="related-nav-related_items-<%= random %>"
           class="gem-c-related-navigation__main-heading"

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

@@ -3,7 +3,6 @@
   add_gem_component_stylesheet("label")
 
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
-  heading_helper = GovukPublishingComponents::Presenters::HeadingHelper.new(local_assigns)
 
   aria_controls ||= nil
   button_text ||= t("components.search_box.search_button")

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

@@ -19,6 +19,7 @@ accessibility_criteria: |
   - identify itself as pagination navigation
   - provide a distinction between the navigation text and label text of the links both visually and for screenreaders
 
+uses_component_wrapper_helper: true
 shared_accessibility_criteria:
   - link
 accessibility_excluded_rules:

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

@@ -3,6 +3,7 @@ description: Component showing related content, including topics, guidance and c
 accessibility_criteria: |
   - Should have a role of 'navigation' on any navigation elements inside the component
   - Should be marked up as navigation and not as tangential content
+uses_component_wrapper_helper: true
 shared_accessibility_criteria:
   - link
 accessibility_excluded_rules:

data/config/locales/cy.yml

@@ -70,9 +70,9 @@ cy:
     devolved_nations:
       applies_to: Yn berthnasol i
       connectors:
-        last_word:
-        two_words:
-      england:
+        last_word: " a "
+        two_words: " a "
+      england: Loegr
       northern_ireland:
       scotland:
       type:

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "46.1.0".freeze
+  VERSION = "46.2.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 46.1.0
+  version: 46.2.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-02 00:00:00.000000000 Z
+date: 2024-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick