RubyGems - govuk_publishing_components - Versions diffs - 67.0.1 → 68.0.0 - Mend

govuk_publishing_components 67.0.1 → 68.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (352) hide show

data/app/views/govuk_publishing_components/components/docs/layout_super_navigation_header.yml CHANGED Viewed

@@ -16,10 +16,8 @@ accessibility_criteria: |
   Landmarks and Roles in the super navigation header should:
-  * have a role of banner at the root of the component (<header>) (ARIA 1.1)
+  * sit within the primary header element (<header>) provided by the page layout
 accessibility_excluded_rules:
-   # The header element can not be top level in the examples.
-  - landmark-banner-is-top-level
   # Banners will be duplicated in component examples list.
   - duplicate-id
   - duplicate-id-active

data/app/views/govuk_publishing_components/components/docs/tag.yml CHANGED Viewed

@@ -23,26 +23,22 @@ examples:
     data:
       text: Hello world!
       colour: green
-  turquoise:
+  teal:
     data:
       text: Hello world!
-      colour: turquoise
+      colour: teal
   blue:
     data:
       text: Hello world!
       colour: blue
-  light_blue:
-    data:
-      text: Hello world!
-      colour: light-blue
   purple:
     data:
       text: Hello world!
       colour: purple
-  pink:
+  magenta:
     data:
       text: Hello world!
-      colour: pink
+      colour: magenta
   red:
     data:
       text: Hello world!

data/app/views/govuk_publishing_components/components/layout_header/_header_logo.html.erb CHANGED Viewed

@@ -8,18 +8,11 @@
   }
   environment_exists = environment.present?
-  deprecated_navigation ||= false
   signout_link ||= false
 %>
-<% if environment_exists && deprecated_navigation %>
-  <div class="gem-c-header__environment">
-    <%= render "govuk_publishing_components/components/tag", { text: environment, colour: colour_map[environment.downcase] } %>
-  </div>
-<% end %>
 <div class="govuk-header__logo gem-c-header__logo">
-  <a href="<%= logo_link %>" class="govuk-header__link govuk-header__link--homepage">
+  <a href="<%= logo_link %>" class="govuk-header__homepage-link">
     <%= render "govuk_publishing_components/components/govuk_logo/govuk_logo" %>
     <% if product_name %>
       <span class="govuk-header__product-name gem-c-header__product-name">
@@ -27,7 +20,7 @@
       </span>
     <% end %>
   </a>
-  <% if environment_exists && !deprecated_navigation %>
+  <% if environment_exists %>
     <div class="gem-c-header__environment">
       <%= render "govuk_publishing_components/components/tag", { text: environment, colour: colour_map[environment.downcase] } %>
     </div>
@@ -35,9 +28,7 @@
 </div>
 <% if signout_link %>
-  <div class="govuk-header__content gem-c-header__content">
-    <nav class="gem-c-header__nav govuk-header__navigation">
-      <a class="govuk-header__link govuk-!-font-weight-bold" href="/auth/gds/sign_out">Sign out</a>
-    </nav>
+  <div class="gem-c-layout-header__signout">
+    <a class="gem-c-layout-header__signout-link govuk-!-font-weight-bold" href="/auth/gds/sign_out">Sign out</a>
   </div>
 <% end %>

data/app/views/layouts/govuk_publishing_components/application.html.erb CHANGED Viewed

@@ -23,7 +23,7 @@
   <% end %>
 <% end %>
 <!DOCTYPE html>
-<html lang="en" class="<%= "govuk-template" unless @preview %> govuk-template--rebranded">
+<html lang="en" class="<%= "govuk-template" unless @preview %>">
   <head>
     <meta charset="utf-8">
     <title>

data/config/initializers/assets.rb CHANGED Viewed

