govuk_publishing_components 60.1.0 → 60.2.0

data/app/views/govuk_publishing_components/components/cross_service_header/_one_login_header.html.erb

@@ -1,6 +1,6 @@
   <% one_login_home = one_login_navigation_items[:one_login_home] %>
   <% one_login_sign_out = one_login_navigation_items[:one_login_sign_out] %>
-  
+
   <div class="gem-c-rebranded-one-login-header" data-one-login-header-nav>
     <div class="gem-c-rebranded-one-login-header__container govuk-width-container">
       <div class="gem-c-rebranded-one-login-header__logo">
@@ -32,18 +32,18 @@
           </svg>
         </a>
       </div>
-      <button type="button" 
-        aria-controls="one-login-header__nav" 
-        aria-label="Show GOV.UK One Login menu" 
-        data-open-class="gem-c-rebranded-cross-service-header__toggle--open" 
-        data-label-for-show="Show GOV.UK One Login menu" 
-        data-label-for-hide="Hide GOV.UK One Login menu" 
-        aria-expanded="false" 
+      <button type="button"
+        aria-controls="one-login-header__nav"
+        aria-label="Show GOV.UK One Login menu"
+        data-open-class="gem-c-rebranded-cross-service-header__toggle--open"
+        data-label-for-show="Show GOV.UK One Login menu"
+        data-label-for-hide="Hide GOV.UK One Login menu"
+        aria-expanded="false"
         class="gem-c-rebranded-cross-service-header__toggle js-x-header-toggle">
         <span class="gem-c-rebranded-cross-service-header__toggle-content-wrapper">
           <svg focusable="false" role="img" xmlns="http://www.w3.org/2000/svg" width="15" height="30" viewBox="150 150 250 250" fill="currentcolor" class="gem-c-rebranded-cross-service-header__logo ">
             <path d="M300.002 312.261C249.445 312.261 208.346 271.165 208.346 220.608C208.346 170.051 249.445 128.954 300.002 128.954C350.559 128.954 391.655 170.051 391.655 220.608C391.655 271.165 350.559 312.261 300.002 312.261ZM300.002 170.892C272.673 170.892 250.389 193.175 250.389 220.504C250.389 247.83 272.673 270.113 300.002 270.113C327.33 270.113 349.611 247.83 349.611 220.504C349.611 193.175 327.33 170.892 300.002 170.892Z" />
-            <path d="M221.275 471.046H179.231V365.202H420.769V407.246H221.275V471.046Z"/>
+            <path d="M221.275 471.046H179.231V365.202H420.769V407.246H221.275V471.046Z" />
           </svg>
           <span class="gem-c-rebranded-cross-service-header__toggle-content">One Login</span>
         </span>
@@ -55,7 +55,7 @@
               <span class="gem-c-rebranded-one-login-header__nav__link-content">
                 <svg focusable="false" role="img" xmlns="http://www.w3.org/2000/svg" width="15" height="30" viewBox="150 150 250 250" fill="currentcolor" class="gem-c-rebranded-cross-service-header__logo gem-c-rebranded-cross-service-header__logo--nav">
                   <path d="M300.002 312.261C249.445 312.261 208.346 271.165 208.346 220.608C208.346 170.051 249.445 128.954 300.002 128.954C350.559 128.954 391.655 170.051 391.655 220.608C391.655 271.165 350.559 312.261 300.002 312.261ZM300.002 170.892C272.673 170.892 250.389 193.175 250.389 220.504C250.389 247.83 272.673 270.113 300.002 270.113C327.33 270.113 349.611 247.83 349.611 220.504C349.611 193.175 327.33 170.892 300.002 170.892Z" />
-                  <path d="M221.275 471.046H179.231V365.202H420.769V407.246H221.275V471.046Z"/>
+                  <path d="M221.275 471.046H179.231V365.202H420.769V407.246H221.275V471.046Z" />
                 </svg>
                 GOV.UK One Login
               </span>

