govuk_publishing_components 47.0.0 → 48.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd401f42bccab58df5ab5fb8d73e8faca9662f68038087b3fe103f0fd383bd21
-  data.tar.gz: 14202a57ad52922b57252c5484bfe7540dbc0d1e2c83690881bf4aed17cc185b
+  metadata.gz: 36a9c949e5b0818fd9a88c6e3d391589f2856b2354b061526323ee0da268663b
+  data.tar.gz: 9e50cfbc67ab2a7ad2be57cc08de07d962555de601f760a1737f99100fb20608
 SHA512:
-  metadata.gz: ef6d0b85a5a028746ca5df2d9dd301cae0401b22d3b9aac4bad2beeeba292ba128940284539b68c1ccc9d6ecd175ab9173bb4e7e49e411f2d252b3a53dda17e9
-  data.tar.gz: 9692404de6256b99bd839ab47e7dd26b52d3641cf51c503caa7d530a7c5a98cf826e47af9deb3f26701805ff8048e9ba2bb2824d69988388cce1ae3412bb294c
+  metadata.gz: d43bd8d3c8c0f58404798658c83e7b5349776b123dd1f3be9f9b380a8124ee510fce6d36ffbc634f33cdd0f4c5f7a4be2002a6c1225869e5289ab9f1c9c65183
+  data.tar.gz: a26a44f9bc7ba5b824d9f145662675935cf329f8cb98cfd076f217b18b1e2a557aff6df08b8bc03dc3c84f1d0b90330eb26c211569a3d99d3836bb765b4e5fe2

data/app/assets/javascripts/govuk_publishing_components/rum-custom-data.js

@@ -0,0 +1,18 @@
+(function () {
+  /* global LUX, performance */
+  if (typeof LUX === 'undefined') { return }
+
+  const navigationPerformance = performance.getEntriesByType('navigation')[0]
+  if (!navigationPerformance) { return }
+
+  // As per RFC 147[1], this adds in monitoring of the type of HTTP protocol that
+  // is used when a browser loads a page.
+  // [1]: https://github.com/alphagov/govuk-rfcs/pull/148
+  LUX.addData('http-protocol', navigationPerformance.nextHopProtocol)
+
+  const serverTiming = navigationPerformance.serverTiming
+  if (serverTiming) {
+    const cacheState = serverTiming.find(entry => ['cacheHit', 'cacheMiss'].includes(entry.name))
+    if (cacheState) { LUX.addData('cache', cacheState.name) }
+  }
+}())

data/app/assets/javascripts/govuk_publishing_components/vendor/lux/lux-measurer.js

@@ -157,40 +157,3 @@ if (
     LongTaskObserver.observe({ type: ["longtask"] });
   } catch (e) {}
 }
-
-// As per RFC 147[1], this adds in monitoring of the type of HTTP protocol that
-// is used when a browser loads a page.
-//
-// The User Timing API (aka window.performance) is used to record the data - to
-// avoid the use of this from breaking the JavaScript for the small number of
-// browsers that don't support it, it's been wrapped in a try/catch block plus a
-// couple of checks to prevent "is not defined" errors.
-//
-// Because the `nextHopProtocol` isn't immediately available - it seems to need
-// a request to be made before it's populated - we need to wait for the
-// `DOMContentReady` event before we can see what the HTTP version is.
-//
-// [1]: https://github.com/alphagov/govuk-rfcs/pull/148
-
-var measureHTTPProtocol = function () {
-  var getEntriesByType = performance.getEntriesByType('navigation')
-
-  if (typeof getEntriesByType !== 'undefined' && getEntriesByType.length > 0) {
-    var httpProtocol = getEntriesByType[0].nextHopProtocol
-    LUX.addData("http-protocol", httpProtocol)
-  }
-}
-
-try {
-  if (typeof performance !== 'undefined' && typeof performance.getEntriesByType !== 'undefined') {
-    if (document.readyState === 'complete') {
-      measureHTTPProtocol()
-    } else {
-      window.addEventListener('load', function() {
-        measureHTTPProtocol()
-      })
-    }
-  }
-} catch (e) {
-  console.error('Error in LUX reporting the HTTP protocol (%s):', window.location, e)
-}

