govuk_tech_docs 5.2.2 → 6.0.0.beta

data/node_modules/govuk-frontend/dist/govuk/components/exit-this-page/exit-this-page.bundle.mjs

@@ -342,7 +342,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;
@@ -353,132 +353,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';
-  }
-};
 
 /**
  * Exit this page component

data/node_modules/govuk-frontend/dist/govuk/components/file-upload/_index.scss

@@ -6,8 +6,8 @@
   $file-upload-border-width: 2px;
   $component-padding: govuk-spacing(1);
   $empty-button-background-colour: govuk-colour("white");
-  $empty-pseudo-button-background-colour: govuk-colour("light-grey");
-  $empty-status-background-colour: govuk-tint(govuk-colour("blue"), 70%);
+  $empty-pseudo-button-background-colour: govuk-colour("black", $variant: "tint-95");
+  $empty-status-background-colour: govuk-colour("blue", $variant: "tint-80");
 
   .govuk-file-upload {
     @include govuk-font($size: 19);
@@ -27,11 +27,12 @@
     }
 
     &:focus {
-      outline: $govuk-focus-width solid $govuk-focus-colour;
+      outline: $govuk-focus-width solid;
+      outline-color: govuk-functional-colour(focus);
       // Use `box-shadow` to add border instead of changing `border-width`
       // (which changes element size) and since `outline` is already used for
       // the yellow focus state.
-      box-shadow: inset 0 0 0 4px $govuk-input-border-colour;
+      box-shadow: inset 0 0 0 4px govuk-functional-colour(input-border);
     }
 
     // Set "focus-within" to fix https://bugzil.la/1430196 so that component
@@ -40,9 +41,10 @@
     // to recognise `focus-within` and don't set any styles from the block
     // when it's a selector.
     &:focus-within {
-      outline: $govuk-focus-width solid $govuk-focus-colour;
+      outline: $govuk-focus-width solid;
+      outline-color: govuk-functional-colour(focus);
 
-      box-shadow: inset 0 0 0 4px $govuk-input-border-colour;
+      box-shadow: inset 0 0 0 4px govuk-functional-colour(input-border);
     }
 
     &:disabled {
@@ -55,7 +57,7 @@
     display: block;
     position: relative;
     z-index: 0;
-    background-color: $govuk-body-background-colour;
+    background-color: govuk-functional-colour(body-background);
   }
 
   // required because disabling pointer events
@@ -82,8 +84,10 @@
     display: block;
     margin-bottom: govuk-spacing(2);
     padding: govuk-spacing(3) govuk-spacing(2);
-    background-color: govuk-colour("white");
+    color: govuk-colour("white");
+    background-color: govuk-colour("blue");
     text-align: left;
+    @include govuk-text-break-word;
   }
 
   // bugs documented with button using flex
@@ -99,37 +103,38 @@
     width: 100%;
     // align the padding to be same as notification banner and error summary accounting for the thicker borders
     padding: (govuk-spacing(3) + $govuk-border-width - $file-upload-border-width);
-    border: $file-upload-border-width govuk-colour("mid-grey") solid;
-    background-color: govuk-colour("light-grey");
+    border: $file-upload-border-width govuk-colour("black", $variant: "tint-80") solid;
+    background-color: govuk-colour("white");
     cursor: pointer;
 
-    @include govuk-media-query($from: tablet) {
+    @media #{govuk-from-breakpoint(tablet)} {
       padding: (govuk-spacing(4) + $govuk-border-width - $file-upload-border-width);
     }
 
     .govuk-file-upload-button__pseudo-button {
-      background-color: govuk-colour("white");
+      background-color: govuk-colour("black", $variant: "tint-95");
     }
 
     &:hover {
-      background-color: govuk-tint(govuk-colour("mid-grey"), 20%);
+      border-color: govuk-colour("black", $variant: "tint-50");
 
       .govuk-file-upload-button__pseudo-button {
-        background-color: govuk-shade(govuk-colour("light-grey"), 10%);
+        background-color: govuk-colour("black", $variant: "tint-80");
       }
 
       .govuk-file-upload-button__status {
-        background-color: govuk-tint(govuk-colour("blue"), 80%);
+        background-color: govuk-colour("blue");
       }
     }
 
     &:active,
     &:focus {
       border: $file-upload-border-width solid govuk-colour("black");
-      outline: $govuk-focus-width solid $govuk-focus-colour;
+      outline: $govuk-focus-width solid;
+      outline-color: govuk-functional-colour(focus);
       // Ensure outline appears outside of the element
       outline-offset: 0;
-      background-color: govuk-tint(govuk-colour("mid-grey"), 20%);
+      background-color: govuk-colour("black", $variant: "tint-95");
       // Double the border by adding its width again. Use `box-shadow` for this
       // instead of changing `border-width` - this is for consistency with
       // components such as textarea where we avoid changing `border-width` as
@@ -138,15 +143,15 @@
       box-shadow: inset 0 0 0 $govuk-border-width-form-element;
 
       .govuk-file-upload-button__pseudo-button {
-        background-color: $govuk-focus-colour;
+        background-color: govuk-functional-colour(focus);
         box-shadow: 0 2px 0 govuk-colour("black");
       }
 
       &:hover .govuk-file-upload-button__pseudo-button {
-        border-color: $govuk-focus-colour;
+        border-color: govuk-functional-colour(focus);
         outline: 3px solid transparent;
-        background-color: govuk-colour("light-grey");
-        box-shadow: inset 0 0 0 1px $govuk-focus-colour;
+        background-color: govuk-colour("black", $variant: "tint-80");
+        box-shadow: inset 0 0 0 1px govuk-functional-colour(focus);
       }
     }
   }
@@ -160,17 +165,17 @@
     }
 
     .govuk-file-upload-button__status {
-      color: govuk-shade(govuk-colour("blue"), 60%);
+      color: govuk-colour("black");
       background-color: $empty-status-background-colour;
     }
 
     &:hover,
     &:focus,
     &:active {
-      background-color: govuk-colour("light-grey");
+      background-color: govuk-colour("black", $variant: "tint-95");
 
       .govuk-file-upload-button__status {
-        background-color: govuk-tint(govuk-colour("blue"), 80%);
+        background-color: govuk-colour("blue", $variant: "tint-80");
       }
     }
   }
@@ -181,21 +186,8 @@
 
     // extra specificity to apply when
     // empty
-    &.govuk-file-upload-button {
-      background-color: govuk-tint(govuk-colour("mid-grey"), 20%);
-    }
-
     &.govuk-file-upload-button--empty {
-      background-color: govuk-colour("light-grey");
-    }
-
-    &.govuk-file-upload-button--empty:not(:disabled) .govuk-file-upload-button__status,
-    &.govuk-file-upload-button--empty .govuk-file-upload-button__pseudo-button {
-      background-color: govuk-colour("white");
-    }
-
-    .govuk-file-upload-button__pseudo-button {
-      background-color: govuk-shade(govuk-colour("light-grey"), 10%);
+      background-color: govuk-colour("black", $variant: "tint-95");
     }
   }
 

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

@@ -353,7 +353,7 @@
         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;
@@ -364,132 +364,7 @@
       }
       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
@@ -604,7 +479,7 @@
       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');
@@ -626,12 +501,30 @@
     }
     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) {
@@ -678,6 +571,13 @@
       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: {
@@ -699,10 +599,14 @@
       }
     }
   });
-  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;
   }
 
   /**