govuk_publishing_components 27.8.0 → 27.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a177d643883dea8f63ce0c6931e9170ab46e4d50e3499b430c9a67ddb84cb2ca
-  data.tar.gz: e9b25ea90b6d0fd6269df2acf19a8d724884635ad0dbd84b4279e574737a30ac
+  metadata.gz: 1972033395616c1023a78e4452ac636b90a5bc7f9c7739c2a1d258e76691b900
+  data.tar.gz: 0c9ce6602fc0811249802d4c4db210ac2df342d35ce2b6bc2a796315d5b0213f
 SHA512:
-  metadata.gz: b1279ab602818802cf978a9742a8ba40ccdeef9478307c8f724dfa9d8b024ba33945b7dd8eaaa1f758f48c6a70d61957a3b1936db692d04b4c5fb439a7d7bc2d
-  data.tar.gz: 81a267c76307c65fc8a0cca680d82421e18e9e494a1d3a31b252563a05d6b88b38c3d1bb60c1b66bac958f7be668b918b2b9aab53b19f94ab599512e7bd6a5e8
+  metadata.gz: 0ea760c12bc9de04e792adfa8f37c6ffbb2a14ec58bde29a4419afcc7bdc72e7ef47b8c2f7408fddf8a2b0f494aad26947d4d5d2b896c485f72bbea2f37cebdf
+  data.tar.gz: c27b47624a8c10554bf33af5099f5aebc14144410692823e84c7f59a4abb009d82ec9ac1b54c707e30dcd71423e465ced00e405df1abf0ffc325db1f1d9743b0

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

@@ -36,11 +36,20 @@
       fieldsObject = { cookieDomain: fieldsObject }
     }
 
+    function setLinkedDomains () {
+      var domains = window.GOVUK.analyticsVars.primaryLinkedDomains
+      if (domains && domains.length > 0) {
+        sendToGa('require', 'linker')
+        sendToGa('linker:autoLink', domains)
+      }
+    }
+
     configureProfile()
     anonymizeIp()
     disableAdFeatures()
     stripTitlePII()
     stripLocationPII()