data/app/views/govuk_publishing_components/components/feedback/_problem_form.html.erb

@@ -13,7 +13,7 @@
       <h2 class="gem-c-feedback__form-heading"><%= t("components.feedback.help_us_improve_govuk") %></h2>
       <p id="feedback_explanation" class="gem-c-feedback__form-paragraph"><%= t("components.feedback.dont_include_personal_info") %></p>
 
-      <% # Added for spam bots only %>
+      <%# Added for spam bots only %>
       <div class="govuk-visually-hidden" aria-hidden="true">
         <label for="giraffe">This field is for robots only. Please leave blank</label>
         <input id="giraffe" name="giraffe" type="text" pattern=".{0}" tabindex="-1" autocomplete="off">
@@ -21,19 +21,19 @@
 
       <%= render "govuk_publishing_components/components/textarea", {
         label: {
-          text: t("components.feedback.what_doing")
+          text: t("components.feedback.what_doing"),
         },
         name: "what_doing",
         rows: 3,
-        describedby: "feedback_explanation"
+        describedby: "feedback_explanation",
       } do %> <% end %>
 
       <%= render "govuk_publishing_components/components/textarea", {
         label: {
-          text: t("components.feedback.what_wrong")
+          text: t("components.feedback.what_wrong"),
         },
         name: "what_wrong",
-        rows: 3
+        rows: 3,
       } do %> <% end %>
 
       <%
@@ -44,7 +44,7 @@
             type: "feedback",
             text: t("components.feedback.send", locale: :en),
             section: heading_text,
-            tool_name: heading_text
+            tool_name: heading_text,
           }.to_json
         end
       %>
@@ -52,8 +52,8 @@
       <%= render "govuk_publishing_components/components/button", {
         text: t("components.feedback.send"),
         data_attributes: {
-          ga4_event: ga4_submit_button_event
-        }
+          ga4_event: ga4_submit_button_event,
+        },
       } %>
 
       <button
@@ -71,7 +71,7 @@
   # This seems to be a more reliable way to make sure the script is executed.
 %>
 
-<%= javascript_tag nonce: true do -%>
+ <%= javascript_tag nonce: true do -%>
   document.addEventListener("DOMContentLoaded", function () {
     var input = document.querySelector("#giraffe"),
       form = document.querySelector("#something-is-wrong")
@@ -83,4 +83,4 @@
       e.preventDefault();
     }
   });
-<% end -%>
+<% end %>

data/app/views/govuk_publishing_components/components/feedback/_yes_no_banner.html.erb

@@ -34,12 +34,12 @@
         <h2 class="gem-c-feedback__prompt-question"><%= t("components.feedback.is_this_page_useful") %></h2>
         <ul class="gem-c-feedback__option-list">
           <li class="gem-c-feedback__option-list-item govuk-visually-hidden" hidden>
-            <% # Maybe button exists only to try and capture clicks by bots %>
+            <%# Maybe button exists only to try and capture clicks by bots %>
             <%= link_to "/contact/govuk", {
-              class: 'gem-c-feedback__prompt-link',
-              role: 'button',
-              hidden: 'hidden',
-              'aria-hidden': 'true',
+              class: "gem-c-feedback__prompt-link",
+              role: "button",
+              hidden: "hidden",
+              'aria-hidden': "true",
             } do %>
               <%= t("components.feedback.maybe") %>
             <% end %>