@@ -9,7 +9,7 @@ return unless Rails.application.config.respond_to?(:assets)
 Rails.application.config.assets.precompile += %w[govuk_publishing_components_manifest.js]
 Rails.application.config.assets.paths += %W[
-  #{__dir__}/../../node_modules/govuk-frontend/dist/govuk/assets/rebrand/images
+  #{__dir__}/../../node_modules/govuk-frontend/dist/govuk/assets/images
   #{__dir__}/../../node_modules/govuk-frontend/dist/govuk/assets/fonts
   #{__dir__}/../../node_modules/govuk-frontend/dist
   #{__dir__}/../../node_modules/

data/config/locales/cy.yml CHANGED Viewed

@@ -80,15 +80,15 @@ cy:
       aria_label:
       england:
         end: " a Lloegr"
-        middle: ", Lloegr"
+        middle: "Lloegr"
         start: Loegr
       northern_ireland:
         end: " a Gogledd Iwerddon"
-        middle: ", Gogledd Iwerddon"
+        middle: "Gogledd Iwerddon"
         start: Ogledd Iwerddon
       scotland:
         end: " a'r Alban"
-        middle: ", yr Alban"
+        middle: "yr Alban"
         start: "'r Alban"
       type:
         consultation: Ymgynghoriad ar gyfer %{nation}
@@ -97,7 +97,7 @@ cy:
         publication: Cyhoeddiad ar gyfer %{nation}
       wales:
         end: " a Chymru"
-        middle: ", Cymru"
+        middle: "Cymru"
         start: Gymru
     feedback:
       close: Cau

data/config/locales/en.yml CHANGED Viewed

@@ -75,15 +75,15 @@ en:
       aria_label: Nation
       england:
         end: " and England"
-        middle: ", England"
+        middle: "England"
         start: England
       northern_ireland:
         end: " and Northern Ireland"
-        middle: ", Northern Ireland"
+        middle: "Northern Ireland"
         start: Northern Ireland
       scotland:
         end: " and Scotland"
-        middle: ", Scotland"
+        middle: "Scotland"
         start: Scotland
       type:
         consultation: Consultation for %{nation}
@@ -92,7 +92,7 @@ en:
         publication: Publication for %{nation}
       wales:
         end: " and Wales"
-        middle: ", Wales"
+        middle: "Wales"
         start: Wales
     feedback:
       close: Cancel

data/lib/govuk_publishing_components/presenters/devolved_nations_helper.rb CHANGED Viewed

@@ -15,15 +15,16 @@ module GovukPublishingComponents
         nation_keys.each_with_index.map { |k, i| name_for_position(k, i, nation_keys.count, use_english_translation) }.join
       end
-      def name_for_position(nation, position, total, use_english_translation)
+      def name_for_position(nation, position, total, use_english_translation, cy_initial_mutation: true)
         key = if position.zero?
-                :start
+                cy_initial_mutation ? :start : :middle
               elsif position == (total - 1)
                 :end
               else
                 :middle
               end
-        I18n.t("components.devolved_nations.#{nation}.#{key}", locale: use_english_translation ? :en : nil)
+        name = I18n.t("components.devolved_nations.#{nation}.#{key}", locale: use_english_translation ? :en : nil)
+        position.zero? || position == (total - 1) ? name : ", #{name}"
       end
       def ga4_applicable_nations_title_text(remove_connector_word = nil)
@@ -41,7 +42,7 @@ module GovukPublishingComponents
         url_to_nation_keys.transform_values do |nation_keys|
           nations_text = nation_keys.each_with_index.map { |key, index|
-            name_for_position(key, index, nation_keys.count, true)
+            name_for_position(key, index, nation_keys.count, false, cy_initial_mutation: false)
           }.join
           alternative_content_text(nations_text)

data/lib/govuk_publishing_components/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "67.0.1".freeze
+  VERSION = "68.0.0".freeze
 end

data/node_modules/govuk-frontend/README.md CHANGED Viewed

@@ -37,7 +37,7 @@ imports) if you want to override GOV.UK Frontend with your own styles.
 To import add the below to your Sass file:
 ```scss
-@import "node_modules/govuk-frontend/dist/govuk/all";
+@import "node_modules/govuk-frontend/dist/govuk/index";
 ```
 [More details on importing styles](https://frontend.design-system.service.gov.uk/importing-css-assets-and-javascript/#css)

data/node_modules/govuk-frontend/dist/govuk/_base.scss CHANGED Viewed

@@ -1,5 +1,6 @@
 @import "settings/index";
 @import "tools/index";
 @import "helpers/index";
+@import "custom-properties/index";
 /*# sourceMappingURL=_base.scss.map */

data/node_modules/govuk-frontend/dist/govuk/_base.scss.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../src/govuk/_base.scss"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,qBAAqB;AACrB,uBAAuB","file":"_base.scss","sourcesContent":["@import \"settings/index\";\n@import \"tools/index\";\n@import \"helpers/index\";\n"]}
1	+ {"version":3,"sources":["../../src/govuk/_base.scss"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,qBAAqB;AACrB,uBAAuB;AACvB,iCAAiC","file":"_base.scss","sourcesContent":["@import \"settings/index\";\n@import \"tools/index\";\n@import \"helpers/index\";\n@import \"custom-properties/index\";\n"]}

