govuk_publishing_components 27.19.0 → 28.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fe93045cd00a9b553478260bc30d9f793d60d32ddeb91b65adbd1b2571465e1
-  data.tar.gz: f732e4835b31cc71f667fbf68db58cd413d7eaebf26871bc410a5707618f7ed8
+  metadata.gz: '0989b4b0c9bafbc71f0347de67fb337acee0cfb13da092fae2be8c6c35122d32'
+  data.tar.gz: e56b816c73f788ca8bfd9383fe39db912a84f5a14b141bb258cd7e7fcc526919
 SHA512:
-  metadata.gz: f558e8a2f476bd8c8e5282ff3bde74ec1d2c07923d953c88ca507d1efe3efb197f46748559849153c08af5295bc7f2f4c5e227b3ba3c1592f5f7d8b2705cb8e3
-  data.tar.gz: 460a222515c556721269935be2f702cec9fa2f33bf27afef7dc39dd50d22d7dce7e5db9369f4959834663e2cf176dd05a131a15bed886bdce41f252f74805243
+  metadata.gz: 384f96c451155a016bbfea69596892e4ed287afa095a0780570d07842c62498f3de4890819e1d87e173a856178e74d34e3f6561562aa8b5e9e2fe7a5974a2380
+  data.tar.gz: b8e6166d94e9536640edca9e877f8bec63429596dfe7c563f2521b2254b4acbcadd7decf26ffbc64ca28b14a8a5bd2b02d8fb7ceba35a2d523c3c65641b8d3fb

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