@@ -59,7 +59,6 @@
               class: "govuk-button gem-c-feedback__prompt-link js-toggle-form js-page-is-not-useful",
               aria: {
                 controls: "page-is-not-useful",
-                expanded: "false",
               },
               data: {
                 ga4_event: ga4_no_button_event,
@@ -79,8 +78,7 @@
       <%= tag.button(
         class: "govuk-button gem-c-feedback__prompt-link js-toggle-form js-something-is-wrong",
         aria: {
-          expanded: "false",
-          controls: "something-is-wrong"
+          controls: "something-is-wrong",
         },
         data: {
           ga4_event: ga4_problem_button_event,

data/app/views/govuk_publishing_components/components/govuk_logo/_govuk_logo_crown_only.html.erb

@@ -9,7 +9,6 @@
   aria-hidden="true"
   height="30"
   width="32"
-  viewBox="0 0 32 30"
->
+  viewBox="0 0 32 30">
   <path d="M22.6 10.4c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m-5.9 6.7c-.9.4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m10.8-3.7c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s0 2-1 2.4m3.3 4.8c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4M17 4.7l2.3 1.2V2.5l-2.3.7-.2-.2.9-3h-3.4l.9 3-.2.2c-.1.1-2.3-.7-2.3-.7v3.4L15 4.7c.1.1.1.2.2.2l-1.3 4c-.1.2-.1.4-.1.6 0 1.1.8 2 1.9 2.2h.7c1-.2 1.9-1.1 1.9-2.1 0-.2 0-.4-.1-.6l-1.3-4c-.1-.2 0-.2.1-.3m-7.6 5.7c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m-5 3c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s.1 2 1 2.4m-3.2 4.8c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m14.8 11c4.4 0 8.6.3 12.3.8 1.1-4.5 2.4-7 3.7-8.8l-2.5-.9c.2 1.3.3 1.9 0 2.7-.4-.4-.8-1.1-1.1-2.3l-1.2 4c.7-.5 1.3-.8 2-.9-1.1 2.5-2.6 3.1-3.5 3-1.1-.2-1.7-1.2-1.5-2.1.3-1.2 1.5-1.5 2.1-.1 1.1-2.3-.8-3-2-2.3 1.9-1.9 2.1-3.5.6-5.6-2.1 1.6-2.1 3.2-1.2 5.5-1.2-1.4-3.2-.6-2.5 1.6.9-1.4 2.1-.5 1.9.8-.2 1.1-1.7 2.1-3.5 1.9-2.7-.2-2.9-2.1-2.9-3.6.7-.1 1.9.5 2.9 1.9l.4-4.3c-1.1 1.1-2.1 1.4-3.2 1.4.4-1.2 2.1-3 2.1-3h-5.4s1.7 1.9 2.1 3c-1.1 0-2.1-.2-3.2-1.4l.4 4.3c1-1.4 2.2-2 2.9-1.9-.1 1.5-.2 3.4-2.9 3.6-1.9.2-3.4-.8-3.5-1.9-.2-1.3 1-2.2 1.9-.8.7-2.3-1.2-3-2.5-1.6.9-2.2.9-3.9-1.2-5.5-1.5 2-1.3 3.7.6 5.6-1.2-.7-3.1 0-2 2.3.6-1.4 1.8-1.1 2.1.1.2.9-.3 1.9-1.5 2.1-.9.2-2.4-.5-3.5-3 .6 0 1.2.3 2 .9l-1.2-4c-.3 1.1-.7 1.9-1.1 2.3-.3-.8-.2-1.4 0-2.7l-2.9.9C1.3 23 2.6 25.5 3.7 30c3.7-.5 7.9-.8 12.3-.8"></path>
 </svg>

data/app/views/govuk_publishing_components/components/layout_for_public/_account-layout.html.erb

@@ -1,11 +1,11 @@
 <div class="govuk-width-container">
   <%= render "govuk_publishing_components/components/phase_banner", {
     phase: "beta",
-    message: sanitize(t("components.layout_for_public.account_layout.feedback.banners.phase_banner_html"))
+    message: sanitize(t("components.layout_for_public.account_layout.feedback.banners.phase_banner_html")),
   } unless omit_account_phase_banner %>
 
   <div class="govuk-grid-row govuk-main-wrapper">
-    <%= tag.div(class: 'govuk-grid-column-one-third') do %>
+    <%= tag.div(class: "govuk-grid-column-one-third") do %>
       <%= render "govuk_publishing_components/components/layout_for_public/account-navigation", { page_is: account_nav_location} %>
     <% end unless omit_account_navigation %>
 

data/app/views/govuk_publishing_components/components/layout_for_public/_account-navigation.html.erb

@@ -6,7 +6,7 @@
       <%= link_to(
         t("components.layout_for_public.account_layout.navigation.menu_bar.account.link_text"),
         GovukPersonalisation::Urls.your_account,
-        class: 'gem-c-layout-for-public-account-menu__link govuk-link govuk-link--no-visited-state',
+        class: "gem-c-layout-for-public-account-menu__link govuk-link govuk-link--no-visited-state",
         'aria-current': page_is == "your-account" ? "page" : nil,
       ) %>
     </li>
@@ -14,7 +14,7 @@
       <%= link_to(
         t("components.layout_for_public.account_layout.navigation.menu_bar.manage.link_text"),
         GovukPersonalisation::Urls.manage,
-        class: 'gem-c-layout-for-public-account-menu__link govuk-link govuk-link--no-visited-state',
+        class: "gem-c-layout-for-public-account-menu__link govuk-link govuk-link--no-visited-state",
         'aria-current': page_is == "manage" ? "page" : nil,
         data: { module: "explicit-cross-domain-links" },
       ) %>

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

@@ -7,7 +7,7 @@
     "development" => "grey",
   }
 
-  environment_exists = !environment.blank?
+  environment_exists = environment.present?
   deprecated_navigation ||= false
 %>
 

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

@@ -10,8 +10,7 @@
       class="govuk-header__menu-button govuk-js-header-toggle gem-c-header__menu-button govuk-!-display-none-print"
       type="button"
       data-button-name="menu"
-      hidden
-    >
+      hidden>
       <%= t("components.layout_header.menu") %>
     </button>
     <ul id="<%= navigation_id %>" class="govuk-header__navigation-list govuk-!-display-none-print">
@@ -25,7 +24,7 @@
           <%= link_to(
             item[:text],
             item[:href],
-            class: 'govuk-header__link',
+            class: "govuk-header__link",
             data: item[:data],
           ) %>
         <% end %>

data/app/views/govuk_publishing_components/components/metadata/_sentence.html.erb

@@ -16,7 +16,7 @@
        data-expanded="false"
        data-toggled-text="<%= t("common.toggle_less") %>">
         <%= t("common.toggle_more",
-          show: t('common.show'),
+          show: t("common.show"),
           number: remaining.length) %>
     </a>
   </div>

data/app/views/govuk_publishing_components/components/related_navigation/_section.html.erb

@@ -10,7 +10,7 @@
   <% else %>
     <%=
       heading_class = related_nav_helper.section_css_class("gem-c-related-navigation__sub-heading", section_title)
-      heading_data = { 'track-count' => related_nav_helper.section_data_track_count(:related_item_section) }
+      heading_data = { "track-count" => related_nav_helper.section_data_track_count(:related_item_section) }
       heading_id = "related-nav-#{section_title}-#{random}"
       heading_level = related_nav_helper.section_heading_level
       heading_text = related_nav_helper.construct_section_text(section_title, true)
@@ -48,7 +48,7 @@
           lang: shared_helper.t_locale_check(link[:locale]),
           data: {
             ga4_link: ga4_attributes,
-          }
+          },
         )
       %>
       <% if index <= section_link_limit %>
