govuk_publishing_components 64.0.0 → 64.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16c3c262e09722b90a73a068ab44323e447d40e7c833b0ef9e060bf113f776f2
-  data.tar.gz: 38303d6dd5e90633a3b7a75126f0b1fcfc51c522417f9efc4f365992cc878171
+  metadata.gz: 6ce0c3f4602a7fc50dd1f1f38a9d177c256c320842afd37f83260571361c8aef
+  data.tar.gz: 851ec585153e68a005871ad0a242130d0e8df04e10902c888750f51186a63410
 SHA512:
-  metadata.gz: b590dce6cb9e0f0d0b53a0921579325699c0f6911c0bc3aa619293fedaa455bce9b41769c1fb95a662c7210ecb059faff660f50a0f0ac3620124f6151e4fcc7b
-  data.tar.gz: 0b1fbb803c88a2147aa091c46453d44c51ed35612a76f1d7815544a8858fd3f15bf432240ed7766d8831e2111e85597635b51d0157961aaba79eaedefd15ddbb
+  metadata.gz: 994f0af2defdd9971a6c22b14e039e9afc801ef18d704527287fc6d355ba1a2d9ea2c898fd1a067992e7a6f289529c8844e4822f8e855b69cfbcdad204dd4ea7
+  data.tar.gz: b9b4edbc35f12d6373aca1df522393529da9124a65eb64b8598c120963815be5f405b29dede59ea5a9277123c1d1632e2753ecc9d9b727bcb0a62e5932cc9b3b

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-form-change-tracker.js

