govuk_publishing_components 27.10.3 → 27.12.0

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

@@ -1,13 +1,16 @@
 <%
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
 
-  id ||= "input-#{SecureRandom.hex(4)}"
-  value ||= nil
-  type ||= "text"
-  describedby ||= nil
+  autocomplete ||= nil
   controls ||= nil
   data ||= nil
-  autocomplete ||= nil
+  describedby ||= nil
+  enterkeyhint ||= nil
+  id ||= "input-#{SecureRandom.hex(4)}"
+  type ||= "text"
+  value ||= nil
+  inputmode ||= nil
+  pattern ||= nil
 
   label ||= nil
   hint ||= nil
@@ -32,6 +35,7 @@
   css_classes << "govuk-input--error" if has_error
   css_classes << "govuk-input--width-#{width}" if [2, 3, 4, 5, 10, 20, 30].include?(width)
   css_classes << "gem-c-input--with-search-icon" if search_icon
+
   form_group_css_classes = %w(govuk-form-group)
   form_group_css_classes << "govuk-form-group--error" if has_error && !grouped
 
@@ -44,14 +48,21 @@
     aria_described_by = aria_described_by.join(" ")
   end
 
+  checked_enterkeyhint = enterkeyhint if [
+    "done",
+    "enter",
+    "go",
+    "next",
+    "previous",
+    "search",
+    "send",
+  ].include?(enterkeyhint)
+
   if type == "number"
     type = "text"
     inputmode = "numeric"
     pattern = "[0-9]*"
   end
-
-  inputmode ||= nil
-  pattern ||= nil
 %>
 
 <%= content_tag :div, class: form_group_css_classes do %>
@@ -87,24 +98,26 @@
     } %>
   <% end %>
 
-  <% input_tag = tag.input name: name,
-    value: value,
-    class: css_classes,
-    id: id,
-    type: type,
-    data: data,
+  <% input_tag = tag.input({
+    aria: {
+      describedby: aria_described_by,
+      controls: controls
+    },
     autocomplete: autocomplete,
-    tabindex: tabindex,
     autofocus: autofocus,
-    readonly: readonly,
-    maxlength: maxlength,
+    class: css_classes,
+    data: data,
+    enterkeyhint: checked_enterkeyhint,
+    id: id,
     inputmode: inputmode,
+    maxlength: maxlength,
+    name: name,
     pattern: pattern,
-    aria: {
-      describedby: aria_described_by,
-      controls: controls
-    }
-  %>
+    readonly: readonly,
+    tabindex: tabindex,
+    type: type,
+    value: value,
+  }) %>
 
   <% if prefix && suffix %>
     <%= tag.div class: "govuk-input__wrapper" do %>

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

@@ -80,13 +80,8 @@
         id="super-navigation-menu-toggle"
         type="button"
       >
-        Menu
-        <span
-          aria-hidden="true"
-          class="gem-c-layout-super-navigation-header__navigation-top-toggle-close-icon"
-          focusable="false"
-        >
-          &times;
+        <span class="gem-c-layout-super-navigation-header__navigation-top-toggle-button-inner">
+          Menu
         </span>
       </button>
       <ul id="super-navigation-menu" class="gem-c-layout-super-navigation-header__navigation-items">
@@ -147,8 +142,8 @@
                         </p>
                       <% end %>
                     </div>
-                    <% if link[:menu_contents].present? %>
-                      <div class="govuk-grid-column-two-thirds-from-desktop">
+                    <div class="govuk-grid-column-two-thirds-from-desktop">
+                      <% if link[:menu_contents].present? %>
                           <ul class="govuk-list gem-c-layout-super-navigation-header__navigation-second-items gem-c-layout-super-navigation-header__navigation-second-items--<%= link[:label].parameterize %>">
                             <% link[:menu_contents].each do | item | %>
                               <%
@@ -172,39 +167,32 @@
                               </li>
                             <% end %>
                           </ul>