@@ -65,14 +65,14 @@
         data_attributes_link = {
           controls: "toggle_#{section_title}",
           expanded: "false",
-          toggled_text: t("common.toggle_less")
+          toggled_text: t("common.toggle_less"),
         }
         data_attributes_link[:ga4_event] = { "event_name": "select_content", "type": "related content" } unless disable_ga4
       %>
       <%= tag.li(class: classes, data: data_attributes_li) do %>
         <%= link_to("#", class: "gem-c-related-navigation__toggle", data: data_attributes_link) do %>
           <%= t("common.toggle_more",
-            show: t('common.show'),
+            show: t("common.show"),
             number: related_nav_helper.remaining_link_count(links)) %>
         <% end %>
       <% end %>

data/app/views/govuk_publishing_components/components/search/_search_icon.html.erb

@@ -10,8 +10,7 @@
   fill="none"
   xmlns="http://www.w3.org/2000/svg"
   aria-hidden="true"
-  focusable="false"
->
+  focusable="false">
   <circle
     cx="12.0161"
     cy="11.0161"
@@ -25,4 +24,4 @@
     y2="25.9393"
     stroke="currentColor"
     stroke-width="3" />
-</svg>
+</svg>

data/app/views/layouts/govuk_publishing_components/application.html.erb

@@ -9,11 +9,11 @@
     <%= render "govuk_publishing_components/components/layout_header", {
       environment: GovukPublishingComponents::AppHelpers::Environment.current_acceptance_environment,
       product_name: "#{GovukPublishingComponents::Config.component_guide_title} #{GovukPublishingComponents::VERSION}",
-      href: component_guide_path
+      href: component_guide_path,
     } %>
     <div id="wrapper" class="govuk-width-container">
       <% if @guide_breadcrumbs %>
