govuk_publishing_components 12.7.1 → 12.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfdd3079ae3a6f82e937daabce31c39802425c6aacb5a43058c790cf014f3aaa
-  data.tar.gz: 9cd7474fb49eb06f86aed091092f94d86955c949a7d1b49a277a1c84bcf81bfa
+  metadata.gz: a387aeb59072c1b6409f0b54132f6468f45065bca13fc551327ccdb1675d42b1
+  data.tar.gz: c3ffb8f5c1d721e27c44206763cffe6f2f1b7d0885451585ac6f7b6502b1db60
 SHA512:
-  metadata.gz: 4fd65bf35f92694de070420bf166f0b56981f87898960c6e5c2b7aff92b0874b5f61d5808a7a7036b7dfa60d19aafe8624b5db3f08fb59bf3f061cf1c3b2120d
-  data.tar.gz: 1bba4aeca78d0bf298999d7ebbc8bb8b0d0d8d9baaf1ed820cb5d40508b0a9702f02c68a966b3727b42a824b473a7e838e21f81e515356dad98091ea31a7ebca
+  metadata.gz: 0eb5c5f693e7dcf997ee9255300d344c8432941194954a020c67de631b3650f3511715f4feeeb538ea2f614b6e1bb674e4c5e3bcbfa816206d20b4b1c9b01e55
+  data.tar.gz: 8887d46f6cba2359e83ce7fdc092c9b62b43267d4ad5d25c21b548673fcc2d3fe399614a51e2da85e31eb1428118eadf59732eb24df46b368b3fc6a1797e9786

data/app/assets/stylesheets/govuk_publishing_components/_all_components.scss

@@ -28,6 +28,7 @@
 @import "components/feedback";
 @import "components/fieldset";
 @import "components/file-upload";
+@import "components/govspeak-html-publication";
 @import "components/govspeak";
 @import "components/heading";
 @import "components/highlight-boxes";

data/app/views/govuk_publishing_components/components/_error_summary.html.erb

@@ -1,4 +1,5 @@
 <%
+  id ||= "error-summary-#{SecureRandom.hex(4)}"
   title ||= false
   description ||= false
   items ||= []
@@ -13,6 +14,7 @@
   aria-labelledby="<%= title_id %>"
   role="alert"
   tabindex="-1"
+  id="<%= id %>"
 >
   <% if title %>
     <h2 class="gem-c-error-summary__title" id="<%= title_id %>">

data/app/views/govuk_publishing_components/components/_file_upload.html.erb

@@ -7,19 +7,21 @@
   label ||= nil
   hint ||= nil
   error_message ||= nil
-  hint_id = "hint-#{SecureRandom.hex(4)}" if hint
-  error_message_id = "error-message-#{SecureRandom.hex(4)}" if error_message
+  error_items ||= nil
+  has_error = error_message || error_items&.any?
+  hint_id = "hint-#{SecureRandom.hex(4)}"
+  error_id = "error-#{SecureRandom.hex(4)}"
 
   css_classes = %w(gem-c-file-upload govuk-file-upload)
-  css_classes << "govuk-file-upload--error" if error_message
+  css_classes << "govuk-file-upload--error" if has_error
   form_group_css_classes = %w(govuk-form-group)
-  form_group_css_classes << "govuk-form-group--error" if error_message
+  form_group_css_classes << "govuk-form-group--error" if has_error
 
   aria_described_by ||= nil
-  if hint || error_message
+  if hint || has_error
     aria_described_by = []
     aria_described_by << hint_id if hint
-    aria_described_by << error_message_id if error_message
+    aria_described_by << error_id if has_error
     aria_described_by = aria_described_by.join(" ")
   end
 %>
@@ -38,9 +40,14 @@
 
   <% if error_message %>
     <%= render "govuk_publishing_components/components/error_message", {
-      id: error_message_id,
+      id: error_id,
       text: error_message
     } %>
+  <% elsif error_items %>
+    <%= render "govuk_publishing_components/components/error_summary", {
+      id: error_id,
+      items: error_items
+    } %>
   <% end %>
 
   <%= tag.input name: name,

data/app/views/govuk_publishing_components/components/_input.html.erb

@@ -8,21 +8,23 @@
   label ||= nil
   hint ||= nil
   error_message ||= nil
+  error_items ||= nil
   autofocus ||= nil
   tabindex ||= nil
-  hint_id = "hint-#{SecureRandom.hex(4)}" if hint
-  error_message_id = "error-message-#{SecureRandom.hex(4)}" if error_message
+  has_error = error_message || error_items&.any?
+  hint_id = "hint-#{SecureRandom.hex(4)}"
+  error_id = "error-#{SecureRandom.hex(4)}"
 
   css_classes = %w(gem-c-input govuk-input)
-  css_classes << "govuk-input--error" if error_message
+  css_classes << "govuk-input--error" if has_error
   form_group_css_classes = %w(govuk-form-group)
-  form_group_css_classes << "govuk-form-group--error" if error_message
+  form_group_css_classes << "govuk-form-group--error" if has_error
 
   aria_described_by ||= nil
-  if hint || error_message || describedby
+  if hint || has_error || describedby
     aria_described_by = []
     aria_described_by << hint_id if hint
-    aria_described_by << error_message_id if error_message
+    aria_described_by << error_id if has_error
     aria_described_by << describedby if describedby
     aria_described_by = aria_described_by.join(" ")
   end
@@ -45,9 +47,14 @@
 
   <% if error_message %>
     <%= render "govuk_publishing_components/components/error_message", {
-      id: error_message_id,
+      id: error_id,
       text: error_message
     } %>