@@ -7,11 +7,11 @@
 
   CustomDimensions.getAndExtendDefaultTrackingOptions = function (extraOptions) {
     var trackingOptions = this.customDimensions()
-    return this.extend(trackingOptions, extraOptions)
+    return GOVUK.extendObject(trackingOptions, extraOptions)
   }
 
   CustomDimensions.customDimensions = function () {
-    var dimensions = this.extend(
+    var dimensions = GOVUK.extendObject(
       {},
       customDimensionsFromBrowser(),
       customDimensionsFromMetaTags(),
@@ -25,24 +25,6 @@
     return dimensions
   }
 
-  CustomDimensions.extend = function (out) {
-    out = out || {}
-
-    for (var i = 1; i < arguments.length; i++) {
-      if (!arguments[i]) {
-        continue
-      }
-
-      for (var key in arguments[i]) {
-        if (Object.prototype.hasOwnProperty.call(arguments[i], key)) {
-          out[key] = arguments[i][key]
-        }
-      }
-    }
-
-    return out
-  }
-
   function customDimensionsFromBrowser () {
     var customDimensions = {
       dimension15: window.httpStatusCode || 200,

data/app/assets/javascripts/govuk_publishing_components/analytics/download-link-tracker.js

@@ -1,23 +1,38 @@
 ;(function (global) {
   'use strict'
 
-  var $ = global.jQuery
   var GOVUK = global.GOVUK || {}
 
   GOVUK.analyticsPlugins = GOVUK.analyticsPlugins || {}
   GOVUK.analyticsPlugins.downloadLinkTracker = function (options) {
     options = options || {}
     var downloadLinkSelector = options.selector
+    var selectors = downloadLinkSelector.split(',')
 
     if (downloadLinkSelector) {
-      $('body').on('click', downloadLinkSelector, trackDownload)
+      document.querySelector('body').addEventListener('click', function (event) {
+        var element = event.target
+        if (element.tagName !== 'A') {
+          element = element.closest('a')
+        }
+
+        if (!element) {
+          return
+        }
+
+        for (var i = 0; i < selectors.length; i++) {
+          if (element.matches(selectors[i].trim())) {
+            trackDownload(element)
+            break
+          }
+        }
+      })
     }
 
-    function trackDownload (evt) {
-      var $link = getLinkFromEvent(evt)
-      var href = $link.attr('href')
+    function trackDownload (element) {
+      var href = element.getAttribute('href')
       var evtOptions = { transport: 'beacon' }
-      var linkText = $.trim($link.text())
+      var linkText = element.textContent.trim()
 
       if (linkText) {
         evtOptions.label = linkText
@@ -25,16 +40,6 @@
 
       GOVUK.analytics.trackEvent('Download Link Clicked', href, evtOptions)
     }
-
-    function getLinkFromEvent (evt) {
-      var $target = $(evt.target)
-
-      if (!$target.is('a')) {
-        $target = $target.parents('a')
-      }
-
-      return $target
-    }
   }
 
   global.GOVUK = GOVUK

data/app/assets/javascripts/govuk_publishing_components/analytics/external-link-tracker.js

@@ -1,49 +1,63 @@
+// = require govuk/vendor/polyfills/Element/prototype/closest.js
 ;(function (global) {
   'use strict'
 
-  var $ = global.jQuery
   var GOVUK = global.GOVUK || {}
 
   GOVUK.analyticsPlugins = GOVUK.analyticsPlugins || {}
   GOVUK.analyticsPlugins.externalLinkTracker = function (options) {
     options = options || {}
-    var externalLinkUploadCustomDimension = options.externalLinkUploadCustomDimension
+    GOVUK.analyticsPlugins.externalLinkTracker.options = options
+    document.querySelector('body').addEventListener('click', GOVUK.analyticsPlugins.externalLinkTracker.handleClick)
+  }
+
+  GOVUK.analyticsPlugins.externalLinkTracker.handleClick = function (event) {
+    var element = event.target
+    if (element.tagName !== 'A') {
+      element = element.closest('a')
+    }
+
+    if (!element) {
+      return
+    }
+
+    if (GOVUK.analyticsPlugins.externalLinkTracker.isExternalLink(element.getAttribute('href'))) {
+      GOVUK.analyticsPlugins.externalLinkTracker.trackClickEvent(element)
+    }
+  }
+
+  GOVUK.analyticsPlugins.externalLinkTracker.isExternalLink = function (href) {
+    if (!href) {
+      return false
+    }
+
     var currentHost = GOVUK.analyticsPlugins.externalLinkTracker.getHostname()
-    var externalLinkSelector = 'a[href^="http"]:not(a[href*="' + currentHost + '"])'
-    $('body').on('click', externalLinkSelector, trackClickEvent)
-
-    function trackClickEvent (evt) {
-      var $link = getLinkFromEvent(evt)
-      var options = { transport: 'beacon' }
-      var href = $link.attr('href')
-      var linkText = $.trim($link.text())
-
-      if (linkText) {
-        options.label = linkText
-      }
-
-      if (externalLinkUploadCustomDimension !== undefined) {
-        // This custom dimension will be used to duplicate the url information
-        // that we normally send in an "event action". This will be used to join
-        // up with a scheduled custom upload called "External Link Status".
-        // We can only join uploads on custom dimensions, not on `event actions`
-        // where we normally add the url info.
-        var externalLinkToJoinUploadOn = href
-
-        GOVUK.analytics.setDimension(externalLinkUploadCustomDimension, externalLinkToJoinUploadOn)
-      }
-      GOVUK.analytics.trackEvent('External Link Clicked', href, options)
+    if (href.substring(0, 4) === 'http' && href.indexOf(currentHost) === -1) {
+      return true
     }
+  }
+
+  GOVUK.analyticsPlugins.externalLinkTracker.trackClickEvent = function (element) {
+    var options = { transport: 'beacon' }
+    var href = element.getAttribute('href')
+    var linkText = element.textContent.trim()
 
-    function getLinkFromEvent (evt) {
-      var $target = $(evt.target)
+    if (linkText) {
+      options.label = linkText
+    }
 
-      if (!$target.is('a')) {
-        $target = $target.parents('a')
-      }
+    var externalLinkUploadCustomDimension = GOVUK.analyticsPlugins.externalLinkTracker.options.externalLinkUploadCustomDimension
+    if (externalLinkUploadCustomDimension !== undefined) {
+      // This custom dimension will be used to duplicate the url information
+      // that we normally send in an "event action". This will be used to join
+      // up with a scheduled custom upload called "External Link Status".
+      // We can only join uploads on custom dimensions, not on `event actions`
+      // where we normally add the url info.
+      var externalLinkToJoinUploadOn = href
 
-      return $target
+      GOVUK.analytics.setDimension(externalLinkUploadCustomDimension, externalLinkToJoinUploadOn)
     }
+    GOVUK.analytics.trackEvent('External Link Clicked', href, options)
   }
 
   GOVUK.analyticsPlugins.externalLinkTracker.getHostname = function () {

data/app/assets/javascripts/govuk_publishing_components/analytics/google-analytics-universal-tracker.js

@@ -1,7 +1,6 @@
 ;(function (global) {
   'use strict'
 
-  var $ = global.jQuery
   var GOVUK = global.GOVUK || {}
   var pii
 
@@ -78,7 +77,7 @@
     // Set an options object for the pageview (e.g. transport, sessionControl)
     // https://developers.google.com/analytics/devguides/collection/analyticsjs/field-reference#transport
     if (typeof options === 'object') {
-      pageviewObject = $.extend(pageviewObject || {}, options)
+      pageviewObject = GOVUK.extendObject(pageviewObject || {}, options)
 
       // trackerName is optional
       if (typeof options.trackerName === 'string') {
@@ -87,10 +86,24 @@
       }
     }
 
-    if (!$.isEmptyObject(pageviewObject)) {
-      sendToGa(trackerName + 'send', 'pageview', pageviewObject)
-    } else {
+    function isEmptyObject (obj) {
+      if (typeof obj === 'undefined') {
+        return true
+      }
+
+      for (var prop in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj, prop)) {
+          return false
+        }
+      }
+
+      return JSON.stringify(obj) === JSON.stringify({})
+    }
+
+    if (isEmptyObject(pageviewObject)) {
       sendToGa(trackerName + 'send', 'pageview')
+    } else {
+      sendToGa(trackerName + 'send', 'pageview', pageviewObject)
     }
   }
 
@@ -135,7 +148,7 @@
     }
 
     if (typeof options === 'object') {
-      $.extend(evt, options)
+      evt = GOVUK.extendObject(evt, options)
     }
 
     sendToGa(trackerName + 'send', evt)
@@ -156,7 +169,7 @@
       socialTarget: target
     }
 
-    $.extend(trackingOptions, options)
+    trackingOptions = GOVUK.extendObject(trackingOptions, options)
 
     sendToGa('send', trackingOptions)
   }

data/app/assets/javascripts/govuk_publishing_components/analytics/mailto-link-tracker.js

@@ -1,36 +1,41 @@
+//= require ../vendor/polyfills/closest.js
 ;(function (global) {
   'use strict'
 
-  var $ = global.jQuery
   var GOVUK = global.GOVUK || {}
 
   GOVUK.analyticsPlugins = GOVUK.analyticsPlugins || {}
   GOVUK.analyticsPlugins.mailtoLinkTracker = function () {
-    var mailtoLinkSelector = 'a[href^="mailto:"]'
+    document.querySelector('body').addEventListener('click', function (event) {
+      var element = event.target
+      if (element.tagName !== 'A') {
+        element = element.closest('a')
+      }
 
-    $('body').on('click', mailtoLinkSelector, trackClickEvent)
+      if (!element) {
+        return
+      }
 
-    function trackClickEvent (evt) {
-      var $link = getLinkFromEvent(evt)
-      var options = { transport: 'beacon' }
-      var href = $link.attr('href')
-      var linkText = $.trim($link.text())
+      var href = element.getAttribute('href')
 
-      if (linkText) {
-        options.label = linkText
+      if (!href) {
+        return
       }
 
-      GOVUK.analytics.trackEvent('Mailto Link Clicked', href, options)
-    }
+      if (href.substring(0, 7) === 'mailto:') {
+        trackClickEvent(element, href)
+      }
+    })
 
-    function getLinkFromEvent (evt) {
-      var $target = $(evt.target)
+    function trackClickEvent (element, href) {
+      var options = { transport: 'beacon' }
+      var linkText = element.textContent
 
-      if (!$target.is('a')) {
-        $target = $target.parents('a')
+      if (linkText) {
+        options.label = linkText.trim()
       }
 
-      return $target
+      GOVUK.analytics.trackEvent('Mailto Link Clicked', href, options)
     }
   }
 

data/app/assets/javascripts/govuk_publishing_components/analytics/static-analytics.js

@@ -1,4 +1,4 @@
-/* global GOVUK, $, ga */
+/* global GOVUK, ga */
 
 (function () {
   'use strict'
@@ -20,7 +20,7 @@
     ga(function (tracker) {
       this.gaClientId = tracker.get('clientId')
 
-      $(window).trigger('gaClientSet')
+      GOVUK.triggerEvent(window, 'gaClientSet')
 
       // Start up ecommerce tracking
       GOVUK.Ecommerce.start()
@@ -49,7 +49,7 @@
     // Add the cookie banner status as a custom dimension
     var cookieBannerShown = !this.getCookie('seen_cookie_message')
     var cookieBannerDimension = { dimension100: cookieBannerShown ? cookieBannerShown.toString() : 'false' }
-    $.extend(options, cookieBannerDimension)
+    options = GOVUK.extendObject(options, cookieBannerDimension)
 
     var trackingOptions = GOVUK.CustomDimensions.getAndExtendDefaultTrackingOptions(options)
     this.analytics.trackPageview(path, title, trackingOptions)
@@ -83,7 +83,7 @@
 
     var cookieOptions = getOptionsFromCookie()
 
-    $.extend(cookieOptions, options)
+    cookieOptions = GOVUK.extendObject(cookieOptions, options)
 
     this.setCookie('analytics_next_page_call', cookieOptions)
   }

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

@@ -1,4 +1,5 @@
 //= require govuk_publishing_components/lib/cookie-functions
+//= require govuk_publishing_components/lib/extend-object
 //= require ./analytics/pii
 //= require ./analytics/google-analytics-universal-tracker
 //= require ./analytics/analytics
@@ -13,7 +14,6 @@
 //= require ./analytics/static-analytics
 //= require ./analytics/ecommerce
 //= require ./analytics/init
-//= require ./analytics/scroll-tracker
 //= require ./analytics/auto-scroll-tracker
 //= require ./analytics/explicit-cross-domain-links
 //= require ./analytics/track-click

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

@@ -25,10 +25,16 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     this.setInitialAriaAttributes()
     this.setHiddenValues()
 
+    this.prompt.hidden = false
+    for (var k = 0; k < this.promptQuestions.length; k++) {
+      this.promptQuestions[k].hidden = false
+    }
+    this.surveyForm.hidden = true
+
     for (var j = 0; j < this.toggleForms.length; j++) {
       this.toggleForms[j].addEventListener('click', function (e) {
         e.preventDefault()
-        var el = e.target
+        var el = e.target.closest('button')
         this.toggleForm(el.getAttribute('aria-controls'))
         this.trackEvent(this.getTrackEventParams(el))
         this.updateAriaAttributes(el)
@@ -36,6 +42,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     }
 
     for (var i = 0; i < this.closeForms.length; i++) {
+      this.closeForms[i].hidden = false
       this.closeForms[i].addEventListener('click', function (e) {
         e.preventDefault()
         var el = e.target
@@ -89,7 +96,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
               this.showFormSuccess(xhr.message)
               this.revealInitialPrompt()
               this.setInitialAriaAttributes()
-              this.activeForm.classList.toggle(this.jshiddenClass)
+              this.activeForm.hidden ? this.activeForm.hidden = false : this.activeForm.hidden = true
             } else {
               this.showError(xhr)
               this.enableSubmitFormButton($form)
@@ -114,9 +121,6 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
   }
 
   Feedback.prototype.setInitialAriaAttributes = function () {
-    for (var i = 0; i < this.forms.length; i++) {
-      this.forms[i].setAttribute('aria-hidden', true)
-    }
     this.pageIsNotUsefulButton.setAttribute('aria-expanded', false)
     this.somethingIsWrongButton.setAttribute('aria-expanded', false)
   }
@@ -168,20 +172,16 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
   Feedback.prototype.updateAriaAttributes = function (linkClicked) {
     linkClicked.setAttribute('aria-expanded', true)
-    var controls = linkClicked.getAttribute('aria-controls')
-    var ariaControls = document.querySelector('#' + controls)
-    ariaControls.setAttribute('aria-hidden', false)
   }
 
   Feedback.prototype.toggleForm = function (formId) {
     this.activeForm = this.$module.querySelector('#' + formId)
-    this.activeForm.classList.toggle(this.jshiddenClass)
-    this.prompt.classList.toggle(this.jshiddenClass)
-
-    var formIsVisible = !this.activeForm.classList.contains(this.jshiddenClass)
+    this.activeForm.hidden ? this.activeForm.hidden = false : this.activeForm.hidden = true
+    this.prompt.hidden ? this.prompt.hidden = false : this.prompt.hidden = true
 
-    if (formIsVisible) {
-      this.activeForm.querySelector('.gem-c-input').focus()
+    if (!this.activeForm.hidden) {
+      this.activeForm.querySelectorAll('.gem-c-textarea .govuk-textarea, .gem-c-input.govuk-input')[0]
+        .focus()
     } else {
       this.activeForm = false
     }
@@ -223,20 +223,20 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     }
     var $errors = this.activeForm.querySelector('.js-errors')
     $errors.innerHTML = error
-    $errors.classList.remove(this.jshiddenClass)
+    $errors.hidden = false
     $errors.focus()
   }
 
   Feedback.prototype.showFormSuccess = function () {
     for (var i = 0; i < this.promptQuestions.length; i++) {
-      this.promptQuestions[i].classList.add(this.jshiddenClass)
+      this.promptQuestions[i].hidden = true
     }
-    this.promptSuccessMessage.classList.remove(this.jshiddenClass)
+    this.promptSuccessMessage.hidden = false
     this.promptSuccessMessage.focus()
   }
 
   Feedback.prototype.revealInitialPrompt = function () {
-    this.prompt.classList.remove(this.jshiddenClass)
+    this.prompt.hidden = false
     this.prompt.focus()
   }
 

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

@@ -0,0 +1,27 @@
+window.GOVUK = window.GOVUK || {}
+window.GOVUK.Modules = window.GOVUK.Modules || {};
+
+(function (Modules) {
+  function Metadata ($module) {
+    this.$module = $module
+  }
+
+  Metadata.prototype.init = function () {
+    var seeAllUpdates = this.$module.querySelector('.js-see-all-updates-link')
+
+    if (seeAllUpdates) {
+      var target = document.querySelector(seeAllUpdates.getAttribute('href'))
+
+      if (target) {
+        seeAllUpdates.addEventListener('click', function () {
+          var targetToggleTrigger = target.querySelector('[aria-expanded]')
+          if (targetToggleTrigger && targetToggleTrigger.getAttribute('aria-expanded') !== 'true') {
+            targetToggleTrigger.click()
+          }
+        })
+      }
+    }
+  }
+
+  Modules.Metadata = Metadata
+})(window.GOVUK.Modules)

data/app/assets/javascripts/govuk_publishing_components/lib/extend-object.js

@@ -0,0 +1,22 @@
+(function (root) {
+  'use strict'
+  window.GOVUK = window.GOVUK || {}
+
+  window.GOVUK.extendObject = function (obj) {
+    obj = obj || {}
+
+    for (var i = 1; i < arguments.length; i++) {
+      if (!arguments[i]) {
+        continue
+      }
+
+      for (var key in arguments[i]) {
+        if (Object.prototype.hasOwnProperty.call(arguments[i], key)) {
+          obj[key] = arguments[i][key]
+        }
+      }
+    }
+
+    return obj
+  }
+}(window))

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

@@ -39,7 +39,6 @@ $govuk-new-link-styles: true;
 @import "components/govspeak-html-publication";
 @import "components/govspeak";
 @import "components/heading";
-@import "components/highlight-boxes";
 @import "components/hint";
 @import "components/image-card";
 @import "components/input";
@@ -68,6 +67,7 @@ $govuk-new-link-styles: true;
 @import "components/select";
 @import "components/share-links";
 @import "components/show-password";
+@import "components/signup-link";
 @import "components/single-page-notification-button";
 @import "components/skip-link";
 @import "components/step-by-step-nav-header";
@@ -78,7 +78,6 @@ $govuk-new-link-styles: true;
 @import "components/summary-list";
 @import "components/tabs";
 @import "components/table";
-@import "components/taxonomy-list";
 @import "components/textarea";
 @import "components/title";
 @import "components/translation-nav";

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

@@ -6,6 +6,12 @@
     margin-top: govuk-spacing(9);
     border-bottom: 1px solid govuk-colour("white");
   }
+
+  // Scoped to the feedback component temporarily
+  [hidden] {
+    // stylelint-disable-next-line declaration-no-important
+    display: none !important;
+  }
 }
 
 .gem-c-feedback__prompt-questions {
@@ -135,9 +141,9 @@
   }
 }
 
-.gem-c-feedback__option-list-item:first-child {
+.gem-c-feedback__option-list-item:last-child {
   @include govuk-media-query($from: mobile) {
-    margin-right: govuk-spacing(4);
+    margin-left: govuk-spacing(4);
   }
 }
 
@@ -238,38 +244,3 @@
     outline: $govuk-focus-width solid $govuk-focus-colour;
   }
 }
-
-// hide without js
-// show with js, unless also has the js-hidden class
-.gem-c-feedback__js-show,
-.gem-c-feedback__prompt-success,
-.gem-c-feedback__prompt-questions,
-.gem-c-feedback__error-summary {
-  display: none;
-
-  .js-enabled & {
-    display: block;
-
-    &.js-hidden {
-      display: none;
-    }
-  }
-}
-
-// maintain table display for prompt and prompt-questions
-.js-enabled .gem-c-feedback__prompt {
-  @include govuk-media-query($from: tablet) {
-    display: table;
-  }
-}
-
-.js-enabled .gem-c-feedback__prompt-questions {
-  @include govuk-media-query($from: tablet) {
-    display: table-cell;
-  }
-}
-
-// show the default feedback form without js
-.js-enabled .gem-c-feedback__form.js-hidden {
-  display: none;
-}

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

@@ -0,0 +1,34 @@
+.gem-c-signup-link__link {
+  @include govuk-font($size: 19);
+}
+
+.gem-c-signup-link__inner {
+  position: relative;
+}
+
+.gem-c-signup-link__icon {
+  position: absolute;
+
+  @include govuk-media-query($from: tablet) {
+    top: 2px;
+  }
+}
+
+.gem-c-signup-link__title {
+  margin-bottom: govuk-spacing(2);
+  margin-left: govuk-spacing(5);
+}
+
+.gem-c-signup-link--with-background-and-border {
+  padding: govuk-spacing(6);
+  background-color: govuk-colour("light-grey");
+  border: 1px solid $govuk-border-colour;
+}
+
+.gem-c-signup-link--link-only .gem-c-signup-link__link {
+  display: inline-block;
+  vertical-align: top;
+  font-weight: bold;
+  margin-left: govuk-spacing(5);
+  margin-bottom: 0;
+}

data/app/assets/stylesheets/govuk_publishing_components/components/helpers/_markdown-typography.scss

@@ -145,4 +145,10 @@
     margin-bottom: $govuk-gutter;
     border-top: 1px solid $govuk-border-colour;
   }
+
+  code {
+    padding: 0 5px;
+    color: govuk-colour("red");
+    background-color: govuk-colour("light-grey");
+  }
 }