data/node_modules/govuk-frontend/dist/govuk/all.bundle.js CHANGED Viewed

@@ -4,7 +4,7 @@
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.GOVUKFrontend = global.GOVUKFrontend || {}));
 })(this, (function (exports) { 'use strict';
-  const version = '5.14.0';
+  const version = '6.0.0';
   function getBreakpoint(name) {
     const property = `--govuk-breakpoint-${name}`;
@@ -886,6 +886,7 @@
       var _ref, _this$config$maxwords;
       super($root, config);
       this.$textarea = void 0;
+      this.count = 0;
       this.$visibleCountMessage = void 0;
       this.$screenReaderCountMessage = void 0;
       this.lastInputTimestamp = null;
@@ -941,15 +942,22 @@
       $textareaDescription.classList.add('govuk-visually-hidden');
       this.$textarea.removeAttribute('maxlength');
       this.bindChangeEvents();
-      window.addEventListener('pageshow', () => this.updateCountMessage());
+      window.addEventListener('pageshow', () => {
+        if (this.$textarea.value !== this.$textarea.textContent) {
+          this.updateCount();
+          this.updateCountMessage();
+        }
+      });
+      this.updateCount();
       this.updateCountMessage();
     }
     bindChangeEvents() {
-      this.$textarea.addEventListener('keyup', () => this.handleKeyUp());
+      this.$textarea.addEventListener('input', () => this.handleInput());
       this.$textarea.addEventListener('focus', () => this.handleFocus());
       this.$textarea.addEventListener('blur', () => this.handleBlur());
     }
-    handleKeyUp() {
+    handleInput() {
+      this.updateCount();
       this.updateVisibleCountMessage();
       this.lastInputTimestamp = Date.now();
     }
@@ -976,7 +984,7 @@
       this.updateScreenReaderCountMessage();
     }
     updateVisibleCountMessage() {
-      const remainingNumber = this.maxLength - this.count(this.$textarea.value);
+      const remainingNumber = this.maxLength - this.count;
       const isError = remainingNumber < 0;
       this.$visibleCountMessage.classList.toggle('govuk-character-count__message--disabled', !this.isOverThreshold());
       if (!this.$errorMessage) {
@@ -994,16 +1002,18 @@
       }
       this.$screenReaderCountMessage.textContent = this.getCountMessage();
     }
-    count(text) {
+    updateCount() {
+      const text = this.$textarea.value;
       if (this.config.maxwords) {
         var _text$match;
         const tokens = (_text$match = text.match(/\S+/g)) != null ? _text$match : [];
-        return tokens.length;
+        this.count = tokens.length;
+        return;
       }
-      return text.length;
+      this.count = text.length;
     }
     getCountMessage() {
-      const remainingNumber = this.maxLength - this.count(this.$textarea.value);
+      const remainingNumber = this.maxLength - this.count;
       const countType = this.config.maxwords ? 'words' : 'characters';
       return this.formatCountMessage(remainingNumber, countType);
     }
@@ -1020,7 +1030,7 @@
       if (!this.config.threshold) {
         return true;
       }
-      const currentLength = this.count(this.$textarea.value);
+      const currentLength = this.count;
       const maxLength = this.maxLength;
       const thresholdValue = maxLength * this.config.threshold / 100;
       return thresholdValue <= currentLength;
@@ -1841,89 +1851,6 @@
    * @import { TranslationPluralForms } from '../../i18n.mjs'
    */
-  /**
-   * Header component
-   *
-   * @preserve
-   */
-  class Header extends Component {
-    /**
-     * Apply a matchMedia for desktop which will trigger a state sync if the
-     * browser viewport moves between states.
-     *
-     * @param {Element | null} $root - HTML element to use for header
-     */
-    constructor($root) {
-      super($root);
-      this.$menuButton = void 0;
-      this.$menu = void 0;
-      this.menuIsOpen = false;
-      this.mql = null;
-      const $menuButton = this.$root.querySelector('.govuk-js-header-toggle');
-      if (!$menuButton) {
-        return this;
-      }
-      this.$root.classList.add('govuk-header--with-js-navigation');
-      const menuId = $menuButton.getAttribute('aria-controls');
-      if (!menuId) {
-        throw new ElementError({
-          component: Header,
-          identifier: 'Navigation button (`<button class="govuk-js-header-toggle">`) attribute (`aria-controls`)'
-        });
-      }
-      const $menu = document.getElementById(menuId);
-      if (!$menu) {
-        throw new ElementError({
-          component: Header,
-          element: $menu,
-          identifier: `Navigation (\`<ul id="${menuId}">\`)`
-        });
-      }
-      this.$menu = $menu;
-      this.$menuButton = $menuButton;
-      this.setupResponsiveChecks();
-      this.$menuButton.addEventListener('click', () => this.handleMenuButtonClick());
-    }
-    setupResponsiveChecks() {
-      const breakpoint = getBreakpoint('desktop');
-      if (!breakpoint.value) {
-        throw new ElementError({
-          component: Header,
-          identifier: `CSS custom property (\`${breakpoint.property}\`) on pseudo-class \`:root\``
-        });
-      }
-      this.mql = window.matchMedia(`(min-width: ${breakpoint.value})`);
-      if ('addEventListener' in this.mql) {
-        this.mql.addEventListener('change', () => this.checkMode());
-      } else {
-        this.mql.addListener(() => this.checkMode());
-      }
-      this.checkMode();
-    }
-    checkMode() {
-      if (!this.mql || !this.$menu || !this.$menuButton) {
-        return;
-      }
-      if (this.mql.matches) {
-        this.$menu.removeAttribute('hidden');
-        this.$menuButton.setAttribute('hidden', '');
-      } else {
-        this.$menuButton.removeAttribute('hidden');
-        this.$menuButton.setAttribute('aria-expanded', this.menuIsOpen.toString());
-        if (this.menuIsOpen) {
-          this.$menu.removeAttribute('hidden');
-        } else {
-          this.$menu.setAttribute('hidden', '');
-        }
-      }
-    }
-    handleMenuButtonClick() {
-      this.menuIsOpen = !this.menuIsOpen;
-      this.checkMode();
-    }
-  }
-  Header.moduleName = 'govuk-header';
   /**
    * Notification Banner component
    *
@@ -2655,7 +2582,7 @@
       }
       return;
     }
-    const components = [[Accordion, config.accordion], [Button, config.button], [CharacterCount, config.characterCount], [Checkboxes], [ErrorSummary, config.errorSummary], [ExitThisPage, config.exitThisPage], [FileUpload, config.fileUpload], [Header], [NotificationBanner, config.notificationBanner], [PasswordInput, config.passwordInput], [Radios], [ServiceNavigation], [SkipLink], [Tabs]];
+    const components = [[Accordion, config.accordion], [Button, config.button], [CharacterCount, config.characterCount], [Checkboxes], [ErrorSummary, config.errorSummary], [ExitThisPage, config.exitThisPage], [FileUpload, config.fileUpload], [NotificationBanner, config.notificationBanner], [PasswordInput, config.passwordInput], [Radios], [ServiceNavigation], [SkipLink], [Tabs]];
     components.forEach(([Component, componentConfig]) => {
       createAll(Component, componentConfig, options);
     });
@@ -2788,7 +2715,6 @@
   exports.ErrorSummary = ErrorSummary;
   exports.ExitThisPage = ExitThisPage;
   exports.FileUpload = FileUpload;
-  exports.Header = Header;
   exports.NotificationBanner = NotificationBanner;
   exports.PasswordInput = PasswordInput;
   exports.Radios = Radios;