govuk_publishing_components 67.0.1 → 67.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99b5db78e9403ab8185c70ca380baef82323d8b796ff3004e02f0fbe720dc31f
-  data.tar.gz: f7c44b0435078b223f65e05a4ea1923dcfb4bfe9e62f8fca42192771846f0ed6
+  metadata.gz: a12344674cf0cfd1049d50b15532e6d0f01031c754ac5d1331621917a2ccd695
+  data.tar.gz: 16356b2c3df1aefc42d7eeb114c0fb6180c102e680c5f271b8cb955caf51f8da
 SHA512:
-  metadata.gz: b71db86bb78921c84cb12c66812fcc7c0165c209c555aab17fcf948f78842681ff60159b487093112c221dcbd1c64c94776b1b91924da235bf030fc2bedb42b1
-  data.tar.gz: 19c4818c51a9cbfeeb67bfbcc9913aa0050b2114a0e2b013f278f32e9f6500b0e65d54fae811ee7ffc05b21be88db892711acc3a2bf8afe9fe4873968de373c1
+  metadata.gz: c84332e25080f8ca2998712a619160a5045a8bc15104f2c5f4373f9b1cd51fea0b092a2a5587f06e538a6d32d7f6f7e551363293feb806fa86f32c7713e31811
+  data.tar.gz: 5917c52f8b7ceb1ab7ba69a4fae8782624cac4e18027e661fe795dc7bd4662563a028a9dd1d82a0b940ccfb1e66c1124a952991e6cb5050d0386559cdf432ca9

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

@@ -4,7 +4,7 @@
   service_navigation_items ||= []
 %>
 
-<header class="gem-c-cross-service-header gem-c-rebranded-cross-service-header" data-module="cross-service-header">
+<div class="gem-c-cross-service-header gem-c-rebranded-cross-service-header" data-module="cross-service-header">
   <%= render "govuk_publishing_components/components/cross_service_header/one_login_header", {
     one_login_navigation_items: one_login_navigation_items,
   } %>
@@ -12,4 +12,4 @@
     service_name: service_name,
     navigation_items: service_navigation_items,
   } %>
-</header>
+</div>

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

@@ -81,27 +81,29 @@
       <% end %>
     <% end %>
     <% unless omit_header %>
