@esri/solutions-components 0.7.33 → 0.7.35

package/dist/components/sortableComponent.js

@@ -4,33 +4,27 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  */
 /**!
- * Sortable 1.15.0
+ * Sortable 1.15.1
  * @author	RubaXa   <trash@rubaxa.org>
  * @author	owenm    <owen23355@gmail.com>
  * @license MIT
  */
 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]);
@@ -43,10 +37,8 @@ function _objectSpread2(target) {
       });
     }
   }
-
   return target;
 }
-
 function _typeof(obj) {
   "@babel/helpers - typeof";
 
@@ -59,10 +51,8 @@ function _typeof(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, {
@@ -74,53 +64,40 @@ function _defineProperty(obj, key, value) {
   } else {
     obj[key] = value;
   }
-
   return obj;
 }
-
 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 _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;
@@ -128,18 +105,16 @@ function _objectWithoutProperties(source, excluded) {
       target[key] = source[key];
     }
   }
-
   return target;
 }
 
-var version = "1.15.0";
+var version = "1.15.1";
 
 function userAgent(pattern) {
   if (typeof window !== 'undefined' && window.navigator) {
     return !! /*@__PURE__*/navigator.userAgent.match(pattern);
   }
 }
-
 var IE11OrLess = userAgent(/(?:Trident.*rv[ :]?11\.|msie|iemobile|Windows Phone)/i);
 var Edge = userAgent(/Edge/i);
 var FireFox = userAgent(/firefox/i);
@@ -151,23 +126,15 @@ var captureMode = {
   capture: false,
   passive: false
 };
-
 function on(el, event, fn) {
   el.addEventListener(event, fn, !IE11OrLess && captureMode);
 }
-
 function off(el, event, fn) {
   el.removeEventListener(event, fn, !IE11OrLess && captureMode);
 }