@@ -110,13 +110,19 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     let text
 
     if (checkableValue) {
+      const fieldset = checkableValue.closest('fieldset') || null
+      const redactedFieldset = fieldset && fieldset.dataset.ga4Redact
+
       // radio, check, option can have `:checked` pseudo-class
       if (!checkableValue.matches(':checked')) {
         action = 'remove'
       }
 
-      text = checkableValue.innerText ||
-        this.module.querySelector(`label[for='${window.CSS.escape(id)}']`).innerText
+      if (redactedFieldset && !checkableValue.dataset.ga4RedactPermit) {
+        text = '[REDACTED]'
+      } else {
+        text = checkableValue.innerText || this.module.querySelector(`label[for='${window.CSS.escape(id)}']`).innerText
+      }
 
       if (text) {
         text = text.replace(/\r?\n|\r/g, ' ')

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-form-tracker.js

@@ -83,12 +83,17 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     for (var i = 0; i < labels.length; i++) {
       var label = labels[i]
       var labelFor = label.getAttribute('for')
+      var hiddenInput = label.getAttribute('data-ga4-hidden-input')
       var input = false
-      if (labelFor) {
+
+      if (hiddenInput) {
+        input = this.module.querySelector('[id="' + hiddenInput + '"]')
+      } else if (labelFor) {
         input = this.module.querySelector('[id="' + labelFor + '"]')
       } else {
         input = label.querySelector('input')
       }
+
       inputs.push({
         input: input,
         label: label
@@ -122,9 +127,13 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
         // don't include conditional field control in text
         inputs.splice(i, 1)
       } else if (elem.checked) {
-        input.answer = labelText
+        var fieldset = elem.closest('fieldset') || null
 
-        var fieldset = elem.closest('fieldset')
+        if (fieldset.dataset.ga4Redact && !elem.dataset.ga4RedactPermit) {
+          input.answer = '[REDACTED]'
+        } else {
+          input.answer = labelText
+        }
 
         if (fieldset) {
           var legend = fieldset.querySelector('legend')

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

@@ -14,3 +14,7 @@ $search-icon-size: 40px;
   height: govuk-px-to-rem($search-icon-size);
   background: url("govuk_publishing_components/icon-search.svg") no-repeat -3px center;
 }
+
+.gem-c-input--with-search-icon {
+  padding-left: govuk-spacing(6);
+}

data/app/controllers/govuk_publishing_components/applications_page_controller.rb

@@ -40,6 +40,7 @@ module GovukPublishingComponents
             gem_version: app.gem_version,
             gem_version_status: app.gem_version == GovukPublishingComponents::VERSION ? "green" : "red",
             sass_version: app.sass_version,
+            ruby_version: app.ruby_version,
           }
         end
       end

data/app/models/govuk_publishing_components/applications_page.rb

@@ -5,7 +5,8 @@ module GovukPublishingComponents
     def initialize(application)
       @application = application
       @dir = get_directory
-      @gemfilelock = get_gemfile
+      @gemfilelock = get_file("Gemfile.lock")
+      @rubyfile = get_file(".ruby-version")
     end
 
     def readable_name
@@ -20,6 +21,10 @@ module GovukPublishingComponents
       parse_file(@gemfilelock, /sass-embedded \(([^)>=~ ]+)\)/)
     end
 
+    def ruby_version
+      @rubyfile.strip if @rubyfile
+    end
+
   private
 
     def get_directory
@@ -27,20 +32,20 @@ module GovukPublishingComponents
       Dir.exist?(app_dir) ? app_dir : false
     end
 
-    def get_gemfile
-      @dir ? get_gemfile_local : get_gemfile_remote
+    def get_file(name)
+      @dir ? get_local_file(name) : get_remote_file(name)
     end
 
-    def get_gemfile_local
-      lockfile = "#{@dir}/Gemfile.lock"
+    def get_local_file(name)
+      lockfile = "#{@dir}/#{name}"
       return unless File.file?(lockfile)
 
       @source = "local"
       File.read(lockfile)
     end
 
-    def get_gemfile_remote
-      uri = URI("https://raw.githubusercontent.com/alphagov/#{@application}/main/Gemfile.lock")
+    def get_remote_file(name)
+      uri = URI("https://raw.githubusercontent.com/alphagov/#{@application}/main/#{name}")
       result = Net::HTTP.get_response(uri)
       if result.is_a?(Net::HTTPSuccess)
         @source = "remote"

data/app/views/govuk_publishing_components/applications_page/_table-content.html.erb

@@ -28,5 +28,12 @@
         } %>
       <% end %>
     </td>
+    <td class="govuk-table__cell">
+      <% if app[:ruby_version] %>
+        <%= render "govuk_publishing_components/components/tag", {
+          text: app[:ruby_version],
+        } %>
+      <% end %>
+    </td>
   </tr>
 <% end %>

data/app/views/govuk_publishing_components/applications_page/show.html.erb

@@ -24,6 +24,7 @@
         <th scope="col" class="govuk-table__header sticky-table-header">Source</th>
         <th scope="col" class="govuk-table__header sticky-table-header">Gem version</th>
         <th scope="col" class="govuk-table__header sticky-table-header">Sass version</th>
+        <th scope="col" class="govuk-table__header sticky-table-header">Ruby version</th>
       </tr>
     </thead>
     <tbody class="govuk-table__body">

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

@@ -6,60 +6,61 @@
   component_helper.add_class(cb_helper.css_classes.join(" ")) # cb_helper.css_classes generates "gem-c-checkboxes"
   component_helper.add_data_attribute({ module: "gem-checkboxes govuk-checkboxes" })
 %>
+<% if cb_helper.items.any? %>
+  <%= tag.div(**component_helper.all_attributes) do %>
+    <% if cb_helper.should_have_fieldset %>
+      <% if cb_helper.heading_markup %>
+        <%= tag.fieldset class: "govuk-fieldset", "aria-describedby": cb_helper.fieldset_describedby do %>
+          <%= cb_helper.heading_markup %>
 
-<%= tag.div(**component_helper.all_attributes) do %>
-  <% if cb_helper.should_have_fieldset %>
-    <% if cb_helper.heading_markup %>
-      <%= tag.fieldset class: "govuk-fieldset", "aria-describedby": cb_helper.fieldset_describedby do %>
-        <%= cb_helper.heading_markup %>
-
-        <% if cb_helper.description %>
-          <%= tag.div cb_helper.description, class: "govuk-body" %>
-        <% end %>
+          <% if cb_helper.description %>
+            <%= tag.div cb_helper.description, class: "govuk-body" %>
+          <% end %>
 
-        <% if cb_helper.hint_text %>
-          <%= tag.div cb_helper.hint_text, id: "#{id}-hint", class: "govuk-hint" %>
-        <% end %>
+          <% if cb_helper.hint_text %>
+            <%= tag.div cb_helper.hint_text, id: "#{id}-hint", class: "govuk-hint" %>
+          <% end %>
 
-        <% if cb_helper.error %>
-          <%= tag.p error, id: "#{id}-error", class: "govuk-error-message" %>
-        <% end %>
+          <% if cb_helper.error %>
+            <%= tag.p error, id: "#{id}-error", class: "govuk-error-message" %>
+          <% end %>
 
-        <%= tag.div class: "govuk-checkboxes", data: {
-          module: ("govuk-checkboxes" if cb_helper.has_conditional),
-          nested: ("true" if cb_helper.has_nested),
-        } do %>
-          <% cb_helper.items.each_with_index do |item, index| %>
-            <% if item === :or %>
-              <%= tag.div t("components.checkboxes.or"), class: "govuk-checkboxes__divider" %>
-            <% else %>
-              <%= tag.div class: "govuk-checkboxes__item" do %>
-                <%= cb_helper.checkbox_markup(item, index) %>
+          <%= tag.div class: "govuk-checkboxes", data: {
+            module: ("govuk-checkboxes" if cb_helper.has_conditional),
+            nested: ("true" if cb_helper.has_nested),
+          } do %>
+            <% cb_helper.items.each_with_index do |item, index| %>
+              <% if item === :or %>
+                <%= tag.div t("components.checkboxes.or"), class: "govuk-checkboxes__divider" %>
+              <% else %>
+                <%= tag.div class: "govuk-checkboxes__item" do %>
+                  <%= cb_helper.checkbox_markup(item, index) %>
 
-                <% if item[:items].present? %>
-                  <%= tag.div id: "#{id}-nested-#{index}", class: "govuk-checkboxes--nested", data: { parent: "#{id}-#{index}" } do %>
-                    <% item[:items].each_with_index do |nested_item, nested_index| %>
-                      <%= tag.div class: "govuk-checkboxes__item" do %>
-                        <%= cb_helper.checkbox_markup(nested_item, "#{index}-#{nested_index}") %>
+                  <% if item[:items].present? %>
+                    <%= tag.div id: "#{id}-nested-#{index}", class: "govuk-checkboxes--nested", data: { parent: "#{id}-#{index}" } do %>
+                      <% item[:items].each_with_index do |nested_item, nested_index| %>
+                        <%= tag.div class: "govuk-checkboxes__item" do %>
+                          <%= cb_helper.checkbox_markup(nested_item, "#{index}-#{nested_index}") %>
+                        <% end %>
                       <% end %>
                     <% end %>
                   <% end %>
                 <% end %>
-              <% end %>
 
-              <% if item[:conditional] %>
-                <%= tag.div item[:conditional], id: "#{id}-#{index}-conditional-#{index}", class: "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" %>
-              <% end %>
+                <% if item[:conditional] %>
+                  <%= tag.div item[:conditional], id: "#{id}-#{index}-conditional-#{index}", class: "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" %>
+                <% end %>
 
+              <% end %>
             <% end %>
           <% end %>
         <% end %>
       <% end %>
-    <% end %>
 
-  <% else %>
-    <div class="govuk-checkboxes__item">
-      <%= cb_helper.checkbox_markup(cb_helper.items[0], 0) %>
-    </div>
+    <% else %>
+      <div class="govuk-checkboxes__item">
+        <%= cb_helper.checkbox_markup(cb_helper.items[0], 0) %>
+      </div>
+    <% end %>
   <% end %>
 <% end %>

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

@@ -18,6 +18,10 @@
   heading_level ||= nil
   javascript ||= false
 
+  if javascript
+    label[:data_attributes] = { ga4_hidden_input: "#{id}-input" }
+  end
+
   css_classes = %w(gem-c-file-upload govuk-file-upload)
   css_classes << "govuk-file-upload--error" if has_error
   form_group_css_classes = %w(govuk-form-group)

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

@@ -28,13 +28,6 @@ examples:
         text: "What is the nature of your medical emergency?"
       name: "emergency-name"
       textarea_id: "emergency-id"
-  with_margin_bottom:
-    description: The component accepts a number for margin bottom from `0` to `9` (`0px` to `60px`) using the [GOV.UK Frontend spacing scale](https://design-system.service.gov.uk/styles/spacing/#the-responsive-spacing-scale). It defaults to a margin bottom of 6 (30px).
-    data:
-      margin_bottom: 9
-      label:
-        text: "Can you provide more detail?"
-      name: "more-detail"
   specific_rows:
     description: Textarea with 10 rows
     data:
@@ -64,6 +57,12 @@ examples:
         href: '#example-error-1'
       - text: Descriptive link to the question with an error 2
         href: '#example-error-2'
+  with bold_label:
+    data:
+      label:
+        text: "Can you provide more detail?"
+        bold: true
+      name: "more-detail"
   with_label_as_page_heading:
     data:
       label:
@@ -106,7 +105,6 @@ examples:
       textarea_id: "contextual-guidance-id"
       label:
         text: "Title"
-        bold: true
       name: "described"
       rows: 2
       describedby: "contextual-guidance"

data/lib/govuk_publishing_components/presenters/checkboxes_helper.rb

@@ -17,6 +17,8 @@ module GovukPublishingComponents
 
       def initialize(options)
         @items = options[:items] || []
+        return unless @items.any?
+
         @name = options[:name]
         @css_classes = %w[gem-c-checkboxes govuk-form-group]
         @css_classes << "govuk-form-group--error" if options[:error]
@@ -24,8 +26,8 @@ module GovukPublishingComponents
         @error = true if options[:error]
 
         # check if any item is set as being conditional
-        @has_conditional = options[:items].any? { |item| item.is_a?(Hash) && item[:conditional] }
-        @has_nested = options[:items].any? { |item| item.is_a?(Hash) && item[:items] }
+        @has_conditional = @items.any? { |item| item.is_a?(Hash) && item[:conditional] }
+        @has_nested = @items.any? { |item| item.is_a?(Hash) && item[:items] }
 
         @id = options[:id] || "checkboxes-#{SecureRandom.hex(4)}"
         @heading = options[:heading] || nil
@@ -41,7 +43,7 @@ module GovukPublishingComponents
       # should have a fieldset if there's a heading, or if more than one checkbox
       # separate check is in the view for if more than one checkbox and no heading, in which case fail
       def should_have_fieldset
-        @items.length > 1 || @heading
+        @items.length > 1 || !@heading.blank? # rubocop:disable Rails/Present
       end
 
       def fieldset_describedby
@@ -91,6 +93,7 @@ module GovukPublishingComponents
         checked = true if checkbox[:checked].present?
         data = checkbox[:data_attributes] || {}
         data[:controls] = controls
+        # aria-controls is set as a data attribute then applied properly using JS
         data["aria-controls"] = aria_controls
         data[:behaviour] = "exclusive" if checkbox[:exclusive]
 

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

@@ -24,8 +24,7 @@ module GovukPublishingComponents
       end
 
       def questions_and_answers_markup
-        question_and_answers.select { |_, value| value[:answer].present? }
-                            .map do |question, value|
+        question_and_answers.select { |_, value| value[:answer].present? }.map do |question, value|
           q_and_a_url = section_url(value[:anchor])
 
           {

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "64.0.0".freeze
+  VERSION = "64.1.1".freeze
 end

data/node_modules/sortablejs/Sortable.js

@@ -1,5 +1,5 @@
 /**!
- * Sortable 1.15.6
+ * Sortable 1.15.7
  * @author	RubaXa   <trash@rubaxa.org>
  * @author	owenm    <owen23355@gmail.com>
  * @license MIT
@@ -10,131 +10,113 @@
   (global = global || self, global.Sortable = factory());
 }(this, (function () { 'use strict';
 
-  function ownKeys(object, enumerableOnly) {
-    var keys = Object.keys(object);
-    if (Object.getOwnPropertySymbols) {
-      var symbols = Object.getOwnPropertySymbols(object);
-      if (enumerableOnly) {
-        symbols = symbols.filter(function (sym) {
-          return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-        });
-      }
-      keys.push.apply(keys, symbols);
-    }
-    return keys;
-  }
-  function _objectSpread2(target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i] != null ? arguments[i] : {};
-      if (i % 2) {
-        ownKeys(Object(source), true).forEach(function (key) {
-          _defineProperty(target, key, source[key]);
-        });
-      } else if (Object.getOwnPropertyDescriptors) {
-        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-      } else {
-        ownKeys(Object(source)).forEach(function (key) {
-          Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-        });
-      }
-    }
-    return target;
+  function _arrayLikeToArray(r, a) {
+    (null == a || a > r.length) && (a = r.length);
+    for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+    return n;
   }
-  function _typeof(obj) {
-    "@babel/helpers - typeof";
-
-    if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-      _typeof = function (obj) {
-        return typeof obj;
-      };
-    } else {
-      _typeof = function (obj) {
-        return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-      };
-    }
-    return _typeof(obj);
-  }
-  function _defineProperty(obj, key, value) {
-    if (key in obj) {
-      Object.defineProperty(obj, key, {
-        value: value,
-        enumerable: true,
-        configurable: true,
-        writable: true
-      });
-    } else {
-      obj[key] = value;
-    }
-    return obj;
+  function _arrayWithoutHoles(r) {
+    if (Array.isArray(r)) return _arrayLikeToArray(r);
   }
-  function _extends() {
-    _extends = Object.assign || function (target) {
-      for (var i = 1; i < arguments.length; i++) {
-        var source = arguments[i];
-        for (var key in source) {
-          if (Object.prototype.hasOwnProperty.call(source, key)) {
-            target[key] = source[key];
-          }
-        }
-      }
-      return target;
-    };
-    return _extends.apply(this, arguments);
-  }
-  function _objectWithoutPropertiesLoose(source, excluded) {
-    if (source == null) return {};
-    var target = {};
-    var sourceKeys = Object.keys(source);
-    var key, i;
-    for (i = 0; i < sourceKeys.length; i++) {
-      key = sourceKeys[i];
-      if (excluded.indexOf(key) >= 0) continue;
-      target[key] = source[key];
-    }
-    return target;
+  function _defineProperty(e, r, t) {
+    return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
+      value: t,
+      enumerable: !0,
+      configurable: !0,
+      writable: !0
+    }) : e[r] = t, e;
   }
-  function _objectWithoutProperties(source, excluded) {
-    if (source == null) return {};
-    var target = _objectWithoutPropertiesLoose(source, excluded);
-    var key, i;
-    if (Object.getOwnPropertySymbols) {
-      var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-      for (i = 0; i < sourceSymbolKeys.length; i++) {
-        key = sourceSymbolKeys[i];
-        if (excluded.indexOf(key) >= 0) continue;
-        if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
-        target[key] = source[key];
+  function _extends() {
+    return _extends = Object.assign ? Object.assign.bind() : function (n) {
+      for (var e = 1; e < arguments.length; e++) {
+        var t = arguments[e];
+        for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
       }
-    }
-    return target;
+      return n;
+    }, _extends.apply(null, arguments);
   }
-  function _toConsumableArray(arr) {
-    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+  function _iterableToArray(r) {
+    if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r);
   }
-  function _arrayWithoutHoles(arr) {
-    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+  function _nonIterableSpread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
   }
-  function _iterableToArray(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+  function ownKeys(e, r) {
+    var t = Object.keys(e);
+    if (Object.getOwnPropertySymbols) {
+      var o = Object.getOwnPropertySymbols(e);
+      r && (o = o.filter(function (r) {
+        return Object.getOwnPropertyDescriptor(e, r).enumerable;
+      })), t.push.apply(t, o);
+    }
+    return t;
+  }
+  function _objectSpread2(e) {
+    for (var r = 1; r < arguments.length; r++) {
+      var t = null != arguments[r] ? arguments[r] : {};
+      r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
+        _defineProperty(e, r, t[r]);
+      }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
+        Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
+      });
+    }
+    return e;
   }
-  function _unsupportedIterableToArray(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(o);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+  function _objectWithoutProperties(e, t) {
+    if (null == e) return {};
+    var o,
+      r,
+      i = _objectWithoutPropertiesLoose(e, t);
+    if (Object.getOwnPropertySymbols) {
+      var n = Object.getOwnPropertySymbols(e);
+      for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
+    }
+    return i;
+  }
+  function _objectWithoutPropertiesLoose(r, e) {
+    if (null == r) return {};
+    var t = {};
+    for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
+      if (-1 !== e.indexOf(n)) continue;
+      t[n] = r[n];
+    }
+    return t;
+  }
+  function _toConsumableArray(r) {
+    return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread();
+  }
+  function _toPrimitive(t, r) {
+    if ("object" != typeof t || !t) return t;
+    var e = t[Symbol.toPrimitive];
+    if (void 0 !== e) {
+      var i = e.call(t, r || "default");
+      if ("object" != typeof i) return i;
+      throw new TypeError("@@toPrimitive must return a primitive value.");
+    }
+    return ("string" === r ? String : Number)(t);
   }
-  function _arrayLikeToArray(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-    for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-    return arr2;
+  function _toPropertyKey(t) {
+    var i = _toPrimitive(t, "string");
+    return "symbol" == typeof i ? i : i + "";
   }
-  function _nonIterableSpread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+  function _typeof(o) {
+    "@babel/helpers - typeof";
+
+    return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
+      return typeof o;
+    } : function (o) {
+      return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
+    }, _typeof(o);
+  }
+  function _unsupportedIterableToArray(r, a) {
+    if (r) {
+      if ("string" == typeof r) return _arrayLikeToArray(r, a);
+      var t = {}.toString.call(r).slice(8, -1);
+      return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
+    }
   }
 
-  var version = "1.15.6";
+  var version = "1.15.7";
 
   function userAgent(pattern) {
     if (typeof window !== 'undefined' && window.navigator) {
@@ -177,7 +159,7 @@
     return false;
   }
   function getParentOrHost(el) {
-    return el.host && el !== document && el.host.nodeType ? el.host : el.parentNode;
+    return el.host && el !== document && el.host.nodeType && el.host !== el ? el.host : el.parentNode;
   }
   function closest( /**HTMLElement*/el, /**String*/selector, /**HTMLElement*/ctx, includeCTX) {
     if (el) {
@@ -2061,8 +2043,11 @@
     _nulling: function _nulling() {
       pluginEvent('nulling', this);
       rootEl = dragEl = parentEl = ghostEl = nextEl = cloneEl = lastDownEl = cloneHidden = tapEvt = touchEvt = moved = newIndex = newDraggableIndex = oldIndex = oldDraggableIndex = lastTarget = lastDirection = putSortable = activeGroup = Sortable.dragged = Sortable.ghost = Sortable.clone = Sortable.active = null;
-      savedInputChecked.forEach(function (el) {
-        el.checked = true;
+      var el = this.el;
+      savedInputChecked.forEach(function (checkEl) {
+        if (el.contains(checkEl)) {
+          checkEl.checked = true;
+        }
       });
       savedInputChecked.length = lastDx = lastDy = 0;
     },