govuk_publishing_components 29.7.0 → 29.10.0

data/config/locales/pt.yml

@@ -162,9 +162,8 @@ pt:
         link_text: Verifique o que precisa de fazer
         title: Brexit
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: Locais mundiais
     search_box:
       input_title: Pesquisar

data/config/locales/ro.yml

@@ -163,9 +163,8 @@ ro:
         link_text: Verificați ce trebuie să faceți
         title: Brexit
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: Locații pe glob
     search_box:
       input_title: Căutați

data/config/locales/ru.yml

@@ -166,9 +166,8 @@ ru:
         link_text: Проверьте, что вам нужно сделать
         title: Брексит
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: Места нахождения по миру
     search_box:
       input_title: Поиск

data/config/locales/si.yml

@@ -162,9 +162,8 @@ si:
         link_text: ඔබ කළ යුතු දේ පරීක්ෂා කරන්න
         title: බ්රෙක්සිට්
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: ලෝක ස්ථාන
     search_box:
       input_title: සොයන්න

data/config/locales/sk.yml

@@ -167,9 +167,8 @@ sk:
         link_text: Skontrolujte, čo je potrebné urobiť
         title: Brexit
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: Svetové lokality
     search_box:
       input_title: Vyhľadávanie

data/config/locales/sl.yml

@@ -169,9 +169,8 @@ sl:
         link_text: Preverite, kaj morate storiti
         title: Brexit
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: Lokacije po svetu
     search_box:
       input_title: Iskanje

data/config/locales/so.yml

@@ -162,9 +162,8 @@ so:
         link_text: Hubi waxaad u baahantahay inaad qabato
         title: Ka bixitaanka Ingiriiska
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: Goobaha Dunida
     search_box:
       input_title: Baadh

data/config/locales/sq.yml

@@ -162,9 +162,8 @@ sq:
         link_text: Kontrolloni se çfarë duhet të bëni
         title: Brexit
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: Vendndodhjet globale
     search_box:
       input_title: Kërko

data/config/locales/sr.yml

@@ -163,9 +163,8 @@ sr:
         link_text: Proverite šta treba da uradite
         title: Bregzit
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: Globalne lokacije
     search_box:
       input_title: Pretraži

data/config/locales/sv.yml

@@ -162,9 +162,8 @@ sv:
         link_text: Kontrollera vad du behöver göra
         title: Brexit
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: Platser i världen
     search_box:
       input_title: Sök på

data/config/locales/sw.yml

@@ -162,9 +162,8 @@ sw:
         link_text: Angalia unachopaswa kufanya
         title: Brexit
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: Maeneo ya kimataifa
     search_box:
       input_title: Tafuta

data/config/locales/ta.yml

@@ -163,9 +163,8 @@ ta:
         link_text: நீங்கள் செய்யவேண்டியது என்ன என்று பாருங்கள்
         title: பிரெக்சிட்
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: உலக இருப்பிடங்கள்
     search_box:
       input_title: தேடு

data/config/locales/th.yml

@@ -160,9 +160,8 @@ th:
         link_text: ตรวจสอบสิ่งที่คุณต้องทำ
         title: Brexit
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: สถานที่ทั่วโลก
     search_box:
       input_title: ค้นหา

data/config/locales/tk.yml

@@ -163,9 +163,8 @@ tk:
         link_text: Näme etmelidigiňizi belläň
         title: Brexit
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: Dünýä ýerleri
     search_box:
       input_title: Gözlemek

data/config/locales/tr.yml

@@ -163,9 +163,8 @@ tr:
         link_text: Ne yapmaya ihtiyacınız olduğunu kontrol edin
         title: Brexit
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: Dünya geneli konumlar
     search_box:
       input_title: Ara

data/config/locales/uk.yml

@@ -169,9 +169,8 @@ uk:
         link_text: Перевірте, що вам потрібно зробити
         title: Brexit
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: Світові локації
     search_box:
       input_title: Пошук

data/config/locales/ur.yml

@@ -159,9 +159,8 @@ ur:
         link_text: پڑتال کریں کہ آپ کو کیا کرنے کی ضرورت ہے
         title: Brexit
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: عالمی مقامات
     search_box:
       input_title: تلاش

data/config/locales/uz.yml

@@ -164,9 +164,8 @@ uz:
         link_text: Нима қилиш зарурлигини текшириш
         title: Брексит
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: Жаҳондаги жойлашиш жойи
     search_box:
       input_title: Излаш