-        <%= render 'govuk_publishing_components/components/breadcrumbs', breadcrumbs: @guide_breadcrumbs  %>
+        <%= render "govuk_publishing_components/components/breadcrumbs", breadcrumbs: @guide_breadcrumbs %>
       <% end %>
       <main class="govuk-main-wrapper govuk-main-wrapper--auto-spacing">
         <%= yield %>
@@ -48,7 +48,7 @@
   <body class="gem-c-layout-for-admin govuk-template__body">
     <%= javascript_tag nonce: true do -%>
       document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' govuk-frontend-supported' : '');
-    <% end -%>
+    <% end %>
     <%= yield :body %>
 
     <%= javascript_include_tag "component_guide/application" %>

data/lib/govuk_publishing_components/presenters/component_wrapper_helper.rb

@@ -268,7 +268,7 @@ module GovukPublishingComponents
       end
 
       def extend_string(option, string)
-        ((@options[option] ||= "") << " #{string}").strip!
+        @options[option] = "#{@options[option]} #{string}".strip
       end
 
       def extend_object(option, object)

data/lib/govuk_publishing_components/presenters/heading_helper.rb

@@ -7,9 +7,9 @@ module GovukPublishingComponents
         @id = options[:id]
 
         @classes = ""
-        @classes << " gem-c-heading--padding" if options[:padding]
-        @classes << " gem-c-heading--border-top-#{options[:border_top]}" if [1, 2, 5].include? options[:border_top]
-        @classes << " gem-c-heading--inverse" if options[:inverse]
+        @classes += " gem-c-heading--padding" if options[:padding]
+        @classes += " gem-c-heading--border-top-#{options[:border_top]}" if [1, 2, 5].include? options[:border_top]
+        @classes += " gem-c-heading--inverse" if options[:inverse]
 
         @heading_classes = "gem-c-heading__text #{heading_size(options[:font_size])}"
       end

data/lib/govuk_publishing_components/presenters/meta_tags.rb

@@ -43,6 +43,7 @@ module GovukPublishingComponents
         meta_tags["govuk:content-has-history"] = "true" if has_content_history?
         meta_tags["govuk:ga4-strip-dates"] = "true" if should_strip_dates_pii?(content_item, local_assigns)
         meta_tags["govuk:ga4-strip-postcodes"] = "true" if should_strip_postcode_pii?(content_item, local_assigns)
+        meta_tags["govuk:ga4-base-path"] = content_item[:base_path] if content_item[:base_path]
         meta_tags["govuk:first-published-at"] = content_item[:first_published_at] if content_item[:first_published_at]
         meta_tags["govuk:updated-at"] = content_item[:updated_at] if content_item[:updated_at]
         meta_tags["govuk:public-updated-at"] = content_item[:public_updated_at] if content_item[:public_updated_at]

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "60.1.0".freeze
+  VERSION = "60.2.0".freeze
 end