dxw_govuk_frontend_rails 3.3.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d4acfd39c6602f72f50fd8e2747ac3f99708422eb74c9083f968d05d735135d
-  data.tar.gz: 8696f9c16710bedbe45ceef93cebcfce11579a42a30ffb5cabc39e00f6d7f78b
+  metadata.gz: 76252356e718d773b335f5c46af4aa74fb1c7d1a7145941c030183ce45043340
+  data.tar.gz: 1a2df5ee7e9080f9975aa76b749074405fed3a6f48062fc9996e0f82dbbf49c3
 SHA512:
-  metadata.gz: 79005a142ab72a650b9a8259faa9106c7e0aeda3ae180df70ced6732ff4d794ce23effd8e85f89d7f3c9a2880b347b04e006507b91cfa3626836a1bddaa77103
-  data.tar.gz: 74ab6084a3189937c9825bceeb4a9ddf0c94603a32579733f396bbc9cb8061d24bb4e009c431d294afd08c15612918bd370841a1181c9020cb5e2ddd602ebcaf
+  metadata.gz: 435fc41bbd556daab6ab8286d78b7c9f7d22166e64b345653e221d01aa035cb478bc566d792d55cb99a335cfdb56b0391764b7566839185c86cffe13765cc86a
+  data.tar.gz: 8ae7e6ca9a70f1c4796f4950dee3b11e4e8dde78be034614a7c95f4fc3eacff6de59b3c31f2d9690cb9e710da920725654a31c319b98eaa2e7ae1c9d850a372f

data/.github/workflows/gempush.yml

@@ -1,4 +1,4 @@
-name: Ruby Gem
+name: Ruby Gems
 
 on:
   push:
@@ -13,7 +13,7 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
+      uses: actions/setup-ruby@master
       with:
         version: 2.6.x
 

data/.github/workflows/test.yml

@@ -0,0 +1,19 @@
+name: CI
+
+on: [push]
+
+jobs:
+  build:
+    name: Test that the sass compiles
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@master
+    - uses: actions/setup-node@master
+      with:
+        node-version: '10.x'
+    - run: npm test
+    env:
+      CI: true
+
+

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    dxw_govuk_frontend_rails (3.3.0)
+    dxw_govuk_frontend_rails (3.7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    rake (10.5.0)
+    rake (13.0.1)
 
 PLATFORMS
   ruby
@@ -14,7 +14,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   dxw_govuk_frontend_rails!
-  rake (~> 10.0)
+  rake (~> 13.0)
 
 BUNDLED WITH
    2.0.2

data/dxw_govuk_frontend_rails.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
 end

data/lib/dxw_govuk_frontend_rails.rb

@@ -5,7 +5,18 @@ module DxwGovukFrontendRails
     class Engine < ::Rails::Engine
       initializer 'GovukFrontendRails.assets.precompile' do |app|
         app.config.assets.precompile <<
-          /[\w]+\.(?:png|svg|gif|ico|eot|woff|woff2)$/
+          [
+            "favicon.ico",
+            "govuk-apple-touch-icon-152x152.png",
+            "govuk-apple-touch-icon-167x167.png",
+            "govuk-apple-touch-icon-180x180.png",
+            "govuk-apple-touch-icon.png",
+            "govuk-crest-2x.png",
+            "govuk-crest.png",
+            "govuk-logotype-crown.png",
+            "govuk-mask-icon.svg",
+            "govuk-opengraph-image.png",
+          ]
       end
     end
   end

data/lib/dxw_govuk_frontend_rails/version.rb

@@ -1,3 +1,3 @@
 module DxwGovukFrontendRails
-  VERSION = "3.3.0"
+  VERSION = "3.7.0"
 end

data/package-lock.json

@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "govuk-frontend": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.3.0.tgz",
-      "integrity": "sha512-ncOGTAV6mzz1CPBlr/UGETiG3IO6P3b0CvSI0wxBz7Uo0A/6jttLoxkvuYXju2oNA2yqRh2NjD1zJUOP3Q32CQ=="
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.7.0.tgz",
+      "integrity": "sha512-G3bqoKGGF8YQ18UJH9tTARrwB8i7iPwN1xc8RXwWyx91q0p/Xl10uNywZLkzGWcJDzEz1vwmBTTL3SLDU/KxNg=="
     }
   }
 }