-                      </div>
-                    <% end %>
-                  </div>
-                  <% if link[:footer_links].present? %>
-                    <div class="govuk-grid-row">
-                      <div class="govuk-grid-column-full">
-                        <div class="gem-c-layout-super-navigation-header__navigation-second-footer">
-                          <div class="govuk-grid-row">
-                            <ul class="gem-c-layout-super-navigation-header__navigation-second-footer-list">
-                              <% link[:footer_links].each do | item | %>
-                                <li class="gem-c-layout-super-navigation-header__navigation-second-footer-item">
-                                  <%= link_to item[:label], item[:href], {
-                                    class: [
-                                      "govuk-link",
-                                      "gem-c-layout-super-navigation-header__navigation-second-footer-link",
-                                    ],
-                                    data: {
-                                      module: "gem-track-click",
-                                      track_action: "#{tracking_label}Link",
-                                      track_category: "headerClicked",
-                                      track_label: item[:href],
-                                      track_dimension: item[:label],
-                                      track_dimension_index: "29",
-                                    }
-                                  } %>
-                                </li>
-                              <% end %>
-                            </ul>
-                          </div>
-                        </div>
-                      </div>
+                      <% end %>
+                      <% if link[:footer_links].present? %>
+                        <hr class="gem-c-layout-super-navigation-header__navigation-second-footer-break govuk-section-break govuk-section-break--visible">
+                        <ul class="gem-c-layout-super-navigation-header__navigation-second-footer-list">
+                          <% link[:footer_links].each do | item | %>
+                            <li class="gem-c-layout-super-navigation-header__navigation-second-footer-item">
+                              <%= link_to item[:label], item[:href], {
+                                class: [
+                                  "govuk-link",
+                                  "gem-c-layout-super-navigation-header__navigation-second-footer-link",
+                                ],
+                                data: {
+                                  module: "gem-track-click",
+                                  track_action: "#{tracking_label}Link",
+                                  track_category: "headerClicked",
+                                  track_label: item[:href],
+                                  track_dimension: item[:label],
+                                  track_dimension_index: "29",
+                                }
+                              } %>
+                            </li>
+                          <% end %>
+                        </ul>
+                      <% end %>
                     </div>
-                  <% end %>
+                  </div>
                 </div>
               </div>
             <% end %>

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

@@ -43,6 +43,7 @@
       aria: {
         controls: aria_controls,
       },
+      enterkeyhint: "search",
       class: "gem-c-search__item gem-c-search__input js-class-toggle",
       id: id,
       name: name,
@@ -51,7 +52,7 @@
       value: value,
     ) %>
     <div class="gem-c-search__item gem-c-search__submit-wrapper">
-      <%= tag.button class: "gem-c-search__submit", type: "submit", data: data_attributes do %>
+      <%= tag.button class: "gem-c-search__submit", type: "submit", data: data_attributes, enterkeyhint: "search" do %>
         <%= button_text %>
         <%= render "govuk_publishing_components/components/search/search_icon" %>
       <% end %>

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

@@ -0,0 +1,23 @@
+<%
+  page ||= ''
+  data_attributes ||= {}
+  base_path ||= nil
+  local_assigns[:margin_bottom] ||= 3
+  already_subscribed ||= false
+  text ||= already_subscribed ? t('components.single_page_notification_button.unsubscribe_text') : t('components.single_page_notification_button.subscribe_text')
+
+  shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
+  wrapper_classes = %w(gem-c-single-page-notification-button govuk-!-display-none-print)
+  wrapper_classes << shared_helper.get_margin_bottom
+  classes = "govuk-body-s gem-c-single-page-notification-button__submit"
+%>
+<% button_text = capture do %>
+  <svg class="gem-c-single-page-notification-button__icon" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" height="18" width="18" viewBox="0 0 459.334 459.334"><path fill="currentColor" d="M177.216 404.514c-.001.12-.009.239-.009.359 0 30.078 24.383 54.461 54.461 54.461s54.461-24.383 54.461-54.461c0-.12-.008-.239-.009-.359H175.216zM403.549 336.438l-49.015-72.002v-89.83c0-60.581-43.144-111.079-100.381-122.459V24.485C254.152 10.963 243.19 0 229.667 0s-24.485 10.963-24.485 24.485v27.663c-57.237 11.381-100.381 61.879-100.381 122.459v89.83l-49.015 72.002a24.76 24.76 0 0 0 20.468 38.693H383.08a24.761 24.761 0 0 0 20.469-38.694z"/></svg><%= text %>
+<% end %>
+<%= tag.form class: wrapper_classes, action: "/email/subscriptions/single-page/new", method: "POST", data: data_attributes do %>
+  <input type="hidden" name="base_path" value="<%= base_path %>">
+  <%= content_tag(:button, button_text, {
+    class: classes,
+    type: "submit",
+  }) %>
+<% end if base_path.presence %>

