govuk_publishing_components 36.0.0 → 36.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 773208000d7b04127bf634415ed17bbfd977ba73ab9a45e2eca5742f19eacbc6
-  data.tar.gz: c2b77952558ca4fd34c22e87088721dffe9d55346cc1cd9a5ac8ee3f64ff2087
+  metadata.gz: 9964e934f4ce2788b32ae7209b5838a04a44cadbb302c4cf45bd723fd6e9cf38
+  data.tar.gz: 9aa95ca3c117ebef6c201f29990e1b12961b53c435c7904936c44e7b22b53cd7
 SHA512:
-  metadata.gz: 5d2efbb677bc763e54375000098c7419ccec70d70d4ad49093e6fda016788ec22ef989d8c7a480e5e9fa00d4dba4c6ac10672bb683baa67d129a3a49da80e460
-  data.tar.gz: 5e34040e64f3863838db6c24a5d8e2c0f0d423d62f24f6841adb204e0071899699796c07740130b6ec06205a87cffdcfed80814a177f7eb6aa93cd7112e55e1a
+  metadata.gz: 1094205965013e02ab4655bd58fa2e6ac6cfad898ba94275ab93fc3bec5c738fff2fe575e34ac2429e66c912fc54c25afdcf3f878d6090e20ce180bc805e4aa5
+  data.tar.gz: 52f249d3d4edbf8f16d696154c5faf1e751ea386eae9ede15bde6ad248bd705eda6c91b98dfaf4f221c03908b5dd57e9b8ce84eba0c9e85d2078aee907dfe9a8

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

@@ -7,15 +7,10 @@
   checkboxes_count_id = checkboxes_id + "-count"
   show_filter ||= false
   large ||= false
-
-  classes = %w[gem-c-option-select__container js-options-container]
-  classes << "gem-c-option-select__container--large" if large
 %>
 
 <% if show_filter %>
-  <%
-    filter_id ||= "input-#{SecureRandom.hex(4)}"
-  %>
+  <% filter_id ||= "input-#{SecureRandom.hex(4)}" %>
   <% filter = capture do %>
     <%= tag.label for: filter_id, class: "govuk-label govuk-visually-hidden" do %>
       Filter <%= title %>
@@ -34,20 +29,27 @@
   <% filter_element = CGI::escapeHTML(filter) %>
 <% end %>
 
-<div
-  class="gem-c-option-select" data-module="option-select"
-  <% if local_assigns.include?(:closed_on_load) && closed_on_load %>data-closed-on-load="true"<% end %>
-  <% if local_assigns.include?(:closed_on_load_mobile) && closed_on_load_mobile %>data-closed-on-load-mobile="true"<% end %>
-  <% if local_assigns.include?(:aria_controls_id) %>data-input-aria-controls="<%= aria_controls_id %>"<% end %>
-  <% if show_filter %>data-filter-element="<%= filter_element %>"<% end %>
->
+<%
+  helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
+  helper.add_class("gem-c-option-select")
+  helper.add_data_attribute({ module: "option-select" })
+  helper.add_data_attribute({ "closed-on-load": true }) if local_assigns.include?(:closed_on_load) && closed_on_load
+  helper.add_data_attribute({ "closed-on-load-mobile": "true" }) if local_assigns.include?(:closed_on_load_mobile) && closed_on_load_mobile
+  helper.add_data_attribute({ "input-aria-controls": aria_controls_id }) if local_assigns.include?(:aria_controls_id)
+  helper.add_data_attribute({ "filter-element": filter_element }) if show_filter
+
+  options_container_classes = %w[gem-c-option-select__container js-options-container]
+  options_container_classes << "gem-c-option-select__container--large" if large
+%>
+
+<%= tag.div(**helper.all_attributes) do %>
   <h3 class="gem-c-option-select__heading js-container-heading">
     <span class="gem-c-option-select__title js-container-button" id="<%= title_id %>"><%= title %></span>
     <svg version="1.1" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="0" height="0" class="gem-c-option-select__icon gem-c-option-select__icon--up" aria-hidden="true" focusable="false"><path d="m798.16 609.84l-256-256c-16.683-16.683-43.691-16.683-60.331 0l-256 256c-16.683 16.683-16.683 43.691 0 60.331s43.691 16.683 60.331 0l225.84-225.84 225.84 225.84c16.683 16.683 43.691 16.683 60.331 0s16.683-43.691 0-60.331z"/></svg>
     <svg version="1.1" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="0" height="0" class="gem-c-option-select__icon gem-c-option-select__icon--down" aria-hidden="true" focusable="false"><path d="m225.84 414.16l256 256c16.683 16.683 43.691 16.683 60.331 0l256-256c16.683-16.683 16.683-43.691 0-60.331s-43.691-16.683-60.331 0l-225.84 225.84-225.84-225.84c-16.683-16.683-43.691-16.683-60.331 0s-16.683 43.691 0 60.331z"/></svg>
   </h3>
 
-  <%= content_tag(:div, role: "group", aria: { labelledby: title_id }, class: classes, id: options_container_id, tabindex: "-1") do %>
+  <%= content_tag(:div, role: "group", aria: { labelledby: title_id }, class: options_container_classes, id: options_container_id, tabindex: "-1") do %>
     <div class="gem-c-option-select__container-inner js-auto-height-inner">
       <% if show_filter %>
         <span id="<%= checkboxes_count_id %>"
@@ -68,4 +70,4 @@
       } %>
     </div>
   <% end %>
-</div>
+<% end %>

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

@@ -22,6 +22,7 @@ accessibility_criteria: |
   - inform the user that is it an editable field
   - inform the user when there are matches, or if there are no matches
   - inform the user as the number of matches changes
+uses_component_wrapper_helper: true
 examples:
   default:
     data:

data/lib/govuk_publishing_components/presenters/meta_tags.rb

@@ -92,13 +92,12 @@ module GovukPublishingComponents
       def add_ga4_political_tags(meta_tags)
         government = content_item.dig(:links, :government, 0)
 
-        # political: true/false is in a different place to current: true/false, which is why we have 'details' and 'government[:details]'
+        # political: true/false is in a different place to current: true/false, which is why we have 'details' and 'government.dig(:details)'
         if government && details[:political]
-          meta_tags["govuk:ga4-political-status"] = government[:details][:current] ? "political" : "historic"
-
-          government_title = government[:title]
-          if government_title && !government[:details][:current]
-            meta_tags["govuk:ga4-publishing-government"] = government_title
+          current_government = government.dig(:details, :current)
+          unless current_government
+            meta_tags["govuk:ga4-political-status"] = "historic"
+            meta_tags["govuk:ga4-publishing-government"] = government[:title] if government[:title]
           end
         end
 

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "36.0.0".freeze
+  VERSION = "36.0.2".freeze
 end

data/node_modules/sortablejs/README.md

@@ -54,12 +54,12 @@ Demo: http://sortablejs.github.io/Sortable/
 
 Install with NPM:
 ```bash
-$ npm install sortablejs --save
+npm install sortablejs --save
 ```
 
 Install with Bower:
 ```bash
-$ bower install --save sortablejs
+bower install --save sortablejs
 ```
 
 Import into your project: