govuk_tech_docs 5.2.2 → 6.0.0.beta

data/node_modules/govuk-frontend/dist/govuk/components/file-upload/file-upload.bundle.mjs

@@ -347,7 +347,7 @@ class I18n {
       return 'other';
     }
     const translation = this.translations[lookupKey];
-    const preferredForm = this.hasIntlPluralRulesSupport() ? new Intl.PluralRules(this.locale).select(count) : this.selectPluralFormUsingFallbackRules(count);
+    const preferredForm = this.hasIntlPluralRulesSupport() ? new Intl.PluralRules(this.locale).select(count) : 'other';
     if (isObject(translation)) {
       if (preferredForm in translation) {
         return preferredForm;
@@ -358,132 +358,7 @@ class I18n {
     }
     throw new Error(`i18n: Plural form ".other" is required for "${this.locale}" locale`);
   }
-  selectPluralFormUsingFallbackRules(count) {
-    count = Math.abs(Math.floor(count));
-    const ruleset = this.getPluralRulesForLocale();
-    if (ruleset) {
-      return I18n.pluralRules[ruleset](count);
-    }
-    return 'other';
-  }
-  getPluralRulesForLocale() {
-    const localeShort = this.locale.split('-')[0];
-    for (const pluralRule in I18n.pluralRulesMap) {
-      const languages = I18n.pluralRulesMap[pluralRule];
-      if (languages.includes(this.locale) || languages.includes(localeShort)) {
-        return pluralRule;
-      }
-    }
-  }
 }
