govuk_publishing_components 24.17.0 → 24.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c57ef1405fbd96f5987dc24d795eb197a2682388ba0f3ccd4d09e933a5c0e8d2
-  data.tar.gz: 1213a4f3a3ac27a30ddba5a3f265607a1ff2970a5ee47896759c50986ab16f19
+  metadata.gz: 356af78d76ad3c161339e6c908f64e22aa8ce6da250fa1389ec2d5095d28c906
+  data.tar.gz: e820884ca39a8533a260ae07b824bee43d3d0616e4434f70e8d8a5212ec5f693
 SHA512:
-  metadata.gz: f769ee68de178a08f866be215ed3c01a9a113c83cc56c120dbb47093659dfeeda6e4ca5f20d576b000125efaff11423a034a4931a138f31fcf95b6fae6c91809
-  data.tar.gz: 6aa9cd20cc9e8bd4c3a5c377bb863ec02704bbbf8eddf9f28153b102b0c32b001b5f23ca7539a453b67cdc7b551447e762c6ff1a47114a20581e876e1ed083f4
+  metadata.gz: 115b6017568f069bece6086533f4e24e03af451682b59323924e96fe5996dc6c9e6f7597226571adba3fcba0df5798f85d8cfbd55f3ecaeaa49ac570946876af
+  data.tar.gz: 10f2ba6089990b0703e6cc4bc37aa3fc9e689560d8dfa9c193bf60aac1bc8536693e5f67a1501fdd836a408ad41d2ea3f191a640271425a27148bd8e1df54baf

data/README.md