data/app/views/govuk_publishing_components/components/contextual_sidebar/_brexit_cta.html.erb

@@ -1,10 +1,9 @@
 <% shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns) %>
-<% cta_helper = GovukPublishingComponents::Presenters::BrexitCtaHelper.new(content_item) %>
 <%
-  title = t(cta_helper.title_key)
-  link_text = t(cta_helper.link_text_key)
-  link_path = t(cta_helper.link_path_key)
-  lang = shared_helper.t_locale(cta_helper.title_key)
+  title = t("components.related_navigation.transition.title")
+  link_text = t("components.related_navigation.transition.link_text")
+  link_path = t("components.related_navigation.transition.link_path")
+  lang = shared_helper.t_locale("components.related_navigation.transition.title")
 %>
 
 <% data_attributes = {

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

@@ -170,3 +170,13 @@ examples:
       name: "lead-times"
       width: 10
       suffix: "days"
+  with_enterhintkey_attribute:
+    description: |
+      To help users with virtual keyboards this changes the "enter" key to be a word that's more descriptive of the action.
+
+      Must be one of `enter`, `done`, `go`, `next`, `previous`, `search`, or `send`. See the [list of values and descriptions on MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/enterkeyhint#values).
+    data:
+      label:
+        text: "Given name"
+      name: given-name
+      enterkeyhint: "next"

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

@@ -0,0 +1,32 @@
+name: Single page notification button
+description: A button that subscribes the user to email notifications to a page
+body: |
+  By default, the component displays with the "Get emails about this page" state. The component does not render without the `base_path` parameter.
+
+  The `base_path` is necessary for [checking if an email subscription is active on page load](https://github.com/alphagov/account-api/blob/main/docs/api.md#get-apipersonalisationcheck-email-subscriptiontopic_slug) and the creation/deletion of an email notification subscription.
+
+  When the button is clicked, the `base_path` is submitted to an endpoint which proceeds to check the user's authentication status and whether they are already subscribed to the page or not. Depending on these factors, they will be routed accordingly.
+accessibility_criteria: |
+  - The bell icon must be presentational and ignored by screen readers.
+examples:
+  default:
+    description: By default this component prompts the user to subscribe to email notifications to this page.
+    data:
+      base_path: '/current-page-path'
+  already_subscribed:
+    description: If the user has already subscribed to email notifications about the current page, display the "Stop getting emails about this page" state.
+    data:
+      base_path: '/current-page-path'
+      already_subscribed: true
+  with_data_attributes:
+    description: The component accepts data attributes (for example, for analytics)
+    data:
+      base_path: '/current-page-path'
+      data_attributes:
+        category: fancyButtons
+  with_margin_bottom:
+    description: |
+      The component accepts a number for margin bottom from 0 to 9 (0px to 60px) using the [GOV.UK Frontend spacing scale](https://design-system.service.gov.uk/styles/spacing/#the-responsive-spacing-scale). It defaults to having a margin bottom of 15px.
+    data:
+      base_path: '/current-page-path'
+      margin_bottom: 5

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

@@ -13,15 +13,15 @@
   focusable="false"
 >
   <circle
-    cx="10.0161"
-    cy="10.0161"
+    cx="12.0161"
+    cy="11.0161"
     r="8.51613"
     stroke="currentColor"
     stroke-width="3" />
   <line
-    x1="15.8668"
-    y1="16.3587"
-    x2="25.4475"
+    x1="17.8668"
+    y1="17.3587"
+    x2="26.4475"
     y2="25.9393"
     stroke="currentColor"
     stroke-width="3" />

data/config/locales/ar.yml

@@ -166,9 +166,6 @@ ar:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/az.yml

@@ -166,9 +166,6 @@ az:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/be.yml

@@ -166,9 +166,6 @@ be:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/bg.yml

@@ -166,9 +166,6 @@ bg:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/bn.yml

@@ -166,9 +166,6 @@ bn:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/cs.yml

@@ -166,9 +166,6 @@ cs:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/cy.yml

@@ -166,9 +166,6 @@ cy:
       topical_events:
       topics: Archwilio’r pwnc
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title: Gwiriwr Brexit
         link_path: "/brexit.cy"
         link_text: Cael rhestr bersonol o gamau gweithredu
         title: Brexit

data/config/locales/da.yml

@@ -166,9 +166,6 @@ da:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/de.yml

@@ -166,9 +166,6 @@ de:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/dr.yml

@@ -166,9 +166,6 @@ dr:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/el.yml

@@ -166,9 +166,6 @@ el:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/en.yml

@@ -157,13 +157,14 @@ en:
           href: "/browse/visas-immigration"
         - label: Working, jobs and pensions
           href: "/browse/working"
-      - label: Departments
-        href: "/government/organisations"
       - label: Government activity
         href: "/search/news-and-communications"
-        description: Find out what the government is doing
+        description: Search for a department and find out what the government is doing
         menu_contents: # If adding or removing items, remember to update the
                        # `columns` in the layout-super-navigation-header SCSS.
+        - label: Departments
+          href: "/government/organisations"
+          description: Departments, agencies and public bodies
         - label: News
           href: "/search/news-and-communications"
           description: News stories, speeches, letters and notices
@@ -239,9 +240,6 @@ en:
       topical_events: Topical event
       topics: Explore the topic
       transition:
-        hub_page_link_path: "/transition-check/questions"
-        hub_page_link_text: Get a personalised list of actions
-        hub_page_title: Brexit checker
         link_path: "/brexit"
         link_text: Check what you need to do
         title: Brexit
@@ -257,6 +255,9 @@ en:
       hide_password: Hide password
       show: Show
       show_password: Show password
+    single_page_notification_button:
+      subscribe_text: Get emails about this page
+      unsubscribe_text: Stop getting emails about this page
     skip_link:
       text: Skip to main content
     step_by_step_nav:

data/config/locales/es-419.yml

@@ -166,9 +166,6 @@ es-419:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/es.yml

@@ -166,9 +166,6 @@ es:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/et.yml

@@ -166,9 +166,6 @@ et:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/fa.yml

@@ -166,9 +166,6 @@ fa:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/fi.yml

@@ -166,9 +166,6 @@ fi:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/fr.yml

@@ -166,9 +166,6 @@ fr:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/gd.yml

@@ -166,9 +166,6 @@ gd:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/gu.yml

@@ -166,9 +166,6 @@ gu:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/he.yml

@@ -166,9 +166,6 @@ he:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/hi.yml

@@ -166,9 +166,6 @@ hi:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/hr.yml

@@ -166,9 +166,6 @@ hr:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/hu.yml

@@ -166,9 +166,6 @@ hu:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/hy.yml

@@ -166,9 +166,6 @@ hy:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/id.yml

@@ -166,9 +166,6 @@ id:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/is.yml

@@ -166,9 +166,6 @@ is:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title:

data/config/locales/it.yml

@@ -166,9 +166,6 @@ it:
       topical_events:
       topics:
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path:
         link_text:
         title: