govuk_publishing_components 21.45.0 → 21.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6b9b3ccb50fed59ef6f76d01f29904a100f1b3e3f5585e4884dd59c2ebe61a2
-  data.tar.gz: 11681141b7eb3b7904c8ee16f950370599ec2c4f4f9121ba34b6d04a57c4b522
+  metadata.gz: 8d54671ad8f273c7964008613ed64cb631808376ac9a1dbb9b810649dbb13909
+  data.tar.gz: a5497f0e68627da627a50ea02d4fad88af8e6f58f79d7482b1c5f12d45d3fbb7
 SHA512:
-  metadata.gz: 8be5fd215ab57c63d064a6b98f41ff4a6ecf92aafeea63e63a27a823075d72e12881b54c0d76995fc8037089b37696b64e9353940814ade22692439db3999ab8
-  data.tar.gz: bb193cd02f9916cdd204132eeccf7a3c155bf74503c8be662ac947a5d867bcdbd3d455e3fbede4950129c79dd7c6561ce459ff916b3198c9d80c47c1989658b7
+  metadata.gz: c4a9b2848c97f714246a21736f7bd0aa2febec61777da0b8319cf77d354db2048e1b4dd552698e30d61edc7d613cd6db8582b014936da86ce339e45cde8a61bb
+  data.tar.gz: 9ce6d6e08b93012137c37b489f16d45ffd784739df06ab7e65d50979417499a7dee7f7ea1af551bb8418e28e371cb27f17de8504085a12a173c60d5b14239359

data/app/assets/javascripts/govuk_publishing_components/components/checkboxes.js

@@ -48,6 +48,21 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
           }
         }
       })
+
+      $(scope).on('change', '[data-exclusive=true] input[type=checkbox]', function (e) {
+        var currentCheckbox = e.target
+        var checkboxes = currentCheckbox.closest('.govuk-checkboxes')
+        var exclusiveOption = $(checkboxes).find('input[type=checkbox][data-exclusive]')
+        var nonExclusiveOptions = $(checkboxes).find('input[type=checkbox]:not([data-exclusive])')
+
+        if (currentCheckbox.dataset.exclusive === 'true' && currentCheckbox.checked === true) {
+          nonExclusiveOptions.each(function () {
+            $(this).prop('checked', false)
+          })
+        } else if (currentCheckbox.dataset.exclusive !== 'true' && currentCheckbox.checked === true) {
+          exclusiveOption.prop('checked', false)
+        }
+      })
     }
 
     this.toggleNestedCheckboxes = function (scope, checkbox) {

data/app/assets/stylesheets/govuk_publishing_components/components/_checkboxes.scss

@@ -25,6 +25,15 @@
   margin: 0;
 }
 