@@ -1,103 +1,52 @@
-GOV.UK Publishing Components
+# GOV.UK Publishing Components
+
 [![status](https://badgen.net/github/status/alphagov/govuk_publishing_components/master)](https://ci.integration.publishing.service.gov.uk/job/govuk_publishing_components/job/master/)
 [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
 [![Stylelint Style Guide](https://img.shields.io/badge/code_style-stylelint-brightgreen.svg)](https://github.com/alphagov/stylelint-config-gds/)
-=====================
 
-GOV.UK Publishing Components is a Ruby gem to document and distribute components for GOV.UK applications.
+A Ruby gem to document and distribute components for GOV.UK applications. It provides:
 
-It provides:
 - a shared library of components
 - helpers to generate component payloads
 - an application to preview components and provide guidance
+- [GOV.UK Design System](https://design-system.service.gov.uk/) styles and components (via [GOV.UK Frontend](https://github.com/alphagov/govuk-frontend))
 
-Components should be added to this gem if they are required in more than one application, otherwise they should be added to that application.
-
-## How to
-
-- [Install and use this gem](/docs/install-and-use.md)
-- [Use a component in your application](/docs/use-components.md)
-- [Generate a new component](/docs/generate-a-new-component.md)
-- [Develop a component](/docs/develop-component.md)
-- [Run the component guide](/docs/run-component-guide.md)
-- [Move a component from an application to the gem](/docs/moving-components-upstream-into-this-gem.md)
-- [Publish/release a new version of the gem](/docs/publishing-to-rubygems.md)
-- [Keep this gem in sync with the Design System](/docs/upgrade-govuk-frontend.md)
-
-## Architecture / structure
-
-![](https://docs.google.com/drawings/d/e/2PACX-1vRj6JM7cQvngDl3Gr_U9G4xga2gsU7Z-d2qHHQcsBdjsW4WaC9_eQdryBJIS69cLkrY7S0fK9BcrPSF/pub?w=960&h=720)
-
-[Source](https://docs.google.com/drawings/d/1N8-kbyCN_xOvvshN6d2HnQz5i5Bqed2WIatI3Nj9gNQ/edit)
-
-There are 2 types of helper classes in this app:
-
-- [AppHelpers](lib/govuk_publishing_components/app_helpers). Are exposed to the applications using this gem. They should be documented using RDoc.
-- [Component Presenters](lib/govuk_publishing_components/presenters). Anything in these classes is only for use within the components. They should be marked `@private`.
+Components should be added to this gem if they are required in more than one application, otherwise they should be added to that application. All components should meet the same standards of browser and assistive technology support described in [GOV.UK Frontend](https://github.com/alphagov/govuk-frontend#browser-and-assistive-technology-support).
 
-## Relationship with GOV.UK Design System
+## Technical documentation
 
-GOV.UK Publishing Components also makes [GOV.UK Design System](https://design-system.service.gov.uk/) styles and components available to GOV.UK's frontend applications. This gem consumes [GOV.UK Frontend](https://github.com/alphagov/govuk-frontend) via [Yarn](https://classic.yarnpkg.com/).
+You can use the [GOV.UK Docker environment](https://github.com/alphagov/govuk-docker) or the local `startup.sh` script to run the app. Read the [guidance on local frontend development](https://docs.publishing.service.gov.uk/manual/local-frontend-development.html) to find out more about each approach, before you get started.
 
-## Browser and assistive technology support
+If you are using GOV.UK Docker, remember to combine it with the commands that follow. See the [GOV.UK Docker usage instructions](https://github.com/alphagov/govuk-docker#usage) for examples.
 
-GOV.UK Publishing Components shares the same standards in terms of browser and assistive technology support with [GOV.UK Frontend](https://github.com/alphagov/govuk-frontend#browser-and-assistive-technology-support).
-
-## Documentation
-
-[See the rubydoc.info documentation](http://www.rubydoc.info/gems/govuk_publishing_components)
-
-## Working locally
-
-### Install dependencies
-
-As well as the Ruby, you will also need the [Yarn package manager](https://classic.yarnpkg.com/en/docs/install/) to allow installing [npm](https://npmjs.com) dependencies.
-
-Install the application's dependencies with:
+### Running the test suite
 
 ```sh
-bundle install
-yarn install
+bundle exec rake
 ```
 
-### Running a local app with a local gem
-
-The GDS Developer Docs has a [guide on local frontend development](https://docs.publishing.service.gov.uk/manual/local-frontend-development.html) that covers setting up a local app to use the local version of the components gem in Docker and using the `./startup.sh` script.
+To run JavaScript tests (only):
 
-### Running tests
-
-The default rake task runs all the linting and test tasks:
-
-```sh
-bin/rake
 ```
-Javascript is tested using Jasmine and the [Jasmine gem](https://github.com/pivotal/jasmine-gem). Tests can be run either in the browser or on the command line via the dummy app’s tasks:
-
-```sh
-# browser
+# run JS tests in browser
 bin/rake app:jasmine
 
-# command line
+# run JS tests on command line
 bin/rake app:jasmine:ci
 ```
 
-### Viewing the component guide
-
-View the component guide in your browser with:
-
-```sh
-./startup.sh
-```
-
-The guide should be available at http://localhost:3212
-
-### View documentation
-
-Preview documentation in your browser with:
-
-```sh
-bundle exec yard server --reload
-```
+### Further documentation
+
+- [Install and use this gem](docs/install-and-use.md)
+- [Use a component in your application](docs/use-components.md)
+- [Generate a new component](docs/generate-a-new-component.md)
+- [Testing a component](docs/testing-components.md)
+- [Move a component from an application to the gem](docs/moving-components-upstream-into-this-gem.md)
+- [Publish/release a new version of the gem](docs/publishing-to-rubygems.md)
+- [Keep this gem in sync with the Design System](docs/upgrade-govuk-frontend.md)
+- [Code documentation on rubydoc.info](http://www.rubydoc.info/gems/govuk_publishing_components)
+- [Component conventions](docs/component_conventions.md)
+- [Component principles](docs/component_principles.md)
 
 ## Licence
 

data/app/assets/javascripts/govuk_publishing_components/analytics/custom-dimensions.js

@@ -63,6 +63,8 @@
       'taxon-ids': { dimension: 59, defaultValue: 'other' },
       'content-has-history': { dimension: 39, defaultValue: 'false' },
       'publishing-application': { dimension: 89 },
+      'brexit-audience': { dimension: 112 },
+      'brexit-superbreadcrumb': { dimension: 111 },
       stepnavs: { dimension: 96 },
       'relevant-result-shown': { dimension: 83 },
       'spelling-suggestion': { dimension: 81 }

data/app/assets/javascripts/govuk_publishing_components/rum-loader.js.erb

@@ -1,9 +1,6 @@
 (function() {
-  var marker = document.getElementsByTagName('script')[0]
-  var scripts = [
-    '<%= path_to_javascript("govuk_publishing_components/vendor/lux/lux-polyfill") %>',
-    '<%= path_to_javascript("govuk_publishing_components/vendor/lux/lux") %>'
-  ]
+  var scriptSrc = '<%= path_to_javascript("govuk_publishing_components/vendor/lux/lux-reporter") %>'
+
   var parsedCookie = (function() {
     try {
       var cookies = document.cookie.split(';')
@@ -23,14 +20,22 @@
     return {}
   })()
 
-  if (parsedCookie.usage === true) {
-    for (var i = 0; i < scripts.length; i++) {
-      var script = document.createElement('script')
-      script.src = scripts[i]
-      script.async = true
-      script.defer = true
+  var insertScript = function(source) {
+    var marker = document.getElementsByTagName('script')[0]
 
-      marker.parentNode.insertBefore(script, marker)
-    }
+    var script = document.createElement('script')
+    script.src = source
+    script.async = true
+    script.defer = true
+
+    marker.parentNode.insertBefore(script, marker)
+  }
+
+  if (parsedCookie.usage === true) {
+    insertScript(scriptSrc)
+  } else {
+    window.addEventListener('cookie-consent', function() {
+      insertScript(scriptSrc)
+    })
   }
 })()

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

@@ -102,10 +102,14 @@
   }
 }
 
-.govuk-header__logotype {
+.gem-c-header__logotype {
   vertical-align: middle;
 }
 
+.gem-c-header__logotype-crown {
+  top: -2px;
+}
+
 .gem-c-header__product-name {
   display: none;
 

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

@@ -18,7 +18,7 @@
     <%= render "govuk_publishing_components/components/textarea", { id: id, character_count: true }.merge(textarea.symbolize_keys) %>
 
     <span id="<%= id %>-info" class="govuk-hint govuk-character-count__message" aria-live="polite">
-      <%= t("components.character_count", number: maxlength || maxwords, type: maxwords ? t("components.character_count.type.words") : t("components.character_count.type.characters")) %>
+      <%= t("components.character_count.body", number: maxlength || maxwords, type: maxwords ? t("components.character_count.type.words") : t("components.character_count.type.characters")) %>
     </span>
   <% end %>
 <% end %>

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

@@ -12,9 +12,9 @@
                inverse: inverse,
                collapse_on_mobile: collapse_on_mobile %>
   <% end %>
-
-  <%= render(
-        'govuk_publishing_components/components/step_by_step_nav_header', breadcrumb_selector.priority_breadcrumbs
-      ) if breadcrumb_selector.priority_breadcrumbs
-  %>
+  <% if breadcrumb_selector.priority_breadcrumbs %>
+    <%= render 'govuk_publishing_components/components/step_by_step_nav_header', breadcrumb_selector.priority_breadcrumbs %>
+    <% meta_tag = GovukPublishingComponents::Presenters::MetaTags.new(content_item, local_assigns, request).brexit_priority_breadcrumb_tag %>
+    <meta name="<%= meta_tag.keys.first %>" content="<%= meta_tag.values.first %>">
+  <% end %>
 </div>

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

@@ -39,6 +39,7 @@
     <meta charset="utf-8" />
     <title><%= title %></title>
 
+    <%= javascript_include_tag "govuk_publishing_components/vendor/lux/lux-measurer", { async: true } %>
     <%= javascript_include_tag "govuk_publishing_components/rum-loader", { async: true } %>
 
     <%= csrf_meta_tags %>

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

@@ -1,4 +1,5 @@
 <%
+  local_assigns[:margin_bottom] ||= 6
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
   id ||= nil
   id_prefix ||= "radio-#{SecureRandom.hex(4)}"
@@ -27,6 +28,7 @@
   hint ||= nil
   error_message ||= nil
   error_items ||= []
+  margin_bottom = margin_bottom ||= 6
 
   has_error = error_message || error_items.any?
   hint_id = "hint-#{SecureRandom.hex(4)}" if hint
@@ -34,6 +36,7 @@
 
   form_group_css_classes = %w(govuk-form-group)
   form_group_css_classes << "govuk-form-group--error" if has_error
+  form_group_css_classes << shared_helper.get_margin_bottom
 
   radio_classes = %w(govuk-radios)
   radio_classes << "govuk-radios--small" if small

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

@@ -1,7 +1,7 @@
 name: Form checkboxes
 description: Let users select one or more options with checkboxes.
 body: |
-  If there is more than one checkbox they are rendered in a list. If there is only one, the markup is simplified to a single div and a heading attribute is not required.
+  If there is more than one checkbox they are rendered in a list. If there is only one, the markup is simplified to a single div and a heading attribute is not required. A `[]` needs to be appended to the name for Rails to treat the checkbox value as an array, otherwise only the last selected item is captured.
 govuk_frontend_components:
   - checkboxes
 accessibility_criteria: |
@@ -25,7 +25,7 @@ examples:
   with_multiple_checkboxes:
     description: When more than one checkbox is shown they are wrapped in a fieldset element, which requires a legend. This must be supplied to the component using the heading option.
     data:
-      name: "favourite_colour"
+      name: "favourite_colour[]"
       heading: "What is your favourite colour?"
       items:
         - label: "Red"
@@ -36,7 +36,7 @@ examples:
           value: "blue"
   with_small_checkboxes:
     data:
-      name: "favourite_small_synonym"
+      name: "favourite_small_synonym[]"
       heading: "What is your favourite synonym for small?"
       small: true
       items:
@@ -55,7 +55,7 @@ examples:
   with_custom_hint_text:
     description: Hint text defaults to 'Select all that apply' but can be overridden with this option. Note that a hint (and a heading) is only displayed if there is more than one checkbox.
     data:
-      name: "favourite_skittle"
+      name: "favourite_skittle[]"
       heading: "What is your favourite skittle?"
       hint_text: "Taste the rainbow"
       items:
@@ -71,7 +71,7 @@ examples:
       The description text can only render text and not govspeak specific syntax.
       This is a pattern that is used across GOV.UK where a question is followed by a description.
     data:
-      name: "favourite_skittle"
+      name: "favourite_skittle[]"
       heading: "Choose your favourite skittles"
       description: |
         Skittles consist of hard sugar shells imprinted with the letter "S".
@@ -91,7 +91,7 @@ examples:
       The description text can only render text and not govspeak specific syntax.
       This is a pattern that is used across GOV.UK where a question is followed by a description.
     data:
-      name: "favourite_skittle"
+      name: "favourite_skittle[]"
       heading: "Choose your favourite skittles"
       is_page_heading: true
       description: |
@@ -112,7 +112,7 @@ examples:
       A caption can only be used with a page heading. If a heading is not provided the caption will not render.
       The pattern is used across GOV.UK to show a high-level section that this page question falls into.
     data:
-      name: "favourite_skittle"
+      name: "favourite_skittle[]"
       heading: "Choose your favourite skittles"
       heading_caption: "Question 3 of 9"
       is_page_heading: true
@@ -126,7 +126,7 @@ examples:
   without_hint_text:
     description: Hint text can be removed entirely with this option. Note that this option can be combined with the visually_hide_heading option.
     data:
-      name: "favourite_skittle"
+      name: "favourite_skittle[]"
       heading: "What is your favourite skittle?"
       no_hint_text: true
       items:
@@ -137,7 +137,7 @@ examples:
   with_a_hidden_heading:
     description: If the heading/legend on the checkboxes is not required, it can be visually hidden using this option. It will still be visible to screen readers.
     data:
-      name: "favourite_colour"
+      name: "favourite_colour[]"
       heading: "What is your favourite colour?"
       visually_hide_heading: true
       items:
@@ -150,7 +150,7 @@ examples:
   with_a_custom_id_attribute:
     description: Note that if an id is not given one is generated automatically. In either case, the id is applied to the parent element of the checkboxes, and each checkbox is given the same id with an incremented number at the end, e.g. the checkboxes below have ids of potatoes-0 and potatoes-1.
     data:
-      name: "potatoes"
+      name: "potatoes[]"
       id: "potatoes"
       heading: "What kind of potatoes do you like?"
       items:
@@ -161,7 +161,7 @@ examples:
   with_custom_ids_on_individal_checkboxes:
     description: Individual checkboxes can be given specific ids if required. Note that the general id option can still be used, but the individual ids will override the general one if it is given.
     data:
-      name: "carrots"
+      name: "carrots[]"
       id: "carrots"
       heading: "What kind of carrots do you like?"
       items:
@@ -173,7 +173,7 @@ examples:
   with_legend_as_page_heading:
     description: Since the legend/heading is required, if the checkboxes are alone on a page it makes sense to use this element as the H1 on the page rather than duplicate text.
     data:
-      name: "favourite_colour"
+      name: "favourite_colour[]"
       heading: "What is your favourite colour?"
       is_page_heading: true
       items:
@@ -185,11 +185,11 @@ examples:
           value: "blue"
   with_custom_heading_size:
     description: |
-      This allows the size of the legend to be changed. Valid options are s, m, l, xl, defaulting to m if no option is passed. 
+      This allows the size of the legend to be changed. Valid options are s, m, l, xl, defaulting to m if no option is passed.
 
       If the is_page_heading option is true and heading_size is not set, the text size will be xl.
     data:
-      name: "favourite_colour"
+      name: "favourite_colour[]"
       heading: "What is your favourite colour?"
       heading_size: "s"
       items:
@@ -235,7 +235,7 @@ examples:
   with_aria_controls_attributes:
     description: Aria controls attributes are applied to the checkboxes only if Javascript is enabled.
     data:
-      name: "aria_controls"
+      name: "aria_controls[]"
       heading: "What areas are you interested in?"
       items:
         - label: "Farming and the environment"
@@ -246,7 +246,7 @@ examples:
           controls: "js-live-results"
   checkboxes_with_individual_hints:
     data:
-      name: "nationality"
+      name: "nationality[]"
       heading: "What is your nationality?"
       hint_text: "If you have dual nationality, select all options that are relevant to you."
       items:
@@ -260,7 +260,7 @@ examples:
           hint: "anything other than the above"
   checkbox_items_with_error:
     data:
-      name: "nationality"
+      name: "nationality[]"
       heading: "What is your nationality?"
       error: "Select if you are British, Irish or a citizen of a different country"
       hint_text: "If you have dual nationality, select all options that are relevant to you."
@@ -281,7 +281,7 @@ examples:
 
       This behaviour should be doubled by similar checks on the backend.
     data:
-      name: "nationality-exclusive"
+      name: "nationality-exclusive[]"
       heading: "What kind of expertise can you offer?"
       hint_text: "Select the types of support you can offer."
       items:
@@ -301,7 +301,7 @@ examples:
 
       Note that if you do insert HTML, this may cause accessibility violations if the additional elements have different name attributes to the checkboxes. No styling will be applied to the inserted content by the component.
     data:
-      name: "contactingme"
+      name: "contactingme[]"
       id: "contactingme"
       heading: "How would you like to be contacted?"
       hint_text: "Please select all options that are relevant to you."
@@ -317,7 +317,7 @@ examples:
           conditional: <div class="govuk-form-group"><label class="govuk-label" for="contact-by-text">Mobile phone number</label><input class="govuk-input govuk-!-width-one-third" id="contact-by-text" name="contactingme" type="tel"></div>
   checkbox_items_with_conditional_reveal_checked:
     data:
-      name: "contacting-checked"
+      name: "contacting-checked[]"
       id: "contacting-checked"
       heading: "How would you like to be contacted?"
       hint_text: "Please select all options that are relevant to you."
@@ -334,7 +334,7 @@ examples:
           conditional: <div class="govuk-form-group"><label class="govuk-label" for="contact-by-text">Mobile phone number</label><input class="govuk-input govuk-!-width-one-third" id="contact-by-text" name="contactingme" type="tel"></div>
   checkbox_items_with_checked_items:
     data:
-      name: "nationality"
+      name: "nationality[]"
       heading: "What is your nationality?"
       hint_text: "If you have dual nationality, select all options that are relevant to you."
       items:
@@ -347,7 +347,7 @@ examples:
           value: "other"
   checkbox_items_with_nested_checkboxes:
     data:
-      name: "favourite_colour"
+      name: "favourite_colour[]"
       heading: "What is your favourite colour?"
       items:
         - label: "Red"

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

@@ -109,10 +109,14 @@ examples:
         items:
           - href: '/help'
             text: Help
+          - href: '/help/privacy-notice'
+            text: Privacy
           - href: '/help/cookies'
             text: Cookies
           - href: '/contact'
             text: Contact
+          - href: '/help/accessibility-statement'
+            text: Accessibility statement
           - href: '/help/terms-conditions'
             text: Terms and conditions
           - href: '/cymraeg'
@@ -150,10 +154,14 @@ examples:
         items:
           - href: '/help'
             text: Help
+          - href: '/help/privacy-notice'
+            text: Privacy
           - href: '/help/cookies'
             text: Cookies
           - href: '/contact'
             text: Contact
+          - href: '/help/accessibility-statement'
+            text: Accessibility statement
           - href: '/help/terms-conditions'
             text: Terms and conditions
           - href: '/cymraeg'

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

@@ -65,6 +65,16 @@ examples:
         text: "Use GOV.UK Verify"
         hint_text: "You'll have an account if you've already proved your identity with a certified company, such as the Post Office."
         bold: true
+  with_bottom_margin:
+    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 a margin bottom of 30px (6)."
+    data:
+      name: "radio-group"
+      margin_bottom: 9
+      items:
+      - value: "government-gateway"
+        text: "Use Government Gateway"
+      - value: "govuk-verify"
+        text: "Use GOV.UK Verify"
   with_hint_on_form_group:
     data:
       name: "radio-group-error"

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

@@ -1,6 +1,6 @@
 <div class="govuk-header__logo gem-c-header__logo">
   <a href="<%= logo_link %>" class="govuk-header__link govuk-header__link--homepage" data-module="gem-track-click" data-track-category="homeLinkClicked" data-track-action="homeHeader">
-    <span class="govuk-header__logotype">
+    <span class="govuk-header__logotype gem-c-header__logotype">
       <svg aria-hidden="true" focusable="false" class="gem-c-header__logotype-crown govuk-header__logotype-crown" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 132 97" height="32" width="36">
         <path fill="currentColor" fill-rule="evenodd"
           d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"></path>

data/config/initializers/assets.rb

@@ -8,8 +8,8 @@ Rails.application.config.assets.precompile += %w[
   component_guide/visual-regression.js
   component_guide/print.css
   govuk_publishing_components/rum-loader.js
-  govuk_publishing_components/vendor/lux.js
-  govuk_publishing_components/vendor/lux-polyfill.js
+  govuk_publishing_components/vendor/lux/lux-reporter.js
+  govuk_publishing_components/vendor/lux/lux-measurer.js
   govuk_publishing_components/all_components.js
   govuk_publishing_components/ie.js
   govuk_publishing_components/modules.js

data/config/locales/cy.yml

@@ -114,14 +114,14 @@ cy:
       related_guides:
       statistical_data_sets:
       topical_events:
-      topics:
+      topics: Archwilio’r pwnc
       transition:
-        hub_page_link_path:
-        hub_page_link_text:
-        hub_page_title:
         link_path: "/brexit.cy"
-        link_text: Gwiriwch beth sydd angen i chi ei wneud
+        link_text: Cael rhestr bersonol o gamau gweithredu
         title: Brexit
+        hub_page_link_path:
+        hub_page_link_text:
+        hub_page_title: Gwiriwr Brexit
       world_locations:
     search_box:
       input_title:
@@ -154,4 +154,4 @@ cy:
       delete:
       edit:
     tabs:
-      contents:
+      contents: Cynnwys

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb

@@ -39,7 +39,16 @@ module GovukPublishingComponents
           tracking_category: "breadcrumbClicked",
           tracking_action: tracking_action,
           tracking_label: content_item["base_path"],
-        }.merge(custom_dimension_tracking)
+          tracking_dimension_enabled: false,
+        }
+      end
+
+      def brexit_audience
+        {
+          PRIORITY_TAXONS[:brexit_business] => "Brexitbusiness",
+          PRIORITY_TAXONS[:brexit_individuals] => "Brexitcitizen",
+          PRIORITY_TAXONS[:brexit_taxon] => "Brexitbusinessandcitizen",
+        }[taxon["content_id"]]
       end
 
     private
@@ -79,38 +88,16 @@ module GovukPublishingComponents
         [PRIORITY_TAXONS[:brexit_business], PRIORITY_TAXONS[:brexit_individuals]]
       end
 
-      def brexit_taxons
-        brexit_child_taxons << PRIORITY_TAXONS[:brexit_taxon]
-      end
-
       def preferred_priority_taxon
         query_parameters["priority-taxon"] if query_parameters
       end
 
       def tracking_action
         action = %w[superBreadcrumb]
-        action << page_name_for_tracking
+        action << brexit_audience
         action.compact.join(" ")
       end
 
-      def custom_dimension_tracking
-        tracking = { tracking_dimension_enabled: false }
-        if brexit_taxons.include?(taxon["content_id"])
-          tracking[:tracking_dimension_enabled] = true
-          tracking[:tracking_dimension] = page_name_for_tracking
-          tracking[:tracking_dimension_index] = 111
-        end
-        tracking
-      end
-
-      def page_name_for_tracking
-        {
-          PRIORITY_TAXONS[:brexit_business] => "Brexitbusiness",
-          PRIORITY_TAXONS[:brexit_individuals] => "Brexitcitizen",
-          PRIORITY_TAXONS[:brexit_taxon] => "Brexitbusinessandcitizen",
-        }[taxon["content_id"]]
-      end
-
       def tagged_to_both_brexit_child_taxons?
         t = priority_taxons.select { |taxon| brexit_child_taxon?(taxon) }
         t.uniq.count > 1

data/lib/govuk_publishing_components/presenters/meta_tags.rb

@@ -20,7 +20,12 @@ module GovukPublishingComponents
         meta_tags = add_organisation_tags(meta_tags)
         meta_tags = add_political_tags(meta_tags)
         meta_tags = add_taxonomy_tags(meta_tags)
-        add_step_by_step_tags(meta_tags)
+        meta_tags = add_step_by_step_tags(meta_tags)
+        add_brexit_tags("govuk:brexit-audience", meta_tags)
+      end
+
+      def brexit_priority_breadcrumb_tag
+        add_brexit_tags("govuk:brexit-superbreadcrumb")
       end
 
     private
@@ -111,6 +116,30 @@ module GovukPublishingComponents
         meta_tags
       end
 
+      def add_brexit_tags(tag_key, meta_tags = {})
+        links = content_item[:links]
+        taxons = links[:taxons] unless links.nil?
+
+        return meta_tags if taxons.blank?
+        return meta_tags unless tagged_to_priority_taxon?
+
+        meta_tags[tag_key] = brexit_audience if brexit_audience.present?
+
+        meta_tags
+      end
+
+      def tagged_to_priority_taxon?
+        priority_taxon_helper.taxon.present?
+      end
+
+      def priority_taxon_helper
+        @priority_taxon_helper ||= ContentBreadcrumbsBasedOnPriority.new(content_item.deep_stringify_keys, request.query_parameters)
+      end
+
+      def brexit_audience
+        priority_taxon_helper.brexit_audience
+      end
+
       def has_content_history?
         (content_item[:public_updated_at] && details[:first_public_at] && content_item[:public_updated_at] != details[:first_public_at]) ||
           (details[:change_history] && details[:change_history].size > 1)

data/lib/govuk_publishing_components/presenters/public_layout_helper.rb

@@ -330,10 +330,18 @@ module GovukPublishingComponents
             href: "/help",
             text: "Help",
           },
+          {
+            href: "/help/privacy-notice",
+            text: "Privacy",
+          },
           {
             href: "/help/cookies",
             text: "Cookies",
           },
+          {
+            href: "/help/accessibility-statement",
+            text: "Accessibility statement",
+          },
           {
             href: "/contact",
             text: "Contact",

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "24.17.0".freeze
+  VERSION = "24.18.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 24.17.0
+  version: 24.18.4
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-29 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: jasmine_selenium_runner
   requirement: !ruby/object:Gem::Requirement
@@ -503,8 +503,8 @@ files:
 - app/assets/javascripts/govuk_publishing_components/rum-loader.js.erb
 - app/assets/javascripts/govuk_publishing_components/vendor/html5shiv-printshiv.js
 - app/assets/javascripts/govuk_publishing_components/vendor/json2.js
-- app/assets/javascripts/govuk_publishing_components/vendor/lux/lux-polyfill.js
-- app/assets/javascripts/govuk_publishing_components/vendor/lux/lux.js
+- app/assets/javascripts/govuk_publishing_components/vendor/lux/lux-measurer.js
+- app/assets/javascripts/govuk_publishing_components/vendor/lux/lux-reporter.js
 - app/assets/javascripts/govuk_publishing_components/vendor/modernizr.js
 - app/assets/javascripts/govuk_publishing_components/vendor/polyfills/all.js
 - app/assets/javascripts/govuk_publishing_components/vendor/polyfills/closest.js