data/config/locales/vi.yml

@@ -161,9 +161,8 @@ vi:
         link_text: Kiểm tra những gì bạn cần làm
         title: Brexit
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: Các vị trí trên thế giới
     search_box:
       input_title: Tìm kiếm

data/config/locales/zh-hk.yml

@@ -160,9 +160,8 @@ zh-hk:
         link_text: 查看您需要做的事
         title: 英國脫歐
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: 全世界之地點
     search_box:
       input_title: 搜尋

data/config/locales/zh-tw.yml

@@ -160,9 +160,8 @@ zh-tw:
         link_text: 確認你需要：
         title: 脫歐
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: 世界地點
     search_box:
       input_title: 搜尋

data/config/locales/zh.yml

@@ -160,9 +160,8 @@ zh:
         link_text: 检查您需要做的事情
         title: 英国脱欧
       ukraine:
-        link_path:
-        link_text:
         title:
+        links:
       world_locations: 世界地点
     search_box:
       input_title: 搜索

data/lib/generators/govuk_publishing_components/templates/_component.html.erb

@@ -1,3 +1,3 @@
 <div class="<%= @component_prefix %><%= @public_name %>">
-  <h2><a href="https://github.com/alphagov/govuk_publishing_components/blob/master/docs/component_conventions.md">How to build a component</a></h2>
+  <h2><a href="https://github.com/alphagov/govuk_publishing_components/blob/main/docs/component_conventions.md">How to build a component</a></h2>
 </div>

data/lib/govuk_publishing_components/app_helpers/brand_helper.rb

@@ -7,7 +7,7 @@ module GovukPublishingComponents
 
       # Apply government organisation branding to individual components, specifically
       # link colour and border colour
-      # see https://github.com/alphagov/govuk_publishing_components/blob/master/docs/component_branding.md
+      # see https://github.com/alphagov/govuk_publishing_components/blob/main/docs/component_branding.md
 
       def brand_class
         "brand--#{@brand}" if @brand

data/lib/govuk_publishing_components/presenters/attachment_helper.rb

@@ -6,9 +6,7 @@ module GovukPublishingComponents
       # scheme is rolled out further this can be removed.
       # Currently DfE, DWP and DVSA are participating in the pilot.
       EMAILS_IN_ACCESSIBLE_FORMAT_REQUEST_PILOT = %w[govuk_publishing_components@example.com
-                                                     alternative.formats@education.gov.uk
-                                                     accessible.formats@dwp.gov.uk
-                                                     gov.uk.publishing@dvsa.gov.uk].freeze
+                                                     alternative.formats@education.gov.uk].freeze
 
       delegate :opendocument?, :document?, :spreadsheet?, to: :content_type
 

data/lib/govuk_publishing_components/presenters/public_layout_helper.rb

@@ -2,7 +2,7 @@ module GovukPublishingComponents
   module Presenters
     class PublicLayoutHelper
       FOOTER_NAVIGATION_COLUMNS = [2, 1].freeze