+.gem-c-checkboxes__divider {
+  @include govuk-font($size: 19);
+  @include govuk-text-colour;
+  list-style-type: none;
+  margin-bottom: govuk-spacing(2);
+  text-align: center;
+  width: 40px;
+}
+
 .gem-c-checkboxes {
   // this is complex but needed to override the govuk-frontend styles in
   // https://github.com/alphagov/govuk-frontend/blob/b8058640b9602ecb6e1f66f887553190cbae7b46/src/components/hint/_hint.scss#L16

data/app/assets/stylesheets/govuk_publishing_components/components/_input.scss

@@ -34,7 +34,7 @@
 .gem-c-input__suffix {
   @include govuk-font($size: 19);
 
-  background-color: govuk-colour("light-grey");
+  background-color: govuk-colour("light-grey", $legacy: "grey-3");
   border: $govuk-border-width-form-element solid $govuk-input-border-colour;
   border-left: 0;
   box-sizing: border-box;

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_footnotes.scss

@@ -15,6 +15,10 @@
     margin-top: govuk-spacing(6);
     padding-top: govuk-spacing(2);
 
+    a {
+      overflow-wrap: break-word;
+    }
+
     ol {
       margin-top: 0;
       padding-top: 0;

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_tables.scss

@@ -9,7 +9,9 @@
   table {
     border-collapse: collapse;
     border-spacing: 0;
+    display: block;
     margin: govuk-spacing(6) 0;
+    overflow-x: auto;
     width: 100%;
     @include govuk-font($size: 14);
 

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_typography.scss

@@ -17,6 +17,10 @@
     margin-left: 0;
     margin-right: govuk-spacing(4);
 
+    a {
+      overflow-wrap: break-word;
+    }
+
     ul,
     ol {
       margin-top: 0;

data/app/assets/stylesheets/govuk_publishing_components/components/helpers/_brand-colours.scss

@@ -90,16 +90,3 @@
     border-color: govuk-colour("black");
   }
 }
-
-// new brand colour to match Public Health England
-// used on the coronavirus page
-// note that PHE already has a different brand colour, the brand
-// department-for-health is used on the PHE org page
-$gem-c-covid-yellow: #ffe114;
-
-.brand--public-health-england {
-  &.brand__border-color,
-  .brand__border-color {
-    border-color: $gem-c-covid-yellow;
-  }
-}

data/app/models/govuk_publishing_components/component_example.rb

@@ -71,11 +71,11 @@ module GovukPublishingComponents
     end
 
     def right_to_left?
-      !!context["right_to_left"]
+      context["right_to_left"].present?
     end
 
     def dark_background?
-      !!context["dark_background"]
+      context["dark_background"].present?
     end
 
     def html_description
@@ -83,11 +83,11 @@ module GovukPublishingComponents
     end
 
     def has_block?
-      !!block
+      block.present?
     end
 
     def has_embed?
-      !!embed
+      embed.present?
     end
 
   private

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

@@ -25,20 +25,25 @@
         <%= tag.ul class: cb_helper.list_classes, data: {
           module: ('checkboxes' if cb_helper.has_conditional),
           nested: ('true' if cb_helper.has_nested),
+          exclusive: ('true' if cb_helper.has_exclusive)
         } do %>
           <% cb_helper.items.each_with_index do |item, index| %>
-            <%= tag.li class: "govuk-checkboxes__item" do %>
-              <%= cb_helper.checkbox_markup(item, index) %>
-
-              <% if item[:conditional] %>
-                <%= tag.div item[:conditional], id: "#{id}-#{index}-conditional-#{index}", class: "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" %>
-              <% end %>
+            <% if item === :or %>
+              <%= tag.li t('components.checkboxes.or'), class: "gem-c-checkboxes__divider" %>
+            <% else %>
+              <%= tag.li class: "govuk-checkboxes__item" do %>
+                <%= cb_helper.checkbox_markup(item, index) %>
+
+                <% if item[:conditional] %>
+                  <%= tag.div item[:conditional], id: "#{id}-#{index}-conditional-#{index}", class: "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" %>
+                <% end %>
 
-              <% if item[:items].present? %>
-                <%= tag.ul id: "#{id}-nested-#{index}", class: "govuk-checkboxes govuk-checkboxes--nested", data: { parent: "#{id}-#{index}" } do %>
-                  <% item[:items].each_with_index do |nested_item, nested_index| %>
-                    <%= tag.li class: "govuk-checkboxes__item" do %>
-                      <%= cb_helper.checkbox_markup(nested_item, "#{index}-#{nested_index}") %>
+                <% if item[:items].present? %>
+                  <%= tag.ul id: "#{id}-nested-#{index}", class: "govuk-checkboxes govuk-checkboxes--nested", data: { parent: "#{id}-#{index}" } do %>
+                    <% item[:items].each_with_index do |nested_item, nested_index| %>
+                      <%= tag.li class: "govuk-checkboxes__item" do %>
+                        <%= cb_helper.checkbox_markup(nested_item, "#{index}-#{nested_index}") %>
+                      <% end %>
                     <% end %>
                   <% end %>
                 <% end %>

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

@@ -268,6 +268,29 @@ examples:
           value: "irish"
         - label: "Other"
           value: "other"
+  checkbox_with_exclusive_item:
+    description: |
+      Allows an option to become exclusive, as follows:
+
+        - when the exclusive item is checked, all non-exclusive items are unchecked
+        - when a non-exclusive item is checked, the exclusive item is unchecked
+
+      This behaviour should be doubled by similar checks on the backend.
+    data:
+      name: "nationality-exclusive"
+      heading: "What kind of expertise can you offer?"
+      hint_text: "Select the types of support you can offer."
+      items:
+        - label: "Medical"
+          value: "medical"
+        - label: "Engineering"
+          value: "engineering"
+        - label: "Other"
+          value: "other"
+        - :or
+        - label: "I cannot offer expertise"
+          value: "no-expertise"
+          exclusive: true
   checkbox_items_with_conditional_reveal:
     description: |
       Checkboxes can be configured to show additional elements when checked. This could include further components, such as text inputs as shown.

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

@@ -149,15 +149,30 @@ examples:
           <caption>A table with data</caption>
           <thead>
             <tr>
-              <th>Heading 1</th><th>Heading 2</th>
+              <th>Group</th>
+              <th>Explanation</th>
+              <th>Current and continuing guidance</th>
+              <th>Government support</th>
             </tr>
           </thead>
           <tbody>
             <tr>
-              <td>cell 1</td><td>cell 2</td>
+              <th>Clinically extremely vulnerable people (all people in this cohort will have received communication from the NHS)</th>
+              <td>People defined on medical grounds a clinically extremely vulnerable, meaning they are at the greatest risk of severe illness. This group includes solid organ transplant recipients, people receiving chemotherapy, renal dialysis patients and others.</td>
+              <td>Follow shielding guidance by staying at home at all times and avoiding all non-essential face-to-face contact. This guidance is in place until end June.</td>
+              <td>Support available from the National Shielding Programme, which includes food supplies (through food boxes and priority supermarket deliveries), pharmacy deliveries and care. Support is available via the NHS Volunteer Responders app.</td>
             </tr>
             <tr>
-              <td>cell 3</td><td>cell 4</td>
+              <th>Clinically vulnerable people</th>
+              <td>People considered to be at higher risk of severe illness from COVID-19. Clinically vulnerable people include the following: people aged 70 or older, people with liver disease, people with diabetes, pregnant women and others.</td>
+              <td>Stay at home as much as possible. If you do go out, take particular care to minimise contact with others outside your household.</td>
+              <td>Range of support available while measures in place, including by local authorities and through voluntary and community groups. Support is available via the NHS Volunteer Responders app.</td>
+            </tr>
+            <tr>
+              <th>Vulnerable people (non-clinical)</th>
+              <td>There are a range of people who can be classified as ‘vulnerable’ due to non-clinical factors, such as children at risk of violence or with special education needs, victims of domestic abuse, rough sleepers and others.</td>
+              <td>People in this group will need to follow general guidance except where they are also clinically vulnerable or clinically extremely vulnerable, where they should follow guidance as set out above.</td>
+              <td>For those who need it, a range of support and guidance across public services and the benefits system, including by central and local government and the voluntary and community sector.</td>
             </tr>
           </tbody>
         </table>
@@ -257,6 +272,10 @@ examples:
             <li id="fn:1a">
               <p>And here is the definition. <a href="#fnref:1a" class="reversefootnote">&#8617;</a></p>
             </li>
+            <li id="fn:2">
+              <a href="https://www.ons.gov.uk/peoplepopulationandcommunity/birthsdeathsandmarriages/deaths/datasets/weeklyprovisionalfiguresondeathsregisteredinenglandandwales" class="govuk-link">https://www.ons.gov.uk/peoplepopulationandcommunity/birthsdeathsandmarriages/deaths/datasets/weeklyprovisionalfiguresondeathsregisteredinenglandandwales</a>
+              <a href="#fnref:2" class="govuk-link">↩</a>
+            </li>
           </ol>
         </div>
   rtl_block:

data/config/locales/en.yml

@@ -32,6 +32,8 @@ en:
       scoped_search_description: "Search within %{title}"
     back_link:
       back: 'Back'
+    checkboxes:
+      or: 'or'
     contents_list:
       contents: Contents
     organisation_schema:

data/lib/govuk_publishing_components/presenters/attachment.rb

@@ -131,15 +131,15 @@ module GovukPublishingComponents
         end
 
         def opendocument?
-          !!content_type_data[:opendocument]
+          content_type_data[:opendocument].present?
         end
 
         def document?
-          !!content_type_data[:document]
+          content_type_data[:document].present?
         end
 
         def spreadsheet?
-          !!content_type_data[:spreadsheet]
+          content_type_data[:spreadsheet].present?
         end
       end
 

data/lib/govuk_publishing_components/presenters/checkboxes_helper.rb

@@ -5,7 +5,8 @@ module GovukPublishingComponents
       include ActionView::Context
 
       attr_reader :items, :name, :css_classes, :list_classes, :error, :has_conditional,
-                  :has_nested, :id, :hint_text, :description, :heading_size, :heading_caption
+                  :has_nested, :id, :hint_text, :description, :heading_size, :heading_caption,
+                  :has_exclusive
 
       def initialize(options)
         @items = options[:items] || []
@@ -19,6 +20,7 @@ module GovukPublishingComponents
 
         # check if any item is set as being conditional
         @has_conditional = options[:items].any? { |item| item.is_a?(Hash) && item[:conditional] }
+        @has_exclusive = options[:items].any? { |item| item.is_a?(Hash) && item[:exclusive] }
         @has_nested = options[:items].any? { |item| item.is_a?(Hash) && item[:items] }
 
         @id = options[:id] || "checkboxes-#{SecureRandom.hex(4)}"
@@ -77,6 +79,7 @@ module GovukPublishingComponents
         data = checkbox[:data_attributes] || {}
         data[:controls] = controls
         data["aria-controls"] = aria_controls
+        data[:exclusive] = checkbox[:exclusive]
 
         capture do
           concat check_box_tag checkbox_name, checkbox[:value], checked, class: "govuk-checkboxes__input", id: checkbox_id, data: data

data/lib/govuk_publishing_components/presenters/contents_list_helper.rb

@@ -9,7 +9,7 @@ module GovukPublishingComponents
 
       def initialize(options)
         @contents = options[:contents] || []
-        @nested = !!@contents.find { |c| c[:items] && c[:items].any? }
+        @nested = @contents.any? { |c| c[:items] && c[:items].any? }
         @format_numbers = options[:format_numbers]
 
         @classes = %w[gem-c-contents-list]

data/lib/govuk_publishing_components/presenters/contextual_navigation.rb

@@ -13,7 +13,7 @@ module GovukPublishingComponents
       end
 
       def simple_smart_answer?
-        content_item["document_type"] === "simple_smart_answer"
+        content_item["document_type"] == "simple_smart_answer"
       end
 
       def taxon_breadcrumbs

data/lib/govuk_publishing_components/presenters/machine_readable/faq_page_schema.rb

@@ -100,7 +100,7 @@ module GovukPublishingComponents
       end
 
       def answer_is_unset?(q_and_as, question)
-        !q_and_as[question].has_key?(:answer)
+        !q_and_as[question].key?(:answer)
       end
 
       # we use H2 tags as the "question" and the html between them as the "answer"

data/lib/govuk_publishing_components/presenters/machine_readable/organisation_schema.rb

@@ -47,7 +47,7 @@ module GovukPublishingComponents
         ministers.each_with_object({}) do |minister, grouped|
           person_schema = person_schema_for_minister(minister)
 
-          if grouped.has_key? person_schema
+          if grouped.key? person_schema
             grouped[person_schema] << role_for_minister(minister)
           else
             grouped[person_schema] = [role_for_minister(minister)]

data/lib/govuk_publishing_components/presenters/page_with_step_by_step_navigation.rb

@@ -115,7 +115,7 @@ module GovukPublishingComponents
       end
 
       def show_secondary_step_by_step?
-        !primary_step_by_steps? && secondary_step_by_step? && secondary_step_by_steps.count === 1
+        !primary_step_by_steps? && secondary_step_by_step? && secondary_step_by_steps.count == 1
       end
 
       def show_related_links_for_secondary_step_by_steps?

data/lib/govuk_publishing_components/presenters/related_navigation_helper.rb

@@ -54,7 +54,7 @@ module GovukPublishingComponents
       end
 
       def construct_section_heading(section_title)
-        unless section_title === "related_items"
+        unless section_title == "related_items"
           I18n.t("components.related_#{@context}_navigation." + section_title,
                  default: [
                    I18n.t("components.related_navigation." + section_title),
@@ -232,13 +232,13 @@ module GovukPublishingComponents
           links = links.find_all { |link| link["document_type"] == only }
         end
 
-        links.map { |link|
+        links.map do |link|
           {
             path: link["base_path"],
             text: link["title"],
             locale: link["locale"],
           }
-        }
+        end
       end
     end
   end

data/lib/govuk_publishing_components/presenters/select.rb

@@ -17,14 +17,14 @@ module GovukPublishingComponents
       def get_options
         return if options.nil?
 
-        options.map { |option|
+        options.map do |option|
           @selected_option = option[:value] if option[:selected]
           [
             option[:text],
             option[:value],
             options_data_attribute(option[:data_attributes]),
           ]
-        }
+        end
       end
 
       def options_data_attribute(attributes)

data/lib/govuk_publishing_components/presenters/step_by_step_nav_helper.rb

@@ -40,7 +40,7 @@ module GovukPublishingComponents
             length: element[:contents].length,
           },
         ) do
-          element[:contents].collect { |contents|
+          element[:contents].collect do |contents|
             concat(
               content_tag(
                 :li,
@@ -49,7 +49,7 @@ module GovukPublishingComponents
                 create_list_item_content(contents)
               end,
             )
-          }
+          end
         end
       end
 

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "21.45.0".freeze
+  VERSION = "21.46.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 21.45.0
+  version: 21.46.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters
@@ -108,34 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.7.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.7.4
-- !ruby/object:Gem::Dependency
-  name: sassc-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -276,6 +248,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: sassc-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement