govuk_publishing_components 60.0.2 → 60.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 912c6faaf7a85ad5135fa59593901a10ac2a67b7af46f4d6dd7984a9437484f8
-  data.tar.gz: ba6aa16e51af611001f5b06d5f3aece0ccca3f3039178efc9b9fec41f0584051
+  metadata.gz: 794efa31b3bf2f3bf14ff614f93dd7d60d3b0207d73bcfb6aa13c457e29204b2
+  data.tar.gz: 8564c23a089572c189f236487340d252b2fb6d037f93ea958deb521dd3402586
 SHA512:
-  metadata.gz: bbbbff143d71a357b4925b4a23f3fbd694b878f7f1e005c95d7e82de4424ac5477fca893c0bf6d7af4134e2d817cd6d71967298186d45da09667ecff8d54a89e
-  data.tar.gz: 464ffccbe45249d0348f4d7be68386a6be5b51fc3f5716f6287cbbb5e605308d6d74e623ab8f87c04a7118ee8d6c1d34c38f5554f3e8a39e2006b71d3ca404df
+  metadata.gz: 74f9f8b3a7cdb6843970fb167f0d3ac449d3eeaebc22268cfa875948b74ee7609129a9e56aebbb8de2e1aab3985cbb8bc4ff245dbd6b38ca18f7d6a7a39553db
+  data.tar.gz: 2e23c78296ecba1aafa76f9e45a3b78d6e3a8d7336b84c84b430521479b39602482c0ad8ce7181190338187a808be6be650152d0dfae52d6f18f279b162126dc

data/README.md

@@ -2,6 +2,8 @@
 [![status](https://github.com/alphagov/govuk_publishing_components/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/alphagov/govuk_publishing_components/actions/workflows/ci.yml?query=branch%3Amain)
 [![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/)
+[![Rubocop Style Guide](https://img.shields.io/badge/code_style-rubocop-brightgreen.svg)](https://github.com/alphagov/rubocop-govuk)
+[![erb_lint Style Guide](https://img.shields.io/badge/code_style-erb_lint-brightgreen.svg)](https://github.com/Shopify/erb_lint)
 
 govuk_publishing_components is a Ruby gem to document and distribute components for GOV.UK applications. It provides:
 

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-page-views.js

@@ -85,12 +85,22 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
       }
     },
 
+    getBasePath: function () {
+      return this.getMetaContent('ga4-base-path')
+    },
+
     getCanonicalHref: function () {
       var link = document.querySelector('link[rel=canonical]')
 
       if (link) {
         return link.href
       }
+
+      var basePath = this.getBasePath()
+
+      if (basePath) {
+        return window.location.origin + basePath // e.g. https://www.gov.uk + /browse
+      }
     },
 
     getLocation: function () {
@@ -159,7 +169,7 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
     },
 
     getTitle: function () {
-      return this.PIIRemover.stripPIIWithOverride(document.title, true, true)
+      return this.PIIRemover.stripPIIWithOverride(document.title, false, true)
     },
 
     // window.httpStatusCode is set in the source of the error page in static

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

@@ -13,7 +13,6 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     this.closeForms = this.$module.querySelectorAll('.js-close-form')
     this.activeForm = false
     this.pageIsUsefulButton = this.$module.querySelector('.js-page-is-useful')
-    this.pageIsNotUsefulButton = this.$module.querySelector('.js-page-is-not-useful')
     this.somethingIsWrongButton = this.$module.querySelector('.js-something-is-wrong')
     this.promptQuestions = this.$module.querySelectorAll('.js-prompt-questions')
     this.promptSuccessMessage = this.$module.querySelector('.js-prompt-success')
@@ -24,7 +23,6 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
   }
 
   Feedback.prototype.init = function () {
-    this.setInitialAriaAttributes()
     this.setHiddenValues()
     this.setSurveyPath()
     this.prompt.hidden = false
@@ -38,7 +36,6 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
         e.preventDefault()
         var el = e.target.closest('button')
         this.toggleForm(el.getAttribute('aria-controls'))
-        this.updateAriaAttributes(el)
       }.bind(this))
     }
 
@@ -49,7 +46,6 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
         var el = e.target
         var formToToggle = el.getAttribute('aria-controls')
         this.toggleForm(formToToggle)
-        this.setInitialAriaAttributes()
         this.revealInitialPrompt()
         var refocusClass = '.js-' + formToToggle
         this.$module.querySelector(refocusClass).focus()
@@ -82,7 +78,6 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
           if (xhr.status === 200) {
             this.showFormSuccess(xhr.message)
             this.revealInitialPrompt()
-            this.setInitialAriaAttributes()
             this.activeForm.hidden = true
             clearInterval(this.timerInterval)
           } else {
@@ -111,11 +106,6 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     formButton.removeAttribute('disabled')
   }
 
-  Feedback.prototype.setInitialAriaAttributes = function () {
-    this.pageIsNotUsefulButton.setAttribute('aria-expanded', false)
-    this.somethingIsWrongButton.setAttribute('aria-expanded', false)
-  }
-
   Feedback.prototype.setHiddenValues = function () {
     var javascriptEnabled = document.createElement('input')
     javascriptEnabled.setAttribute('type', 'hidden')
@@ -157,10 +147,6 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     }
   }
 
-  Feedback.prototype.updateAriaAttributes = function (linkClicked) {
-    linkClicked.setAttribute('aria-expanded', true)
-  }
-
   Feedback.prototype.toggleForm = function (formId) {
     this.activeForm = this.$module.querySelector('#' + formId)
     this.activeForm.hidden ? this.activeForm.hidden = false : this.activeForm.hidden = true