-
-function matches(
-/**HTMLElement*/
-el,
-/**String*/
-selector) {
+function matches( /**HTMLElement*/el, /**String*/selector) {
   if (!selector) return;
   selector[0] === '>' && (selector = selector.substring(1));
-
   if (el) {
     try {
       if (el.matches) {
@@ -181,39 +148,25 @@ selector) {
       return false;
     }
   }
-
   return false;
 }
-
 function getParentOrHost(el) {
   return el.host && el !== document && el.host.nodeType ? el.host : el.parentNode;
 }
-
-function closest(
-/**HTMLElement*/
-el,
-/**String*/
-selector,
-/**HTMLElement*/
-ctx, includeCTX) {
+function closest( /**HTMLElement*/el, /**String*/selector, /**HTMLElement*/ctx, includeCTX) {
   if (el) {
     ctx = ctx || document;
-
     do {
       if (selector != null && (selector[0] === '>' ? el.parentNode === ctx && matches(el, selector) : matches(el, selector)) || includeCTX && el === ctx) {
         return el;
       }
-
       if (el === ctx) break;
       /* jshint boss:true */
     } while (el = getParentOrHost(el));
   }
-
   return null;
 }
-
 var R_SPACE = /\s+/g;
-
 function toggleClass(el, name, state) {
   if (el && name) {
     if (el.classList) {
@@ -224,10 +177,8 @@ function toggleClass(el, name, state) {
     }
   }
 }
-
 function css(el, prop, val) {
   var style = el && el.style;
-
   if (style) {
     if (val === void 0) {
       if (document.defaultView && document.defaultView.getComputedStyle) {
@@ -235,83 +186,67 @@ function css(el, prop, val) {
       } else if (el.currentStyle) {
         val = el.currentStyle;
       }
-
       return prop === void 0 ? val : val[prop];
     } else {
       if (!(prop in style) && prop.indexOf('webkit') === -1) {
         prop = '-webkit-' + prop;
       }
-
       style[prop] = val + (typeof val === 'string' ? '' : 'px');
     }
   }
 }
-
 function matrix(el, selfOnly) {
   var appliedTransforms = '';
-
   if (typeof el === 'string') {
     appliedTransforms = el;
   } else {
     do {
       var transform = css(el, 'transform');
-
       if (transform && transform !== 'none') {
         appliedTransforms = transform + ' ' + appliedTransforms;
       }
       /* jshint boss:true */
-
     } while (!selfOnly && (el = el.parentNode));
   }
-
   var matrixFn = window.DOMMatrix || window.WebKitCSSMatrix || window.CSSMatrix || window.MSCSSMatrix;
   /*jshint -W056 */
-
   return matrixFn && new matrixFn(appliedTransforms);
 }
-
 function find(ctx, tagName, iterator) {
   if (ctx) {
     var list = ctx.getElementsByTagName(tagName),
-        i = 0,
-        n = list.length;
-
+      i = 0,
+      n = list.length;
     if (iterator) {
       for (; i < n; i++) {
         iterator(list[i], i);
       }
     }
-
     return list;
   }
-
   return [];
 }
-
 function getWindowScrollingElement() {
   var scrollingElement = document.scrollingElement;
-
   if (scrollingElement) {
     return scrollingElement;
   } else {
     return document.documentElement;
   }
 }
-/**
- * Returns the "bounding client rect" of given element
- * @param  {HTMLElement} el                       The element whose boundingClientRect is wanted
- * @param  {[Boolean]} relativeToContainingBlock  Whether the rect should be relative to the containing block of (including) the container
- * @param  {[Boolean]} relativeToNonStaticParent  Whether the rect should be relative to the relative parent of (including) the contaienr
- * @param  {[Boolean]} undoScale                  Whether the container's scale() should be undone
- * @param  {[HTMLElement]} container              The parent the element will be placed in
- * @return {Object}                               The boundingClientRect of el, with specified adjustments
- */
-
 
+/**
+ * Returns the "bounding client rect" of given element
+ * @param  {HTMLElement} el                       The element whose boundingClientRect is wanted
+ * @param  {[Boolean]} relativeToContainingBlock  Whether the rect should be relative to the containing block of (including) the container
+ * @param  {[Boolean]} relativeToNonStaticParent  Whether the rect should be relative to the relative parent of (including) the contaienr
+ * @param  {[Boolean]} undoScale                  Whether the container's scale() should be undone
+ * @param  {[HTMLElement]} container              The parent the element will be placed in
+ * @return {Object}                               The boundingClientRect of el, with specified adjustments
+ */
 function getRect(el, relativeToContainingBlock, relativeToNonStaticParent, undoScale, container) {
   if (!el.getBoundingClientRect && el !== window) return;
   var elRect, top, left, bottom, right, height, width;
-
   if (el !== window && el.parentNode && el !== getWindowScrollingElement()) {
     elRect = el.getBoundingClientRect();
     top = elRect.top;
@@ -328,17 +263,18 @@ function getRect(el, relativeToContainingBlock, relativeToNonStaticParent, undoS
     height = window.innerHeight;
     width = window.innerWidth;
   }
-
   if ((relativeToContainingBlock || relativeToNonStaticParent) && el !== window) {
     // Adjust for translate()
-    container = container || el.parentNode; // solves #1123 (see: https://stackoverflow.com/a/37953806/6088312)
-    // Not needed on <= IE11
+    container = container || el.parentNode;
 
+    // solves #1123 (see: https://stackoverflow.com/a/37953806/6088312)
+    // Not needed on <= IE11
     if (!IE11OrLess) {
       do {
         if (container && container.getBoundingClientRect && (css(container, 'transform') !== 'none' || relativeToNonStaticParent && css(container, 'position') !== 'static')) {
-          var containerRect = container.getBoundingClientRect(); // Set relative to edges of padding box of container
+          var containerRect = container.getBoundingClientRect();
 
+          // Set relative to edges of padding box of container
           top -= containerRect.top + parseInt(css(container, 'border-top-width'));
           left -= containerRect.left + parseInt(css(container, 'border-left-width'));
           bottom = top + elRect.height;
@@ -346,17 +282,14 @@ function getRect(el, relativeToContainingBlock, relativeToNonStaticParent, undoS
           break;
         }
         /* jshint boss:true */
-
       } while (container = container.parentNode);
     }
   }
-
   if (undoScale && el !== window) {
     // Adjust for scale()
     var elMatrix = matrix(container || el),
-        scaleX = elMatrix && elMatrix.a,
-        scaleY = elMatrix && elMatrix.d;
-
+      scaleX = elMatrix && elMatrix.a,
+      scaleY = elMatrix && elMatrix.d;
     if (elMatrix) {
       top /= scaleY;
       left /= scaleX;
@@ -366,7 +299,6 @@ function getRect(el, relativeToContainingBlock, relativeToNonStaticParent, undoS
       right = left + width;
     }
   }
-
   return {
     top: top,
     left: left,
@@ -376,165 +308,160 @@ function getRect(el, relativeToContainingBlock, relativeToNonStaticParent, undoS
     height: height
   };
 }
-/**
- * Checks if a side of an element is scrolled past a side of its parents
- * @param  {HTMLElement}  el           The element who's side being scrolled out of view is in question
- * @param  {String}       elSide       Side of the element in question ('top', 'left', 'right', 'bottom')
- * @param  {String}       parentSide   Side of the parent in question ('top', 'left', 'right', 'bottom')
- * @return {HTMLElement}               The parent scroll element that the el's side is scrolled past, or null if there is no such element
- */
 
+/**
+ * Returns the content rect of the element (bounding rect minus border and padding)
+ * @param {HTMLElement} el 
+ */
+function getContentRect(el) {
+  var rect = getRect(el);
+  var paddingLeft = parseInt(css(el, 'padding-left')),
+    paddingTop = parseInt(css(el, 'padding-top')),
+    paddingRight = parseInt(css(el, 'padding-right')),
+    paddingBottom = parseInt(css(el, 'padding-bottom'));
+  rect.top += paddingTop + parseInt(css(el, 'border-top-width'));
+  rect.left += paddingLeft + parseInt(css(el, 'border-left-width'));
+  // Client Width/Height includes padding only
+  rect.width = el.clientWidth - paddingLeft - paddingRight;
+  rect.height = el.clientHeight - paddingTop - paddingBottom;
+  rect.bottom = rect.top + rect.height;
+  rect.right = rect.left + rect.width;
+  return rect;
+}
 
+/**
+ * Checks if a side of an element is scrolled past a side of its parents
+ * @param  {HTMLElement}  el           The element who's side being scrolled out of view is in question
+ * @param  {String}       elSide       Side of the element in question ('top', 'left', 'right', 'bottom')
+ * @param  {String}       parentSide   Side of the parent in question ('top', 'left', 'right', 'bottom')
+ * @return {HTMLElement}               The parent scroll element that the el's side is scrolled past, or null if there is no such element
+ */
 function isScrolledPast(el, elSide, parentSide) {
   var parent = getParentAutoScrollElement(el, true),
-      elSideVal = getRect(el)[elSide];
-  /* jshint boss:true */
+    elSideVal = getRect(el)[elSide];
 
+  /* jshint boss:true */
   while (parent) {
     var parentSideVal = getRect(parent)[parentSide],
-        visible = void 0;
-
+      visible = void 0;
     if (parentSide === 'top' || parentSide === 'left') {
       visible = elSideVal >= parentSideVal;
     } else {
       visible = elSideVal <= parentSideVal;
     }
-
     if (!visible) return parent;
     if (parent === getWindowScrollingElement()) break;
     parent = getParentAutoScrollElement(parent, false);
   }
-
   return false;
 }
-/**
- * Gets nth child of el, ignoring hidden children, sortable's elements (does not ignore clone if it's visible)
- * and non-draggable elements
- * @param  {HTMLElement} el       The parent element
- * @param  {Number} childNum      The index of the child
- * @param  {Object} options       Parent Sortable's options
- * @return {HTMLElement}          The child at index childNum, or null if not found
- */
-
 
+/**
+ * Gets nth child of el, ignoring hidden children, sortable's elements (does not ignore clone if it's visible)
+ * and non-draggable elements
+ * @param  {HTMLElement} el       The parent element
+ * @param  {Number} childNum      The index of the child
+ * @param  {Object} options       Parent Sortable's options
+ * @return {HTMLElement}          The child at index childNum, or null if not found
+ */
 function getChild(el, childNum, options, includeDragEl) {
   var currentChild = 0,
-      i = 0,
-      children = el.children;
-
+    i = 0,
+    children = el.children;
   while (i < children.length) {
     if (children[i].style.display !== 'none' && children[i] !== Sortable.ghost && (includeDragEl || children[i] !== Sortable.dragged) && closest(children[i], options.draggable, el, false)) {
       if (currentChild === childNum) {
         return children[i];
       }
-
       currentChild++;
     }
-
     i++;
   }
-
   return null;
 }
-/**
- * Gets the last child in the el, ignoring ghostEl or invisible elements (clones)
- * @param  {HTMLElement} el       Parent element
- * @param  {selector} selector    Any other elements that should be ignored
- * @return {HTMLElement}          The last child, ignoring ghostEl
- */
-
 
+/**
+ * Gets the last child in the el, ignoring ghostEl or invisible elements (clones)
+ * @param  {HTMLElement} el       Parent element
+ * @param  {selector} selector    Any other elements that should be ignored
+ * @return {HTMLElement}          The last child, ignoring ghostEl
+ */
 function lastChild(el, selector) {
   var last = el.lastElementChild;
-
   while (last && (last === Sortable.ghost || css(last, 'display') === 'none' || selector && !matches(last, selector))) {
     last = last.previousElementSibling;
   }
-
   return last || null;
 }
-/**
- * Returns the index of an element within its parent for a selected set of
- * elements
- * @param  {HTMLElement} el
- * @param  {selector} selector
- * @return {number}
- */
-
 
+/**
+ * Returns the index of an element within its parent for a selected set of
+ * elements
+ * @param  {HTMLElement} el
+ * @param  {selector} selector
+ * @return {number}
+ */
 function index(el, selector) {
   var index = 0;
-
   if (!el || !el.parentNode) {
     return -1;
   }
-  /* jshint boss:true */
-
 
+  /* jshint boss:true */
   while (el = el.previousElementSibling) {
     if (el.nodeName.toUpperCase() !== 'TEMPLATE' && el !== Sortable.clone && (!selector || matches(el, selector))) {
       index++;
     }
   }
-
   return index;
 }
-/**
- * Returns the scroll offset of the given element, added with all the scroll offsets of parent elements.
- * The value is returned in real pixels.
- * @param  {HTMLElement} el
- * @return {Array}             Offsets in the format of [left, top]
- */
-
 
+/**
+ * Returns the scroll offset of the given element, added with all the scroll offsets of parent elements.
+ * The value is returned in real pixels.
+ * @param  {HTMLElement} el
+ * @return {Array}             Offsets in the format of [left, top]
+ */
 function getRelativeScrollOffset(el) {
   var offsetLeft = 0,
-      offsetTop = 0,
-      winScroller = getWindowScrollingElement();
-
+    offsetTop = 0,
+    winScroller = getWindowScrollingElement();
   if (el) {
     do {
       var elMatrix = matrix(el),
-          scaleX = elMatrix.a,
-          scaleY = elMatrix.d;
+        scaleX = elMatrix.a,
+        scaleY = elMatrix.d;
       offsetLeft += el.scrollLeft * scaleX;
       offsetTop += el.scrollTop * scaleY;
     } while (el !== winScroller && (el = el.parentNode));
   }
-
   return [offsetLeft, offsetTop];
 }
-/**
- * Returns the index of the object within the given array
- * @param  {Array} arr   Array that may or may not hold the object
- * @param  {Object} obj  An object that has a key-value pair unique to and identical to a key-value pair in the object you want to find
- * @return {Number}      The index of the object in the array, or -1
- */
-
 
+/**
+ * Returns the index of the object within the given array
+ * @param  {Array} arr   Array that may or may not hold the object
+ * @param  {Object} obj  An object that has a key-value pair unique to and identical to a key-value pair in the object you want to find
+ * @return {Number}      The index of the object in the array, or -1
+ */
 function indexOfObject(arr, obj) {
   for (var i in arr) {
     if (!arr.hasOwnProperty(i)) continue;
-
     for (var key in obj) {
       if (obj.hasOwnProperty(key) && obj[key] === arr[i][key]) return Number(i);
     }
   }
-
   return -1;
 }
-
 function getParentAutoScrollElement(el, includeSelf) {
   // skip to window
   if (!el || !el.getBoundingClientRect) return getWindowScrollingElement();
   var elem = el;
   var gotSelf = false;
-
   do {
     // we don't need to get elem css if it isn't even overflowing in the first place (performance)
     if (elem.clientWidth < elem.scrollWidth || elem.clientHeight < elem.scrollHeight) {
       var elemCSS = css(elem);
-
       if (elem.clientWidth < elem.scrollWidth && (elemCSS.overflowX == 'auto' || elemCSS.overflowX == 'scroll') || elem.clientHeight < elem.scrollHeight && (elemCSS.overflowY == 'auto' || elemCSS.overflowY == 'scroll')) {
         if (!elem.getBoundingClientRect || elem === document.body) return getWindowScrollingElement();
         if (gotSelf || includeSelf) return elem;
@@ -542,12 +469,9 @@ function getParentAutoScrollElement(el, includeSelf) {
       }
     }
     /* jshint boss:true */
-
   } while (elem = elem.parentNode);
-
   return getWindowScrollingElement();
 }
-
 function extend(dst, src) {
   if (dst && src) {
     for (var key in src) {
@@ -556,49 +480,39 @@ function extend(dst, src) {
       }
     }
   }
-
   return dst;
 }
-
 function isRectEqual(rect1, rect2) {
   return Math.round(rect1.top) === Math.round(rect2.top) && Math.round(rect1.left) === Math.round(rect2.left) && Math.round(rect1.height) === Math.round(rect2.height) && Math.round(rect1.width) === Math.round(rect2.width);
 }
-
 var _throttleTimeout;
-
 function throttle(callback, ms) {
   return function () {
     if (!_throttleTimeout) {
       var args = arguments,
-          _this = this;
-
+        _this = this;
       if (args.length === 1) {
         callback.call(_this, args[0]);
       } else {
         callback.apply(_this, args);
       }
-
       _throttleTimeout = setTimeout(function () {
         _throttleTimeout = void 0;
       }, ms);
     }
   };
 }
-
 function cancelThrottle() {
   clearTimeout(_throttleTimeout);
   _throttleTimeout = void 0;
 }
-
 function scrollBy(el, x, y) {
   el.scrollLeft += x;
   el.scrollTop += y;
 }
-
 function clone(el) {
   var Polymer = window.Polymer;
   var $ = window.jQuery || window.Zepto;
-
   if (Polymer && Polymer.dom) {
     return Polymer.dom(el).cloneNode(true);
   } else if ($) {
@@ -607,12 +521,11 @@ function clone(el) {
     return el.cloneNode(true);
   }
 }
-
 var expando = 'Sortable' + new Date().getTime();
 
 function AnimationStateManager() {
   var animationStates = [],
-      animationCallbackId;
+    animationCallbackId;
   return {
     captureAnimationState: function captureAnimationState() {
       animationStates = [];
@@ -624,19 +537,16 @@ function AnimationStateManager() {
           target: child,
           rect: getRect(child)
         });
+        var fromRect = _objectSpread2({}, animationStates[animationStates.length - 1].rect);
 
-        var fromRect = _objectSpread2({}, animationStates[animationStates.length - 1].rect); // If animating: compensate for current animation
-
-
+        // If animating: compensate for current animation
         if (child.thisAnimationDuration) {
           var childMatrix = matrix(child, true);
-
           if (childMatrix) {
             fromRect.top -= childMatrix.f;
             fromRect.left -= childMatrix.e;
           }
         }
-
         child.fromRect = fromRect;
       });
     },
@@ -650,54 +560,47 @@ function AnimationStateManager() {
     },
     animateAll: function animateAll(callback) {
       var _this = this;
-
       if (!this.options.animation) {
         clearTimeout(animationCallbackId);
         if (typeof callback === 'function') callback();
         return;
       }
-
       var animating = false,
-          animationTime = 0;
+        animationTime = 0;
       animationStates.forEach(function (state) {
         var time = 0,
-            target = state.target,
-            fromRect = target.fromRect,
-            toRect = getRect(target),
-            prevFromRect = target.prevFromRect,
-            prevToRect = target.prevToRect,
-            animatingRect = state.rect,
-            targetMatrix = matrix(target, true);
-
+          target = state.target,
+          fromRect = target.fromRect,
+          toRect = getRect(target),
+          prevFromRect = target.prevFromRect,
+          prevToRect = target.prevToRect,
+          animatingRect = state.rect,
+          targetMatrix = matrix(target, true);
         if (targetMatrix) {
           // Compensate for current animation
           toRect.top -= targetMatrix.f;
           toRect.left -= targetMatrix.e;
         }
-
         target.toRect = toRect;
-
         if (target.thisAnimationDuration) {
           // Could also check if animatingRect is between fromRect and toRect
-          if (isRectEqual(prevFromRect, toRect) && !isRectEqual(fromRect, toRect) && // Make sure animatingRect is on line between toRect & fromRect
+          if (isRectEqual(prevFromRect, toRect) && !isRectEqual(fromRect, toRect) &&
+          // Make sure animatingRect is on line between toRect & fromRect
           (animatingRect.top - toRect.top) / (animatingRect.left - toRect.left) === (fromRect.top - toRect.top) / (fromRect.left - toRect.left)) {
             // If returning to same place as started from animation and on same axis
             time = calculateRealTime(animatingRect, prevFromRect, prevToRect, _this.options);
           }
-        } // if fromRect != toRect: animate
-
+        }
 
+        // if fromRect != toRect: animate
         if (!isRectEqual(toRect, fromRect)) {
           target.prevFromRect = fromRect;
           target.prevToRect = toRect;
-
           if (!time) {
             time = _this.options.animation;
           }
-
           _this.animate(target, animatingRect, toRect, time);
         }
-
         if (time) {
           animating = true;
           animationTime = Math.max(animationTime, time);
@@ -713,7 +616,6 @@ function AnimationStateManager() {
         }
       });
       clearTimeout(animationCallbackId);
-
       if (!animating) {
         if (typeof callback === 'function') callback();
       } else {
@@ -721,7 +623,6 @@ function AnimationStateManager() {
           if (typeof callback === 'function') callback();
         }, animationTime);
       }
-
       animationStates = [];
     },
     animate: function animate(target, currentRect, toRect, duration) {
@@ -729,10 +630,10 @@ function AnimationStateManager() {
         css(target, 'transition', '');
         css(target, 'transform', '');
         var elMatrix = matrix(this.el),
-            scaleX = elMatrix && elMatrix.a,
-            scaleY = elMatrix && elMatrix.d,
-            translateX = (currentRect.left - toRect.left) / (scaleX || 1),
-            translateY = (currentRect.top - toRect.top) / (scaleY || 1);
+          scaleX = elMatrix && elMatrix.a,
+          scaleY = elMatrix && elMatrix.d,
+          translateX = (currentRect.left - toRect.left) / (scaleX || 1),
+          translateY = (currentRect.top - toRect.top) / (scaleY || 1);
         target.animatingX = !!translateX;
         target.animatingY = !!translateY;
         css(target, 'transform', 'translate3d(' + translateX + 'px,' + translateY + 'px,0)');
@@ -752,11 +653,9 @@ function AnimationStateManager() {
     }
   };
 }
-
 function repaint(target) {
   return target.offsetWidth;
 }
-
 function calculateRealTime(animatingRect, fromRect, toRect, options) {
   return Math.sqrt(Math.pow(fromRect.top - animatingRect.top, 2) + Math.pow(fromRect.left - animatingRect.left, 2)) / Math.sqrt(Math.pow(fromRect.top - toRect.top, 2) + Math.pow(fromRect.left - toRect.left, 2)) * options.animation;
 }
@@ -773,7 +672,6 @@ var PluginManager = {
         plugin[option] = defaults[option];
       }
     }
-
     plugins.forEach(function (p) {
       if (p.pluginName === plugin.pluginName) {
         throw "Sortable: Cannot mount plugin ".concat(plugin.pluginName, " more than once");
@@ -783,25 +681,22 @@ var PluginManager = {
   },
   pluginEvent: function pluginEvent(eventName, sortable, evt) {
     var _this = this;
-
     this.eventCanceled = false;
-
     evt.cancel = function () {
       _this.eventCanceled = true;
     };
-
     var eventNameGlobal = eventName + 'Global';
     plugins.forEach(function (plugin) {
-      if (!sortable[plugin.pluginName]) return; // Fire global events if it exists in this sortable
-
+      if (!sortable[plugin.pluginName]) return;
+      // Fire global events if it exists in this sortable
       if (sortable[plugin.pluginName][eventNameGlobal]) {
         sortable[plugin.pluginName][eventNameGlobal](_objectSpread2({
           sortable: sortable
         }, evt));
-      } // Only fire plugin event if plugin is enabled in this sortable,
-      // and plugin has event defined
-
+      }
 
+      // Only fire plugin event if plugin is enabled in this sortable,
+      // and plugin has event defined
       if (sortable.options[plugin.pluginName] && sortable[plugin.pluginName][eventName]) {
         sortable[plugin.pluginName][eventName](_objectSpread2({
           sortable: sortable
@@ -816,15 +711,14 @@ var PluginManager = {
       var initialized = new plugin(sortable, el, sortable.options);
       initialized.sortable = sortable;
       initialized.options = sortable.options;
-      sortable[pluginName] = initialized; // Add default options from plugin
+      sortable[pluginName] = initialized;
 
+      // Add default options from plugin
       _extends(defaults, initialized.defaults);
     });
-
     for (var option in sortable.options) {
       if (!sortable.options.hasOwnProperty(option)) continue;
       var modified = this.modifyOption(sortable, option, sortable.options[option]);
-
       if (typeof modified !== 'undefined') {
         sortable.options[option] = modified;
       }
@@ -834,7 +728,6 @@ var PluginManager = {
     var eventProperties = {};
     plugins.forEach(function (plugin) {
       if (typeof plugin.eventProperties !== 'function') return;
-
       _extends(eventProperties, plugin.eventProperties.call(sortable[plugin.pluginName], name));
     });
     return eventProperties;
@@ -843,8 +736,9 @@ var PluginManager = {
     var modifiedValue;
     plugins.forEach(function (plugin) {
       // Plugin must exist on the Sortable
-      if (!sortable[plugin.pluginName]) return; // If static option listener exists for this option, call in the context of the Sortable's instance of this plugin
+      if (!sortable[plugin.pluginName]) return;
 
+      // If static option listener exists for this option, call in the context of the Sortable's instance of this plugin
       if (plugin.optionListeners && typeof plugin.optionListeners[name] === 'function') {
         modifiedValue = plugin.optionListeners[name].call(sortable[plugin.pluginName], value);
       }
@@ -855,25 +749,25 @@ var PluginManager = {
 
 function dispatchEvent(_ref) {
   var sortable = _ref.sortable,
-      rootEl = _ref.rootEl,
-      name = _ref.name,
-      targetEl = _ref.targetEl,
-      cloneEl = _ref.cloneEl,
-      toEl = _ref.toEl,
-      fromEl = _ref.fromEl,
-      oldIndex = _ref.oldIndex,
-      newIndex = _ref.newIndex,
-      oldDraggableIndex = _ref.oldDraggableIndex,
-      newDraggableIndex = _ref.newDraggableIndex,
-      originalEvent = _ref.originalEvent,
-      putSortable = _ref.putSortable,
-      extraEventProperties = _ref.extraEventProperties;
+    rootEl = _ref.rootEl,
+    name = _ref.name,
+    targetEl = _ref.targetEl,
+    cloneEl = _ref.cloneEl,
+    toEl = _ref.toEl,
+    fromEl = _ref.fromEl,
+    oldIndex = _ref.oldIndex,
+    newIndex = _ref.newIndex,
+    oldDraggableIndex = _ref.oldDraggableIndex,
+    newDraggableIndex = _ref.newDraggableIndex,
+    originalEvent = _ref.originalEvent,
+    putSortable = _ref.putSortable,
+    extraEventProperties = _ref.extraEventProperties;
   sortable = sortable || rootEl && rootEl[expando];
   if (!sortable) return;
   var evt,
-      options = sortable.options,
-      onName = 'on' + name.charAt(0).toUpperCase() + name.substr(1); // Support for new CustomEvent feature
-
+    options = sortable.options,
+    onName = 'on' + name.charAt(0).toUpperCase() + name.substr(1);
+  // Support for new CustomEvent feature
   if (window.CustomEvent && !IE11OrLess && !Edge) {
     evt = new CustomEvent(name, {
       bubbles: true,
@@ -883,7 +777,6 @@ function dispatchEvent(_ref) {
     evt = document.createEvent('Event');
     evt.initEvent(name, true, true);
   }
-
   evt.to = toEl || rootEl;
   evt.from = fromEl || rootEl;
   evt.item = targetEl || rootEl;
@@ -894,29 +787,23 @@ function dispatchEvent(_ref) {
   evt.newDraggableIndex = newDraggableIndex;
   evt.originalEvent = originalEvent;
   evt.pullMode = putSortable ? putSortable.lastPutMode : undefined;
-
   var allEventProperties = _objectSpread2(_objectSpread2({}, extraEventProperties), PluginManager.getEventProperties(name, sortable));
-
   for (var option in allEventProperties) {
     evt[option] = allEventProperties[option];
   }
-
   if (rootEl) {
     rootEl.dispatchEvent(evt);
   }
-
   if (options[onName]) {
     options[onName].call(sortable, evt);
   }
 }
 
 var _excluded = ["evt"];
-
 var pluginEvent = function pluginEvent(eventName, sortable) {
   var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
-      originalEvent = _ref.evt,
-      data = _objectWithoutProperties(_ref, _excluded);
-
+    originalEvent = _ref.evt,
+    data = _objectWithoutProperties(_ref, _excluded);
   PluginManager.pluginEvent.bind(Sortable)(eventName, sortable, _objectSpread2({
     dragEl: dragEl,
     parentEl: parentEl,
@@ -951,7 +838,6 @@ var pluginEvent = function pluginEvent(eventName, sortable) {
     }
   }, data));
 };
-
 function _dispatchEvent(info) {
   dispatchEvent(_objectSpread2({
     putSortable: putSortable,
@@ -964,62 +850,61 @@ function _dispatchEvent(info) {
     newDraggableIndex: newDraggableIndex
   }, info));
 }
-
 var dragEl,
-    parentEl,
-    ghostEl,
-    rootEl,
-    nextEl,
-    lastDownEl,
-    cloneEl,
-    cloneHidden,
-    oldIndex,
-    newIndex,
-    oldDraggableIndex,
-    newDraggableIndex,
-    activeGroup,
-    putSortable,
-    awaitingDragStarted = false,
-    ignoreNextClick = false,
-    sortables = [],
-    tapEvt,
-    touchEvt,
-    lastDx,
-    lastDy,
-    tapDistanceLeft,
-    tapDistanceTop,
-    moved,
-    lastTarget,
-    lastDirection,
-    pastFirstInvertThresh = false,
-    isCircumstantialInvert = false,
-    targetMoveDistance,
-    // For positioning ghost absolutely
-ghostRelativeParent,
-    ghostRelativeParentInitialScroll = [],
-    // (left, top)
-_silent = false,
-    savedInputChecked = [];
-/** @const */
+  parentEl,
+  ghostEl,
+  rootEl,
+  nextEl,
+  lastDownEl,
+  cloneEl,
+  cloneHidden,
+  oldIndex,
+  newIndex,
+  oldDraggableIndex,
+  newDraggableIndex,
+  activeGroup,
+  putSortable,
+  awaitingDragStarted = false,
+  ignoreNextClick = false,
+  sortables = [],
+  tapEvt,
+  touchEvt,
+  lastDx,
+  lastDy,
+  tapDistanceLeft,
+  tapDistanceTop,
+  moved,
+  lastTarget,
+  lastDirection,
+  pastFirstInvertThresh = false,
+  isCircumstantialInvert = false,
+  targetMoveDistance,
+  // For positioning ghost absolutely
+  ghostRelativeParent,
+  ghostRelativeParentInitialScroll = [],
+  // (left, top)
+
+  _silent = false,
+  savedInputChecked = [];
 
+/** @const */
 var documentExists = typeof document !== 'undefined',
-    PositionGhostAbsolutely = IOS,
-    CSSFloatProperty = Edge || IE11OrLess ? 'cssFloat' : 'float',
-    // This will not pass for IE9, because IE9 DnD only works on anchors
-supportDraggable = documentExists && !ChromeForAndroid && !IOS && 'draggable' in document.createElement('div'),
-    supportCssPointerEvents = function () {
-  if (!documentExists) return; // false when <= IE11
-
-  if (IE11OrLess) {
-    return false;
-  }
-
-  var el = document.createElement('x');
-  el.style.cssText = 'pointer-events:auto';
-  return el.style.pointerEvents === 'auto';
-}(),
-    _detectDirection = function _detectDirection(el, options) {
-  var elCSS = css(el),
+  PositionGhostAbsolutely = IOS,
+  CSSFloatProperty = Edge || IE11OrLess ? 'cssFloat' : 'float',
+  // This will not pass for IE9, because IE9 DnD only works on anchors
+  supportDraggable = documentExists && !ChromeForAndroid && !IOS && 'draggable' in document.createElement('div'),
+  supportCssPointerEvents = function () {
+    if (!documentExists) return;
+    // false when <= IE11
+    if (IE11OrLess) {
+      return false;
+    }
+    var el = document.createElement('x');
+    el.style.cssText = 'pointer-events:auto';
+    return el.style.pointerEvents === 'auto';
+  }(),
+  _detectDirection = function _detectDirection(el, options) {
+    var elCSS = css(el),
       elWidth = parseInt(elCSS.width) - parseInt(elCSS.paddingLeft) - parseInt(elCSS.paddingRight) - parseInt(elCSS.borderLeftWidth) - parseInt(elCSS.borderRightWidth),
       child1 = getChild(el, 0, options),
       child2 = getChild(el, 1, options),
@@ -1027,102 +912,92 @@ supportDraggable = documentExists && !ChromeForAndroid && !IOS && 'draggable' in
       secondChildCSS = child2 && css(child2),
       firstChildWidth = firstChildCSS && parseInt(firstChildCSS.marginLeft) + parseInt(firstChildCSS.marginRight) + getRect(child1).width,
       secondChildWidth = secondChildCSS && parseInt(secondChildCSS.marginLeft) + parseInt(secondChildCSS.marginRight) + getRect(child2).width;
-
-  if (elCSS.display === 'flex') {
-    return elCSS.flexDirection === 'column' || elCSS.flexDirection === 'column-reverse' ? 'vertical' : 'horizontal';
-  }
-
-  if (elCSS.display === 'grid') {
-    return elCSS.gridTemplateColumns.split(' ').length <= 1 ? 'vertical' : 'horizontal';
-  }
-
-  if (child1 && firstChildCSS["float"] && firstChildCSS["float"] !== 'none') {
-    var touchingSideChild2 = firstChildCSS["float"] === 'left' ? 'left' : 'right';
-    return child2 && (secondChildCSS.clear === 'both' || secondChildCSS.clear === touchingSideChild2) ? 'vertical' : 'horizontal';
-  }
-
-  return child1 && (firstChildCSS.display === 'block' || firstChildCSS.display === 'flex' || firstChildCSS.display === 'table' || firstChildCSS.display === 'grid' || firstChildWidth >= elWidth && elCSS[CSSFloatProperty] === 'none' || child2 && elCSS[CSSFloatProperty] === 'none' && firstChildWidth + secondChildWidth > elWidth) ? 'vertical' : 'horizontal';
-},
-    _dragElInRowColumn = function _dragElInRowColumn(dragRect, targetRect, vertical) {
-  var dragElS1Opp = vertical ? dragRect.left : dragRect.top,
+    if (elCSS.display === 'flex') {
+      return elCSS.flexDirection === 'column' || elCSS.flexDirection === 'column-reverse' ? 'vertical' : 'horizontal';
+    }
+    if (elCSS.display === 'grid') {
+      return elCSS.gridTemplateColumns.split(' ').length <= 1 ? 'vertical' : 'horizontal';
+    }
+    if (child1 && firstChildCSS["float"] && firstChildCSS["float"] !== 'none') {
+      var touchingSideChild2 = firstChildCSS["float"] === 'left' ? 'left' : 'right';
+      return child2 && (secondChildCSS.clear === 'both' || secondChildCSS.clear === touchingSideChild2) ? 'vertical' : 'horizontal';
+    }
+    return child1 && (firstChildCSS.display === 'block' || firstChildCSS.display === 'flex' || firstChildCSS.display === 'table' || firstChildCSS.display === 'grid' || firstChildWidth >= elWidth && elCSS[CSSFloatProperty] === 'none' || child2 && elCSS[CSSFloatProperty] === 'none' && firstChildWidth + secondChildWidth > elWidth) ? 'vertical' : 'horizontal';
+  },
+  _dragElInRowColumn = function _dragElInRowColumn(dragRect, targetRect, vertical) {
+    var dragElS1Opp = vertical ? dragRect.left : dragRect.top,
       dragElS2Opp = vertical ? dragRect.right : dragRect.bottom,
       dragElOppLength = vertical ? dragRect.width : dragRect.height,
       targetS1Opp = vertical ? targetRect.left : targetRect.top,
       targetS2Opp = vertical ? targetRect.right : targetRect.bottom,
       targetOppLength = vertical ? targetRect.width : targetRect.height;
-  return dragElS1Opp === targetS1Opp || dragElS2Opp === targetS2Opp || dragElS1Opp + dragElOppLength / 2 === targetS1Opp + targetOppLength / 2;
-},
-
-/**
- * Detects first nearest empty sortable to X and Y position using emptyInsertThreshold.
- * @param  {Number} x      X position
- * @param  {Number} y      Y position
- * @return {HTMLElement}   Element of the first found nearest Sortable
- */
-_detectNearestEmptySortable = function _detectNearestEmptySortable(x, y) {
-  var ret;
-  sortables.some(function (sortable) {
-    var threshold = sortable[expando].options.emptyInsertThreshold;
-    if (!threshold || lastChild(sortable)) return;
-    var rect = getRect(sortable),
+    return dragElS1Opp === targetS1Opp || dragElS2Opp === targetS2Opp || dragElS1Opp + dragElOppLength / 2 === targetS1Opp + targetOppLength / 2;
+  },
+  /**
+   * Detects first nearest empty sortable to X and Y position using emptyInsertThreshold.
+   * @param  {Number} x      X position
+   * @param  {Number} y      Y position
+   * @return {HTMLElement}   Element of the first found nearest Sortable
+   */
+  _detectNearestEmptySortable = function _detectNearestEmptySortable(x, y) {
+    var ret;
+    sortables.some(function (sortable) {
+      var threshold = sortable[expando].options.emptyInsertThreshold;
+      if (!threshold || lastChild(sortable)) return;
+      var rect = getRect(sortable),
         insideHorizontally = x >= rect.left - threshold && x <= rect.right + threshold,
         insideVertically = y >= rect.top - threshold && y <= rect.bottom + threshold;
-
-    if (insideHorizontally && insideVertically) {
-      return ret = sortable;
-    }
-  });
-  return ret;
-},
-    _prepareGroup = function _prepareGroup(options) {
-  function toFn(value, pull) {
-    return function (to, from, dragEl, evt) {
-      var sameGroup = to.options.group.name && from.options.group.name && to.options.group.name === from.options.group.name;
-
-      if (value == null && (pull || sameGroup)) {
-        // Default pull value
-        // Default pull and put value if same group
-        return true;
-      } else if (value == null || value === false) {
-        return false;
-      } else if (pull && value === 'clone') {
-        return value;
-      } else if (typeof value === 'function') {
-        return toFn(value(to, from, dragEl, evt), pull)(to, from, dragEl, evt);
-      } else {
-        var otherGroup = (pull ? to : from).options.group.name;
-        return value === true || typeof value === 'string' && value === otherGroup || value.join && value.indexOf(otherGroup) > -1;
+      if (insideHorizontally && insideVertically) {
+        return ret = sortable;
       }
-    };
-  }
-
-  var group = {};
-  var originalGroup = options.group;
-
-  if (!originalGroup || _typeof(originalGroup) != 'object') {
-    originalGroup = {
-      name: originalGroup
-    };
-  }
-
-  group.name = originalGroup.name;
-  group.checkPull = toFn(originalGroup.pull, true);
-  group.checkPut = toFn(originalGroup.put);
-  group.revertClone = originalGroup.revertClone;
-  options.group = group;
-},
-    _hideGhostForTarget = function _hideGhostForTarget() {
-  if (!supportCssPointerEvents && ghostEl) {
-    css(ghostEl, 'display', 'none');
-  }
-},
-    _unhideGhostForTarget = function _unhideGhostForTarget() {
-  if (!supportCssPointerEvents && ghostEl) {
-    css(ghostEl, 'display', '');
-  }
-}; // #1184 fix - Prevent click event on fallback if dragged but item not changed position
-
+    });
+    return ret;
+  },
+  _prepareGroup = function _prepareGroup(options) {
+    function toFn(value, pull) {
+      return function (to, from, dragEl, evt) {
+        var sameGroup = to.options.group.name && from.options.group.name && to.options.group.name === from.options.group.name;
+        if (value == null && (pull || sameGroup)) {
+          // Default pull value
+          // Default pull and put value if same group
+          return true;
+        } else if (value == null || value === false) {
+          return false;
+        } else if (pull && value === 'clone') {
+          return value;
+        } else if (typeof value === 'function') {
+          return toFn(value(to, from, dragEl, evt), pull)(to, from, dragEl, evt);
+        } else {
+          var otherGroup = (pull ? to : from).options.group.name;
+          return value === true || typeof value === 'string' && value === otherGroup || value.join && value.indexOf(otherGroup) > -1;
+        }
+      };
+    }
+    var group = {};
+    var originalGroup = options.group;
+    if (!originalGroup || _typeof(originalGroup) != 'object') {
+      originalGroup = {
+        name: originalGroup
+      };
+    }
+    group.name = originalGroup.name;
+    group.checkPull = toFn(originalGroup.pull, true);
+    group.checkPut = toFn(originalGroup.put);
+    group.revertClone = originalGroup.revertClone;
+    options.group = group;
+  },
+  _hideGhostForTarget = function _hideGhostForTarget() {
+    if (!supportCssPointerEvents && ghostEl) {
+      css(ghostEl, 'display', 'none');
+    }
+  },
+  _unhideGhostForTarget = function _unhideGhostForTarget() {
+    if (!supportCssPointerEvents && ghostEl) {
+      css(ghostEl, 'display', '');
+    }
+  };
 
+// #1184 fix - Prevent click event on fallback if dragged but item not changed position
 if (documentExists && !ChromeForAndroid) {
   document.addEventListener('click', function (evt) {
     if (ignoreNextClick) {
@@ -1134,53 +1009,44 @@ if (documentExists && !ChromeForAndroid) {
     }
   }, true);
 }
-
 var nearestEmptyInsertDetectEvent = function nearestEmptyInsertDetectEvent(evt) {
   if (dragEl) {
     evt = evt.touches ? evt.touches[0] : evt;
-
     var nearest = _detectNearestEmptySortable(evt.clientX, evt.clientY);
-
     if (nearest) {
       // Create imitation event
       var event = {};
-
       for (var i in evt) {
         if (evt.hasOwnProperty(i)) {
           event[i] = evt[i];
         }
       }
-
       event.target = event.rootEl = nearest;
       event.preventDefault = void 0;
       event.stopPropagation = void 0;
-
       nearest[expando]._onDragOver(event);
     }
   }
 };
-
 var _checkOutsideTargetEl = function _checkOutsideTargetEl(evt) {
   if (dragEl) {
     dragEl.parentNode[expando]._isOutsideThisEl(evt.target);
   }
 };
+
 /**
  * @class  Sortable
  * @param  {HTMLElement}  el
  * @param  {Object}       [options]
  */
-
-
 function Sortable(el, options) {
   if (!(el && el.nodeType && el.nodeType === 1)) {
     throw "Sortable: `el` must be an HTMLElement, not ".concat({}.toString.call(el));
   }
-
   this.el = el; // root element
+  this.options = options = _extends({}, options);
 
-  this.options = options = _extends({}, options); // Export instance
-
+  // Export instance
   el[expando] = this;
   var defaults = {
     group: null,
@@ -1227,52 +1093,48 @@ function Sortable(el, options) {
     supportPointer: Sortable.supportPointer !== false && 'PointerEvent' in window && !Safari,
     emptyInsertThreshold: 5
   };
-  PluginManager.initializePlugins(this, el, defaults); // Set default options
+  PluginManager.initializePlugins(this, el, defaults);
 
+  // Set default options
   for (var name in defaults) {
     !(name in options) && (options[name] = defaults[name]);
   }
+  _prepareGroup(options);
 
-  _prepareGroup(options); // Bind all private methods
-
-
+  // Bind all private methods
   for (var fn in this) {
     if (fn.charAt(0) === '_' && typeof this[fn] === 'function') {
       this[fn] = this[fn].bind(this);
     }
-  } // Setup drag mode
-
+  }
 
+  // Setup drag mode
   this.nativeDraggable = options.forceFallback ? false : supportDraggable;
-
   if (this.nativeDraggable) {
     // Touch start threshold cannot be greater than the native dragstart threshold
     this.options.touchStartThreshold = 1;
-  } // Bind events
-
+  }
 
+  // Bind events
   if (options.supportPointer) {
     on(el, 'pointerdown', this._onTapStart);
   } else {
     on(el, 'mousedown', this._onTapStart);
     on(el, 'touchstart', this._onTapStart);
   }
-
   if (this.nativeDraggable) {
     on(el, 'dragover', this);
     on(el, 'dragenter', this);
   }
+  sortables.push(this.el);
 
-  sortables.push(this.el); // Restore sorting
-
-  options.store && options.store.get && this.sort(options.store.get(this) || []); // Add animation state manager
+  // Restore sorting
+  options.store && options.store.get && this.sort(options.store.get(this) || []);
 
+  // Add animation state manager
   _extends(this, AnimationStateManager());
 }
-
-Sortable.prototype =
-/** @lends Sortable.prototype */
-{
+Sortable.prototype = /** @lends Sortable.prototype */{
   constructor: Sortable,
   _isOutsideThisEl: function _isOutsideThisEl(target) {
     if (!this.el.contains(target) && target !== this.el) {
@@ -1282,57 +1144,50 @@ Sortable.prototype =
   _getDirection: function _getDirection(evt, target) {
     return typeof this.options.direction === 'function' ? this.options.direction.call(this, evt, target, dragEl) : this.options.direction;
   },
-  _onTapStart: function _onTapStart(
-  /** Event|TouchEvent */
-  evt) {
+  _onTapStart: function _onTapStart( /** Event|TouchEvent */evt) {
     if (!evt.cancelable) return;
-
     var _this = this,
-        el = this.el,
-        options = this.options,
-        preventOnFilter = options.preventOnFilter,
-        type = evt.type,
-        touch = evt.touches && evt.touches[0] || evt.pointerType && evt.pointerType === 'touch' && evt,
-        target = (touch || evt).target,
-        originalTarget = evt.target.shadowRoot && (evt.path && evt.path[0] || evt.composedPath && evt.composedPath()[0]) || target,
-        filter = options.filter;
-
-    _saveInputCheckedState(el); // Don't trigger start event when an element is been dragged, otherwise the evt.oldindex always wrong when set option.group.
-
-
+      el = this.el,
+      options = this.options,
+      preventOnFilter = options.preventOnFilter,
+      type = evt.type,
+      touch = evt.touches && evt.touches[0] || evt.pointerType && evt.pointerType === 'touch' && evt,
+      target = (touch || evt).target,
+      originalTarget = evt.target.shadowRoot && (evt.path && evt.path[0] || evt.composedPath && evt.composedPath()[0]) || target,
+      filter = options.filter;
+    _saveInputCheckedState(el);
+
+    // Don't trigger start event when an element is been dragged, otherwise the evt.oldindex always wrong when set option.group.
     if (dragEl) {
       return;
     }
-
     if (/mousedown|pointerdown/.test(type) && evt.button !== 0 || options.disabled) {
       return; // only left button and enabled
-    } // cancel dnd if original target is content editable
-
+    }
 
+    // cancel dnd if original target is content editable
     if (originalTarget.isContentEditable) {
       return;
-    } // Safari ignores further event handling after mousedown
-
+    }
 
+    // Safari ignores further event handling after mousedown
     if (!this.nativeDraggable && Safari && target && target.tagName.toUpperCase() === 'SELECT') {
       return;
     }
-
     target = closest(target, options.draggable, el, false);
-
     if (target && target.animated) {
       return;
     }
-
     if (lastDownEl === target) {
       // Ignoring duplicate `down`
       return;
-    } // Get the index of the dragged element within its parent
-
+    }
 
+    // Get the index of the dragged element within its parent
     oldIndex = index(target);
-    oldDraggableIndex = index(target, options.draggable); // Check filter
+    oldDraggableIndex = index(target, options.draggable);
 
+    // Check filter
     if (typeof filter === 'function') {
       if (filter.call(this, evt, target, this)) {
         _dispatchEvent({
@@ -1343,7 +1198,6 @@ Sortable.prototype =
           toEl: el,
           fromEl: el
         });
-
         pluginEvent('filter', _this, {
           evt: evt
         });
@@ -1353,7 +1207,6 @@ Sortable.prototype =
     } else if (filter) {
       filter = filter.split(',').some(function (criteria) {
         criteria = closest(originalTarget, criteria.trim(), el, false);
-
         if (criteria) {
           _dispatchEvent({
             sortable: _this,
@@ -1363,40 +1216,30 @@ Sortable.prototype =
             fromEl: el,
             toEl: el
           });
-
           pluginEvent('filter', _this, {
             evt: evt
           });
           return true;
         }
       });
-
       if (filter) {
         preventOnFilter && evt.cancelable && evt.preventDefault();
         return; // cancel dnd
       }
     }
-
     if (options.handle && !closest(originalTarget, options.handle, el, false)) {
       return;
-    } // Prepare `dragstart`
-
+    }
 
+    // Prepare `dragstart`
     this._prepareDragStart(evt, touch, target);
   },
-  _prepareDragStart: function _prepareDragStart(
-  /** Event */
-  evt,
-  /** Touch */
-  touch,
-  /** HTMLElement */
-  target) {
+  _prepareDragStart: function _prepareDragStart( /** Event */evt, /** Touch */touch, /** HTMLElement */target) {
     var _this = this,
-        el = _this.el,
-        options = _this.options,
-        ownerDocument = el.ownerDocument,
-        dragStartFn;
-
+      el = _this.el,
+      options = _this.options,
+      ownerDocument = el.ownerDocument,
+      dragStartFn;
     if (target && !dragEl && target.parentNode === el) {
       var dragRect = getRect(target);
       rootEl = el;
@@ -1416,41 +1259,36 @@ Sortable.prototype =
       this._lastX = (touch || evt).clientX;
       this._lastY = (touch || evt).clientY;
       dragEl.style['will-change'] = 'all';
-
       dragStartFn = function dragStartFn() {
         pluginEvent('delayEnded', _this, {
           evt: evt
         });
-
         if (Sortable.eventCanceled) {
           _this._onDrop();
-
           return;
-        } // Delayed drag has been triggered
+        }
+        // Delayed drag has been triggered
         // we can re-enable the events: touchmove/mousemove
-
-
         _this._disableDelayedDragEvents();
-
         if (!FireFox && _this.nativeDraggable) {
           dragEl.draggable = true;
-        } // Bind the events: dragstart/dragend
-
-
-        _this._triggerDragStart(evt, touch); // Drag start event
+        }
 
+        // Bind the events: dragstart/dragend
+        _this._triggerDragStart(evt, touch);
 
+        // Drag start event
         _dispatchEvent({
           sortable: _this,
           name: 'choose',
           originalEvent: evt
-        }); // Chosen item
-
+        });
 
+        // Chosen item
         toggleClass(dragEl, options.chosenClass, true);
-      }; // Disable "draggable"
-
+      };
 
+      // Disable "draggable"
       options.ignore.split(',').forEach(function (criteria) {
         find(dragEl, criteria.trim(), _disableDraggable);
       });
@@ -1459,27 +1297,26 @@ Sortable.prototype =
       on(ownerDocument, 'touchmove', nearestEmptyInsertDetectEvent);
       on(ownerDocument, 'mouseup', _this._onDrop);
       on(ownerDocument, 'touchend', _this._onDrop);
-      on(ownerDocument, 'touchcancel', _this._onDrop); // Make dragEl draggable (must be before delay for FireFox)
+      on(ownerDocument, 'touchcancel', _this._onDrop);
 
+      // Make dragEl draggable (must be before delay for FireFox)
       if (FireFox && this.nativeDraggable) {
         this.options.touchStartThreshold = 4;
         dragEl.draggable = true;
       }
-
       pluginEvent('delayStart', this, {
         evt: evt
-      }); // Delay is impossible for native DnD in Edge or IE
+      });
 
+      // Delay is impossible for native DnD in Edge or IE
       if (options.delay && (!options.delayOnTouchOnly || touch) && (!this.nativeDraggable || !(Edge || IE11OrLess))) {
         if (Sortable.eventCanceled) {
           this._onDrop();
-
           return;
-        } // If the user moves the pointer or let go the click or touch
+        }
+        // If the user moves the pointer or let go the click or touch
         // before the delay has been reached:
         // disable the delayed drag
-
-
         on(ownerDocument, 'mouseup', _this._disableDelayedDrag);
         on(ownerDocument, 'touchend', _this._disableDelayedDrag);
         on(ownerDocument, 'touchcancel', _this._disableDelayedDrag);
@@ -1492,11 +1329,8 @@ Sortable.prototype =
       }
     }
   },
-  _delayedDragTouchMoveHandler: function _delayedDragTouchMoveHandler(
-  /** TouchEvent|PointerEvent **/
-  e) {
+  _delayedDragTouchMoveHandler: function _delayedDragTouchMoveHandler( /** TouchEvent|PointerEvent **/e) {
     var touch = e.touches ? e.touches[0] : e;
-
     if (Math.max(Math.abs(touch.clientX - this._lastX), Math.abs(touch.clientY - this._lastY)) >= Math.floor(this.options.touchStartThreshold / (this.nativeDraggable && window.devicePixelRatio || 1))) {
       this._disableDelayedDrag();
     }
@@ -1504,7 +1338,6 @@ Sortable.prototype =
   _disableDelayedDrag: function _disableDelayedDrag() {
     dragEl && _disableDraggable(dragEl);
     clearTimeout(this._dragStartTimer);
-
     this._disableDelayedDragEvents();
   },
   _disableDelayedDragEvents: function _disableDelayedDragEvents() {
@@ -1516,13 +1349,8 @@ Sortable.prototype =
     off(ownerDocument, 'touchmove', this._delayedDragTouchMoveHandler);
     off(ownerDocument, 'pointermove', this._delayedDragTouchMoveHandler);
   },
-  _triggerDragStart: function _triggerDragStart(
-  /** Event */
-  evt,
-  /** Touch */
-  touch) {
+  _triggerDragStart: function _triggerDragStart( /** Event */evt, /** Touch */touch) {
     touch = touch || evt.pointerType == 'touch' && evt;
-
     if (!this.nativeDraggable || touch) {
       if (this.options.supportPointer) {
         on(document, 'pointermove', this._onTouchMove);
@@ -1535,7 +1363,6 @@ Sortable.prototype =
       on(dragEl, 'dragend', this);
       on(rootEl, 'dragstart', this._onDragStart);
     }
-
     try {
       if (document.selection) {
         // Timeout neccessary for IE9
@@ -1548,25 +1375,23 @@ Sortable.prototype =
     } catch (err) {}
   },
   _dragStarted: function _dragStarted(fallback, evt) {
-
     awaitingDragStarted = false;
-
     if (rootEl && dragEl) {
       pluginEvent('dragStarted', this, {
         evt: evt
       });
-
       if (this.nativeDraggable) {
         on(document, 'dragover', _checkOutsideTargetEl);
       }
+      var options = this.options;
 
-      var options = this.options; // Apply effect
-
+      // Apply effect
       !fallback && toggleClass(dragEl, options.dragClass, false);
       toggleClass(dragEl, options.ghostClass, true);
       Sortable.active = this;
-      fallback && this._appendGhost(); // Drag start event
+      fallback && this._appendGhost();
 
+      // Drag start event
       _dispatchEvent({
         sortable: this,
         name: 'start',
@@ -1580,20 +1405,15 @@ Sortable.prototype =
     if (touchEvt) {
       this._lastX = touchEvt.clientX;
       this._lastY = touchEvt.clientY;
-
       _hideGhostForTarget();
-
       var target = document.elementFromPoint(touchEvt.clientX, touchEvt.clientY);
       var parent = target;
-
       while (target && target.shadowRoot) {
         target = target.shadowRoot.elementFromPoint(touchEvt.clientX, touchEvt.clientY);
         if (target === parent) break;
         parent = target;
       }
-
       dragEl.parentNode[expando]._isOutsideThisEl(target);
-
       if (parent) {
         do {
           if (parent[expando]) {
@@ -1604,44 +1424,37 @@ Sortable.prototype =
               target: target,
               rootEl: parent
             });
-
             if (inserted && !this.options.dragoverBubble) {
               break;
             }
           }
-
           target = parent; // store last element
         }
-        /* jshint boss:true */
-        while (parent = parent.parentNode);
+        /* jshint boss:true */ while (parent = parent.parentNode);
       }
-
       _unhideGhostForTarget();
     }
   },
-  _onTouchMove: function _onTouchMove(
-  /**TouchEvent*/
-  evt) {
+  _onTouchMove: function _onTouchMove( /**TouchEvent*/evt) {
     if (tapEvt) {
       var options = this.options,
-          fallbackTolerance = options.fallbackTolerance,
-          fallbackOffset = options.fallbackOffset,
-          touch = evt.touches ? evt.touches[0] : evt,
-          ghostMatrix = ghostEl && matrix(ghostEl, true),
-          scaleX = ghostEl && ghostMatrix && ghostMatrix.a,
-          scaleY = ghostEl && ghostMatrix && ghostMatrix.d,
-          relativeScrollOffset = PositionGhostAbsolutely && ghostRelativeParent && getRelativeScrollOffset(ghostRelativeParent),
-          dx = (touch.clientX - tapEvt.clientX + fallbackOffset.x) / (scaleX || 1) + (relativeScrollOffset ? relativeScrollOffset[0] - ghostRelativeParentInitialScroll[0] : 0) / (scaleX || 1),
-          dy = (touch.clientY - tapEvt.clientY + fallbackOffset.y) / (scaleY || 1) + (relativeScrollOffset ? relativeScrollOffset[1] - ghostRelativeParentInitialScroll[1] : 0) / (scaleY || 1); // only set the status to dragging, when we are actually dragging
-
+        fallbackTolerance = options.fallbackTolerance,
+        fallbackOffset = options.fallbackOffset,
+        touch = evt.touches ? evt.touches[0] : evt,
+        ghostMatrix = ghostEl && matrix(ghostEl, true),
+        scaleX = ghostEl && ghostMatrix && ghostMatrix.a,
+        scaleY = ghostEl && ghostMatrix && ghostMatrix.d,
+        relativeScrollOffset = PositionGhostAbsolutely && ghostRelativeParent && getRelativeScrollOffset(ghostRelativeParent),
+        dx = (touch.clientX - tapEvt.clientX + fallbackOffset.x) / (scaleX || 1) + (relativeScrollOffset ? relativeScrollOffset[0] - ghostRelativeParentInitialScroll[0] : 0) / (scaleX || 1),
+        dy = (touch.clientY - tapEvt.clientY + fallbackOffset.y) / (scaleY || 1) + (relativeScrollOffset ? relativeScrollOffset[1] - ghostRelativeParentInitialScroll[1] : 0) / (scaleY || 1);
+
+      // only set the status to dragging, when we are actually dragging
       if (!Sortable.active && !awaitingDragStarted) {
         if (fallbackTolerance && Math.max(Math.abs(touch.clientX - this._lastX), Math.abs(touch.clientY - this._lastY)) < fallbackTolerance) {
           return;
         }
-
         this._onDragStart(evt, true);
       }
-
       if (ghostEl) {
         if (ghostMatrix) {
           ghostMatrix.e += dx - (lastDx || 0);
@@ -1656,7 +1469,6 @@ Sortable.prototype =
             f: dy
           };
         }
-
         var cssMatrix = "matrix(".concat(ghostMatrix.a, ",").concat(ghostMatrix.b, ",").concat(ghostMatrix.c, ",").concat(ghostMatrix.d, ",").concat(ghostMatrix.e, ",").concat(ghostMatrix.f, ")");
         css(ghostEl, 'webkitTransform', cssMatrix);
         css(ghostEl, 'mozTransform', cssMatrix);
@@ -1666,7 +1478,6 @@ Sortable.prototype =
         lastDy = dy;
         touchEvt = touch;
       }
-
       evt.cancelable && evt.preventDefault();
     }
   },
@@ -1675,17 +1486,16 @@ Sortable.prototype =
     // Not being adjusted for
     if (!ghostEl) {
       var container = this.options.fallbackOnBody ? document.body : rootEl,
-          rect = getRect(dragEl, true, PositionGhostAbsolutely, true, container),
-          options = this.options; // Position absolutely
+        rect = getRect(dragEl, true, PositionGhostAbsolutely, true, container),
+        options = this.options;
 
+      // Position absolutely
       if (PositionGhostAbsolutely) {
         // Get relatively positioned parent
         ghostRelativeParent = container;
-
         while (css(ghostRelativeParent, 'position') === 'static' && css(ghostRelativeParent, 'transform') === 'none' && ghostRelativeParent !== document) {
           ghostRelativeParent = ghostRelativeParent.parentNode;
         }
-
         if (ghostRelativeParent !== document.body && ghostRelativeParent !== document.documentElement) {
           if (ghostRelativeParent === document) ghostRelativeParent = getWindowScrollingElement();
           rect.top += ghostRelativeParent.scrollTop;
@@ -1693,10 +1503,8 @@ Sortable.prototype =
         } else {
           ghostRelativeParent = getWindowScrollingElement();
         }
-
         ghostRelativeParentInitialScroll = getRelativeScrollOffset(ghostRelativeParent);
       }
-
       ghostEl = dragEl.cloneNode(true);
       toggleClass(ghostEl, options.ghostClass, false);
       toggleClass(ghostEl, options.fallbackClass, true);
@@ -1714,62 +1522,50 @@ Sortable.prototype =
       css(ghostEl, 'zIndex', '100000');
       css(ghostEl, 'pointerEvents', 'none');
       Sortable.ghost = ghostEl;
-      container.appendChild(ghostEl); // Set transform-origin
+      container.appendChild(ghostEl);
 
+      // Set transform-origin
       css(ghostEl, 'transform-origin', tapDistanceLeft / parseInt(ghostEl.style.width) * 100 + '% ' + tapDistanceTop / parseInt(ghostEl.style.height) * 100 + '%');
     }
   },
-  _onDragStart: function _onDragStart(
-  /**Event*/
-  evt,
-  /**boolean*/
-  fallback) {
+  _onDragStart: function _onDragStart( /**Event*/evt, /**boolean*/fallback) {
     var _this = this;
-
     var dataTransfer = evt.dataTransfer;
     var options = _this.options;
     pluginEvent('dragStart', this, {
       evt: evt
     });
-
     if (Sortable.eventCanceled) {
       this._onDrop();
-
       return;
     }
-
     pluginEvent('setupClone', this);
-
     if (!Sortable.eventCanceled) {
       cloneEl = clone(dragEl);
       cloneEl.removeAttribute("id");
       cloneEl.draggable = false;
       cloneEl.style['will-change'] = '';
-
       this._hideClone();
-
       toggleClass(cloneEl, this.options.chosenClass, false);
       Sortable.clone = cloneEl;
-    } // #1143: IFrame support workaround
-
+    }
 
+    // #1143: IFrame support workaround
     _this.cloneId = _nextTick(function () {
       pluginEvent('clone', _this);
       if (Sortable.eventCanceled) return;
-
       if (!_this.options.removeCloneOnHide) {
         rootEl.insertBefore(cloneEl, dragEl);
       }
-
       _this._hideClone();
-
       _dispatchEvent({
         sortable: _this,
         name: 'clone'
       });
     });
-    !fallback && toggleClass(dragEl, options.dragClass, true); // Set proper drop events
+    !fallback && toggleClass(dragEl, options.dragClass, true);
 
+    // Set proper drop events
     if (fallback) {
       ignoreNextClick = true;
       _this._loopId = setInterval(_this._emulateDragOver, 50);
@@ -1778,47 +1574,40 @@ Sortable.prototype =
       off(document, 'mouseup', _this._onDrop);
       off(document, 'touchend', _this._onDrop);
       off(document, 'touchcancel', _this._onDrop);
-
       if (dataTransfer) {
         dataTransfer.effectAllowed = 'move';
         options.setData && options.setData.call(_this, dataTransfer, dragEl);
       }
+      on(document, 'drop', _this);
 
-      on(document, 'drop', _this); // #1276 fix:
-
+      // #1276 fix:
       css(dragEl, 'transform', 'translateZ(0)');
     }
-
     awaitingDragStarted = true;
     _this._dragStartId = _nextTick(_this._dragStarted.bind(_this, fallback, evt));
     on(document, 'selectstart', _this);
     moved = true;
-
     if (Safari) {
       css(document.body, 'user-select', 'none');
     }
   },
   // Returns true - if no further action is needed (either inserted or another condition)
-  _onDragOver: function _onDragOver(
-  /**Event*/
-  evt) {
+  _onDragOver: function _onDragOver( /**Event*/evt) {
     var el = this.el,
-        target = evt.target,
-        dragRect,
-        targetRect,
-        revert,
-        options = this.options,
-        group = options.group,
-        activeSortable = Sortable.active,
-        isOwner = activeGroup === group,
-        canSort = options.sort,
-        fromSortable = putSortable || activeSortable,
-        vertical,
-        _this = this,
-        completedFired = false;
-
+      target = evt.target,
+      dragRect,
+      targetRect,
+      revert,
+      options = this.options,
+      group = options.group,
+      activeSortable = Sortable.active,
+      isOwner = activeGroup === group,
+      canSort = options.sort,
+      fromSortable = putSortable || activeSortable,
+      vertical,
+      _this = this,
+      completedFired = false;
     if (_silent) return;
-
     function dragOverEvent(name, extra) {
       pluginEvent(name, _this, _objectSpread2({
         evt: evt,
@@ -1836,25 +1625,22 @@ Sortable.prototype =
         },
         changed: changed
       }, extra));
-    } // Capture animation state
-
+    }
 
+    // Capture animation state
     function capture() {
       dragOverEvent('dragOverAnimationCapture');
-
       _this.captureAnimationState();
-
       if (_this !== fromSortable) {
         fromSortable.captureAnimationState();
       }
-    } // Return invocation when dragEl is inserted (or completed)
-
+    }
 
+    // Return invocation when dragEl is inserted (or completed)
     function completed(insertion) {
       dragOverEvent('dragOverCompleted', {
         insertion: insertion
       });
-
       if (insertion) {
         // Clones must be hidden before folding animation to capture dragRectAbsolute properly
         if (isOwner) {
@@ -1862,57 +1648,51 @@ Sortable.prototype =
         } else {
           activeSortable._showClone(_this);
         }
-
         if (_this !== fromSortable) {
           // Set ghost class to new sortable's ghost class
           toggleClass(dragEl, putSortable ? putSortable.options.ghostClass : activeSortable.options.ghostClass, false);
           toggleClass(dragEl, options.ghostClass, true);
         }
-
         if (putSortable !== _this && _this !== Sortable.active) {
           putSortable = _this;
         } else if (_this === Sortable.active && putSortable) {
           putSortable = null;
-        } // Animation
-
+        }
 
+        // Animation
         if (fromSortable === _this) {
           _this._ignoreWhileAnimating = target;
         }
-
         _this.animateAll(function () {
           dragOverEvent('dragOverAnimationComplete');
           _this._ignoreWhileAnimating = null;
         });
-
         if (_this !== fromSortable) {
           fromSortable.animateAll();
           fromSortable._ignoreWhileAnimating = null;
         }
-      } // Null lastTarget if it is not inside a previously swapped element
-
+      }
 
+      // Null lastTarget if it is not inside a previously swapped element
       if (target === dragEl && !dragEl.animated || target === el && !target.animated) {
         lastTarget = null;
-      } // no bubbling and not fallback
-
+      }
 
+      // no bubbling and not fallback
       if (!options.dragoverBubble && !evt.rootEl && target !== document) {
-        dragEl.parentNode[expando]._isOutsideThisEl(evt.target); // Do not detect for empty insert if already inserted
-
+        dragEl.parentNode[expando]._isOutsideThisEl(evt.target);
 
+        // Do not detect for empty insert if already inserted
         !insertion && nearestEmptyInsertDetectEvent(evt);
       }
-
       !options.dragoverBubble && evt.stopPropagation && evt.stopPropagation();
       return completedFired = true;
-    } // Call when dragEl has been inserted
-
+    }
 
+    // Call when dragEl has been inserted
     function changed() {
       newIndex = index(dragEl);
       newDraggableIndex = index(dragEl, options.draggable);
-
       _dispatchEvent({
         sortable: _this,
         name: 'change',
@@ -1922,37 +1702,27 @@ Sortable.prototype =
         originalEvent: evt
       });
     }
-
     if (evt.preventDefault !== void 0) {
       evt.cancelable && evt.preventDefault();
     }
-
     target = closest(target, options.draggable, el, true);
     dragOverEvent('dragOver');
     if (Sortable.eventCanceled) return completedFired;
-
     if (dragEl.contains(evt.target) || target.animated && target.animatingX && target.animatingY || _this._ignoreWhileAnimating === target) {
       return completed(false);
     }
-
     ignoreNextClick = false;
-
     if (activeSortable && !options.disabled && (isOwner ? canSort || (revert = parentEl !== rootEl) // Reverting item into the original list
     : putSortable === this || (this.lastPutMode = activeGroup.checkPull(this, activeSortable, dragEl, evt)) && group.checkPut(this, activeSortable, dragEl, evt))) {
       vertical = this._getDirection(evt, target) === 'vertical';
       dragRect = getRect(dragEl);
       dragOverEvent('dragOverValid');
       if (Sortable.eventCanceled) return completedFired;
-
       if (revert) {
         parentEl = rootEl; // actualization
-
         capture();
-
         this._hideClone();
-
         dragOverEvent('revert');
-
         if (!Sortable.eventCanceled) {
           if (nextEl) {
             rootEl.insertBefore(dragEl, nextEl);
@@ -1960,38 +1730,32 @@ Sortable.prototype =
             rootEl.appendChild(dragEl);
           }
         }
-
         return completed(true);
       }
-
       var elLastChild = lastChild(el, options.draggable);
-
       if (!elLastChild || _ghostIsLast(evt, vertical, this) && !elLastChild.animated) {
         // Insert to end of list
+
         // If already at end of list: Do not insert
         if (elLastChild === dragEl) {
           return completed(false);
-        } // if there is a last element, it is the target
-
+        }
 
+        // if there is a last element, it is the target
         if (elLastChild && el === evt.target) {
           target = elLastChild;
         }
-
         if (target) {
           targetRect = getRect(target);
         }
-
         if (_onMove(rootEl, el, dragEl, dragRect, target, targetRect, evt, !!target) !== false) {
           capture();
-
           if (elLastChild && elLastChild.nextSibling) {
             // the last draggable element is not the last node
             el.insertBefore(dragEl, elLastChild.nextSibling);
           } else {
             el.appendChild(dragEl);
           }
-
           parentEl = el; // actualization
 
           changed();
@@ -2000,14 +1764,11 @@ Sortable.prototype =
       } else if (elLastChild && _ghostIsFirst(evt, vertical, this)) {
         // Insert to start of list
         var firstChild = getChild(el, 0, options, true);
-
         if (firstChild === dragEl) {
           return completed(false);
         }
-
         target = firstChild;
         targetRect = getRect(target);
-
         if (_onMove(rootEl, el, dragEl, dragRect, target, targetRect, evt, false) !== false) {
           capture();
           el.insertBefore(dragEl, firstChild);
@@ -2019,82 +1780,68 @@ Sortable.prototype =
       } else if (target.parentNode === el) {
         targetRect = getRect(target);
         var direction = 0,
-            targetBeforeFirstSwap,
-            differentLevel = dragEl.parentNode !== el,
-            differentRowCol = !_dragElInRowColumn(dragEl.animated && dragEl.toRect || dragRect, target.animated && target.toRect || targetRect, vertical),
-            side1 = vertical ? 'top' : 'left',
-            scrolledPastTop = isScrolledPast(target, 'top', 'top') || isScrolledPast(dragEl, 'top', 'top'),
-            scrollBefore = scrolledPastTop ? scrolledPastTop.scrollTop : void 0;
-
+          targetBeforeFirstSwap,
+          differentLevel = dragEl.parentNode !== el,
+          differentRowCol = !_dragElInRowColumn(dragEl.animated && dragEl.toRect || dragRect, target.animated && target.toRect || targetRect, vertical),
+          side1 = vertical ? 'top' : 'left',
+          scrolledPastTop = isScrolledPast(target, 'top', 'top') || isScrolledPast(dragEl, 'top', 'top'),
+          scrollBefore = scrolledPastTop ? scrolledPastTop.scrollTop : void 0;
         if (lastTarget !== target) {
           targetBeforeFirstSwap = targetRect[side1];
           pastFirstInvertThresh = false;
           isCircumstantialInvert = !differentRowCol && options.invertSwap || differentLevel;
         }
-
         direction = _getSwapDirection(evt, target, targetRect, vertical, differentRowCol ? 1 : options.swapThreshold, options.invertedSwapThreshold == null ? options.swapThreshold : options.invertedSwapThreshold, isCircumstantialInvert, lastTarget === target);
         var sibling;
-
         if (direction !== 0) {
           // Check if target is beside dragEl in respective direction (ignoring hidden elements)
           var dragIndex = index(dragEl);
-
           do {
             dragIndex -= direction;
             sibling = parentEl.children[dragIndex];
           } while (sibling && (css(sibling, 'display') === 'none' || sibling === ghostEl));
-        } // If dragEl is already beside target: Do not insert
-
-
+        }
+        // If dragEl is already beside target: Do not insert
         if (direction === 0 || sibling === target) {
           return completed(false);
         }
-
         lastTarget = target;
         lastDirection = direction;
         var nextSibling = target.nextElementSibling,
-            after = false;
+          after = false;
         after = direction === 1;
-
         var moveVector = _onMove(rootEl, el, dragEl, dragRect, target, targetRect, evt, after);
-
         if (moveVector !== false) {
           if (moveVector === 1 || moveVector === -1) {
             after = moveVector === 1;
           }
-
           _silent = true;
           setTimeout(_unsilent, 30);
           capture();
-
           if (after && !nextSibling) {
             el.appendChild(dragEl);
           } else {
             target.parentNode.insertBefore(dragEl, after ? nextSibling : target);
-          } // Undo chrome's scroll adjustment (has no effect on other browsers)
-
+          }
 
+          // Undo chrome's scroll adjustment (has no effect on other browsers)
           if (scrolledPastTop) {
             scrollBy(scrolledPastTop, 0, scrollBefore - scrolledPastTop.scrollTop);
           }
-
           parentEl = dragEl.parentNode; // actualization
-          // must be done before animation
 
+          // must be done before animation
           if (targetBeforeFirstSwap !== undefined && !isCircumstantialInvert) {
             targetMoveDistance = Math.abs(targetBeforeFirstSwap - getRect(target)[side1]);
           }
-
           changed();
           return completed(true);
         }
       }
-
       if (el.contains(dragEl)) {
         return completed(false);
       }
     }
-
     return false;
   },
   _ignoreWhileAnimating: null,
@@ -2114,83 +1861,69 @@ Sortable.prototype =
     off(ownerDocument, 'touchcancel', this._onDrop);
     off(document, 'selectstart', this);
   },
-  _onDrop: function _onDrop(
-  /**Event*/
-  evt) {
+  _onDrop: function _onDrop( /**Event*/evt) {
     var el = this.el,
-        options = this.options; // Get the index of the dragged element within its parent
+      options = this.options;
 
+    // Get the index of the dragged element within its parent
     newIndex = index(dragEl);
     newDraggableIndex = index(dragEl, options.draggable);
     pluginEvent('drop', this, {
       evt: evt
     });
-    parentEl = dragEl && dragEl.parentNode; // Get again after plugin event
+    parentEl = dragEl && dragEl.parentNode;
 
+    // Get again after plugin event
     newIndex = index(dragEl);
     newDraggableIndex = index(dragEl, options.draggable);
-
     if (Sortable.eventCanceled) {
       this._nulling();
-
       return;
     }
-
     awaitingDragStarted = false;
     isCircumstantialInvert = false;
     pastFirstInvertThresh = false;
     clearInterval(this._loopId);
     clearTimeout(this._dragStartTimer);
-
     _cancelNextTick(this.cloneId);
+    _cancelNextTick(this._dragStartId);
 
-    _cancelNextTick(this._dragStartId); // Unbind events
-
-
+    // Unbind events
     if (this.nativeDraggable) {
       off(document, 'drop', this);
       off(el, 'dragstart', this._onDragStart);
     }
-
     this._offMoveEvents();
-
     this._offUpEvents();
-
     if (Safari) {
       css(document.body, 'user-select', '');
     }
-
     css(dragEl, 'transform', '');
-
     if (evt) {
       if (moved) {
         evt.cancelable && evt.preventDefault();
         !options.dropBubble && evt.stopPropagation();
       }
-
       ghostEl && ghostEl.parentNode && ghostEl.parentNode.removeChild(ghostEl);
-
       if (rootEl === parentEl || putSortable && putSortable.lastPutMode !== 'clone') {
         // Remove clone(s)
         cloneEl && cloneEl.parentNode && cloneEl.parentNode.removeChild(cloneEl);
       }
-
       if (dragEl) {
         if (this.nativeDraggable) {
           off(dragEl, 'dragend', this);
         }
-
         _disableDraggable(dragEl);
+        dragEl.style['will-change'] = '';
 
-        dragEl.style['will-change'] = ''; // Remove classes
+        // Remove classes
         // ghostClass is added in dragStarted
-
         if (moved && !awaitingDragStarted) {
           toggleClass(dragEl, putSortable ? putSortable.options.ghostClass : this.options.ghostClass, false);
         }
+        toggleClass(dragEl, this.options.chosenClass, false);
 
-        toggleClass(dragEl, this.options.chosenClass, false); // Drag stop event
-
+        // Drag stop event
         _dispatchEvent({
           sortable: this,
           name: 'unchoose',
@@ -2199,7 +1932,6 @@ Sortable.prototype =
           newDraggableIndex: null,
           originalEvent: evt
         });
-
         if (rootEl !== parentEl) {
           if (newIndex >= 0) {
             // Add event
@@ -2209,17 +1941,17 @@ Sortable.prototype =
               toEl: parentEl,
               fromEl: rootEl,
               originalEvent: evt
-            }); // Remove event
-
+            });
 
+            // Remove event
             _dispatchEvent({
               sortable: this,
               name: 'remove',
               toEl: parentEl,
               originalEvent: evt
-            }); // drag from one list and drop into another
-
+            });
 
+            // drag from one list and drop into another
             _dispatchEvent({
               rootEl: parentEl,
               name: 'sort',
@@ -2227,7 +1959,6 @@ Sortable.prototype =
               fromEl: rootEl,
               originalEvent: evt
             });
-
             _dispatchEvent({
               sortable: this,
               name: 'sort',
@@ -2235,7 +1966,6 @@ Sortable.prototype =
               originalEvent: evt
             });
           }
-
           putSortable && putSortable.save();
         } else {
           if (newIndex !== oldIndex) {
@@ -2247,7 +1977,6 @@ Sortable.prototype =
                 toEl: parentEl,
                 originalEvent: evt
               });
-
               _dispatchEvent({
                 sortable: this,
                 name: 'sort',
@@ -2257,27 +1986,24 @@ Sortable.prototype =
             }
           }
         }
-
         if (Sortable.active) {
           /* jshint eqnull:true */
           if (newIndex == null || newIndex === -1) {
             newIndex = oldIndex;
             newDraggableIndex = oldDraggableIndex;
           }
-
           _dispatchEvent({
             sortable: this,
             name: 'end',
             toEl: parentEl,
             originalEvent: evt
-          }); // Save sorting
-
+          });
 
+          // Save sorting
           this.save();
         }
       }
     }
-
     this._nulling();
   },
   _nulling: function _nulling() {
@@ -2288,65 +2014,52 @@ Sortable.prototype =
     });
     savedInputChecked.length = lastDx = lastDy = 0;
   },
-  handleEvent: function handleEvent(
-  /**Event*/
-  evt) {
+  handleEvent: function handleEvent( /**Event*/evt) {
     switch (evt.type) {
       case 'drop':
       case 'dragend':
         this._onDrop(evt);
-
         break;
-
       case 'dragenter':
       case 'dragover':
         if (dragEl) {
           this._onDragOver(evt);
-
           _globalDragOver(evt);
         }
-
         break;
-
       case 'selectstart':
         evt.preventDefault();
         break;
     }
   },
-
   /**
    * Serializes the item into an array of string.
    * @returns {String[]}
    */
   toArray: function toArray() {
     var order = [],
-        el,
-        children = this.el.children,
-        i = 0,
-        n = children.length,
-        options = this.options;
-
+      el,
+      children = this.el.children,
+      i = 0,
+      n = children.length,
+      options = this.options;
     for (; i < n; i++) {
       el = children[i];
-
       if (closest(el, options.draggable, this.el, false)) {
         order.push(el.getAttribute(options.dataIdAttr) || _generateId(el));
       }
     }
-
     return order;
   },
-
   /**
    * Sorts the elements according to the array.
    * @param  {String[]}  order  order of the items
    */
   sort: function sort(order, useAnimation) {
     var items = {},
-        rootEl = this.el;
+      rootEl = this.el;
     this.toArray().forEach(function (id, i) {
       var el = rootEl.children[i];
-
       if (closest(el, this.options.draggable, rootEl, false)) {
         items[id] = el;
       }
@@ -2360,7 +2073,6 @@ Sortable.prototype =
     });
     useAnimation && this.animateAll();
   },
-
   /**
    * Save the current sorting
    */
@@ -2368,7 +2080,6 @@ Sortable.prototype =
     var store = this.options.store;
     store && store.set && store.set(this);
   },
-
   /**
    * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
    * @param   {HTMLElement}  el
@@ -2378,7 +2089,6 @@ Sortable.prototype =
   closest: function closest$1(el, selector) {
     return closest(el, selector || this.options.draggable, this.el, false);
   },
-
   /**
    * Set/get option
    * @param   {string} name
@@ -2387,24 +2097,20 @@ Sortable.prototype =
    */
   option: function option(name, value) {
     var options = this.options;
-
     if (value === void 0) {
       return options[name];
     } else {
       var modifiedValue = PluginManager.modifyOption(this, name, value);
-
       if (typeof modifiedValue !== 'undefined') {
         options[name] = modifiedValue;
       } else {
         options[name] = value;
       }
-
       if (name === 'group') {
         _prepareGroup(options);
       }
     }
   },
-
   /**
    * Destroy
    */
@@ -2415,21 +2121,16 @@ Sortable.prototype =
     off(el, 'mousedown', this._onTapStart);
     off(el, 'touchstart', this._onTapStart);
     off(el, 'pointerdown', this._onTapStart);
-
     if (this.nativeDraggable) {
       off(el, 'dragover', this);
       off(el, 'dragenter', this);
-    } // Remove draggable attributes
-
-
+    }
+    // Remove draggable attributes
     Array.prototype.forEach.call(el.querySelectorAll('[draggable]'), function (el) {
       el.removeAttribute('draggable');
     });
-
     this._onDrop();
-
     this._disableDelayedDragEvents();
-
     sortables.splice(sortables.indexOf(this.el), 1);
     this.el = el = null;
   },
@@ -2438,25 +2139,22 @@ Sortable.prototype =
       pluginEvent('hideClone', this);
       if (Sortable.eventCanceled) return;
       css(cloneEl, 'display', 'none');
-
       if (this.options.removeCloneOnHide && cloneEl.parentNode) {
         cloneEl.parentNode.removeChild(cloneEl);
       }
-
       cloneHidden = true;
     }
   },
   _showClone: function _showClone(putSortable) {
     if (putSortable.lastPutMode !== 'clone') {
       this._hideClone();
-
       return;
     }
-
     if (cloneHidden) {
       pluginEvent('showClone', this);
-      if (Sortable.eventCanceled) return; // show clone at dragEl or original position
+      if (Sortable.eventCanceled) return;
 
+      // show clone at dragEl or original position
       if (dragEl.parentNode == rootEl && !this.options.group.revertClone) {
         rootEl.insertBefore(cloneEl, dragEl);
       } else if (nextEl) {
@@ -2464,33 +2162,26 @@ Sortable.prototype =
       } else {
         rootEl.appendChild(cloneEl);
       }
-
       if (this.options.group.revertClone) {
         this.animate(dragEl, cloneEl);
       }
-
       css(cloneEl, 'display', '');
       cloneHidden = false;
     }
   }
 };
-
-function _globalDragOver(
-/**Event*/
-evt) {
+function _globalDragOver( /**Event*/evt) {
   if (evt.dataTransfer) {
     evt.dataTransfer.dropEffect = 'move';
   }
-
   evt.cancelable && evt.preventDefault();
 }
-
 function _onMove(fromEl, toEl, dragEl, dragRect, targetEl, targetRect, originalEvent, willInsertAfter) {
   var evt,
-      sortable = fromEl[expando],
-      onMoveFn = sortable.options.onMove,
-      retVal; // Support for new CustomEvent feature
-
+    sortable = fromEl[expando],
+    onMoveFn = sortable.options.onMove,
+    retVal;
+  // Support for new CustomEvent feature
   if (window.CustomEvent && !IE11OrLess && !Edge) {
     evt = new CustomEvent('move', {
       bubbles: true,
@@ -2500,7 +2191,6 @@ function _onMove(fromEl, toEl, dragEl, dragRect, targetEl, targetRect, originalE
     evt = document.createEvent('Event');
     evt.initEvent('move', true, true);
   }
-
   evt.to = toEl;
   evt.from = fromEl;
   evt.dragged = dragEl;
@@ -2510,41 +2200,35 @@ function _onMove(fromEl, toEl, dragEl, dragRect, targetEl, targetRect, originalE
   evt.willInsertAfter = willInsertAfter;
   evt.originalEvent = originalEvent;
   fromEl.dispatchEvent(evt);
-
   if (onMoveFn) {
     retVal = onMoveFn.call(sortable, evt, originalEvent);
   }
-
   return retVal;
 }
-
 function _disableDraggable(el) {
   el.draggable = false;
 }
-
 function _unsilent() {
   _silent = false;
 }
-
 function _ghostIsFirst(evt, vertical, sortable) {
-  var rect = getRect(getChild(sortable.el, 0, sortable.options, true));
+  var firstElRect = getRect(getChild(sortable.el, 0, sortable.options, true));
+  var sortableContentRect = getContentRect(sortable.el);
   var spacer = 10;
-  return vertical ? evt.clientX < rect.left - spacer || evt.clientY < rect.top && evt.clientX < rect.right : evt.clientY < rect.top - spacer || evt.clientY < rect.bottom && evt.clientX < rect.left;
+  return vertical ? evt.clientX < sortableContentRect.left - spacer || evt.clientY < firstElRect.top && evt.clientX < firstElRect.right : evt.clientY < sortableContentRect.top - spacer || evt.clientY < firstElRect.bottom && evt.clientX < firstElRect.left;
 }
-
 function _ghostIsLast(evt, vertical, sortable) {
-  var rect = getRect(lastChild(sortable.el, sortable.options.draggable));
+  var lastElRect = getRect(lastChild(sortable.el, sortable.options.draggable));
+  var sortableContentRect = getContentRect(sortable.el);
   var spacer = 10;
-  return vertical ? evt.clientX > rect.right + spacer || evt.clientX <= rect.right && evt.clientY > rect.bottom && evt.clientX >= rect.left : evt.clientX > rect.right && evt.clientY > rect.top || evt.clientX <= rect.right && evt.clientY > rect.bottom + spacer;
+  return vertical ? evt.clientX > sortableContentRect.right + spacer || evt.clientY > lastElRect.bottom && evt.clientX > lastElRect.left : evt.clientY > sortableContentRect.bottom + spacer || evt.clientX > lastElRect.right && evt.clientY > lastElRect.top;
 }
-
 function _getSwapDirection(evt, target, targetRect, vertical, swapThreshold, invertedSwapThreshold, invertSwap, isLastTarget) {
   var mouseOnAxis = vertical ? evt.clientY : evt.clientX,
-      targetLength = vertical ? targetRect.height : targetRect.width,
-      targetS1 = vertical ? targetRect.top : targetRect.left,
-      targetS2 = vertical ? targetRect.bottom : targetRect.right,
-      invert = false;
-
+    targetLength = vertical ? targetRect.height : targetRect.width,
+    targetS1 = vertical ? targetRect.top : targetRect.left,
+    targetS2 = vertical ? targetRect.bottom : targetRect.right,
+    invert = false;
   if (!invertSwap) {
     // Never invert or create dragEl shadow when target movemenet causes mouse to move past the end of regular swapThreshold
     if (isLastTarget && targetMoveDistance < targetLength * swapThreshold) {
@@ -2554,7 +2238,6 @@ function _getSwapDirection(evt, target, targetRect, vertical, swapThreshold, inv
         // past first invert threshold, do not restrict inverted threshold to dragEl shadow
         pastFirstInvertThresh = true;
       }
-
       if (!pastFirstInvertThresh) {
         // dragEl shadow (target move distance shadow)
         if (lastDirection === 1 ? mouseOnAxis < targetS1 + targetMoveDistance // over dragEl shadow
@@ -2571,26 +2254,22 @@ function _getSwapDirection(evt, target, targetRect, vertical, swapThreshold, inv
       }
     }
   }
-
   invert = invert || invertSwap;
-
   if (invert) {
     // Invert of regular
     if (mouseOnAxis < targetS1 + targetLength * invertedSwapThreshold / 2 || mouseOnAxis > targetS2 - targetLength * invertedSwapThreshold / 2) {
       return mouseOnAxis > targetS1 + targetLength / 2 ? 1 : -1;
     }
   }
-
   return 0;
 }
+
 /**
  * Gets the direction dragEl must be swapped relative to target in order to make it
  * seem that dragEl has been "inserted" into that element's position
  * @param  {HTMLElement} target       The target whose position dragEl is being inserted at
  * @return {Number}                   Direction dragEl must be swapped
  */
-
-
 function _getInsertDirection(target) {
   if (index(dragEl) < index(target)) {
     return 1;
@@ -2598,55 +2277,48 @@ function _getInsertDirection(target) {
     return -1;
   }
 }
+
 /**
  * Generate id
  * @param   {HTMLElement} el
  * @returns {String}
  * @private
  */
-
-
 function _generateId(el) {
   var str = el.tagName + el.className + el.src + el.href + el.textContent,
-      i = str.length,
-      sum = 0;
-
+    i = str.length,
+    sum = 0;
   while (i--) {
     sum += str.charCodeAt(i);
   }
-
   return sum.toString(36);
 }
-
 function _saveInputCheckedState(root) {
   savedInputChecked.length = 0;
   var inputs = root.getElementsByTagName('input');
   var idx = inputs.length;
-
   while (idx--) {
     var el = inputs[idx];
     el.checked && savedInputChecked.push(el);
   }
 }
-
 function _nextTick(fn) {
   return setTimeout(fn, 0);
 }
-
 function _cancelNextTick(id) {
   return clearTimeout(id);
-} // Fixed #973:
-
+}
 
+// Fixed #973:
 if (documentExists) {
   on(document, 'touchmove', function (evt) {
     if ((Sortable.active || awaitingDragStarted) && evt.cancelable) {
       evt.preventDefault();
     }
   });
-} // Export utils
-
+}
 
+// Export utils
 Sortable.utils = {
   on: on,
   off: off,
@@ -2666,59 +2338,54 @@ Sortable.utils = {
   detectDirection: _detectDirection,
   getChild: getChild
 };
+
 /**
  * Get the Sortable instance of an element
  * @param  {HTMLElement} element The element
  * @return {Sortable|undefined}         The instance of Sortable
  */
-
 Sortable.get = function (element) {
   return element[expando];
 };
+
 /**
  * Mount a plugin to Sortable
  * @param  {...SortablePlugin|SortablePlugin[]} plugins       Plugins being mounted
  */
-
-
 Sortable.mount = function () {
   for (var _len = arguments.length, plugins = new Array(_len), _key = 0; _key < _len; _key++) {
     plugins[_key] = arguments[_key];
   }
-
   if (plugins[0].constructor === Array) plugins = plugins[0];
   plugins.forEach(function (plugin) {
     if (!plugin.prototype || !plugin.prototype.constructor) {
       throw "Sortable: Mounted plugin must be a constructor function, not ".concat({}.toString.call(plugin));
     }
-
     if (plugin.utils) Sortable.utils = _objectSpread2(_objectSpread2({}, Sortable.utils), plugin.utils);
     PluginManager.mount(plugin);
   });
 };
+
 /**
  * Create sortable instance
  * @param {HTMLElement}  el
  * @param {Object}      [options]
  */
-
-
 Sortable.create = function (el, options) {
   return new Sortable(el, options);
-}; // Export
-
+};
 
+// Export
 Sortable.version = version;
 
 var autoScrolls = [],
-    scrollEl,
-    scrollRootEl,
-    scrolling = false,
-    lastAutoScrollX,
-    lastAutoScrollY,
-    touchEvt$1,
-    pointerElemChangedInterval;
-
+  scrollEl,
+  scrollRootEl,
+  scrolling = false,
+  lastAutoScrollX,
+  lastAutoScrollY,
+  touchEvt$1,
+  pointerElemChangedInterval;
 function AutoScrollPlugin() {
   function AutoScroll() {
     this.defaults = {
@@ -2727,19 +2394,18 @@ function AutoScrollPlugin() {
       scrollSensitivity: 30,
       scrollSpeed: 10,
       bubbleScroll: true
-    }; // Bind all private methods
+    };
 
+    // Bind all private methods
     for (var fn in this) {
       if (fn.charAt(0) === '_' && typeof this[fn] === 'function') {
         this[fn] = this[fn].bind(this);
       }
     }
   }
-
   AutoScroll.prototype = {
     dragStarted: function dragStarted(_ref) {
       var originalEvent = _ref.originalEvent;
-
       if (this.sortable.nativeDraggable) {
         on(document, 'dragover', this._handleAutoScroll);
       } else {
@@ -2754,7 +2420,6 @@ function AutoScrollPlugin() {
     },
     dragOverCompleted: function dragOverCompleted(_ref2) {
       var originalEvent = _ref2.originalEvent;
-
       // For when bubbling is canceled and using fallback (fallback 'touchmove' always reached)
       if (!this.options.dragOverBubble && !originalEvent.rootEl) {
         this._handleAutoScroll(originalEvent);
@@ -2768,7 +2433,6 @@ function AutoScrollPlugin() {
         off(document, 'touchmove', this._handleFallbackAutoScroll);
         off(document, 'mousemove', this._handleFallbackAutoScroll);
       }
-
       clearPointerElemChangedInterval();
       clearAutoScrolls();
       cancelThrottle();
@@ -2782,31 +2446,29 @@ function AutoScrollPlugin() {
     },
     _handleAutoScroll: function _handleAutoScroll(evt, fallback) {
       var _this = this;
-
       var x = (evt.touches ? evt.touches[0] : evt).clientX,
-          y = (evt.touches ? evt.touches[0] : evt).clientY,
-          elem = document.elementFromPoint(x, y);
-      touchEvt$1 = evt; // IE does not seem to have native autoscroll,
+        y = (evt.touches ? evt.touches[0] : evt).clientY,
+        elem = document.elementFromPoint(x, y);
+      touchEvt$1 = evt;
+
+      // IE does not seem to have native autoscroll,
       // Edge's autoscroll seems too conditional,
       // MACOS Safari does not have autoscroll,
       // Firefox and Chrome are good
-
       if (fallback || this.options.forceAutoScrollFallback || Edge || IE11OrLess || Safari) {
-        autoScroll(evt, this.options, elem, fallback); // Listener for pointer element change
+        autoScroll(evt, this.options, elem, fallback);
 
+        // Listener for pointer element change
         var ogElemScroller = getParentAutoScrollElement(elem, true);
-
         if (scrolling && (!pointerElemChangedInterval || x !== lastAutoScrollX || y !== lastAutoScrollY)) {
-          pointerElemChangedInterval && clearPointerElemChangedInterval(); // Detect for pointer elem change, emulating native DnD behaviour
-
+          pointerElemChangedInterval && clearPointerElemChangedInterval();
+          // Detect for pointer elem change, emulating native DnD behaviour
           pointerElemChangedInterval = setInterval(function () {
             var newElem = getParentAutoScrollElement(document.elementFromPoint(x, y), true);
-
             if (newElem !== ogElemScroller) {
               ogElemScroller = newElem;
               clearAutoScrolls();
             }
-
             autoScroll(evt, _this.options, newElem, fallback);
           }, 10);
           lastAutoScrollX = x;
@@ -2818,7 +2480,6 @@ function AutoScrollPlugin() {
           clearAutoScrolls();
           return;
         }
-
         autoScroll(evt, this.options, getParentAutoScrollElement(elem, false), false);
       }
     }
@@ -2828,60 +2489,54 @@ function AutoScrollPlugin() {
     initializeByDefault: true
   });
 }
-
 function clearAutoScrolls() {
   autoScrolls.forEach(function (autoScroll) {
     clearInterval(autoScroll.pid);
   });
   autoScrolls = [];
 }
-
 function clearPointerElemChangedInterval() {
   clearInterval(pointerElemChangedInterval);
 }
-
 var autoScroll = throttle(function (evt, options, rootEl, isFallback) {
   // Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=505521
   if (!options.scroll) return;
   var x = (evt.touches ? evt.touches[0] : evt).clientX,
-      y = (evt.touches ? evt.touches[0] : evt).clientY,
-      sens = options.scrollSensitivity,
-      speed = options.scrollSpeed,
-      winScroller = getWindowScrollingElement();
+    y = (evt.touches ? evt.touches[0] : evt).clientY,
+    sens = options.scrollSensitivity,
+    speed = options.scrollSpeed,
+    winScroller = getWindowScrollingElement();
   var scrollThisInstance = false,
-      scrollCustomFn; // New scroll root, set scrollEl
+    scrollCustomFn;
 
+  // New scroll root, set scrollEl
   if (scrollRootEl !== rootEl) {
     scrollRootEl = rootEl;
     clearAutoScrolls();
     scrollEl = options.scroll;
     scrollCustomFn = options.scrollFn;
-
     if (scrollEl === true) {
       scrollEl = getParentAutoScrollElement(rootEl, true);
     }
   }
-
   var layersOut = 0;
   var currentParent = scrollEl;
-
   do {
     var el = currentParent,
-        rect = getRect(el),
-        top = rect.top,
-        bottom = rect.bottom,
-        left = rect.left,
-        right = rect.right,
-        width = rect.width,
-        height = rect.height,
-        canScrollX = void 0,
-        canScrollY = void 0,
-        scrollWidth = el.scrollWidth,
-        scrollHeight = el.scrollHeight,
-        elCSS = css(el),
-        scrollPosX = el.scrollLeft,
-        scrollPosY = el.scrollTop;
-
+      rect = getRect(el),
+      top = rect.top,
+      bottom = rect.bottom,
+      left = rect.left,
+      right = rect.right,
+      width = rect.width,
+      height = rect.height,
+      canScrollX = void 0,
+      canScrollY = void 0,
+      scrollWidth = el.scrollWidth,
+      scrollHeight = el.scrollHeight,
+      elCSS = css(el),
+      scrollPosX = el.scrollLeft,
+      scrollPosY = el.scrollTop;
     if (el === winScroller) {
       canScrollX = width < scrollWidth && (elCSS.overflowX === 'auto' || elCSS.overflowX === 'scroll' || elCSS.overflowX === 'visible');
       canScrollY = height < scrollHeight && (elCSS.overflowY === 'auto' || elCSS.overflowY === 'scroll' || elCSS.overflowY === 'visible');
@@ -2889,10 +2544,8 @@ var autoScroll = throttle(function (evt, options, rootEl, isFallback) {
       canScrollX = width < scrollWidth && (elCSS.overflowX === 'auto' || elCSS.overflowX === 'scroll');
       canScrollY = height < scrollHeight && (elCSS.overflowY === 'auto' || elCSS.overflowY === 'scroll');
     }
-
     var vx = canScrollX && (Math.abs(right - x) <= sens && scrollPosX + width < scrollWidth) - (Math.abs(left - x) <= sens && !!scrollPosX);
     var vy = canScrollY && (Math.abs(bottom - y) <= sens && scrollPosY + height < scrollHeight) - (Math.abs(top - y) <= sens && !!scrollPosY);
-
     if (!autoScrolls[layersOut]) {
       for (var i = 0; i <= layersOut; i++) {
         if (!autoScrolls[i]) {
@@ -2900,61 +2553,51 @@ var autoScroll = throttle(function (evt, options, rootEl, isFallback) {
         }
       }
     }
-
     if (autoScrolls[layersOut].vx != vx || autoScrolls[layersOut].vy != vy || autoScrolls[layersOut].el !== el) {
       autoScrolls[layersOut].el = el;
       autoScrolls[layersOut].vx = vx;
       autoScrolls[layersOut].vy = vy;
       clearInterval(autoScrolls[layersOut].pid);
-
       if (vx != 0 || vy != 0) {
         scrollThisInstance = true;
         /* jshint loopfunc:true */
-
         autoScrolls[layersOut].pid = setInterval(function () {
           // emulate drag over during autoscroll (fallback), emulating native DnD behaviour
           if (isFallback && this.layer === 0) {
             Sortable.active._onTouchMove(touchEvt$1); // To move ghost if it is positioned absolutely
-
           }
-
           var scrollOffsetY = autoScrolls[this.layer].vy ? autoScrolls[this.layer].vy * speed : 0;
           var scrollOffsetX = autoScrolls[this.layer].vx ? autoScrolls[this.layer].vx * speed : 0;
-
           if (typeof scrollCustomFn === 'function') {
             if (scrollCustomFn.call(Sortable.dragged.parentNode[expando], scrollOffsetX, scrollOffsetY, evt, touchEvt$1, autoScrolls[this.layer].el) !== 'continue') {
               return;
             }
           }
-
           scrollBy(autoScrolls[this.layer].el, scrollOffsetX, scrollOffsetY);
         }.bind({
           layer: layersOut
         }), 24);
       }
     }
-
     layersOut++;
   } while (options.bubbleScroll && currentParent !== winScroller && (currentParent = getParentAutoScrollElement(currentParent, false)));
-
   scrolling = scrollThisInstance; // in case another function catches scrolling as false in between when it is not
 }, 30);
 
 var drop = function drop(_ref) {
   var originalEvent = _ref.originalEvent,
-      putSortable = _ref.putSortable,
-      dragEl = _ref.dragEl,
-      activeSortable = _ref.activeSortable,
-      dispatchSortableEvent = _ref.dispatchSortableEvent,
-      hideGhostForTarget = _ref.hideGhostForTarget,
-      unhideGhostForTarget = _ref.unhideGhostForTarget;
+    putSortable = _ref.putSortable,
+    dragEl = _ref.dragEl,
+    activeSortable = _ref.activeSortable,
+    dispatchSortableEvent = _ref.dispatchSortableEvent,
+    hideGhostForTarget = _ref.hideGhostForTarget,
+    unhideGhostForTarget = _ref.unhideGhostForTarget;
   if (!originalEvent) return;
   var toSortable = putSortable || activeSortable;
   hideGhostForTarget();
   var touch = originalEvent.changedTouches && originalEvent.changedTouches.length ? originalEvent.changedTouches[0] : originalEvent;
   var target = document.elementFromPoint(touch.clientX, touch.clientY);
   unhideGhostForTarget();
-
   if (toSortable && !toSortable.el.contains(target)) {
     dispatchSortableEvent('spill');
     this.onSpill({
@@ -2963,9 +2606,7 @@ var drop = function drop(_ref) {
     });
   }
 };
-
 function Revert() {}
-
 Revert.prototype = {
   startIndex: null,
   dragStart: function dragStart(_ref2) {
@@ -2974,40 +2615,32 @@ Revert.prototype = {
   },
   onSpill: function onSpill(_ref3) {
     var dragEl = _ref3.dragEl,
-        putSortable = _ref3.putSortable;
+      putSortable = _ref3.putSortable;
     this.sortable.captureAnimationState();
-
     if (putSortable) {
       putSortable.captureAnimationState();
     }
-
     var nextSibling = getChild(this.sortable.el, this.startIndex, this.options);
-
     if (nextSibling) {
       this.sortable.el.insertBefore(dragEl, nextSibling);
     } else {
       this.sortable.el.appendChild(dragEl);
     }
-
     this.sortable.animateAll();
-
     if (putSortable) {
       putSortable.animateAll();
     }
   },
   drop: drop
 };
-
 _extends(Revert, {
   pluginName: 'revertOnSpill'
 });
-
 function Remove() {}
-
 Remove.prototype = {
   onSpill: function onSpill(_ref4) {
     var dragEl = _ref4.dragEl,
-        putSortable = _ref4.putSortable;
+      putSortable = _ref4.putSortable;
     var parentSortable = putSortable || this.sortable;
     parentSortable.captureAnimationState();
     dragEl.parentNode && dragEl.parentNode.removeChild(dragEl);
@@ -3015,7 +2648,6 @@ Remove.prototype = {
   },
   drop: drop
 };
-
 _extends(Remove, {
   pluginName: 'removeOnSpill'
 });
@@ -3026,13 +2658,13 @@ Sortable.mount(Remove, Revert);
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-design-system/blob/main/LICENSE.md for details.
- * v2.0.0
+ * v2.4.0
  */
 const sortableComponentSet = new Set();
 const CSS = {
-  ghostClass: "calcite-sortable--ghost",
-  chosenClass: "calcite-sortable--chosen",
-  dragClass: "calcite-sortable--drag",
+    ghostClass: "calcite-sortable--ghost",
+    chosenClass: "calcite-sortable--chosen",
+    dragClass: "calcite-sortable--drag",
 };
 /**
  * Helper to keep track of a SortableComponent. This should be called in the `connectedCallback` lifecycle method as well as any other method necessary to rebuild the sortable instance.
@@ -3040,39 +2672,41 @@ const CSS = {
  * @param {SortableComponent} component - The sortable component.
  */
 function connectSortableComponent(component) {
-  disconnectSortableComponent(component);
-  sortableComponentSet.add(component);
-  const dataIdAttr = "id";
-  const { group, handleSelector: handle, dragSelector: draggable } = component;
-  component.sortable = Sortable.create(component.el, {
-    dataIdAttr,
-    ...CSS,
-    ...(!!draggable && { draggable }),
-    ...(!!group && {
-      group: {
-        name: group,
-        ...(!!component.canPull && {
-          pull: (to, from, dragEl, { newIndex, oldIndex }) => component.canPull({ toEl: to.el, fromEl: from.el, dragEl, newIndex, oldIndex }),
-        }),
-        ...(!!component.canPut && {
-          put: (to, from, dragEl, { newIndex, oldIndex }) => component.canPut({ toEl: to.el, fromEl: from.el, dragEl, newIndex, oldIndex }),
+    disconnectSortableComponent(component);
+    sortableComponentSet.add(component);
+    const dataIdAttr = "id";
+    const { group, handleSelector: handle, dragSelector: draggable } = component;
+    component.sortable = Sortable.create(component.el, {
+        dataIdAttr,
+        ...CSS,
+        ...(!!draggable && { draggable }),
+        ...(!!group && {
+            group: {
+                name: group,
+                ...(!!component.canPull && {
+                    pull: (to, from, dragEl, { newIndex, oldIndex }) => component.canPull({ toEl: to.el, fromEl: from.el, dragEl, newIndex, oldIndex }),
+                }),
+                ...(!!component.canPut && {
+                    put: (to, from, dragEl, { newIndex, oldIndex }) => component.canPut({ toEl: to.el, fromEl: from.el, dragEl, newIndex, oldIndex }),
+                }),
+            },
         }),
-      },
-    }),
-    handle,
-    filter: "[drag-disabled]",
-    onStart: () => {
-      dragState.active = true;
-      onDragStart();
-    },
-    onEnd: () => {
-      dragState.active = false;
-      onDragEnd();
-    },
-    onSort: ({ from: fromEl, item: dragEl, to: toEl, newIndex, oldIndex }) => {
-      component.onDragSort({ fromEl, dragEl, toEl, newIndex, oldIndex });
-    },
-  });
+        handle,
+        filter: "[drag-disabled]",
+        onStart: ({ from: fromEl, item: dragEl, to: toEl, newIndex, oldIndex }) => {
+            dragState.active = true;
+            onGlobalDragStart();
+            component.onDragStart({ fromEl, dragEl, toEl, newIndex, oldIndex });
+        },
+        onEnd: ({ from: fromEl, item: dragEl, to: toEl, newIndex, oldIndex }) => {
+            dragState.active = false;
+            onGlobalDragEnd();
+            component.onDragEnd({ fromEl, dragEl, toEl, newIndex, oldIndex });
+        },
+        onSort: ({ from: fromEl, item: dragEl, to: toEl, newIndex, oldIndex }) => {
+            component.onDragSort({ fromEl, dragEl, toEl, newIndex, oldIndex });
+        },
+    });
 }
 /**
  * Helper to remove track of a SortableComponent. This should be called in the `disconnectedCallback` lifecycle method.
@@ -3080,9 +2714,9 @@ function connectSortableComponent(component) {
  * @param {SortableComponent} component - The sortable component.
  */
 function disconnectSortableComponent(component) {
-  sortableComponentSet.delete(component);
-  component.sortable?.destroy();
-  component.sortable = null;
+    sortableComponentSet.delete(component);
+    component.sortable?.destroy();
+    component.sortable = null;
 }
 const dragState = { active: false };
 /**
@@ -3092,13 +2726,13 @@ const dragState = { active: false };
  * @returns {boolean} a boolean value.
  */
 function dragActive(component) {
-  return component.dragEnabled && dragState.active;
+    return component.dragEnabled && dragState.active;
 }
-function onDragStart() {
-  Array.from(sortableComponentSet).forEach((component) => component.onDragStart());
+function onGlobalDragStart() {
+    Array.from(sortableComponentSet).forEach((component) => component.onGlobalDragStart());
 }
-function onDragEnd() {
-  Array.from(sortableComponentSet).forEach((component) => component.onDragEnd());
+function onGlobalDragEnd() {
+    Array.from(sortableComponentSet).forEach((component) => component.onGlobalDragEnd());
 }
 
 export { disconnectSortableComponent as a, connectSortableComponent as c, dragActive as d };