+  <% elsif error_items %>
+    <%= render "govuk_publishing_components/components/error_summary", {
+      id: error_id,
+      items: error_items
+    } %>
   <% end %>
 
   <%= tag.input name: name,

data/app/views/govuk_publishing_components/components/_radio.html.erb

@@ -5,11 +5,13 @@
   label ||= nil
   hint ||= nil
   error_message ||= nil
-  hint_id = "hint-#{SecureRandom.hex(4)}" if hint
-  error_message_id = "error-message-#{SecureRandom.hex(4)}" if error_message
+  error_items ||= nil
+  has_error = error_message || error_items&.any?
+  hint_id = "hint-#{SecureRandom.hex(4)}"
+  error_id = "error-#{SecureRandom.hex(4)}"
 
   form_group_css_classes = %w(govuk-form-group)
-  form_group_css_classes << "govuk-form-group--error" if error_message
+  form_group_css_classes << "govuk-form-group--error" if has_error
 
   # check if any item is set as being conditional
   has_conditional = items.any? { |item| item.is_a?(Hash) && item[:conditional] }
@@ -25,9 +27,14 @@
 
   <% if error_message %>
     <%= render "govuk_publishing_components/components/error_message", {
-      id: error_message_id,
+      id: error_id,
       text: error_message
     } %>
+  <% elsif error_items %>
+    <%= render "govuk_publishing_components/components/error_summary", {
+      id: error_id,
+      items: error_items
+    } %>
   <% end %>
 
   <%= content_tag :div, class: "govuk-radios",

data/app/views/govuk_publishing_components/components/_textarea.html.erb

@@ -8,21 +8,23 @@
   label ||= nil
   hint ||= nil
   error_message ||= nil
+  error_items ||= nil
   character_count ||= nil
-  hint_id = "hint-#{SecureRandom.hex(4)}" if hint
-  error_message_id = "error-message-#{SecureRandom.hex(4)}" if error_message
+  hint_id = "hint-#{SecureRandom.hex(4)}"
+  has_error ||= error_message || error_items&.any?
+  error_id = "error-#{SecureRandom.hex(4)}"
 
   css_classes = %w(gem-c-textarea govuk-textarea)
   css_classes << "js-character-count" if character_count
-  css_classes << "govuk-textarea--error" if error_message
+  css_classes << "govuk-textarea--error" if has_error
   form_group_css_classes = %w(govuk-form-group)
-  form_group_css_classes << "govuk-form-group--error" if error_message
+  form_group_css_classes << "govuk-form-group--error" if has_error
 
   aria_described_by ||= nil
-  if hint || error_message
+  if hint || has_error
     aria_described_by = []
     aria_described_by << hint_id if hint
-    aria_described_by << error_message_id if error_message
+    aria_described_by << error_id if has_error
     aria_described_by = aria_described_by.join(" ")
   end
 %>
@@ -41,9 +43,14 @@
 
   <% if error_message %>
     <%= render "govuk_publishing_components/components/error_message", {
-      id: error_message_id,
+      id: error_id,
       text: error_message
     } %>
+  <% elsif error_items %>
+    <%= render "govuk_publishing_components/components/error_summary", {
+      id: error_id,
+      items: error_items
+    } %>
   <% end %>
 
   <%= tag.textarea name: name,

data/app/views/govuk_publishing_components/components/docs/error_summary.yml

@@ -8,6 +8,7 @@ shared_accessibility_criteria:
 examples:
   default:
     data:
+      id: error-summary
       title: Message to alert the user to a problem goes here
       description: Optional description of the errors and how to correct them
       items:

data/app/views/govuk_publishing_components/components/docs/file_upload.yml

@@ -32,6 +32,14 @@ examples:
         text: "Upload a file"
       name: "file-upload-with-error"
       error_message: "Please upload a file"
+  with_error_items:
+    data:
+      label:
+        text: "Upload a file"
+      name: "file-upload-with-error"
+      error_items:
+      - text: Descriptive link to the question with an error 1
+        href: '#example-error-1'
   with_file_accept:
     data:
       label:

data/app/views/govuk_publishing_components/components/docs/input.yml

@@ -52,6 +52,14 @@ examples:
         text: "What is your name?"
       name: "name"
       error_message: "Please could you provide your name"
+  with_error_items:
+    data:
+      label:
+        text: "What is your name?"
+      name: "name"
+      error_items:
+      - text: Descriptive link to the question with an error 1
+        href: '#example-error-1'
   with_value:
     data:
       label:

data/app/views/govuk_publishing_components/components/docs/radio.yml

@@ -140,6 +140,18 @@ examples:
         text: "Use Government Gateway"
       - value: "govuk-verify"
         text: "Use GOV.UK Verify"
+  with_error_items_on_form_group:
+    data:
+      name: "radio-group-error"
+      id_prefix: "error"
+      error_items:
+      - text: Descriptive link to the question with an error 1
+        href: '#example-error-1'
+      items:
+      - value: "government-gateway"
+        text: "Use Government Gateway"
+      - value: "govuk-verify"
+        text: "Use GOV.UK Verify"
   conditional:
     data:
       name: "radio-group-conditional"

data/app/views/govuk_publishing_components/components/docs/textarea.yml

@@ -39,6 +39,14 @@ examples:
         text: "Can you provide more detail?"
       name: "more-detail-error"
       error_message: "Please could you provide more detail"
+  with_error_items:
+    data:
+      label:
+        text: "Can you provide more detail?"
+      name: "more-detail-error"
+      error_items:
+      - text: Descriptive link to the question with an error 1
+        href: '#example-error-1'
   with_value:
     data:
       label:

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '12.7.1'.freeze
+  VERSION = '12.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 12.7.1
+  version: 12.8.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config