+    setLinkedDomains()
   }
 
   GoogleAnalyticsUniversalTracker.load = function () {

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

@@ -3,9 +3,12 @@ var analyticsInit = function () {
 
   var analyticsVars = window.GOVUK.analyticsVars || false
   if (analyticsVars) {
-    var gaProperty = window.GOVUK.analyticsVars.gaProperty || false
-    var gaPropertyCrossDomain = window.GOVUK.analyticsVars.gaPropertyCrossDomain || false
-    var linkedDomains = window.GOVUK.analyticsVars.linkedDomains || false
+    // the property naming convention here isn't consistent, but used in static and
+    // govuk-account-manager-prototype, so hard to change
+    var primaryGaProperty = window.GOVUK.analyticsVars.gaProperty || false
+
+    var crossDomainGaProperty = window.GOVUK.analyticsVars.gaPropertyCrossDomain || false
+    var crossDomainLinkedDomains = window.GOVUK.analyticsVars.linkedDomains || false
   }
 
   window.GOVUK.Analytics.checkDigitalIdentityConsent = function (location) {
@@ -39,7 +42,7 @@ var analyticsInit = function () {
 
   // Disable analytics by default
   // This will be reversed below, if the consent cookie says usage cookies are allowed
-  var disabler = 'ga-disable-' + gaProperty
+  var disabler = 'ga-disable-' + primaryGaProperty
   window[disabler] = true
 
   if (consentCookie && consentCookie.usage) {
@@ -48,14 +51,14 @@ var analyticsInit = function () {
     // Load Google Analytics libraries
     window.GOVUK.StaticAnalytics.load()
 
-    if (gaProperty) {
+    if (primaryGaProperty) {
       // Use document.domain in dev, preview and staging so that tracking works
       // Otherwise explicitly set the domain as www.gov.uk (and not gov.uk).
       var cookieDomain = (document.domain === 'www.gov.uk') ? '.www.gov.uk' : document.domain
 
       // Configure profiles, setup custom vars, track initial pageview
       var analytics = new window.GOVUK.StaticAnalytics({
-        universalId: gaProperty,
+        universalId: primaryGaProperty,
         cookieDomain: cookieDomain,
         allowLinker: true
       })
@@ -63,8 +66,9 @@ var analyticsInit = function () {
       // Make interface public for virtual pageviews and events
       window.GOVUK.analytics = analytics
 
-      if (linkedDomains && linkedDomains.length > 0) {
-        window.GOVUK.analytics.addLinkedTrackerDomain(gaPropertyCrossDomain, 'govuk', linkedDomains)
+      // set up linking of domains for cross domain ga property
+      if (crossDomainLinkedDomains && crossDomainLinkedDomains.length > 0) {
+        window.GOVUK.analytics.addLinkedTrackerDomain(crossDomainGaProperty, 'govuk', crossDomainLinkedDomains)
       }
     }
   } else {

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

@@ -8,6 +8,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
   Intervention.prototype.init = function () {
     if (window.GOVUK.analytics && window.GOVUK.analytics.trackEvent) {
+      // Send a tracking event when this component is shown
       window.GOVUK.analytics.trackEvent('interventionBanner', 'interventionShown')
     }
   }

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

@@ -124,25 +124,11 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
     this.hiddenButtons = this.$module.querySelectorAll('button[hidden]')
 
-    this.lastWindowSize = undefined
+    this.lastWindowSize = null
   }
 
   SuperNavigationMegaMenu.prototype.windowSize = windowSize
 
-  // Resizes the space needed for the dropdown menu so that it doesn't overlap
-  // with the page content. As this is an event that needs to be added and
-  // removed it can't be be bound to `this` because that changes the fingerprint
-  // of the function, and makes it unable to be removed with
-  // `removeEventListener`.
-  SuperNavigationMegaMenu.prototype.resizeHandler = function () {
-    var $module = document.querySelector('[data-module="super-navigation-mega-menu"]')
-    var $openButton = $module.querySelector('[aria-expanded="true"][data-toggle-desktop-group="top"]')
-    var $openMenu = $openButton ? $module.querySelector('#' + $openButton.getAttribute('aria-controls')) : null
-    var margin = $openMenu && windowSize() === 'desktop' ? $openMenu.offsetHeight : 0
-
-    $module.style.marginBottom = margin + 'px'
-  }
-
   SuperNavigationMegaMenu.prototype.updateStates = function () {
     if (this.windowSize() === 'mobile' && this.lastWindowSize !== 'mobile') {
       this.$navigationToggle.removeAttribute('hidden')
@@ -161,8 +147,21 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     if (this.windowSize() === 'desktop' && this.lastWindowSize !== 'desktop') {
       this.$navigationToggle.setAttribute('hidden', 'hidden')
       this.$navigationMenu.removeAttribute('hidden')
+    }
 
-      this.resizeHandler()
+    // The dropdown menu height is only needed when in desktop mode as this is
+    // when the dropdown menu is using `absolute` positioning. This requires
+    // JavaScript to work out the height and make space for the dropdown menu.
+    if (windowSize() === 'desktop') {
+      // Check whether any of the dropdown menus are open.
+      var $openButton = this.$module.querySelector('[aria-expanded="true"][data-toggle-desktop-group="top"]')
+      // Gets the open dropdown menu
+      var $openMenu = $openButton ? this.$module.querySelector('#' + $openButton.getAttribute('aria-controls')) : null
+      // If there is an open dropdown menu, get the height of the dropdown menu.
+      var margin = $openMenu ? $openMenu.offsetHeight : 0
+
+      // Make space for the dropdown menu.
+      this.$module.style.marginBottom = margin + 'px'
     }
 
     this.lastWindowSize = this.windowSize()
@@ -231,30 +230,11 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
     this.lastWindowSize = this.windowSize()
 
-    // The menu needs to be updated when the window is resized - specifically,
-    // the top level navigation toggle needs to be shown or hidden.
-    //     Using `matchMedia` to listen for both resize events means that this
-    // will only fire when the media query is matched so is more efficient. The
-    // fallback is the `window.resize` event with a check to make sure that it
-    // only does things when moving from mobile to desktop view.
-    var setupResizeListener = function () {
-      window.addEventListener('resize', this.updateStates.bind(this), { passive: true })
-    }.bind(this)
-
-    if (typeof window.matchMedia === 'function') {
-      // Internet Explorer 11 supports `matchMedia`, but doesn't support
-      // the `change` event[1] - so we try it, and then fail back to using
-      // `window.resize`.
-      // [1]: https://developer.mozilla.org/en-US/docs/Web/API/MediaQueryList/onchange
-      try {
-        window.matchMedia('screen and (min-width:' + SETTINGS.breakpoint.desktop + 'px)')
-          .addEventListener('change', this.updateStates.bind(this))
-      } catch (error) {
-        setupResizeListener()
-      }
-    } else {
-      setupResizeListener()
-    }
+    // The menu needs to be updated when the window is resized to make sure that
+    // the space needed for the dropdown menu is correct.
+    window.addEventListener('resize', this.updateStates.bind(this), { passive: true })
+
+    this.$module.classList.add('js-module-initialised')
   }
 
   Modules.SuperNavigationMegaMenu = SuperNavigationMegaMenu

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

@@ -1,18 +1,21 @@
 .gem-c-intervention {
   @include govuk-text-colour;
-  @include govuk-responsive-padding(6, "left");
-  @include govuk-responsive-padding(6, "right");
-  @include govuk-responsive-padding(4, "top");
-  @include govuk-responsive-padding(4, "bottom");
+  @include govuk-responsive-padding(3);
   @include govuk-responsive-margin(6, "bottom");
   background-color: govuk-colour("light-grey", $legacy: "grey-4");
-
-  .gem-c-intervention__title {
-    @include govuk-responsive-margin(0);
-    @include govuk-responsive-padding(4, "bottom");
-  }
+  border-left: 10px solid $govuk-success-colour;
 
   .govuk-body:last-of-type {
-    @include govuk-responsive-margin(0, "bottom");
+    margin-bottom: 0;
   }
 }
+
+.gem-c-intervention__textwrapper {
+  display: block;
+}
+
+.gem-c-intervention__dismiss-icon {
+  width: 1em;
+  height: 1em;
+  margin-bottom: -2px;
+}

data/app/assets/stylesheets/govuk_publishing_components/components/_layout-for-public.scss

@@ -52,15 +52,3 @@ $current-indicator-width: 4px;
     color: $govuk-link-colour;
   }
 }
-
-.gem-c-layout-for-public-account-feedback-footer {
-  margin-bottom: govuk-spacing(4);
-  padding: govuk-spacing(3);
-  background: govuk-colour("light-grey");
-
-  @include govuk-media-query($from: tablet) {
-    padding: govuk-spacing(6);
-    margin-top: govuk-spacing(2);
-    margin-bottom: govuk-spacing(8);
-  }
-}