govuk_publishing_components 43.1.0 → 43.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cd528b4f8f215e98dc668b8aebbc8a70830275d42df7aadae6d26d8763ea932
-  data.tar.gz: 9406315ea8c87a29bbfe16c9243f8e05e6fb6f418ec10b41d16493891c92d9b4
+  metadata.gz: 0e4cae4dbe308c9a7d6c09b6af0e5a2bd8e336704c65b65b36db523740774350
+  data.tar.gz: 6783d9392096dc776ab89670f28348a037de4c4312648a3459e6c7d59ca93e82
 SHA512:
-  metadata.gz: 5bd32ba843de584bfb07f87df4c3dc7624b3fb65d7cd6f46e6f21cc711950c102edc302cc2004570908e7f18a425315983c516f97d0a370654281803a9b7b394
-  data.tar.gz: d4deba88fd859ddce5ecec74087f169b45a305f84af32a3be12b3666a70c179d6d75901f22c1f7e7dde7b788f98db806fdcf929f3f9809ec649dfd100f06198e
+  metadata.gz: 06ca0b986701886935c7fa20f38e10c65719a7112b99a454a075924a013963d431f1915272140cbc97581ab08d7123de66fd2f1c9179cefe75155326e7d5a784
+  data.tar.gz: dba9a2166cbab782ce0dd4800716f142241ed81aa2afa0a1e5dff4f4f164273973fe62a642cce7c8ddd74ddb1b2c0e0de2e7bfd40a9e925a94b62ed0629c8354

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-core.js

@@ -295,7 +295,7 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
         var PIIRemover = new window.GOVUK.analyticsGa4.PIIRemover()
         searchTerm = searchTerm.replace(/\++|(%2B)+/gm, ' ') // Turn + characters or unicode + characters (%2B) into a space.
         searchTerm = window.GOVUK.analyticsGa4.core.trackFunctions.removeLinesAndExtraSpaces(searchTerm)
-        searchTerm = PIIRemover.stripPIIWithOverride(searchTerm, true, true)
+        searchTerm = PIIRemover.stripPIIWithOverride(searchTerm, false, true)
         searchTerm = searchTerm.toLowerCase()
         return searchTerm
       }
@@ -339,8 +339,7 @@ window.GOVUK.analyticsGa4 = window.GOVUK.analyticsGa4 || {};
         var DEFAULT_LIST_TITLE = 'Smart answer results'
 
         if (isSearchResult) {
-          // Limiting to 100 characters to avoid noise from extra long search queries and to stop the size of the payload going over 8k limit.
-          var searchQuery = window.GOVUK.analyticsGa4.core.trackFunctions.standardiseSearchTerm(element.getAttribute('data-ga4-search-query')).substring(0, 100)
+          var searchQuery = window.GOVUK.analyticsGa4.core.trackFunctions.standardiseSearchTerm(element.getAttribute('data-ga4-search-query'))
           var variant = element.getAttribute('data-ga4-ecommerce-variant')
           DEFAULT_LIST_TITLE = 'Site search results'
         }

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-page-views.js