data/app/assets/stylesheets/govuk_publishing_components/components/_govspeak.scss

@@ -1,6 +1,5 @@
 @import "govuk_publishing_components/individual_component_support";
 
-@import "govspeak/advisory";
 @import "govspeak/attachment";
 @import "govspeak/button";
 @import "govspeak/call-to-action";

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

@@ -9,15 +9,10 @@
   hide ||= false
   new_tab ||= false
 
-  data_attributes = {}
   suggestion_data_attributes = {}
   dismiss_data_attributes = {}
   dismiss_link_data_attributes = {}
-  data_attributes[:module] = "intervention"
-  data_attributes["intervention-name"] = name
 
-  aria_attributes ||= {}
-  aria_attributes[:label] = 'Intervention'
 
   options = {
     name: name,
@@ -35,7 +30,6 @@
   disable_ga4 ||= false
   suggestion_data_attributes[:module] = "#{suggestion_data_attributes[:module]} ga4-link-tracker".strip unless disable_ga4
   suggestion_data_attributes[:ga4_link] = { event_name: "navigation", type: "intervention", section: suggestion_text, index_link: 1, index_total: 1 }.to_json unless disable_ga4
-  data_attributes[:ga4_intervention_banner] = "" unless disable_ga4 # Added to the parent element for the GA4 pageview object to use
 
   suggestion_tag_options = {
     class: "govuk-link gem-c-force-print-link-styles",
@@ -52,18 +46,20 @@
     suggestion_link_text = intervention_helper.accessible_text
   end
 
-  section_options = {
-    class: "gem-c-intervention",
-    role: "region", aria: aria_attributes,
-    data: data_attributes,
-  }
-  section_options.merge!({ hidden: true }) if hide
-
   dismiss_link_data_attributes[:module] = "#{dismiss_link_data_attributes[:module]} ga4-event-tracker".strip unless disable_ga4
   dismiss_link_data_attributes[:ga4_event] = { event_name: "select_content", type: "intervention", section: suggestion_text, action: 'closed' }.to_json unless disable_ga4
+
+  component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
+  component_helper.add_class("gem-c-intervention")
+  component_helper.add_role("region")
+  component_helper.add_aria_attribute({ label: "Intervention"})
+  component_helper.add_data_attribute({ module: "intervention", intervention_name: name })
+  component_helper.add_data_attribute({ ga4_intervention_banner: "" }) unless disable_ga4 # Added to the parent element for the GA4 pageview object to use
+  component_helper.set_hidden("hidden") if hide
+
 %>
 <% if intervention_helper.show? %>
-  <%= tag.section **section_options do %>
+  <%= tag.section(**component_helper.all_attributes) do %>
     <p class="govuk-body">
       <%= tag.span suggestion_text, class: "gem-c-intervention__textwrapper" if suggestion_text %>
       <% if suggestion_link_text && suggestion_link_url %>

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

@@ -65,6 +65,7 @@
     <title><%= title %></title>
 
     <%= javascript_include_tag "govuk_publishing_components/vendor/lux/lux-measurer", { async: true } %>
+    <%= javascript_include_tag "govuk_publishing_components/rum-custom-data", type: "module" %>
     <%= javascript_include_tag "govuk_publishing_components/rum-loader",
       {
         async: true,

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

@@ -35,9 +35,6 @@
   search_toggle_button_classes << "gem-c-layout-super-navigation-header__search-toggle-button--blue-background" if blue_background
   search_toggle_button_classes << "gem-c-layout-super-navigation-header__search-toggle-button--large-navbar" if large_navbar
 
-  layout_super_navigation_header_classes = %w(gem-c-layout-super-navigation-header)
-  layout_super_navigation_header_classes << "gem-c-layout-super-navigation-header--blue-background" if blue_background
-
   item_link_classes = %w(gem-c-layout-super-navigation-header__navigation-item-link)
   item_link_classes << "gem-c-layout-super-navigation-header__navigation-item-link--blue-background" if blue_background
   item_link_classes << "gem-c-layout-super-navigation-header__navigation-item-link--large-navbar" if large_navbar
@@ -64,16 +61,14 @@
   dropdown_menu_classes << "gem-c-layout-super-navigation-header__navigation-dropdown-menu--large-navbar" if large_navbar
 
   absolute_links_helper = GovukPublishingComponents::Presenters::AbsoluteLinksHelper.new()
+
+  component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
+  component_helper.add_class("gem-c-layout-super-navigation-header")
+  component_helper.add_class("gem-c-layout-super-navigation-header--blue-background") if blue_background
+  component_helper.add_role("banner")
+  component_helper.add_data_attribute({ module: "ga4-event-tracker ga4-link-tracker", ga4_expandable: "" })
 %>
-<%= content_tag("header",
-  {
-    role: "banner",
-    class: layout_super_navigation_header_classes,
-    data: {
-      module: "ga4-event-tracker ga4-link-tracker",
-      "ga4-expandable": '',
-    }
-}) do %>
+<%= tag.header(**component_helper.all_attributes) do %>
   <div class="gem-c-layout-super-navigation-header__container govuk-clearfix">
     <div class="govuk-width-container">
       <%= content_tag(:div, {
@@ -317,7 +312,7 @@
                   label: "Site-wide",
                 }
               ) do %>
-                <% search_options = {
+                <%= render "govuk_publishing_components/components/search_with_autocomplete", {
                   name: "keywords",
                   inline_label: false,
                   label_size: "m",
@@ -326,15 +321,9 @@
                   size: "large",
                   margin_bottom: 0,
                   disable_corrections: true,
+                  source_url: [Plek.new.website_root, "/api/search/autocomplete.json"].join,
+                  source_key: "suggestions",
                 } %>
-                <% if ENV["GOVUK_DISABLE_SEARCH_AUTOCOMPLETE"] %>
-                  <%= render "govuk_publishing_components/components/search", search_options %>
-                <% else %>
-                  <%= render "govuk_publishing_components/components/search_with_autocomplete", search_options.merge({
-                    source_url: [Plek.new.website_root, "/api/search/autocomplete.json"].join,
-                    source_key: "suggestions",
-                  }) %>
-                <% end %>
               <% end %>
             </div>
           </div>

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

@@ -1,20 +1,14 @@
 <%
-  aria_label ||= nil
   extra_spacing ||= nil
-  id ||= nil
   items ||= []
   list_type ||= "unordered"
   visible_counters ||= nil
 
-  shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
-
-  classes = %w[gem-c-list govuk-list]
-  classes << "govuk-list--bullet" if visible_counters and list_type === "unordered"
-  classes << "govuk-list--number" if visible_counters and list_type === "number"
-  classes << "govuk-list--spaced" if extra_spacing
-  # Setting the  `margin_bottom` to 4 is the same as the default margin - so we
-  # can omit the override class. To do this we leave out `4` from the array:
-  classes << shared_helper.get_margin_bottom if [0,1,2,3,5,6,7,8,9].include?(local_assigns[:margin_bottom])
+  component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
+  component_helper.add_class("gem-c-list govuk-list")
+  component_helper.add_class("govuk-list--bullet") if visible_counters and list_type === "unordered"
+  component_helper.add_class("govuk-list--number") if visible_counters and list_type === "number"
+  component_helper.add_class("govuk-list--spaced") if extra_spacing
 
   # Default list type is unordered list.
   list_tag = "ul"
@@ -23,7 +17,7 @@
   list_tag = "ol" if list_type === "number"
 %>
 <% if items.any? %>
-  <%= content_tag list_tag, class: classes, id: id, "aria-label": aria_label do %>
+  <%= content_tag list_tag, **component_helper.all_attributes do %>
     <% items.each do |item| %>
       <li><%= raw(item) %></li>
     <% end %>

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

@@ -7,7 +7,7 @@
   aria_controls ||= nil
   button_text ||= t("components.search_box.search_button")
   correction_value = "off" if local_assigns[:disable_corrections]
-  id ||= "search-main-" + SecureRandom.hex(4)
+  label_id ||= "search-main-" + SecureRandom.hex(4)
   wrap_label_in_a_heading ||= false
   label_margin_bottom ||= nil
   label_size ||= nil
@@ -19,21 +19,17 @@
   size ||= ""
   value ||= ""
 
-  data_attributes ||= {}
-
-  classes = %w[gem-c-search govuk-!-display-none-print]
-  classes << shared_helper.get_margin_top
-  classes << shared_helper.get_margin_bottom if local_assigns[:margin_bottom]
-  classes << "gem-c-search--large" if size == "large"
-  classes << "gem-c-search--large-on-mobile" if size == "large-mobile"
-  classes << "gem-c-search--homepage" if homepage
-  classes << "gem-c-search--no-border" if no_border
-  if local_assigns[:on_govuk_blue].eql?(true)
-    classes << "gem-c-search--on-govuk-blue"
-  else
-    classes << "gem-c-search--on-white"
-  end
-  classes << "gem-c-search--separate-label" if local_assigns.include?(:inline_label) or local_assigns.include?(:label_size)
+  component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
+  component_helper.add_data_attribute({ module: "gem-toggle-input-class-on-focus" })
+  component_helper.add_class("gem-c-search govuk-!-display-none-print")
+  component_helper.add_class(shared_helper.get_margin_top)
+  component_helper.add_class("gem-c-search--large") if size == "large"
+  component_helper.add_class("gem-c-search--large-on-mobile") if size == "large-mobile"
+  component_helper.add_class("gem-c-search--homepage") if homepage
+  component_helper.add_class("gem-c-search--no-border") if no_border
+  component_helper.add_class("gem-c-search--on-govuk-blue") if local_assigns[:on_govuk_blue].eql?(true)
+  component_helper.add_class("gem-c-search--on-white") unless local_assigns[:on_govuk_blue].eql?(true)
+  component_helper.add_class("gem-c-search--separate-label") if local_assigns.include?(:inline_label) or local_assigns.include?(:label_size)
 
   label_classes = []
   if (shared_helper.valid_heading_size?(label_size))
@@ -46,12 +42,12 @@
   label_classes << label_custom_class if label_custom_class
 
   tag_label = capture do
-    tag.label(for: id, class: label_classes) do
+    tag.label(for: label_id, class: label_classes) do
       label_text
     end
   end
 %>
-<div class="<%= classes.join(" ") %>" data-module="gem-toggle-input-class-on-focus">
+<%= tag.div(**component_helper.all_attributes) do %>
   <% if wrap_label_in_a_heading %>
     <%= content_tag(shared_helper.get_heading_level, class: "govuk-!-margin-0") do %>
       <%= tag_label %>
@@ -67,7 +63,7 @@
         },
         enterkeyhint: "search",
         class: "gem-c-search__item gem-c-search__input js-class-toggle",
-        id: id,
+        id: label_id,
         name: name,
         title: t("components.search_box.input_title"),
         type: "search",
@@ -77,10 +73,10 @@
       ) %>
     </div>
     <div class="gem-c-search__item gem-c-search__submit-wrapper">
-      <%= tag.button class: "gem-c-search__submit", type: "submit", data: data_attributes, enterkeyhint: "search" do %>
+      <%= tag.button class: "gem-c-search__submit", type: "submit", enterkeyhint: "search" do %>
         <%= button_text %>
         <%= render "govuk_publishing_components/components/search/search_icon" %>
       <% end %>
     </div>
   </div>
-</div>
+<% end %>

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

@@ -5,17 +5,11 @@
   brand_helper = GovukPublishingComponents::AppHelpers::BrandHelper.new(brand)
 
   sl_helper = GovukPublishingComponents::Presenters::SubscriptionLinksHelper.new(local_assigns)
-  shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
 
-  local_assigns[:margin_bottom] ||= 0
-  local_assigns[:margin_bottom] = 0 if local_assigns[:margin_bottom] > 9
-
-  css_classes = %w( gem-c-subscription-links govuk-!-display-none-print )
-  css_classes << shared_helper.get_margin_bottom unless local_assigns[:margin_bottom] == 0
-  css_classes << brand_helper.brand_class
-  css_classes << "gem-c-subscription-links--with-feed-box" if sl_helper.feed_link_box_value
-
-  data = {"module": "gem-toggle"} if sl_helper.feed_link_box_value
+  component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
+  component_helper.add_class("gem-c-subscription-links govuk-!-display-none-print #{brand_helper.brand_class}")
+  component_helper.add_class("gem-c-subscription-links--with-feed-box") if sl_helper.feed_link_box_value
+  component_helper.add_data_attribute({ module: "gem-toggle" }) if sl_helper.feed_link_box_value
 
   hide_heading ||= false
 
@@ -23,7 +17,7 @@
   feed_link_text_locale = local_assigns[:feed_link_text_locale].presence
 %>
 <% if sl_helper.component_data_is_valid? %>
-  <%= tag.section class: css_classes, data: data do %>
+  <%= tag.section(**component_helper.all_attributes) do %>
     <% unless hide_heading %>
       <h2 class="gem-c-subscription-links__hidden-header visuallyhidden"><%= t("components.subscription_links.subscriptions") %></h2>
     <% end %>

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

@@ -3,20 +3,16 @@
 
   description ||= nil
   title_id ||= "govuk-notification-banner-title-#{SecureRandom.hex(4)}"
-  shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
-  classes = %w(gem-c-success-alert govuk-notification-banner govuk-notification-banner--success)
-  classes << shared_helper.get_margin_bottom if local_assigns[:margin_bottom]
+
+  component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
+  component_helper.add_class("gem-c-success-alert govuk-notification-banner govuk-notification-banner--success")
+  component_helper.add_role("alert")
+  component_helper.set_tabindex(-1)
+  component_helper.add_aria_attribute({ labelledby: title_id })
+  component_helper.add_data_attribute({ module: "initial-focus" })
 %>
 
-<%= tag.div class: classes,
-  role: "alert",
-  tabindex: "-1",
-  aria: {
-    labelledby: title_id,
-  },
-  data: {
-    module: "initial-focus",
-  } do %>
+<%= tag.div(**component_helper.all_attributes) do %>
   <div class="govuk-notification-banner__header">
     <%= tag.h2 t("components.success_alert.success"), class: "govuk-notification-banner__title", id: title_id %>
   </div>

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

@@ -3,12 +3,14 @@
 
   id ||= nil
   title ||= nil
-  data_attributes ||= {}
   summary_card_actions ||= []
   rows ||=[]
+
+  component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
+  component_helper.add_class("gem-c-summary-card")
 %>
 <% if title || rows.any? %>
-  <%= tag.div class: "gem-c-summary-card", id: id, data: data_attributes do %>
+  <%= tag.div(**component_helper.all_attributes) do %>
     <%= tag.div class: "govuk-summary-card" do %>
       <%= tag.div class: "govuk-summary-card__title-wrapper" do %>
         <%= tag.h2 class: "govuk-summary-card__title" do %>

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

@@ -5,7 +5,6 @@
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
   heading_size = "m" unless shared_helper.valid_heading_size?(heading_size)
 
-  id ||= nil
   title ||= nil
   borderless ||= false
   edit ||= {}
@@ -13,9 +12,14 @@
   items ||= []
   block ||= yield
   wide_title ||= false
+
+  component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
+  component_helper.add_class("gem-c-summary-list")
+  component_helper.add_class("govuk-summary-list--no-border") if borderless
+  component_helper.add_class("gem-c-summary-list--wide-title") if wide_title
 %>
 <% if title || items.any? %>
-  <%= tag.div class: "gem-c-summary-list #{"govuk-summary-list--no-border" if borderless} #{"gem-c-summary-list--wide-title" if wide_title}", id: id do %>
+  <%= tag.div(**component_helper.all_attributes) do %>
     <% if title %>
       <%= content_tag(shared_helper.get_heading_level, title, class: "govuk-heading-#{heading_size} gem-c-summary-list__group-title") %>
 

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

@@ -4,12 +4,14 @@
   brand ||= false
   brand_helper = GovukPublishingComponents::AppHelpers::BrandHelper.new(brand)
   translation_helper = GovukPublishingComponents::Presenters::TranslationNavHelper.new(local_assigns)
+
+  component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
+  component_helper.add_role("navigation")
+  component_helper.add_class("gem-c-translation-nav govuk-!-display-none-print #{translation_helper.classes} #{brand_helper.brand_class}")
+  component_helper.add_aria_attribute({ label: t("common.translations") })
 %>
 <% if translation_helper.has_translations? %>
-  <nav role="navigation"
-    class="gem-c-translation-nav govuk-!-display-none-print <%= translation_helper.classes %> <%= brand_helper.brand_class %>"
-    aria-label="<%= t("common.translations") %>"
-  >
+  <%= tag.nav(**component_helper.all_attributes) do %>
     <ul class="gem-c-translation-nav__list">
       <% translation_helper.translations.each.with_index do |translation, i| %>
         <li class="gem-c-translation-nav__list-item">
@@ -27,5 +29,5 @@
         </li>
       <% end %>
     </ul>
-  </nav>
+  <% end %>
 <% end %>

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

@@ -14,9 +14,13 @@
   text_classes << "gem-c-warning-text__text--no-indent" if text_icon.empty?
   text_classes << "gem-c-warning-text__text--large" if large_font
   text_classes << "gem-c-warning-text__text--highlight" if highlight_text
+
+  component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
+  component_helper.set_id(id)
+  component_helper.add_class("gem-c-warning-text govuk-warning-text")
 %>
 
-<%= tag.div id: id, class: "gem-c-warning-text govuk-warning-text" do %>
+<%= tag.div(**component_helper.all_attributes) do %>
   <% unless text_icon.empty? %>
     <%= tag.span text_icon, class: "govuk-warning-text__icon", "aria-hidden": "true" %>
   <% end %>

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

@@ -72,7 +72,7 @@ examples:
         northern_ireland:
           applicable: false
           alternative_url: /
-      type: consultation
+      content_type: consultation
   applies_to_one_nation_individual_guidance_available:
     description: Specify alternative type for the content e.g. Guidance
     data:
@@ -82,7 +82,7 @@ examples:
         northern_ireland:
           applicable: false
           alternative_url: /
-      type: detailed_guide
+      content_type: detailed_guide
   specific_heading level:
     description: Use a different heading level for the main link title. Defaults to `h2` if not passed.
     data:
@@ -104,5 +104,5 @@ examples:
         northern_ireland:
           applicable: false
           alternative_url: /
-      type: detailed_guide
+      content_type: detailed_guide
       disable_ga4: true

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

@@ -842,12 +842,6 @@ examples:
             The water in the mouth of a blue whale weighs more than its body.
           </p>
         </div>
-  advisory:
-    data:
-      block: |
-        <h3 role="note" aria-label="Important" class="advisory">
-          <span>This is a very important message or warning</span>
-        </h3>
   form_download:
     data:
       block: |

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

@@ -21,6 +21,7 @@ shared_accessibility_criteria:
   - link
 accessibility_excluded_rules:
   - landmark-unique # aria-label attributes will be duplicated in component examples list
+uses_component_wrapper_helper: true
 examples:
   default:
     data:

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

@@ -26,6 +26,7 @@ accessibility_excluded_rules:
   - duplicate-id-aria
   - landmark-no-duplicate-banner
   - landmark-unique
+uses_component_wrapper_helper: true
 examples:
   default:
   with_custom_logo_link:

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

@@ -5,6 +5,7 @@ body: |
 
   The `items` parameter can include HTML to display - such as links or another
   list. This HTML can either be directly coded or come from another component.
+uses_component_wrapper_helper: true
 accessibility_criteria: |
   The list must:
 
@@ -31,7 +32,8 @@ examples:
   unordered_list_with_aria-label:
     description: "A list with an aria-label"
     data:
-      aria_label: "A list of delicious chocolate bars."
+      aria:
+        label: "A list of delicious chocolate bars."
       <<: *default-example-data
   unordered_list_with_bullet_points:
     description: "An unordered list with visible bullet points."

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

@@ -12,7 +12,7 @@ accessibility_criteria: |
 
   - be used inside a form with the role of 'search', to indicate it as a [search landmark](https://www.w3.org/TR/wai-aria-practices-1.1/#aria_lh_search)
   - have a clear label to identify the search functionality, which is visible to all users
-
+uses_component_wrapper_helper: true
 examples:
   default:
     data: {}
@@ -49,7 +49,7 @@ examples:
       label_text: "Search"
   set_id_for_search_input:
     data:
-      id: "my_unique_id"
+      label_id: "my_unique_id"
   large_version:
     data:
       size: "large"

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

@@ -14,6 +14,7 @@ accessibility_criteria: |
   - show hidden elements by default when JavaScript is disabled
 shared_accessibility_criteria:
   - link
+uses_component_wrapper_helper: true
 examples:
   default:
     data:

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

@@ -7,6 +7,7 @@ accessibility_criteria: |
     assistive tech
   - Should have a role of ‘alert’ to communicate that is a important and
     time sensitive message
+uses_component_wrapper_helper: true
 examples:
   default:
     data:

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

@@ -5,6 +5,7 @@ accessibility_criteria: |
   - be focusable with a keyboard
   - be usable with a keyboard
   - indicate when it has focus
+uses_component_wrapper_helper: true
 examples:
   default:
     data:

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

@@ -9,6 +9,7 @@ shared_accessibility_criteria:
   - link
 govuk_frontend_components:
   - summary-list
+uses_component_wrapper_helper: true
 examples:
   default:
     data: &default-example-data

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

@@ -16,6 +16,7 @@ shared_accessibility_criteria:
   - link
 accessibility_excluded_rules:
   - landmark-unique # aria-label attributes will be duplicated in component examples list
+uses_component_wrapper_helper: true
 examples:
   default:
     data:

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

@@ -5,6 +5,7 @@ govuk_frontend_components:
   - warning-text
 accessibility_criteria: |
   All text must have a contrast ratio higher than 4.5:1 against the background colour to meet [WCAG AA](https://www.w3.org/TR/WCAG20/#visual-audio-contrast-contrast)
+uses_component_wrapper_helper: true
 examples:
   default:
     data:

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

@@ -21,7 +21,7 @@
 >
   <%= render "govuk_publishing_components/components/search", {
     button_text: t("components.layout_header.search_button"),
-    id: "site-search-text",
+    label_id: "site-search-text",
     margin_bottom: 0,
     no_border: true,
     disable_corrections: true,

data/lib/govuk_publishing_components/presenters/component_wrapper_helper.rb

@@ -14,6 +14,7 @@ module GovukPublishingComponents
         check_hidden_is_valid(@options[:hidden]) if @options.include?(:hidden)
         check_tabindex_is_valid(@options[:tabindex]) if @options.include?(:tabindex)
         check_dir_is_valid(@options[:dir]) if @options.include?(:dir)
+        check_type_is_valid(@options[:type]) if @options.include?(:type)
         check_margin_bottom_is_valid(@options[:margin_bottom]) if @options.include?(:margin_bottom)
       end
 
@@ -33,6 +34,7 @@ module GovukPublishingComponents
         attributes[:hidden] = @options[:hidden] unless @options[:hidden].nil?
         attributes[:tabindex] = @options[:tabindex] unless @options[:tabindex].blank?
         attributes[:dir] = @options[:dir] unless @options[:dir].blank?
+        attributes[:type] = @options[:type] unless @options[:type].blank?
 
         attributes
       end
@@ -87,6 +89,11 @@ module GovukPublishingComponents
         @options[:dir] = dir_attribute
       end
 
+      def set_type(type_attribute)
+        check_type_is_valid(type_attribute)
+        @options[:type] = type_attribute
+      end
+
       def set_margin_bottom(margin_bottom)
         check_margin_bottom_is_valid(margin_bottom)
         @options[:margin_bottom] = margin_bottom
@@ -192,6 +199,15 @@ module GovukPublishingComponents
         end
       end
 
+      def check_type_is_valid(type_attribute)
+        return if type_attribute.nil?
+
+        options = %w[button checkbox color date datetime-local email file hidden image month number password radio range reset search submit tel text time url week]
+        unless options.include? type_attribute
+          raise(ArgumentError, "type attribute (#{type_attribute}) is not recognised")
+        end
+      end
+
       def extend_string(option, string)
         ((@options[option] ||= "") << " #{string}").strip!
       end

data/lib/govuk_publishing_components/presenters/devolved_nations_helper.rb

@@ -1,11 +1,11 @@
 module GovukPublishingComponents
   module Presenters
     class DevolvedNationsHelper
-      attr_reader :national_applicability, :type
+      attr_reader :national_applicability, :content_type
 
       def initialize(local_assigns)
         @national_applicability = local_assigns[:national_applicability]
-        @type = local_assigns[:type] || "publication"
+        @content_type = local_assigns[:content_type] || "publication"
       end
 
       def applicable_nations_title_text(use_english_translation = nil)
@@ -42,8 +42,8 @@ module GovukPublishingComponents
       def alternative_content_text(name)
         nation = I18n.t("components.devolved_nations.#{name}")
 
-        if I18n.exists?("components.devolved_nations.type.#{@type}")
-          I18n.t("components.devolved_nations.type.#{@type}", nation:)
+        if I18n.exists?("components.devolved_nations.type.#{@content_type}")
+          I18n.t("components.devolved_nations.type.#{@content_type}", nation:)
         else
           I18n.t("components.devolved_nations.type.publication", nation:)
         end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "47.0.0".freeze
+  VERSION = "48.0.0".freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 47.0.0
+  version: 48.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 bindir: bin
 cert_chain: []
-date: 2025-01-07 00:00:00.000000000 Z
+date: 2025-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -505,6 +505,7 @@ files:
 - app/assets/javascripts/govuk_publishing_components/lib/trigger-event.js
 - app/assets/javascripts/govuk_publishing_components/load-analytics.js
 - app/assets/javascripts/govuk_publishing_components/modules.js
+- app/assets/javascripts/govuk_publishing_components/rum-custom-data.js
 - app/assets/javascripts/govuk_publishing_components/rum-loader.js
 - app/assets/javascripts/govuk_publishing_components/single-consent-functions.js
 - app/assets/javascripts/govuk_publishing_components/vendor/lux/lux-measurer.js
@@ -593,7 +594,6 @@ files:
 - app/assets/stylesheets/govuk_publishing_components/components/_title.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_translation-nav.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_warning-text.scss
-- app/assets/stylesheets/govuk_publishing_components/components/govspeak/_advisory.scss
 - app/assets/stylesheets/govuk_publishing_components/components/govspeak/_attachment.scss
 - app/assets/stylesheets/govuk_publishing_components/components/govspeak/_button.scss
 - app/assets/stylesheets/govuk_publishing_components/components/govspeak/_call-to-action.scss

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_advisory.scss

@@ -1,36 +0,0 @@
-$info-background: #d5e8f3;
-$high-alert-border: #cc0000;
-
-.govspeak, // Legacy class name that's still used in some content items - needs to be kept until `.govspeak` is removed from the content items.
-.gem-c-govspeak {
-  .advisory {
-    background-image: url("govuk_publishing_components/icon-important.svg");
-    background-repeat: no-repeat;
-    background-size: 30px 30px;
-    background-position: 98% center;
-    background-color: $info-background;
-    line-height: 1.3em;
-    margin: 0 0 1em;
-    padding: govuk-spacing(3) govuk-spacing(8) govuk-spacing(3) govuk-spacing(3);
-    text-align: left;
-
-    p {
-      margin: 0 .75em 0 0;
-      min-height: 1.75em;
-      padding-right: 3em;
-    }
-
-    strong {
-      font-weight: 400;
-    }
-
-    &.high-alert {
-      background-color: govuk-colour("light-grey");
-      border: 1px solid $high-alert-border;
-    }
-
-    @include govuk-media-query($until: tablet) {
-      margin: 0 0 1em;
-    }
-  }
-}