-      <% if show_cross_service_header %>
-        <%= render "govuk_publishing_components/components/cross_service_header", {
-          one_login_navigation_items: one_login_navigation_items,
-          service_navigation_items: service_navigation_items,
-          service_name: service_name,
-        } %>
-      <% else %>
-        <% I18n.with_locale(:en) do %>
-          <%= render "govuk_publishing_components/components/layout_super_navigation_header", {
-            homepage:,
-            logo_link:,
-            phase_banner:,
+      <%= tag.header do %>
+        <% if show_cross_service_header %>
+          <%= render "govuk_publishing_components/components/cross_service_header", {
+            one_login_navigation_items: one_login_navigation_items,
+            service_navigation_items: service_navigation_items,
+            service_name: service_name,
           } %>
+        <% else %>
+          <% I18n.with_locale(:en) do %>
+            <%= render "govuk_publishing_components/components/layout_super_navigation_header", {
+              homepage:,
+              logo_link:,
+              phase_banner:,
+            } %>
+          <% end %>
         <% end %>
-      <% end %>
-    <% end %>
 
-    <%= raw(emergency_banner) %>
+        <%= raw(emergency_banner) %>
 
-    <% if global_banner.present? %>
-      <%= raw(global_banner) %>
+        <% if global_banner.present? %>
+          <%= raw(global_banner) %>
+        <% end %>
+      <% end %>
     <% end %>
 
     <% if show_account_layout %>

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

@@ -38,7 +38,7 @@
   component_helper.add_class("gem-c-layout-super-navigation-header")
   component_helper.add_data_attribute({ module: "ga4-event-tracker ga4-link-tracker", ga4_expandable: "" })
 %>
-<%= tag.header(**component_helper.all_attributes) do %>
+<%= tag.div(**component_helper.all_attributes) do %>
 <div class="gem-c-layout-super-navigation-header__nav-wrapper">
   <div class="gem-c-layout-super-navigation-header__container govuk-width-container">
     <nav

data/app/views/govuk_publishing_components/components/attachment/_thumbnail_external.html.erb

@@ -1,3 +1,3 @@
-<svg class="gem-c-attachment__thumbnail-image gem-c-attachment__thumbnail-image--external" version="1.1" viewBox="0 0 99 140" aria-hidden="true">
+<svg class="gem-c-attachment__thumbnail-image gem-c-attachment__thumbnail-image--external" version="1.1" viewBox="0 0 99 140" width="99" height="140" aria-hidden="true">
   <path fill-rule="evenodd" clip-rule="evenodd" d="M21 59H12V68H21V59ZM30 86V77H69V86H30ZM87 104H30V95H87V104ZM78 122H30V113H78V122ZM21 86H12V77H21V86ZM21 122H12V113H21V122ZM21 104H12V95H21V104ZM87 68H30V59H87V68ZM87 39V12H12V39H87ZM77.9699 29.2919H77.9202L75.2756 17H71.2279L68.5088 29.2919H68.4591L66.1249 17H62.2014L66.1746 34.8047H70.5699L73.2145 22.0409L75.9088 34.8047H80.3289L84.3021 17H80.391L77.9699 29.2919ZM53.8195 29.2919H53.8692L56.2903 17H60.2014L56.2282 34.8047H51.8081L49.1138 22.0409L46.4692 34.8047H42.0739L38.1007 17H42.0242L44.3584 29.2919H44.4081L47.1272 17H51.1749L53.8195 29.2919ZM29.7684 29.2919H29.7188L27.0742 17H23.0265L20.3074 29.2919H20.2577L17.9235 17H14L17.9732 34.8047H22.3685L25.0131 22.0409L27.7074 34.8047H32.1275L36.1007 17H32.1896L29.7684 29.2919Z" />
 </svg>

data/app/views/govuk_publishing_components/components/attachment/_thumbnail_pdf.html.erb

@@ -1,3 +1,3 @@
-<svg class="gem-c-attachment__thumbnail-image gem-c-attachment__thumbnail-image--pdf" version="1.1" viewBox="0 0 99 140">
+<svg class="gem-c-attachment__thumbnail-image gem-c-attachment__thumbnail-image--pdf" version="1.1" viewBox="0 0 99 140" width="99" height="140" aria-hidden="true">
   <path d="M12,59h9v9h-9v-9ZM30,77v9h39v-9H30ZM30,104h57v-9H30v9ZM30,122h48v-9H30v9ZM12,86h9v-9h-9v9ZM12,122h9v-9h-9v9ZM12,104h9v-9h-9v9ZM30,68h57v-9H30v9ZM35.2,21c-.3-.2-.6-.4-1-.5s-.8-.2-1.3-.2h-2.6v5.5h2.6c.5,0,1,0,1.3-.2s.7-.3,1-.5c.3-.2.5-.5.7-.8s.2-.7.2-1.1h0c0-.5,0-.9-.2-1.2-.2-.3-.4-.6-.7-.8h0ZM52.4,21.9c-.4-.5-1-.9-1.6-1.1-.7-.3-1.5-.4-2.4-.4h-2.7v11.5h2.7c.9,0,1.7-.1,2.4-.4s1.2-.7,1.6-1.1c.4-.5.7-1.1.9-1.7.2-.7.3-1.4.3-2.1v-.7c0-.8,0-1.5-.3-2.1-.2-.6-.5-1.2-.9-1.7h0ZM87,12v27H12V12h75ZM39.8,23c0-.9-.1-1.6-.4-2.4-.3-.7-.7-1.4-1.2-1.9-.5-.5-1.2-1-1.9-1.2-.8-.3-1.6-.5-2.5-.5h-7.2v17.9h3.6v-6h3.2c.9,0,1.8-.1,2.6-.5.8-.3,1.4-.7,2-1.2.5-.5,1-1.2,1.3-1.9.3-.7.5-1.5.5-2.4h0ZM57.4,26c0-1.3-.2-2.6-.5-3.7s-.9-2-1.6-2.8c-.7-.8-1.6-1.4-2.7-1.8-1.1-.4-2.3-.6-3.8-.6h-6.6v17.9h6.6c1.5,0,2.7-.2,3.8-.6,1.1-.4,2-1,2.7-1.8.7-.8,1.3-1.7,1.6-2.8.4-1.1.5-2.3.5-3.7h0ZM72.4,17.1h-12.1v17.9h3.6v-7.5h7.8v-3.3h-7.8v-3.8h8.4s0-3.3,0-3.3Z" />
 </svg>

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

@@ -25,7 +25,6 @@ accessibility_criteria:
 govuk_frontend_components:
   - service-navigation
 accessibility_excluded_rules:
-  - landmark-banner-is-top-level
   - duplicate-id-aria
   - landmark-no-duplicate-banner
   - landmark-unique

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

@@ -12,6 +12,7 @@ accessibility_criteria: |
     * have a `lang` attribute
     * contain a [skip link](/component-guide/skip_link)
     * have a sensible page `<title>`
+    * contain a `<header>` element
 examples:
   default:
     data:
@@ -47,11 +48,11 @@ examples:
         href: "item-3"
         show_only_in_collapsed_menu: true
   with_global_banner:
-    description: This allows the HTML for the global banner to be added to the page. This is only the slot for the global banner - the markup for the banner needs to be passed in.
+    description: This allows the HTML for the global banner to be added to the page within the header element. This is only the slot for the global banner - the markup for the banner needs to be passed in.
     data:
       global_banner: <div class="govuk-!-padding-top-5 govuk-!-padding-bottom-3">This is the global banner slot</div>
   with_emergency_banner:
-    description: This allows the HTML for the emergency banner to be added to the page in the correct place. This is only the slot for the emergency banner - the markup for the banner needs to be passed in.
+    description: This allows the HTML for the emergency banner to be added to the page within the header element. This is only the slot for the emergency banner - the markup for the banner needs to be passed in.
     data:
       emergency_banner: <div class="govuk-!-padding-top-3 govuk-!-padding-bottom-3">This is the emergency banner slot</div>
   with_phase_banner:
@@ -61,13 +62,33 @@ examples:
         phase: "beta"
         message: "This is a custom test message for the public layout phase banner."
   with_all_banners:
-    description: The phase banner, global banner and emergency banner should be usable together.
+    description: The phase banner, global banner and emergency banner should be usable together within the header element.
     data:
       phase_banner:
           phase: "beta"
           message: "This is the phase banner banner"
       emergency_banner: <div class="govuk-!-padding-top-3 govuk-!-padding-bottom-3">This is the emergency banner slot</div>
       global_banner: <div class="govuk-!-padding-top-5 govuk-!-padding-bottom-3">This is the global banner slot</div>
+  with_cross_service_header:
+    description: Passes the navigation through to the [cross service header](/component-guide/cross_service_header/).
+    data:
+      show_cross_service_header: true
+      service_name: "My Service Name"
+      one_login_navigation_items:
+        one_login_home:
+          href: "#"
+        one_login_sign_out:
+          href: "#"
+        navigation_items: []
+      service_navigation_items:
+        - text: Navigation item 1
+          href: "item-1"
+          active: true
+        - text: Navigation item 2
+          href: "item-2"
+        - text: Hidden on desktop
+          href: "item-3"
+          show_only_in_collapsed_menu: true
   with_account_layout_enabled:
     description: Adds account layout wrapper around the content passed in to the component
     data:

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

@@ -16,10 +16,8 @@ accessibility_criteria: |
 
   Landmarks and Roles in the super navigation header should:
 
-  * have a role of banner at the root of the component (<header>) (ARIA 1.1)
+  * sit within the primary header element (<header>) provided by the page layout
 accessibility_excluded_rules:
-   # The header element can not be top level in the examples.
-  - landmark-banner-is-top-level
   # Banners will be duplicated in component examples list.
   - duplicate-id
   - duplicate-id-active

data/config/locales/cy.yml

@@ -80,15 +80,15 @@ cy:
       aria_label:
       england:
         end: " a Lloegr"
-        middle: ", Lloegr"
+        middle: "Lloegr"
         start: Loegr
       northern_ireland:
         end: " a Gogledd Iwerddon"
-        middle: ", Gogledd Iwerddon"
+        middle: "Gogledd Iwerddon"
         start: Ogledd Iwerddon
       scotland:
         end: " a'r Alban"
-        middle: ", yr Alban"
+        middle: "yr Alban"
         start: "'r Alban"
       type:
         consultation: Ymgynghoriad ar gyfer %{nation}
@@ -97,7 +97,7 @@ cy:
         publication: Cyhoeddiad ar gyfer %{nation}
       wales:
         end: " a Chymru"
-        middle: ", Cymru"
+        middle: "Cymru"
         start: Gymru
     feedback:
       close: Cau

data/config/locales/en.yml

@@ -75,15 +75,15 @@ en:
       aria_label: Nation
       england:
         end: " and England"
-        middle: ", England"
+        middle: "England"
         start: England
       northern_ireland:
         end: " and Northern Ireland"
-        middle: ", Northern Ireland"
+        middle: "Northern Ireland"
         start: Northern Ireland
       scotland:
         end: " and Scotland"
-        middle: ", Scotland"
+        middle: "Scotland"
         start: Scotland
       type:
         consultation: Consultation for %{nation}
@@ -92,7 +92,7 @@ en:
         publication: Publication for %{nation}
       wales:
         end: " and Wales"
-        middle: ", Wales"
+        middle: "Wales"
         start: Wales
     feedback:
       close: Cancel

data/lib/govuk_publishing_components/presenters/devolved_nations_helper.rb

@@ -15,15 +15,16 @@ module GovukPublishingComponents
         nation_keys.each_with_index.map { |k, i| name_for_position(k, i, nation_keys.count, use_english_translation) }.join
       end
 
-      def name_for_position(nation, position, total, use_english_translation)
+      def name_for_position(nation, position, total, use_english_translation, cy_initial_mutation: true)
         key = if position.zero?
-                :start
+                cy_initial_mutation ? :start : :middle
               elsif position == (total - 1)
                 :end
               else
                 :middle
               end
-        I18n.t("components.devolved_nations.#{nation}.#{key}", locale: use_english_translation ? :en : nil)
+        name = I18n.t("components.devolved_nations.#{nation}.#{key}", locale: use_english_translation ? :en : nil)
+        position.zero? || position == (total - 1) ? name : ", #{name}"
       end
 
       def ga4_applicable_nations_title_text(remove_connector_word = nil)
@@ -41,7 +42,7 @@ module GovukPublishingComponents
 
         url_to_nation_keys.transform_values do |nation_keys|
           nations_text = nation_keys.each_with_index.map { |key, index|
-            name_for_position(key, index, nation_keys.count, true)
+            name_for_position(key, index, nation_keys.count, false, cy_initial_mutation: false)
           }.join
 
           alternative_content_text(nations_text)

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "67.0.1".freeze
+  VERSION = "67.1.0".freeze
 end

metadata

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