govuk_publishing_components 24.16.1 → 24.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fa4cc15c73945ed5cadb8da13004d32ca8815d1ce90c3d19f4981d14be0f1d5
-  data.tar.gz: dcead4701b9524c83a2f7d897e2e8e4defc2de6ee83350664f467140439d6767
+  metadata.gz: c29fbe8ad46db11c8172e16fcd68bb08cc6e6799de22293cc29cd1829b6a938b
+  data.tar.gz: ac3904c23ae5a71ca5d556558da2411750454338bdcac2f1747f061322ee2daf
 SHA512:
-  metadata.gz: 81abe2a341566203cbf3db3d3f194540e9322cd21654c7e6cd3a3b2acf2212d3b7ac0b3a15785ddf8f3415820b27154e92c28ff48107f0aa18132b98a33a39ba
-  data.tar.gz: 626dee02647614f4e9513b98d2bba9cf1aa7d2d74e52e34604d5e23239167d1f5cb0184bf961ec52e795f10c6bf854b93674ef1a4f352d1869f83e84c02cf16f
+  metadata.gz: 7c1c5d8b01c9036993418b85125975b0bac85d59e8d7e9fdca6ae8d2444f9742c0c6b017adce4b0e1ba0482e2a410bf992f1e3556f8c971200a18d306ddba07a
+  data.tar.gz: e19439505f30c55bdfcb3fe1f2637f47311ae1c978e6bb5e0b50b09ada4ab0a60ddeb259167048d836ff97863c44213f06fbd369c774969a70452c3f88486724

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/images/govuk_publishing_components/action-link-arrow--brexit.svg

@@ -0,0 +1,3 @@
+<svg width="38" height="36" viewBox="0 0 38 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M38 35.8461C34.8518 35.8299 31.701 35.8136 28.5528 35.7974C28.5447 29.2599 28.5366 22.7252 28.5284 16.1878C21.8989 22.7252 15.2721 29.2599 8.64252 35.7974C5.8547 35.792 3.06417 35.7838 0.276344 35.7784C0.262798 34.1366 0.249251 32.4948 0.232996 30.8503C7.36917 23.7195 14.5026 16.5833 21.6388 9.44717C14.4268 9.47697 7.21204 9.50406 0 9.53387C3.17254 6.35862 6.34778 3.18608 9.52032 0.010837C19.0135 0.00812776 28.5068 0.00270925 38 0C38 11.9234 38 23.8577 38 35.8461Z" fill="#FF003B"/>
+</svg>

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

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

data/app/assets/javascripts/govuk_publishing_components/components/button.js

@@ -2,4 +2,4 @@
 // = require govuk/components/button/button.js
 window.GOVUK = window.GOVUK || {}
 window.GOVUK.Modules = window.GOVUK.Modules || {}
-window.GOVUK.Modules.Button = window.GOVUKFrontend
+window.GOVUK.Modules.GovukButton = window.GOVUKFrontend

data/app/assets/javascripts/govuk_publishing_components/components/character-count.js

@@ -2,4 +2,4 @@
 // = require govuk/components/character-count/character-count.js
 window.GOVUK = window.GOVUK || {}
 window.GOVUK.Modules = window.GOVUK.Modules || {}
-window.GOVUK.Modules.CharacterCount = window.GOVUKFrontend
+window.GOVUK.Modules.GovukCharacterCount = window.GOVUKFrontend

data/app/assets/javascripts/govuk_publishing_components/components/checkboxes.js

@@ -3,17 +3,17 @@
 // = require govuk/components/checkboxes/checkboxes.js
 window.GOVUK = window.GOVUK || {}
 window.GOVUK.Modules = window.GOVUK.Modules || {}