data/package.json

@@ -21,6 +21,6 @@
   },
   "homepage": "https://github.com/mec/dxw_govuk_frontend_rails#readme",
   "dependencies": {
-    "govuk-frontend": "3.3.0"
+    "govuk-frontend": "3.7.0"
   }
 }

data/vendor/assets/javascripts/govuk_frontend_rails.js

@@ -891,7 +891,7 @@ Accordion.prototype.initHeaderAttributes = function ($headerWrapper, index) {
   icon.className = this.iconClass;
   icon.setAttribute('aria-hidden', 'true');
 
-  $heading.appendChild(icon);
+  $button.appendChild(icon);
 };
 
 // When section toggled, set and store state
@@ -1497,6 +1497,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 = $module.querySelector('[id=' + this.$textarea.id + '-info]');
+  }
 }
 
 CharacterCount.prototype.defaults = {
@@ -1509,10 +1512,16 @@ CharacterCount.prototype.init = function () {
   // Check for module
   var $module = this.$module;
   var $textarea = this.$textarea;
-  if (!$textarea) {
+  var $countMessage = this.$countMessage;
+
+  if (!$textarea || !$countMessage) {
     return
   }
 
+  // We move count message right after the field
+  // Kept for backwards compatibility
+  $textarea.insertAdjacentElement('afterend', $countMessage);
+
   // Read options set using dataset ('data-' values)
   this.options = this.getDataset($module);
 
@@ -1530,23 +1539,16 @@ CharacterCount.prototype.init = function () {
     return
   }
 
-  // Generate and reference message
-  var boundCreateCountMessage = this.createCountMessage.bind(this);
-  this.countMessage = boundCreateCountMessage();
+  // Remove hard limit if set
+  $module.removeAttribute('maxlength');
 
-  // If there's a maximum length defined and the count message exists
-  if (this.countMessage) {
-    // Remove hard limit if set
-    $module.removeAttribute('maxlength');
+  // Bind event changes to the textarea
+  var boundChangeEvents = this.bindChangeEvents.bind(this);
+  boundChangeEvents();
 
-    // Bind event changes to the textarea
-    var boundChangeEvents = this.bindChangeEvents.bind(this);
-    boundChangeEvents();
-
-    // Update count message
-    var boundUpdateCountMessage = this.updateCountMessage.bind(this);
-    boundUpdateCountMessage();
-  }
+  // Update count message
+  var boundUpdateCountMessage = this.updateCountMessage.bind(this);
+  boundUpdateCountMessage();
 };
 
 // Read data attributes
@@ -1577,27 +1579,6 @@ CharacterCount.prototype.count = function (text) {
   return length
 };
 
-// Generate count message and bind it to the input
-// returns reference to the generated element
-CharacterCount.prototype.createCountMessage = function () {
-  var countElement = this.$textarea;
-  var elementId = countElement.id;
-  // Check for existing info count message
-  var countMessage = document.getElementById(elementId + '-info');
-  // If there is no existing info count message we add one right after the field
-  if (elementId && !countMessage) {
-    countElement.insertAdjacentHTML('afterend', '<span id="' + elementId + '-info" class="govuk-hint govuk-character-count__message" aria-live="polite"></span>');
-    this.describedBy = countElement.getAttribute('aria-describedby');
-    this.describedByInfo = this.describedBy + ' ' + elementId + '-info';
-    countElement.setAttribute('aria-describedby', this.describedByInfo);
-    countMessage = document.getElementById(elementId + '-info');
-  } else {
-  // If there is an existing info count message we move it right after the field
-    countElement.insertAdjacentElement('afterend', countMessage);
-  }
-  return countMessage
-};
-
 // Bind input propertychange to the elements and update based on the change
 CharacterCount.prototype.bindChangeEvents = function () {
   var $textarea = this.$textarea;
@@ -1624,7 +1605,7 @@ CharacterCount.prototype.checkIfValueChanged = function () {
 CharacterCount.prototype.updateCountMessage = function () {
   var countElement = this.$textarea;
   var options = this.options;
-  var countMessage = this.countMessage;
+  var countMessage = this.$countMessage;
 
   // Determine the remaining number of characters/words
   var currentLength = this.count(countElement.value);
@@ -1767,7 +1748,7 @@ Checkboxes.prototype.handleClick = function (event) {
 
   if (detect) return
 
-    // Polyfill from https://raw.githubusercontent.com/Financial-Times/polyfill-service/1f3c09b402f65bf6e393f933a15ba63f1b86ef1f/packages/polyfill-library/polyfills/Element/prototype/closest/polyfill.js
+  // Polyfill from https://raw.githubusercontent.com/Financial-Times/polyfill-service/1f3c09b402f65bf6e393f933a15ba63f1b86ef1f/packages/polyfill-library/polyfills/Element/prototype/closest/polyfill.js
   Element.prototype.closest = function closest(selector) {
     var node = this;
 
@@ -2045,49 +2026,41 @@ Radios.prototype.handleClick = function (event) {
 
 (function(undefined) {
 
-    // Detection from https://github.com/Financial-Times/polyfill-service/pull/1062/files#diff-b09a5d2acf3314b46a6c8f8d0c31b85c
+    // Detection from https://raw.githubusercontent.com/Financial-Times/polyfill-library/master/polyfills/Element/prototype/nextElementSibling/detect.js
     var detect = (
-      'Element' in this && "nextElementSibling" in document.documentElement
+      'document' in this && "nextElementSibling" in document.documentElement
     );
 
     if (detect) return
 
-
-    (function (global) {
-
-      // Polyfill from https://github.com/Financial-Times/polyfill-service/pull/1062/files#diff-404b69b4750d18dea4174930a49170fd
-      Object.defineProperty(Element.prototype, "nextElementSibling", {
-        get: function(){
-          var el = this.nextSibling;
-          while (el && el.nodeType !== 1) { el = el.nextSibling; }
-          return (el.nodeType === 1) ? el : null;
-        }
-      });
-
-    }(this));
+    // Polyfill from https://raw.githubusercontent.com/Financial-Times/polyfill-library/master/polyfills/Element/prototype/nextElementSibling/polyfill.js
+    Object.defineProperty(Element.prototype, "nextElementSibling", {
+      get: function(){
+        var el = this.nextSibling;
+        while (el && el.nodeType !== 1) { el = el.nextSibling; }
+        return el;
+      }
+    });
 
 }).call('object' === typeof window && window || 'object' === typeof self && self || 'object' === typeof global && global || {});
 
 (function(undefined) {
 
-    // Detection from https://github.com/Financial-Times/polyfill-service/pull/1062/files#diff-a162235fbc9c0dd40d4032265f44942e
+    // Detection from https://raw.githubusercontent.com/Financial-Times/polyfill-library/master/polyfills/Element/prototype/previousElementSibling/detect.js
     var detect = (
-      'Element' in this && 'previousElementSibling' in document.documentElement
+      'document' in this && "previousElementSibling" in document.documentElement
     );
 
     if (detect) return
 
-    (function (global) {
-      // Polyfill from https://github.com/Financial-Times/polyfill-service/pull/1062/files#diff-b45a1197b842728cb76b624b6ba7d739
-      Object.defineProperty(Element.prototype, 'previousElementSibling', {
-        get: function(){
-          var el = this.previousSibling;
-          while (el && el.nodeType !== 1) { el = el.previousSibling; }
-          return (el.nodeType === 1) ? el : null;
-        }
-      });
-
-    }(this));
+    // Polyfill from https://raw.githubusercontent.com/Financial-Times/polyfill-library/master/polyfills/Element/prototype/previousElementSibling/polyfill.js
+    Object.defineProperty(Element.prototype, 'previousElementSibling', {
+      get: function(){
+        var el = this.previousSibling;
+        while (el && el.nodeType !== 1) { el = el.previousSibling; }
+        return el;
+      }
+    });
 
 }).call('object' === typeof window && window || 'object' === typeof self && self || 'object' === typeof global && global || {});
 

data/vendor/assets/stylesheets/_base.scss

@@ -0,0 +1,3 @@
+@import "settings/all";
+@import "tools/all";
+@import "helpers/all";

data/vendor/assets/stylesheets/all.scss

@@ -1,6 +1,4 @@
-@import "settings/all";
-@import "tools/all";
-@import "helpers/all";
+@import "base";
 
 @import "core/all";
 @import "objects/all";

data/vendor/assets/stylesheets/components/_all.scss

@@ -1,29 +1,31 @@
-@import "accordion/accordion";
-@import "back-link/back-link";
-@import "breadcrumbs/breadcrumbs";
-@import "button/button";
-@import "checkboxes/checkboxes";
-@import "character-count/character-count";
-@import "summary-list/summary-list";
-@import "date-input/date-input";
-@import "details/details";
-@import "error-message/error-message";
-@import "error-summary/error-summary";
-@import "fieldset/fieldset";
-@import "file-upload/file-upload";
-@import "footer/footer";
-@import "hint/hint";
-@import "header/header";
-@import "input/input";
-@import "inset-text/inset-text";
-@import "label/label";
-@import "panel/panel";
-@import "phase-banner/phase-banner";
-@import "tabs/tabs";
-@import "tag/tag";
-@import "radios/radios";
-@import "select/select";
-@import "skip-link/skip-link";
-@import "table/table";
-@import "textarea/textarea";
-@import "warning-text/warning-text";
+@import "../base";
+
+@import "accordion/index";
+@import "back-link/index";
+@import "breadcrumbs/index";
+@import "button/index";
+@import "checkboxes/index";
+@import "character-count/index";
+@import "summary-list/index";
+@import "date-input/index";
+@import "details/index";
+@import "error-message/index";
+@import "error-summary/index";
+@import "fieldset/index";
+@import "file-upload/index";
+@import "footer/index";
+@import "hint/index";
+@import "header/index";
+@import "input/index";
+@import "inset-text/index";
+@import "label/index";
+@import "panel/index";
+@import "phase-banner/index";
+@import "tabs/index";
+@import "tag/index";
+@import "radios/index";
+@import "select/index";
+@import "skip-link/index";
+@import "table/index";
+@import "textarea/index";
+@import "warning-text/index";

data/vendor/assets/stylesheets/components/accordion/_accordion.scss

@@ -1,208 +1,2 @@
-@import "../../settings/all";
-@import "../../tools/all";
-@import "../../helpers/all";
-
-
-@include govuk-exports("govuk/component/accordion") {
-
-  $govuk-accordion-link-colour: $govuk-link-colour;
-  $govuk-accordion-link-hover-colour: govuk-colour("light-blue");
-  $govuk-accordion-border-width: 3px;
-
-  .govuk-accordion {
-    @include govuk-responsive-margin(6, "bottom");
-  }
-
-  // Borders between accordion sections
-  .govuk-accordion__section {
-    padding-top: govuk-spacing(3);
-  }
-
-  .govuk-accordion__section-header {
-    padding-top: govuk-spacing(3);
-    padding-bottom: govuk-spacing(3);
-  }
-
-  .govuk-accordion__section-heading {
-    margin-top: 0; // Override browser default
-    margin-bottom: 0; // Override browser default
-  }
-
-  // Buttons within the sections don’t need default styling
-  .govuk-accordion__section-button {
-    @include govuk-font($size: 24, $weight: bold);
-    display: inline-block;
-    margin-bottom: 0;
-    padding-top: govuk-spacing(3);
-  }
-
-  .govuk-accordion__section-summary {
-    margin-top: govuk-spacing(2);
-    margin-bottom: 0;
-  }
-
-  // Remove the bottom margin from the last item inside the content
-  .govuk-accordion__section-content > :last-child {
-    margin-bottom: 0;
-  }
-
-  // JavaScript enabled
-  .js-enabled {
-
-    .govuk-accordion {
-      // Border at the bottom of the whole accordion
-      border-bottom: 1px solid $govuk-border-colour;
-    }
-
-    // Borders between accordion sections
-    .govuk-accordion__section {
-      padding-top: 0;
-    }
-
-    // Hide the body of collapsed sections
-    .govuk-accordion__section-content {
-      display: none;
-      @include govuk-responsive-padding(3, "top");
-      @include govuk-responsive-padding(3, "bottom");
-    }
-
-    // Show the body of expanded sections
-    .govuk-accordion__section--expanded .govuk-accordion__section-content {
-      display: block;
-    }
-
-    // This is styled to look like a link not a button
-    .govuk-accordion__open-all {
-      @include govuk-font($size: 16);
-      position: relative;
-      z-index: 1;
-      margin: 0;
-      padding: 0;
-      border-width: 0;
-      color: $govuk-link-colour;
-      background: none;
-      cursor: pointer;
-      -webkit-appearance: none;
-
-      @include govuk-link-common;
-      @include govuk-link-style-default;
-
-      // Remove default button focus outline in Firefox
-      &::-moz-focus-inner {
-        padding: 0;
-        border: 0;
-      }
-    }
-
-    // Section headers have a pointer cursor as an additional affordance
-    .govuk-accordion__section-header {
-      position: relative;
-      // Safe area on the right to avoid clashing with icon
-      padding-right: 40px;
-      border-top: 1px solid $govuk-border-colour;
-      color: $govuk-accordion-link-colour;
-      cursor: pointer;
-    }
-
-    // For devices that can't hover such as touch devices,
-    // remove hover state as it can be stuck in that state (iOS).
-    @media (hover: none) {
-      .govuk-accordion__section-header:hover {
-        border-top-color: $govuk-accordion-link-colour;
-        box-shadow: inset 0 $govuk-accordion-border-width 0 0 $govuk-accordion-link-colour;
-      }
-    }
-
-    // Buttons within the headers don’t need default styling
-    .govuk-accordion__section-button {
-      @include govuk-typography-common;
-      margin-top: 0;
-      margin-bottom: 0;
-      margin-left: 0;
-      padding: 0;
-      border-width: 0;
-      color: inherit;
-      background: none;
-      text-align: left;
-      cursor: pointer;
-      -webkit-appearance: none;
-
-      &:focus {
-        @include govuk-focused-text;
-      }
-
-      // Remove default button focus outline in Firefox
-      &::-moz-focus-inner {
-        padding: 0;
-        border: 0;
-      }
-    }
-
-    // Extend the touch area of the button to span the section header
-    .govuk-accordion__section-button:after {
-      content: "";
-      position: absolute;
-      top: 0;
-      right: 0;
-      bottom: 0;
-      left: 0;
-    }
-
-    .govuk-accordion__section-button:hover:not(:focus) {
-      text-decoration: underline;
-    }
-
-    // For devices that can't hover such as touch devices,
-    // remove hover state as it can be stuck in that state (iOS).
-    @media (hover: none) {
-      .govuk-accordion__section-button:hover {
-        text-decoration: none;
-      }
-    }
-
-    .govuk-accordion__controls {
-      text-align: right;
-    }
-
-    // Display an icon to the right of each header to indicate open/closed status,
-    // and as an additional affordance.
-    .govuk-accordion__icon {
-      position: absolute;
-      top: 50%;
-      right: 15px;
-      width: 16px;
-      height: 16px;
-      margin-top: -8px;
-    }
-
-    .govuk-accordion__icon:after,
-    .govuk-accordion__icon:before {
-      content: "";
-      box-sizing: border-box;
-      position: absolute;
-      top: 0;
-      right: 0;
-      bottom: 0;
-      left: 0;
-      width: 25%;
-      height: 25%;
-      margin: auto;
-      border: 2px solid transparent;
-      background-color: govuk-colour("black");
-    }
-
-    .govuk-accordion__icon:before {
-      width: 100%;
-    }
-
-    .govuk-accordion__icon:after {
-      height: 100%;
-    }
-
-    // Vertical bar should be hidden when section is open, to display a '-' icon
-    .govuk-accordion__section--expanded .govuk-accordion__icon:after {
-      content: " ";
-      display: none;
-    }
-  }
-}
+@import "../../base";
+@import "./index";