-I18n.pluralRulesMap = {
-  arabic: ['ar'],
-  chinese: ['my', 'zh', 'id', 'ja', 'jv', 'ko', 'ms', 'th', 'vi'],
-  french: ['hy', 'bn', 'fr', 'gu', 'hi', 'fa', 'pa', 'zu'],
-  german: ['af', 'sq', 'az', 'eu', 'bg', 'ca', 'da', 'nl', 'en', 'et', 'fi', 'ka', 'de', 'el', 'hu', 'lb', 'no', 'so', 'sw', 'sv', 'ta', 'te', 'tr', 'ur'],
-  irish: ['ga'],
-  russian: ['ru', 'uk'],
-  scottish: ['gd'],
-  spanish: ['pt-PT', 'it', 'es'],
-  welsh: ['cy']
-};
-I18n.pluralRules = {
-  arabic(n) {
-    if (n === 0) {
-      return 'zero';
-    }
-    if (n === 1) {
-      return 'one';
-    }
-    if (n === 2) {
-      return 'two';
-    }
-    if (n % 100 >= 3 && n % 100 <= 10) {
-      return 'few';
-    }
-    if (n % 100 >= 11 && n % 100 <= 99) {
-      return 'many';
-    }
-    return 'other';
-  },
-  chinese() {
-    return 'other';
-  },
-  french(n) {
-    return n === 0 || n === 1 ? 'one' : 'other';
-  },
-  german(n) {
-    return n === 1 ? 'one' : 'other';
-  },
-  irish(n) {
-    if (n === 1) {
-      return 'one';
-    }
-    if (n === 2) {
-      return 'two';
-    }
-    if (n >= 3 && n <= 6) {
-      return 'few';
-    }
-    if (n >= 7 && n <= 10) {
-      return 'many';
-    }
-    return 'other';
-  },
-  russian(n) {
-    const lastTwo = n % 100;
-    const last = lastTwo % 10;
-    if (last === 1 && lastTwo !== 11) {
-      return 'one';
-    }
-    if (last >= 2 && last <= 4 && !(lastTwo >= 12 && lastTwo <= 14)) {
-      return 'few';
-    }
-    if (last === 0 || last >= 5 && last <= 9 || lastTwo >= 11 && lastTwo <= 14) {
-      return 'many';
-    }
-    return 'other';
-  },
-  scottish(n) {
-    if (n === 1 || n === 11) {
-      return 'one';
-    }
-    if (n === 2 || n === 12) {
-      return 'two';
-    }
-    if (n >= 3 && n <= 10 || n >= 13 && n <= 19) {
-      return 'few';
-    }
-    return 'other';
-  },
-  spanish(n) {
-    if (n === 1) {
-      return 'one';
-    }
-    if (n % 1000000 === 0 && n !== 0) {
-      return 'many';
-    }
-    return 'other';
-  },
-  welsh(n) {
-    if (n === 0) {
-      return 'zero';
-    }
-    if (n === 1) {
-      return 'one';
-    }
-    if (n === 2) {
-      return 'two';
-    }
-    if (n === 3) {
-      return 'few';
-    }
-    if (n === 6) {
-      return 'many';
-    }
-    return 'other';
-  }
-};
 
 /**
  * File upload component
@@ -598,7 +473,7 @@ class FileUpload extends ConfigurableComponent {
     if (this.$button.disabled) return;
     if (event.target instanceof Node) {
       if (this.$root.contains(event.target)) {
-        if (event.dataTransfer && isContainingFiles(event.dataTransfer)) {
+        if (event.dataTransfer && this.canDrop(event.dataTransfer)) {
           if (!this.$button.classList.contains('govuk-file-upload-button--dragging')) {
             this.showDraggingState();
             this.$announcements.innerText = this.i18n.t('enteredDropZone');
@@ -620,12 +495,30 @@ class FileUpload extends ConfigurableComponent {
   }
   onDrop(event) {
     event.preventDefault();
-    if (event.dataTransfer && isContainingFiles(event.dataTransfer)) {
+    if (event.dataTransfer && this.canFillInput(event.dataTransfer)) {
       this.$input.files = event.dataTransfer.files;
       this.$input.dispatchEvent(new CustomEvent('change'));
       this.hideDraggingState();
     }
   }
+  canFillInput(dataTransfer) {
+    return this.matchesInputCapacity(dataTransfer.files.length);
+  }
+  canDrop(dataTransfer) {
+    if (dataTransfer.items.length) {
+      return this.matchesInputCapacity(countFileItems(dataTransfer.items));
+    }
+    if (dataTransfer.types.length) {
+      return dataTransfer.types.includes('Files');
+    }
+    return true;
+  }
+  matchesInputCapacity(numberOfFiles) {
+    if (this.$input.multiple) {
+      return numberOfFiles > 0;
+    }
+    return numberOfFiles === 1;
+  }
   onChange() {
     const fileCount = this.$input.files.length;
     if (fileCount === 0) {
@@ -672,6 +565,13 @@ class FileUpload extends ConfigurableComponent {
     this.$root.classList.toggle('govuk-drop-zone--disabled', this.$button.disabled);
   }
 }
+
+/**
+ * Counts the number of `DataTransferItem` whose kind is `file`
+ *
+ * @param {DataTransferItemList} list - The list
+ * @returns {number} - The number of items whose kind is `file` in the list
+ */
 FileUpload.moduleName = 'govuk-file-upload';
 FileUpload.defaults = Object.freeze({
   i18n: {
@@ -693,10 +593,14 @@ FileUpload.schema = Object.freeze({
     }
   }
 });
-function isContainingFiles(dataTransfer) {
-  const hasNoTypesInfo = dataTransfer.types.length === 0;
-  const isDraggingFiles = dataTransfer.types.some(type => type === 'Files');
-  return hasNoTypesInfo || isDraggingFiles;
+function countFileItems(list) {
+  let result = 0;
+  for (let i = 0; i < list.length; i++) {
+    if (list[i].kind === 'file') {
+      result++;
+    }
+  }
+  return result;
 }
 
 /**

data/node_modules/govuk-frontend/dist/govuk/components/file-upload/file-upload.mjs

@@ -117,7 +117,7 @@ class FileUpload extends ConfigurableComponent {
     if (this.$button.disabled) return;
     if (event.target instanceof Node) {
       if (this.$root.contains(event.target)) {
-        if (event.dataTransfer && isContainingFiles(event.dataTransfer)) {
+        if (event.dataTransfer && this.canDrop(event.dataTransfer)) {
           if (!this.$button.classList.contains('govuk-file-upload-button--dragging')) {
             this.showDraggingState();
             this.$announcements.innerText = this.i18n.t('enteredDropZone');
@@ -139,12 +139,30 @@ class FileUpload extends ConfigurableComponent {
   }
   onDrop(event) {
     event.preventDefault();
-    if (event.dataTransfer && isContainingFiles(event.dataTransfer)) {
+    if (event.dataTransfer && this.canFillInput(event.dataTransfer)) {
       this.$input.files = event.dataTransfer.files;
       this.$input.dispatchEvent(new CustomEvent('change'));
       this.hideDraggingState();
     }
   }
+  canFillInput(dataTransfer) {
+    return this.matchesInputCapacity(dataTransfer.files.length);
+  }
+  canDrop(dataTransfer) {
+    if (dataTransfer.items.length) {
+      return this.matchesInputCapacity(countFileItems(dataTransfer.items));
+    }
+    if (dataTransfer.types.length) {
+      return dataTransfer.types.includes('Files');
+    }
+    return true;
+  }
+  matchesInputCapacity(numberOfFiles) {
+    if (this.$input.multiple) {
+      return numberOfFiles > 0;
+    }
+    return numberOfFiles === 1;
+  }
   onChange() {
     const fileCount = this.$input.files.length;
     if (fileCount === 0) {
@@ -191,6 +209,13 @@ class FileUpload extends ConfigurableComponent {
     this.$root.classList.toggle('govuk-drop-zone--disabled', this.$button.disabled);
   }
 }
+
+/**
+ * Counts the number of `DataTransferItem` whose kind is `file`
+ *
+ * @param {DataTransferItemList} list - The list
+ * @returns {number} - The number of items whose kind is `file` in the list
+ */
 FileUpload.moduleName = 'govuk-file-upload';
 FileUpload.defaults = Object.freeze({
   i18n: {
@@ -212,10 +237,14 @@ FileUpload.schema = Object.freeze({
     }
   }
 });
-function isContainingFiles(dataTransfer) {
-  const hasNoTypesInfo = dataTransfer.types.length === 0;
-  const isDraggingFiles = dataTransfer.types.some(type => type === 'Files');
-  return hasNoTypesInfo || isDraggingFiles;
+function countFileItems(list) {
+  let result = 0;
+  for (let i = 0; i < list.length; i++) {
+    if (list[i].kind === 'file') {
+      result++;
+    }
+  }
+  return result;
 }
 
 /**

data/node_modules/govuk-frontend/dist/govuk/components/footer/_index.scss

@@ -1,24 +1,21 @@
 @include govuk-exports("govuk/component/footer") {
-  $govuk-footer-background: $govuk-template-background-colour;
-  $govuk-footer-text: $govuk-text-colour;
-  $govuk-footer-content-border: $govuk-border-colour;
+  $govuk-footer-background: govuk-functional-colour(surface-background);
+  $govuk-footer-text: govuk-functional-colour(surface-text);
+  $govuk-footer-content-border: govuk-functional-colour(surface-border);
 
   // Royal Arms image dimensions
   $govuk-footer-crest-image-width: 125px;
   $govuk-footer-crest-image-height: 102px;
 
   .govuk-footer {
-    @include govuk-font($size: if($govuk-new-typography-scale, 19, 16));
+    @include govuk-font($size: 19);
     @include govuk-responsive-padding(7, "top");
     @include govuk-responsive-padding(5, "bottom");
 
-    border-top: 10px solid $govuk-brand-colour;
+    border-top: 10px solid;
+    border-top-color: govuk-functional-colour(brand);
     color: $govuk-footer-text;
-    @include _govuk-rebrand(
-      "background",
-      $from: $govuk-footer-background,
-      $to: $_govuk-rebrand-template-background-colour
-    );
+    background: govuk-functional-colour(template-background);
   }
 
   .govuk-footer__crown {
@@ -27,19 +24,16 @@
 
   .govuk-footer__link {
     @include govuk-link-common;
-    @include govuk-link-style-text;
+    @include govuk-link-style-default;
   }
 
   .govuk-footer__section-break {
     margin: 0; // Reset `<hr>` default margins
     @include govuk-responsive-margin(8, "bottom");
     border: 0; // Reset `<hr>` default borders
-    border-bottom: 1px solid;
-    @include _govuk-rebrand(
-      "border-bottom-color",
-      $from: $govuk-footer-content-border,
-      $to: $_govuk-rebrand-border-colour-on-blue-tint-95
-    );
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+    border-bottom-color: $govuk-footer-content-border;
   }
 
   .govuk-footer__meta {
@@ -59,7 +53,7 @@
 
   .govuk-footer__meta-item--grow {
     flex: 1; // Support: Flexbox
-    @include govuk-media-query($until: tablet) {
+    @media #{govuk-until-breakpoint(tablet)} {
       flex-basis: 320px; // Support: Flexbox
     }
   }
@@ -67,7 +61,7 @@
   .govuk-footer__licence-logo {
     display: inline-block;
     margin-right: govuk-spacing(2);
-    @include govuk-media-query($until: desktop) {
+    @media #{govuk-until-breakpoint(desktop)} {
       margin-bottom: govuk-spacing(3);
     }
     vertical-align: top;
@@ -84,6 +78,10 @@
     text-wrap: balance;
   }
 
+  .govuk-footer__copyright-logo {
+    @include govuk-link-style-text;
+  }
+
   .govuk-footer__copyright-logo::before {
     content: "";
     display: block;
@@ -127,10 +125,18 @@
     padding: 0;
   }
 
+  .govuk-footer__inline-list:last-child {
+    margin-bottom: 0;
+  }
+
   .govuk-footer__meta-custom {
     margin-bottom: govuk-spacing(4);
   }
 
+  .govuk-footer__meta-custom:last-child {
+    margin-bottom: 0;
+  }
+
   .govuk-footer__inline-list-item {
     display: inline-block;
     margin-right: govuk-spacing(3);
@@ -141,16 +147,13 @@
     margin-bottom: govuk-spacing(6);
     padding-bottom: govuk-spacing(4);
 
-    @include govuk-media-query($until: tablet) {
+    @media #{govuk-until-breakpoint(tablet)} {
       padding-bottom: govuk-spacing(2);
     }
 
-    border-bottom: 1px solid;
-    @include _govuk-rebrand(
-      "border-bottom-color",
-      $from: $govuk-footer-content-border,
-      $to: $_govuk-rebrand-border-colour-on-blue-tint-95
-    );
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+    border-bottom-color: $govuk-footer-content-border;
   }
 
   .govuk-footer__navigation {
@@ -172,7 +175,7 @@
     column-gap: $govuk-gutter; // Support: Columns
   }
 
-  @include govuk-media-query($from: desktop) {
+  @media #{govuk-from-breakpoint(desktop)} {
     .govuk-footer__list--columns-2 {
       column-count: 2; // Support: Columns
     }