-window.GOVUK.Modules.Checkboxes = window.GOVUKFrontend;
+window.GOVUK.Modules.GovukCheckboxes = window.GOVUKFrontend;
 
 (function (Modules) {
-  function GovukCheckboxes ($module) {
+  function GemCheckboxes ($module) {
     this.$module = $module
     this.$checkboxes = this.$module.querySelectorAll('input[type=checkbox]')
     this.$nestedCheckboxes = this.$module.querySelectorAll('[data-nested=true] input[type=checkbox]')
     this.$exclusiveCheckboxes = this.$module.querySelectorAll('[data-exclusive=true] input[type=checkbox]')
   }
 
-  GovukCheckboxes.prototype.init = function () {
+  GemCheckboxes.prototype.init = function () {
     this.applyAriaControlsAttributes(this.$module)
 
     for (var i = 0; i < this.$checkboxes.length; i++) {
@@ -29,7 +29,7 @@ window.GOVUK.Modules.Checkboxes = window.GOVUKFrontend;
     }
   }
 
-  GovukCheckboxes.prototype.handleCheckboxChange = function (event) {
+  GemCheckboxes.prototype.handleCheckboxChange = function (event) {
     if (window.GOVUK.analytics && window.GOVUK.analytics.trackEvent) {
       // Where checkboxes are manipulated externally in finders, `suppressAnalytics`
       // is passed to prevent duplicate GA events.
@@ -58,7 +58,7 @@ window.GOVUK.Modules.Checkboxes = window.GOVUKFrontend;
     }
   }
 
-  GovukCheckboxes.prototype.handleNestedCheckboxChange = function (event) {
+  GemCheckboxes.prototype.handleNestedCheckboxChange = function (event) {
     var $checkbox = event.target
     var $isNested = $checkbox.closest('.govuk-checkboxes--nested')
     var $hasNested = this.$module.querySelector('.govuk-checkboxes--nested[data-parent=' + $checkbox.id + ']')
@@ -70,7 +70,7 @@ window.GOVUK.Modules.Checkboxes = window.GOVUKFrontend;
     }
   }
 
-  GovukCheckboxes.prototype.toggleNestedCheckboxes = function ($scope, $checkbox) {
+  GemCheckboxes.prototype.toggleNestedCheckboxes = function ($scope, $checkbox) {
     var $nestedCheckboxes = $scope.querySelectorAll('input[type=checkbox]')
     if ($checkbox.checked) {
       for (var i = 0; i < $nestedCheckboxes.length; i++) {
@@ -83,7 +83,7 @@ window.GOVUK.Modules.Checkboxes = window.GOVUKFrontend;
     }
   }
 
-  GovukCheckboxes.prototype.toggleParentCheckbox = function ($scope, $checkbox) {
+  GemCheckboxes.prototype.toggleParentCheckbox = function ($scope, $checkbox) {
     var $inputs = $scope.querySelectorAll('input')
     var $checkedInputs = $scope.querySelectorAll('input:checked')
     var parentId = $scope.getAttribute('data-parent')
@@ -96,7 +96,7 @@ window.GOVUK.Modules.Checkboxes = window.GOVUKFrontend;
     }
   }
 
-  GovukCheckboxes.prototype.handleExclusiveCheckboxChange = function (event) {
+  GemCheckboxes.prototype.handleExclusiveCheckboxChange = function (event) {
     var $currentCheckbox = event.target
     var $checkboxes = $currentCheckbox.closest('.govuk-checkboxes')
     var $exclusiveOption = $checkboxes.querySelector('input[type=checkbox][data-exclusive]')
@@ -113,7 +113,7 @@ window.GOVUK.Modules.Checkboxes = window.GOVUKFrontend;
     }
   }
 
-  GovukCheckboxes.prototype.applyAriaControlsAttributes = function ($scope) {
+  GemCheckboxes.prototype.applyAriaControlsAttributes = function ($scope) {
     var $inputs = $scope.querySelectorAll('[data-controls]')
 
     for (var i = 0; i < $inputs.length; i++) {
@@ -121,5 +121,5 @@ window.GOVUK.Modules.Checkboxes = window.GOVUKFrontend;
     }
   }
 
-  Modules.GovukCheckboxes = GovukCheckboxes
+  Modules.GemCheckboxes = GemCheckboxes
 })(window.GOVUK.Modules)

data/app/assets/javascripts/govuk_publishing_components/components/details.js

@@ -2,16 +2,16 @@
 // = require govuk/components/details/details.js
 window.GOVUK = window.GOVUK || {}
 window.GOVUK.Modules = window.GOVUK.Modules || {}
-window.GOVUK.Modules.Details = window.GOVUKFrontend;
+window.GOVUK.Modules.GovukDetails = window.GOVUKFrontend;
 
 (function (Modules) {
-  function GovukDetails ($module) {
+  function GemDetails ($module) {
     this.$module = $module
     this.customTrackLabel = this.$module.getAttribute('data-track-label')
     this.detailsClick = this.$module.querySelector('[data-details-track-click]')
   }
 
-  GovukDetails.prototype.init = function () {
+  GemDetails.prototype.init = function () {
     if (this.customTrackLabel) { // If a custom label has been provided, we can simply call the tracking module
       var trackDetails = new window.GOVUK.Modules.GemTrackClick()
       trackDetails.start($(this.$module))
@@ -22,7 +22,7 @@ window.GOVUK.Modules.Details = window.GOVUKFrontend;
     }
   }
 
-  GovukDetails.prototype.trackDefault = function (element) {
+  GemDetails.prototype.trackDefault = function (element) {
     if (window.GOVUK.analytics && window.GOVUK.analytics.trackEvent) {
       var componentStatus = (element.getAttribute('open') == null) ? 'open' : 'closed'
       var trackCategory = element.getAttribute('data-track-category')
@@ -45,5 +45,5 @@ window.GOVUK.Modules.Details = window.GOVUKFrontend;
     }
   }
 
-  Modules.GovukDetails = GovukDetails
+  Modules.GemDetails = GemDetails
 })(window.GOVUK.Modules)

data/app/assets/javascripts/govuk_publishing_components/components/error-summary.js

@@ -2,4 +2,4 @@
 // = require govuk/components/error-summary/error-summary.js
 window.GOVUK = window.GOVUK || {}
 window.GOVUK.Modules = window.GOVUK.Modules || {}
-window.GOVUK.Modules.ErrorSummary = window.GOVUKFrontend
+window.GOVUK.Modules.GovukErrorSummary = window.GOVUKFrontend

data/app/assets/javascripts/govuk_publishing_components/components/layout-header.js

@@ -2,4 +2,4 @@
 // = require govuk/components/header/header.js
 window.GOVUK = window.GOVUK || {}
 window.GOVUK.Modules = window.GOVUK.Modules || {}
-window.GOVUK.Modules.Header = window.GOVUKFrontend
+window.GOVUK.Modules.GovukHeader = window.GOVUKFrontend

data/app/assets/javascripts/govuk_publishing_components/components/radio.js

@@ -2,4 +2,4 @@
 // = require govuk/components/radios/radios.js
 window.GOVUK = window.GOVUK || {}
 window.GOVUK.Modules = window.GOVUK.Modules || {}
-window.GOVUK.Modules.Radios = window.GOVUKFrontend
+window.GOVUK.Modules.GovukRadios = window.GOVUKFrontend

data/app/assets/javascripts/govuk_publishing_components/components/tabs.js

@@ -2,4 +2,4 @@
 // = require govuk/components/tabs/tabs.js
 window.GOVUK = window.GOVUK || {}
 window.GOVUK.Modules = window.GOVUK.Modules || {}
-window.GOVUK.Modules.Tabs = window.GOVUKFrontend
+window.GOVUK.Modules.GovukTabs = window.GOVUKFrontend

data/app/assets/javascripts/govuk_publishing_components/lib/govspeak/all.js

@@ -0,0 +1 @@
+// = require_tree ./

data/app/assets/javascripts/govuk_publishing_components/modules.js

@@ -26,29 +26,32 @@
       var modules = this.find(container)
 
       for (var i = 0, l = modules.length; i < l; i++) {
-        var module
         var element = $(modules[i])
-        var moduleName = camelCaseAndCapitalise(element.data('module'))
-        var started = element.data('module-started')
-        var frontendModuleName = moduleName.replace('Govuk', '')
+        var moduleNames = element.data('module').split(' ')
 
-        if ( // GOV.UK Publishing & Legacy Modules
-          typeof GOVUK.Modules[moduleName] === 'function' &&
-          !GOVUK.Modules[moduleName].prototype.init &&
-          !started
-        ) {
-          module = new GOVUK.Modules[moduleName]()
-          module.start(element)
-          element.data('module-started', true)
-        }
+        for (var j = 0, k = moduleNames.length; j < k; j++) {
+          var module
+          var moduleName = camelCaseAndCapitalise(moduleNames[j])
+          var started = element.data(moduleNames[j] + '-module-started')
+
+          if ( // GOV.UK Publishing & Legacy Modules
+            typeof GOVUK.Modules[moduleName] === 'function' &&
+            !GOVUK.Modules[moduleName].prototype.init &&
+            !started
+          ) {
+            module = new GOVUK.Modules[moduleName]()
+            module.start(element)
+            element.data(moduleNames[j] + '-module-started', true)
+          }
 
-        if ( // GOV.UK Frontend Modules
-          typeof GOVUK.Modules[frontendModuleName] === 'function' &&
-          GOVUK.Modules[frontendModuleName].prototype.init &&
-          !started
-        ) {
-          module = new GOVUK.Modules[frontendModuleName](element[0]).init()
-          element.data('module-started', true)
+          if ( // GOV.UK Frontend Modules
+            typeof GOVUK.Modules[moduleName] === 'function' &&
+            GOVUK.Modules[moduleName].prototype.init &&
+            !started
+          ) {
+            module = new GOVUK.Modules[moduleName](element[0]).init()
+            element.data(moduleNames[j] + '-module-started', true)
+          }
         }
       }
 

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/javascripts/govuk_publishing_components/vendor/polyfills/all.js

@@ -0,0 +1 @@
+// = require_tree ./

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

@@ -146,6 +146,31 @@
   }
 }
 
+.gem-c-action-link--brexit {
+  max-width: none;
+
+  &:before {
+    height: 30px;
+    width: 35px;
+    background-image: image-url("govuk_publishing_components/action-link-arrow--brexit.svg");
+    background-repeat: no-repeat;
+    background-size: 25px auto;
+    background-position: 0 0;
+  }
+
+  @include govuk-media-query($until: tablet) {
+    margin-bottom: govuk-spacing(2);
+  }
+
+  @include govuk-media-query($from: tablet) {
+    margin-bottom: govuk-spacing(2);
+
+    &:before {
+      background-position: 0 4px;
+    }
+  }
+}
+
 .gem-c-action-link--nhs {
   &:before {
     width: 80px;

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/_action_link.html.erb

@@ -14,6 +14,7 @@
   dark_icon ||= false
   small_icon ||= false
   nhs_icon ||= false
+  brexit_icon ||= false
   transparent_icon ||= false
   data ||= nil
   classes ||= nil
@@ -25,6 +26,7 @@
   css_classes << "gem-c-action-link--small-icon" if small_icon
   css_classes << "gem-c-action-link--transparent-icon" if transparent_icon
   css_classes << "gem-c-action-link--nhs" if nhs_icon
+  css_classes << "gem-c-action-link--brexit" if brexit_icon
   css_classes << "gem-c-action-link--simple" if simple
   css_classes << "gem-c-action-link--simple-light" if simple_light
   css_classes << "gem-c-action-link--with-subtext" if subtext

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/_checkboxes.html.erb

@@ -4,7 +4,7 @@
   id = cb_helper.id
 %>
 
-<%= tag.div id: id, class: cb_helper.css_classes, data: { module: "govuk-checkboxes" } do %>
+<%= tag.div id: id, class: cb_helper.css_classes, data: { module: "gem-checkboxes" } do %>
   <% if cb_helper.should_have_fieldset %>
     <% if cb_helper.heading_markup %>
       <%= tag.fieldset class: "govuk-fieldset", "aria-describedby": cb_helper.fieldset_describedby do %>
@@ -23,7 +23,7 @@
         <% end %>
 
         <%= tag.ul class: cb_helper.list_classes, data: {
-          module: ('checkboxes' if cb_helper.has_conditional),
+          module: ('govuk-checkboxes' if cb_helper.has_conditional),
           nested: ('true' if cb_helper.has_nested),
           exclusive: ('true' if cb_helper.has_exclusive)
         } do %>

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

@@ -7,7 +7,7 @@
   css_classes << (shared_helper.get_margin_bottom)
 
   data_attributes ||= {}
-  data_attributes[:module] = 'govuk-details'
+  data_attributes[:module] = 'govuk-details gem-details'
 %>
 <%= tag.details class: css_classes, data: data_attributes, open: open do %>
   <summary class="govuk-details__summary" data-details-track-click>

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/action_link.yml

@@ -101,11 +101,11 @@ examples:
       text: Coronavirus (COVID-19)
       href: "/my-test-page"
       dark_icon: true
-  with_custom_font_size:
+  with_brexit_icon_and_custom_font_size:
     data:
       text: Guidance for businesses
       href: "/guidance-for-businesses"
-      dark_icon: true
+      brexit_icon: true
       font_size: m
   with_nhs_icon:
     data:

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/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,8 @@ 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(meta_tags)
       end
 
     private
@@ -111,6 +112,27 @@ module GovukPublishingComponents
         meta_tags
       end
 
+      def add_brexit_tags(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?
+
+        audience = priority_taxon_helper.brexit_audience
+        meta_tags["govuk:brexit-audience"] = audience if 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 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.16.1".freeze
+  VERSION = "24.18.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 24.16.1
+  version: 24.18.3
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-28 00:00:00.000000000 Z
+date: 2021-07-06 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
@@ -364,6 +364,7 @@ files:
 - app/assets/config/govuk_publishing_components_manifest.js
 - app/assets/images/govuk_publishing_components/action-link--nhs.png
 - app/assets/images/govuk_publishing_components/action-link--nhs.svg
+- app/assets/images/govuk_publishing_components/action-link-arrow--brexit.svg
 - app/assets/images/govuk_publishing_components/action-link-arrow--dark.png
 - app/assets/images/govuk_publishing_components/action-link-arrow--dark.svg
 - app/assets/images/govuk_publishing_components/action-link-arrow--simple-light.png
@@ -486,6 +487,7 @@ files:
 - app/assets/javascripts/govuk_publishing_components/lib.js
 - app/assets/javascripts/govuk_publishing_components/lib/cookie-functions.js
 - app/assets/javascripts/govuk_publishing_components/lib/current-location.js
+- app/assets/javascripts/govuk_publishing_components/lib/govspeak/all.js
 - app/assets/javascripts/govuk_publishing_components/lib/govspeak/barchart-enhancement.js
 - app/assets/javascripts/govuk_publishing_components/lib/govspeak/magna-charta.js
 - app/assets/javascripts/govuk_publishing_components/lib/govspeak/youtube-link-enhancement.js
@@ -501,9 +503,10 @@ 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
 - app/assets/javascripts/govuk_publishing_components/vendor/polyfills/common.js
 - app/assets/javascripts/govuk_publishing_components/vendor/polyfills/indexOf.js