@@ -11,6 +11,7 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
 
     init: function (referrer) {
       if (window.dataLayer) {
+        this.stripDates = !this.getSearchTerm()
         var data = {
           event: 'page_view',
           page_view: {
@@ -33,7 +34,7 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
             navigation_page_type: this.getMetaContent('navigation-page-type'),
             navigation_list_type: this.getMetaContent('navigation-list-type'),
             step_navs: this.getMetaContent('stepnavs'),
-            taxonomy_level1: this.getMetaContent('themes'),
+            taxonomy_level1: this.getMetaContent('taxonomy_level1') || this.getMetaContent('themes'),
             taxonomy_main: this.getMetaContent('taxon-slug'),
             taxonomy_main_id: this.getMetaContent('taxon-id'),
             taxonomy_all: this.getMetaContent('taxon-slugs'),
@@ -48,8 +49,8 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
             publishing_government: this.removeHyphensAndDowncase(this.getMetaContent('publishing-government') || this.getMetaContent('ga4-publishing-government')),
             political_status: this.getMetaContent('political-status') || this.getMetaContent('ga4-political-status'),
             primary_publishing_organisation: this.getMetaContent('primary-publishing-organisation'),
-            organisations: this.getMetaContent('analytics:organisations'),
-            world_locations: this.getMetaContent('analytics:world-locations'),
+            organisations: this.getMetaContent('organisations') || this.getMetaContent('analytics:organisations'),
+            world_locations: this.getMetaContent('world-locations') || this.getMetaContent('analytics:world-locations'),
 
             /* The existence of a referrer parameter indicates that the page has been dynamically updated via an AJAX request
             and therefore we can use it to set the dynamic property appropriately. This value is used by PA's to differentiate
@@ -78,7 +79,8 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
     },
 
     getLocation: function () {
-      return this.PIIRemover.stripPIIWithOverride(this.stripGaParam(document.location.href), true, true)
+      // We don't want to remove dates on search pages.
+      return this.PIIRemover.stripPIIWithOverride(this.stripGaParam(document.location.href), this.stripDates, true)
     },
 
     getSearchTerm: function () {
@@ -110,8 +112,9 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
     getQueryString: function () {
       var queryString = window.GOVUK.analyticsGa4.core.trackFunctions.getSearch()
       if (queryString) {
+        // We don't want to remove dates on search pages.
         queryString = this.stripGaParam(queryString)
-        queryString = this.PIIRemover.stripPIIWithOverride(queryString, true, true)
+        queryString = this.PIIRemover.stripPIIWithOverride(queryString, this.stripDates, true)
         queryString = queryString.substring(1) // removes the '?' character from the start.
         return queryString
       }

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/pii-remover.js

@@ -27,18 +27,23 @@
   var UNLOCK_TOKEN_PATTERN = /unlock_token=[a-zA-Z0-9-]+/g
   var STATE_PATTERN = /state=.[^&]+/g
 
+  // some users mistakenly use GOV.UK to search for the status of their applications.
+  // e.g. GWF123456789 and GB123456789000
+  var VISA_PATTERN_GWF = /GWF\d{9}/g
+  var VISA_PATTERN_GB = /GB\d{12}/g
+
   function shouldStripDates () {
-    var metas = document.querySelectorAll('meta[name="govuk:static-analytics:strip-dates"]')
+    var metas = document.querySelectorAll('meta[name="govuk:ga4-strip-dates"]')
     return metas.length > 0
   }
 
   function shouldStripPostcodes () {
-    var metas = document.querySelectorAll('meta[name="govuk:static-analytics:strip-postcodes"]')
+    var metas = document.querySelectorAll('meta[name="govuk:ga4-strip-postcodes"]')
     return metas.length > 0
   }
 
   function queryStringParametersToStrip () {
-    var meta = document.querySelector('meta[name="govuk:static-analytics:strip-query-string-parameters"]')
+    var meta = document.querySelector('meta[name="govuk:ga4-strip-query-string-parameters"]')
     var value = false
     if (meta) {
       value = meta.getAttribute('content')
@@ -97,6 +102,8 @@
     stripped = stripped.replace(RESET_PASSWORD_TOKEN_PATTERN, 'reset_password_token=[reset_password_token]')
     stripped = stripped.replace(UNLOCK_TOKEN_PATTERN, 'unlock_token=[unlock_token]')
     stripped = stripped.replace(STATE_PATTERN, 'state=[state]')
+    stripped = stripped.replace(VISA_PATTERN_GWF, '[gwf number]')
+    stripped = stripped.replace(VISA_PATTERN_GB, '[gb eori number]')
     stripped = this.stripQueryStringParameters(stripped)
 
     if (this.stripDatePII === true) {

data/app/assets/javascripts/govuk_publishing_components/lib/cookie-functions.js

@@ -202,12 +202,14 @@
 
   window.GOVUK.deleteCookie = function (cookie) {
     window.GOVUK.cookie(cookie, null)
+    window.GOVUK.expireCookie(cookie)
+  }
 
-    if (window.GOVUK.cookie(cookie)) {
-      // We need to handle deleting cookies on the domain and the .domain
-      document.cookie = cookie + '=;expires=' + new Date() + ';'
-      document.cookie = cookie + '=;expires=' + new Date() + ';domain=' + window.location.hostname + ';path=/'
-    }
+  window.GOVUK.expireCookie = function (cookie, value = '') {
+    // We need to handle deleting cookies on the domain and the .domain
+    var thePast = new Date(0) // 0 = 0 seconds since UTC started (1970/01/01)
+    document.cookie = cookie + '=' + value + ';expires=' + thePast + ';'
+    document.cookie = cookie + '=' + value + ';expires=' + thePast + ';domain=' + window.location.hostname + ';path=/'
   }
 
   window.GOVUK.deleteUnconsentedCookies = function () {

data/app/assets/javascripts/govuk_publishing_components/lib/cookie-settings.js

@@ -107,7 +107,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     try {
       documentReferrer = document.referrer || new URL(document.referrer).pathname
     } catch (e) {
-      console.error('Error grabbing referrer for cookie settings', window.location, e)
+      console.warn('Error grabbing referrer for cookie settings', window.location, e)
     }
     return documentReferrer
   }

data/app/assets/stylesheets/govuk_publishing_components/_all_components.scss

@@ -67,6 +67,7 @@
 @import "components/related-navigation";
 @import "components/reorderable-list";
 @import "components/search";
+@import "components/secondary-navigation";
 @import "components/select";
 @import "components/share-links";
 @import "components/signup-link";

data/app/assets/stylesheets/govuk_publishing_components/component_support.scss

@@ -12,3 +12,5 @@
 @import "govuk_publishing_components/components/mixins/media-down";
 @import "govuk_publishing_components/components/mixins/margins";
 @import "govuk_publishing_components/components/mixins/css3";
+
+@import "govuk_publishing_components/lib/print_support";

data/app/assets/stylesheets/govuk_publishing_components/components/_action-link.scss

@@ -178,3 +178,22 @@
     }
   }
 }
+
+@include govuk-media-query($media-type: print) {
+  .gem-c-action-link {
+    * {
+      color: $govuk-print-text-colour !important; // stylelint-disable-line declaration-no-important
+    }
+
+    &::before {
+      display: none;
+    }
+
+    .gem-c-action-link__link {
+      &::after {
+        display: block;
+        font-size: 12pt;
+      }
+    }
+  }
+}

data/app/assets/stylesheets/govuk_publishing_components/components/_document-list.scss

@@ -23,14 +23,6 @@
   @include govuk-font($size: 19, $weight: bold);
 }
 
-.gem-c-document-list--no-underline {
-  .gem-c-document-list__item-title {
-    .govuk-link {
-      text-decoration: none;
-    }
-  }
-}
-
 .gem-c-document-list--no-top-border {
   .gem-c-document-list__item {
     border-top: none;
@@ -160,20 +152,6 @@
   }
 }
 
-.gem-c-document-list-child__link {
-  text-decoration: none;
-
-  &:hover {
-    text-decoration: underline;
-    text-underline-offset: .1em;
-    @include govuk-link-hover-decoration;
-  }
-
-  &:focus {
-    text-decoration: none;
-  }
-}
-
 .gem-c-document-list-child__description {
   margin-top: govuk-spacing(1);
   margin-bottom: govuk-spacing(1);

data/app/assets/stylesheets/govuk_publishing_components/components/_layout-super-navigation-header.scss

@@ -290,6 +290,8 @@ $after-button-padding-left: govuk-spacing(4);
 // after it has been toggled closed if the blue background has
 // been enabled
 .gem-c-layout-super-navigation-header__navigation-top-toggle-button.gem-c-layout-super-navigation-header__navigation-top-toggle-button--blue-background {
+  background-color: $govuk-brand-colour;
+
   &:focus:not(:focus-visible) {
     &::after {
       background: none;
@@ -606,6 +608,10 @@ $after-button-padding-left: govuk-spacing(4);
 // Styles for search toggle button.
 .gem-c-layout-super-navigation-header__search-toggle-button {
   background: none;
+
+  &.gem-c-layout-super-navigation-header__search-toggle-button--blue-background {
+    background: $govuk-brand-colour;
+  }
   border: 0;
   color: govuk-colour("white");
   cursor: pointer;

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

@@ -31,7 +31,6 @@ $large-input-size: 50px;
   display: block;
   color: $govuk-text-colour;
   cursor: text;
-  max-width: 68%;
   text-overflow: ellipsis;
   height: 90%;
   overflow: hidden;
@@ -48,6 +47,7 @@ $large-input-size: 50px;
     left: 2px;
     top: 2px;
     bottom: 2px;
+    max-width: 68%;
     padding-left: govuk-spacing(3);
     z-index: 1;
     color: $govuk-secondary-text-colour;
@@ -229,7 +229,7 @@ $large-input-size: 50px;
   }
 }
 
-.gem-c-search__label--white {
+.govuk-label.gem-c-search__label--white {
   color: govuk-colour("white");
 }
 

data/app/assets/stylesheets/govuk_publishing_components/components/_secondary-navigation.scss

@@ -0,0 +1,94 @@
+@import "govuk_publishing_components/individual_component_support";
+
+.gem-c-secondary-navigation {
+  @include govuk-font(19);
+  @include govuk-responsive-margin(6, "bottom");
+
+  @include govuk-media-query($from: tablet) {
+    box-shadow: inset 0 -1px 0 $govuk-border-colour;
+    display: flex;
+  }
+}
+
+.gem-c-secondary-navigation__list {
+  list-style: none;
+  margin-bottom: govuk-spacing(4);
+  padding: 0;
+
+  @include govuk-media-query($from: tablet) {
+    box-shadow: none;
+    display: flex;
+    margin: 0;
+    white-space: nowrap;
+  }
+}
+
+.gem-c-secondary-navigation__list-item {
+  box-shadow: inset 0 -1px 0 $govuk-border-colour;
+
+  @include govuk-media-query($from: tablet) {
+    display: flex;
+    margin-right: 20px;
+
+    &:last-child {
+      margin-right: 0;
+    }
+  }
+
+  &:last-child {
+    box-shadow: none;
+  }
+
+  .gem-c-secondary-navigation__list-item-link,
+  .gem-c-secondary-navigation__list-item-link:link,
+  .gem-c-secondary-navigation__list-item-link:visited {
+    background-color: inherit;
+    border-left: 4px solid transparent;
+    color: govuk-colour("blue");
+    display: block;
+    padding: govuk-spacing(2);
+    text-decoration: none;
+
+    @include govuk-media-query($from: tablet) {
+      border-bottom: 4px solid transparent;
+      border-left: 0;
+      padding: govuk-spacing(2) 0;
+      padding-bottom: govuk-spacing(2) - 4px; // Compensate for 4px border
+    }
+  }
+
+  .gem-c-secondary-navigation__list-item-link:hover {
+    color: $govuk-link-hover-colour;
+  }
+
+  .gem-c-secondary-navigation__list-item-link:focus {
+    @include govuk-focused-text;
+
+    border-color: $govuk-focus-text-colour;
+    border-left-color: transparent;
+    position: relative;
+
+    @include govuk-media-query($from: tablet) {
+      box-shadow: none;
+    }
+  }
+}
+
+.gem-c-secondary-navigation__list-item--current {
+  .gem-c-secondary-navigation__list-item-link:link,
+  .gem-c-secondary-navigation__list-item-link:visited {
+    border-color: govuk-colour("blue");
+    color: $govuk-text-colour;
+  }
+
+  .gem-c-secondary-navigation__list-item-link:focus {
+    @include govuk-focused-text;
+
+    border-color: $govuk-focus-text-colour;
+    border-left-color: transparent;
+
+    @include govuk-media-query($from: tablet) {
+      box-shadow: none;
+    }
+  }
+}

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

@@ -128,6 +128,13 @@ $table-row-even-background-colour: govuk-colour("light-grey");
 
 // stylelint-disable declaration-no-important
 @include govuk-media-query($media-type: print) {
+  .govuk-table,
+  .gem-c-table {
+    a::after {
+      display: none !important;
+    }
+  }
+
   .govuk-table--sortable {
     outline: none;
 

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

@@ -10,7 +10,7 @@ $high-alert-border: #cc0000;
     background-position: 98% center;
     background-color: $info-background;
     line-height: 1.3em;
-    margin: 0 -1em 1em;
+    margin: 0 0 1em;
     padding: govuk-spacing(3) govuk-spacing(8) govuk-spacing(3) govuk-spacing(3);
     text-align: left;
 

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_highlight-answer.scss

@@ -10,7 +10,7 @@ $highlight-answer-color: govuk-colour("white");
     color: $highlight-answer-color;
     text-align: center;
     padding: 1.75em .75em 1.25em;
-    margin: 0 -1em 1em;
+    margin: 0 0 1em;
 
     p {
       color: $highlight-answer-color;

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

@@ -97,3 +97,12 @@
     }
   }
 }
+
+@include govuk-media-query($media-type: print) {
+  .govspeak,
+  .gem-c-govspeak {
+    table a::after {
+      display: none !important; // stylelint-disable-line declaration-no-important
+    }
+  }
+}

data/app/assets/stylesheets/govuk_publishing_components/lib/_print_support.scss

@@ -0,0 +1,27 @@
+// A helper class for removing column layouts when printing.
+// This should be applied to row/column layouts, by adding the
+// class to elements with a `govuk-grid-row` class. The columns
+// will then print at the full width of the page.
+// Note that only the immediate child columns will be affected.
+// If a child column also contains a row/column layout of
+// further elements, these will be unaffected and will retain
+// their existing column layout. Use the class again on these
+// nested grids to apply fullwidth column printing if required.
+
+@include govuk-media-query($media-type: print) {
+  .gem-print-columns-none {
+    width: 100%;
+
+    > .govuk-width-container {
+      margin: 0;
+      max-width: none;
+    }
+
+    > [class*="govuk-grid-column"] {
+      position: static !important; // stylelint-disable-line declaration-no-important
+      float: none;
+      clear: both;
+      width: 100%;
+    }
+  }
+}

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

@@ -17,7 +17,7 @@
   dark_large_icon ||= false
   light_icon ||= false
 
-  css_classes = %w(gem-c-action-link govuk-!-display-none-print)
+  css_classes = %w(gem-c-action-link)
   css_classes << "gem-c-action-link--light-text" if light_text
   css_classes << "gem-c-action-link--dark-icon" if dark_icon
   css_classes << "gem-c-action-link--dark-large-icon" if dark_large_icon

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

@@ -7,12 +7,11 @@
 
   component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
   component_helper.add_class("gem-c-document-list")
-  component_helper.add_class("gem-c-document-list--no-underline") if local_assigns[:remove_underline]
   component_helper.add_class("gem-c-document-list--no-top-border") if local_assigns[:remove_top_border]
   component_helper.add_class("gem-c-document-list--no-top-border-first-child") if local_assigns[:remove_top_border_from_first_child]
   component_helper.add_class(shared_helper.get_margin_bottom)
 
-
+  extra_link_classes = "govuk-link--no-underline" if local_assigns[:remove_underline]
   title_with_context_class = " gem-c-document-list__item-title--context"
 
   brand ||= false
@@ -57,7 +56,7 @@
                 item[:link][:text],
                 item[:link][:path],
                 data: item[:link][:data_attributes],
-                class: "#{item_classes} govuk-link",
+                class: "#{item_classes} govuk-link #{extra_link_classes}",
                 lang: item[:link][:locale].presence,
                 rel: rel,
               )
@@ -118,7 +117,7 @@
                       part[:link][:text],
                       part[:link][:path],
                       data: part[:link][:data_attributes],
-                      class: "gem-c-document-list-child__heading #{brand_helper.color_class} govuk-link gem-c-document-list-child__link",
+                      class: "gem-c-document-list-child__heading gem-c-document-list-child__link #{brand_helper.color_class} govuk-link #{extra_link_classes}",
                     )
                   else
                     content_tag(

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

@@ -1,18 +1,17 @@
 <%
   add_gem_component_stylesheet("hint")
 
-  id ||= "hint-#{SecureRandom.hex(4)}"
+  local_assigns[:id] ||= "hint-#{SecureRandom.hex(4)}"
   is_radio_label_hint ||= false
   right_to_left ||= false
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
 
-  css_classes = %w( gem-c-hint govuk-hint )
-  css_classes << "govuk-radios__hint" if is_radio_label_hint
-
-  custom_margin_bottom_class = shared_helper.get_margin_bottom if [*0..9].include?(local_assigns[:margin_bottom])
-  css_classes << custom_margin_bottom_class if local_assigns[:margin_bottom]
+  component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
+  component_helper.add_class("gem-c-hint govuk-hint")
+  component_helper.add_class("govuk-radios__hint") if is_radio_label_hint
+  component_helper.add_class(shared_helper.get_margin_bottom) if [*0..9].include?(local_assigns[:margin_bottom])
 %>
 
-<%= tag.div id: id, class: css_classes, dir: right_to_left ? "rtl" : nil do %>
+<%= tag.div(**component_helper.all_attributes, dir: right_to_left ? "rtl" : nil) do %>
   <%= text %>
 <% end %>

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

@@ -6,9 +6,24 @@
   error_text ||= nil
   error_text_prefix ||= t("components.password_input.error_text_prefix")
 
+  button_show_password_aria_label ||= t("components.password_input.button_aria_label")
+  button_hide_password_aria_label ||= t("components.password_input.button_aria_hide_label")
+  button_show_password_text ||= t("components.password_input.button")
+  button_hide_password_text ||= t("components.password_input.button_hide")
+  password_shown_announcement ||= t("components.password_input.password_shown_announcement")
+  password_hidden_announcement ||= t("components.password_input.password_hidden_announcement")
+
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
   component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
-  component_helper.add_data_attribute({ module: "govuk-password-input" })
+  component_helper.add_data_attribute({
+    module: "govuk-password-input",
+      "i18n.show-password": button_show_password_text,
+      "i18n.hide-password": button_hide_password_text,
+      "i18n.show-password-aria-label": button_show_password_aria_label,
+      "i18n.hide-password-aria-label": button_hide_password_aria_label,
+      "i18n.password-shown-announcement": password_shown_announcement,
+      "i18n.password-hidden-announcement": password_hidden_announcement,
+    })
   component_helper.add_class('govuk-form-group')
   component_helper.add_class('govuk-form-group--error') if error_text
   component_helper.add_class('govuk-password-input')
@@ -34,7 +49,6 @@
     aria_controls << '-with-error-message'
     paragraph_id = uid + '-password-input-with-error-message-error'
   end
-
 %>
 
 <%= tag.div(**component_helper.all_attributes) do %>
@@ -70,9 +84,9 @@
       hidden: true,
       aria: {
         controls: aria_controls,
-        label: t("components.password_input.button_aria_label")
+        label: button_show_password_aria_label
       }) do %>
-        <%= t("components.password_input.button") %>
+        <%= button_show_password_text %>
       <% end %>
   </div>
 <% end %>

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

@@ -1,5 +1,6 @@
 <%
   add_gem_component_stylesheet("search")
+  add_gem_component_stylesheet("label")
 
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
   heading_helper = GovukPublishingComponents::Presenters::HeadingHelper.new(local_assigns)
@@ -51,10 +52,8 @@
     end
   end
 %>
-
 <div class="<%= classes.join(" ") %>" data-module="gem-toggle-input-class-on-focus">
   <% if wrap_label_in_a_heading %>
-    <% add_gem_component_stylesheet("label") %>
     <%= content_tag(shared_helper.get_heading_level, class: "govuk-!-margin-0") do %>
       <%= tag_label %>
     <% end %>

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

@@ -0,0 +1,29 @@
+<%
+  add_gem_component_stylesheet("secondary-navigation")
+
+  id ||= nil
+  items ||= []
+
+  component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
+  component_helper.add_aria_attribute({label: aria_label})
+  component_helper.add_class('gem-c-secondary-navigation')
+  component_helper.set_id(id)
+  component_helper.add_role("navigation")
+%>
+
+<% if items.any? %>
+  <%= tag.nav(**component_helper.all_attributes) do %>
+    <%= tag.ul class: "gem-c-secondary-navigation__list" do %>
+      <% items.each do |item| %>
+        <%
+          item_classes = %w( gem-c-secondary-navigation__list-item )
+          item_classes << "gem-c-secondary-navigation__list-item--current" if item[:current]
+          item_aria_attributes = { current: "page" } if item[:current]
+        %>
+        <%= tag.li class: item_classes do %>
+          <%= link_to item[:label], item[:href], class: "govuk-link govuk-link--no-visited-state gem-c-secondary-navigation__list-item-link", data: item[:data_attributes], aria: item_aria_attributes %>
+        <% end %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

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

@@ -307,6 +307,29 @@ examples:
         - link:
             text: 'Criteria'
             description: 'no url provided, just text'
+  with_parts_and_no_underline:
+    description: The legacy finders design does not include underlines on links, neither on the main item nor the children.
+    data:
+      remove_underline: true
+      items:
+      - link:
+          text: 'Universal credit'
+          path: '/universal-credit'
+          description: 'Universal Credit is replacing 6 other benefits with a single monthly payment if you are out of work or on a low income - eligibility, how to prepare'
+        parts:
+        - link:
+            text: 'What universal credit is'
+            path: '/universal-credit/what-it-is'
+            description: 'Universal Credit is a payment to help with your living costs. It’s paid monthly - or twice a month for some people in Scotland.'
+        - link:
+            text: 'Elegibility'
+            path: '/universal-credit/eligibility'
+            description: 'You may be able to get Universal Credit if: you’re on a low income or out...'
+            data_attributes:
+              an_attribute: some_value
+        - link:
+            text: 'Criteria'
+            description: 'no url provided, just text'
   with_locale_specified:
     description: |
       The component is used on translated pages that don’t have a translation for the document link text or the metadata. This means that it could display the fallback English string if the translate method can’t find an appropriate translation. This makes sure that the lang can be set to ensure that browsers understand which parts of the page are in each language.

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

@@ -2,6 +2,7 @@ name: Form hint text
 description: Use hints for any form fields.
 govuk_frontend_components:
   - hint
+uses_component_wrapper_helper: true
 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)