-
+      FOOTER_TRACK_ACTIONS = %w[topicsLink governmentActivityLink].freeze
       FOOTER_META = {
         items: [
           {
@@ -46,25 +46,44 @@ module GovukPublishingComponents
       attr_reader :footer_navigation, :footer_meta, :cookie_banner_data
 
       def initialize(local_assigns)
-        @footer_navigation = local_assigns[:footer_navigation] || I18n.t("components.layout_footer.navigation_links").each_with_index.map do |menu, i|
+        @footer_navigation = local_assigns[:footer_navigation] || navigation_link_generation_from_locale(I18n.t("components.layout_footer.navigation_links"))
+        @footer_meta = local_assigns[:footer_meta] || { items: add_data_attributes_to_links(FOOTER_META[:items], "supportLink") }
+        @cookie_banner_data = local_assigns[:cookie_banner_data] || {}
+      end
+
+      def navigation_link_generation_from_locale(links)
+        links.each_with_index.map do |menu, i|
           {
             title: menu[:title],
-            columns: FOOTER_NAVIGATION_COLUMNS[i],
-            items: menu[:menu_contents].map do |item|
-              item.merge({
-                attributes: {
-                  data: {
-                    track_category: "footerClicked",
-                    track_action: "footerLinks",
-                    track_label: item[:text],
-                  },
-                },
-              })
-            end,
+            columns: footer_navigation_columns[i],
+            items: add_data_attributes_to_links(menu[:menu_contents], footer_track_actions[i]),
           }
         end
-        @footer_meta = local_assigns[:footer_meta] || FOOTER_META
-        @cookie_banner_data = local_assigns[:cookie_banner_data] || {}
+      end
+
+      def footer_navigation_columns
+        FOOTER_NAVIGATION_COLUMNS
+      end
+
+      def footer_track_actions
+        FOOTER_TRACK_ACTIONS
+      end
+
+      def generate_data_attribute(link, track_action)
+        {
+          track_category: "footerClicked",
+          track_action: track_action,
+          track_label: link[:href],
+          track_options: {
+            dimension29: link[:text],
+          },
+        }
+      end
+
+      def add_data_attributes_to_links(items, track_action)
+        items.map do |item|
+          item.deep_merge({ attributes: { data: generate_data_attribute(item, track_action) } })
+        end
       end
     end
   end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "29.7.0".freeze
+  VERSION = "29.10.0".freeze
 end

data/node_modules/govuk-frontend/govuk/all.js

@@ -1601,9 +1601,9 @@ Details.prototype.polyfillHandleInputs = function (node, callback) {
 function CharacterCount ($module) {
   this.$module = $module;
   this.$textarea = $module.querySelector('.govuk-js-character-count');
-  if (this.$textarea) {
-    this.$countMessage = document.getElementById(this.$textarea.id + '-info');
-  }
+  this.$visibleCountMessage = null;
+  this.$screenReaderCountMessage = null;
+  this.lastInputTimestamp = null;
 }
 
 CharacterCount.prototype.defaults = {
@@ -1613,18 +1613,39 @@ CharacterCount.prototype.defaults = {
 
 // Initialize component
 CharacterCount.prototype.init = function () {
+  // Check that required elements are present
+  if (!this.$textarea) {
+    return
+  }
+
   // Check for module
   var $module = this.$module;
   var $textarea = this.$textarea;
-  var $countMessage = this.$countMessage;
-
-  if (!$textarea || !$countMessage) {
-    return
-  }
+  var $fallbackLimitMessage = document.getElementById($textarea.id + '-info');
 
-  // We move count message right after the field
+  // Move the fallback count message to be immediately after the textarea
   // Kept for backwards compatibility
-  $textarea.insertAdjacentElement('afterend', $countMessage);
+  $textarea.insertAdjacentElement('afterend', $fallbackLimitMessage);
+
+  // Create the *screen reader* specific live-updating counter
+  // This doesn't need any styling classes, as it is never visible
+  var $screenReaderCountMessage = document.createElement('div');
+  $screenReaderCountMessage.className = 'govuk-character-count__sr-status govuk-visually-hidden';
+  $screenReaderCountMessage.setAttribute('aria-live', 'polite');
+  this.$screenReaderCountMessage = $screenReaderCountMessage;
+  $fallbackLimitMessage.insertAdjacentElement('afterend', $screenReaderCountMessage);
+
+  // Create our live-updating counter element, copying the classes from the
+  // fallback element for backwards compatibility as these may have been configured
+  var $visibleCountMessage = document.createElement('div');
+  $visibleCountMessage.className = $fallbackLimitMessage.className;
+  $visibleCountMessage.classList.add('govuk-character-count__status');
+  $visibleCountMessage.setAttribute('aria-hidden', 'true');
+  this.$visibleCountMessage = $visibleCountMessage;
+  $fallbackLimitMessage.insertAdjacentElement('afterend', $visibleCountMessage);
+
+  // Hide the fallback limit message
+  $fallbackLimitMessage.classList.add('govuk-visually-hidden');
 
   // Read options set using dataset ('data-' values)
   this.options = this.getDataset($module);
@@ -1644,23 +1665,19 @@ CharacterCount.prototype.init = function () {
   }
 
   // Remove hard limit if set
-  $module.removeAttribute('maxlength');
+  $textarea.removeAttribute('maxlength');
+
+  this.bindChangeEvents();
 
   // When the page is restored after navigating 'back' in some browsers the
   // state of the character count is not restored until *after* the DOMContentLoaded
-  // event is fired, so we need to sync after the pageshow event in browsers
-  // that support it.
+  // event is fired, so we need to manually update it after the pageshow event
+  // in browsers that support it.
   if ('onpageshow' in window) {
-    window.addEventListener('pageshow', this.sync.bind(this));
+    window.addEventListener('pageshow', this.updateCountMessage.bind(this));
   } else {
-    window.addEventListener('DOMContentLoaded', this.sync.bind(this));
+    window.addEventListener('DOMContentLoaded', this.updateCountMessage.bind(this));
   }
-
-  this.sync();
-};
-
-CharacterCount.prototype.sync = function () {
-  this.bindChangeEvents();
   this.updateCountMessage();
 };
 
@@ -1695,7 +1712,7 @@ CharacterCount.prototype.count = function (text) {
 // Bind input propertychange to the elements and update based on the change
 CharacterCount.prototype.bindChangeEvents = function () {
   var $textarea = this.$textarea;
-  $textarea.addEventListener('keyup', this.checkIfValueChanged.bind(this));
+  $textarea.addEventListener('keyup', this.handleKeyUp.bind(this));
 
   // Bind focus/blur events to start/stop polling
   $textarea.addEventListener('focus', this.handleFocus.bind(this));
@@ -1713,42 +1730,64 @@ CharacterCount.prototype.checkIfValueChanged = function () {
   }
 };
 
-// Update message box
+// Helper function to update both the visible and screen reader-specific
+// counters simultaneously (e.g. on init)
 CharacterCount.prototype.updateCountMessage = function () {
-  var countElement = this.$textarea;
-  var options = this.options;
-  var countMessage = this.$countMessage;
+  this.updateVisibleCountMessage();
+  this.updateScreenReaderCountMessage();
+};
 
-  // Determine the remaining number of characters/words
-  var currentLength = this.count(countElement.value);
-  var maxLength = this.maxLength;
-  var remainingNumber = maxLength - currentLength;
+// Update visible counter
+CharacterCount.prototype.updateVisibleCountMessage = function () {
+  var $textarea = this.$textarea;
+  var $visibleCountMessage = this.$visibleCountMessage;
+  var remainingNumber = this.maxLength - this.count($textarea.value);
 
-  // Set threshold if presented in options
-  var thresholdPercent = options.threshold ? options.threshold : 0;
-  var thresholdValue = maxLength * thresholdPercent / 100;
-  if (thresholdValue > currentLength) {
-    countMessage.classList.add('govuk-character-count__message--disabled');
-    // Ensure threshold is hidden for users of assistive technologies
-    countMessage.setAttribute('aria-hidden', true);
+  // If input is over the threshold, remove the disabled class which renders the
+  // counter invisible.
+  if (this.isOverThreshold()) {
+    $visibleCountMessage.classList.remove('govuk-character-count__message--disabled');
   } else {
-    countMessage.classList.remove('govuk-character-count__message--disabled');
-    // Ensure threshold is visible for users of assistive technologies
-    countMessage.removeAttribute('aria-hidden');
+    $visibleCountMessage.classList.add('govuk-character-count__message--disabled');
   }
 
   // Update styles
   if (remainingNumber < 0) {
-    countElement.classList.add('govuk-textarea--error');
-    countMessage.classList.remove('govuk-hint');
-    countMessage.classList.add('govuk-error-message');
+    $textarea.classList.add('govuk-textarea--error');
+    $visibleCountMessage.classList.remove('govuk-hint');
+    $visibleCountMessage.classList.add('govuk-error-message');
+  } else {
+    $textarea.classList.remove('govuk-textarea--error');
+    $visibleCountMessage.classList.remove('govuk-error-message');
+    $visibleCountMessage.classList.add('govuk-hint');
+  }
+
+  // Update message
+  $visibleCountMessage.innerHTML = this.formattedUpdateMessage();
+};
+
+// Update screen reader-specific counter
+CharacterCount.prototype.updateScreenReaderCountMessage = function () {
+  var $screenReaderCountMessage = this.$screenReaderCountMessage;
+
+  // If over the threshold, remove the aria-hidden attribute, allowing screen
+  // readers to announce the content of the element.
+  if (this.isOverThreshold()) {
+    $screenReaderCountMessage.removeAttribute('aria-hidden');
   } else {
-    countElement.classList.remove('govuk-textarea--error');
-    countMessage.classList.remove('govuk-error-message');
-    countMessage.classList.add('govuk-hint');
+    $screenReaderCountMessage.setAttribute('aria-hidden', true);
   }
 
   // Update message
+  $screenReaderCountMessage.innerHTML = this.formattedUpdateMessage();
+};
+
+// Format update message
+CharacterCount.prototype.formattedUpdateMessage = function () {
+  var $textarea = this.$textarea;
+  var options = this.options;
+  var remainingNumber = this.maxLength - this.count($textarea.value);
+
   var charVerb = 'remaining';
   var charNoun = 'character';
   var displayNumber = remainingNumber;
@@ -1760,12 +1799,44 @@ CharacterCount.prototype.updateCountMessage = function () {
   charVerb = (remainingNumber < 0) ? 'too many' : 'remaining';
   displayNumber = Math.abs(remainingNumber);
 
-  countMessage.innerHTML = 'You have ' + displayNumber + ' ' + charNoun + ' ' + charVerb;
+  return 'You have ' + displayNumber + ' ' + charNoun + ' ' + charVerb
+};
+
+// Checks whether the value is over the configured threshold for the input.
+// If there is no configured threshold, it is set to 0 and this function will
+// always return true.
+CharacterCount.prototype.isOverThreshold = function () {
+  var $textarea = this.$textarea;
+  var options = this.options;
+
+  // Determine the remaining number of characters/words
+  var currentLength = this.count($textarea.value);
+  var maxLength = this.maxLength;
+
+  // Set threshold if presented in options
+  var thresholdPercent = options.threshold ? options.threshold : 0;
+  var thresholdValue = maxLength * thresholdPercent / 100;
+
+  return (thresholdValue <= currentLength)
+};
+
+// Update the visible character counter and keep track of when the last update
+// happened for each keypress
+CharacterCount.prototype.handleKeyUp = function () {
+  this.updateVisibleCountMessage();
+  this.lastInputTimestamp = Date.now();
 };
 
 CharacterCount.prototype.handleFocus = function () {
-  // Check if value changed on focus
-  this.valueChecker = setInterval(this.checkIfValueChanged.bind(this), 1000);
+  // If the field is focused, and a keyup event hasn't been detected for at
+  // least 1000 ms (1 second), then run the manual change check.
+  // This is so that the update triggered by the manual comparison doesn't
+  // conflict with debounced KeyboardEvent updates.
+  this.valueChecker = setInterval(function () {
+    if (!this.lastInputTimestamp || (Date.now() - 500) >= this.lastInputTimestamp) {
+      this.checkIfValueChanged();
+    }
+  }.bind(this), 1000);
 };
 
 CharacterCount.prototype.handleBlur = function () {

data/node_modules/govuk-frontend/govuk/components/back-link/macro-options.json

@@ -3,13 +3,13 @@
         "name": "text",
         "type": "string",
         "required": false,
-        "description": "Text to use within the back link component. If `html` is provided, the `text` argument will be ignored. Defaults to 'Back'."
+        "description": "Text to use within the back link component. If `html` is provided, the `text` option will be ignored. Defaults to 'Back'."
     },
     {
         "name": "html",
         "type": "string",
         "required": false,
-        "description": "HTML to use within the back link component. If `html` is provided, the `text` argument will be ignored. Defaults to 'Back'."
+        "description": "HTML to use within the back link component. If `html` is provided, the `text` option will be ignored. Defaults to 'Back'."
     },
     {
         "name": "href",

data/node_modules/govuk-frontend/govuk/components/breadcrumbs/_index.scss

@@ -128,8 +128,6 @@
       }
 
       .govuk-breadcrumbs__list {
-        display: -webkit-box;
-        display: -webkit-flex;
         display: -ms-flexbox;
         display: flex;
       }

data/node_modules/govuk-frontend/govuk/components/breadcrumbs/macro-options.json

@@ -9,13 +9,13 @@
                 "name": "text",
                 "type": "string",
                 "required": true,
-                "description": "If `html` is set, this is not required. Text to use within the breadcrumbs item. If `html` is provided, the `text` argument will be ignored."
+                "description": "If `html` is set, this is not required. Text to use within the breadcrumbs item. If `html` is provided, the `text` option will be ignored."
             },
             {
                 "name": "html",
                 "type": "string",
                 "required": true,
-                "description": "If `text` is set, this is not required. HTML to use within the breadcrumbs item. If `html` is provided, the `text` argument will be ignored."
+                "description": "If `text` is set, this is not required. HTML to use within the breadcrumbs item. If `html` is provided, the `text` option will be ignored."
             },
             {
                 "name": "href",