@pantograph/sortable 2.0.0 → 2.1.0

package/Sortable.js

@@ -1,7 +1,6 @@
 /**!
  * Sortable 1.15.6
- * @author	RubaXa   <trash@rubaxa.org>
- * @author	owenm    <owen23355@gmail.com>
+ * @author	Sedmedgh   <sedmedgh@gmail.com>
  * @license MIT
  */
 (function (global, factory) {
@@ -15,9 +14,6 @@
     for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
     return n;
   }
-  function _arrayWithoutHoles(r) {
-    if (Array.isArray(r)) return _arrayLikeToArray(r);
-  }
   function _classCallCheck(a, n) {
     if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
   }
@@ -97,12 +93,6 @@
       return n;
     }, _extends.apply(null, arguments);
   }
-  function _iterableToArray(r) {
-    if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r);
-  }
-  function _nonIterableSpread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-  }
   function ownKeys(e, r) {
     var t = Object.keys(e);
     if (Object.getOwnPropertySymbols) {
@@ -144,9 +134,6 @@
     }
     return t;
   }
-  function _toConsumableArray(r) {
-    return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread();
-  }
   function _toPrimitive(t, r) {
     if ("object" != typeof t || !t) return t;
     var e = t[Symbol.toPrimitive];
@@ -223,11 +210,13 @@
   function getParentOrHost(el) {
     return el.host && el !== document && el.host.nodeType && el.host !== el ? el.host : el.parentNode;
   }
-  function closest(/**HTMLElement*/el, /**String*/selector, /**HTMLElement*/ctx, includeCTX, /**HTMLElement*/ignoreEl) {
+  function closest(/**HTMLElement*/el, /**String*/selector, /**HTMLElement*/ctx, includeCTX, /**HTMLElement[]*/ignoreEls) {
     if (el) {
       ctx = ctx || document;
       do {
-        if (el !== ignoreEl && (selector != null && (selector[0] === '>' ? el.parentNode === ctx && matches(el, selector) : matches(el, selector)) || includeCTX && el === ctx)) {
+        if (!(ignoreEls !== null && ignoreEls !== void 0 && ignoreEls.some(function (ignoreEl) {
+          return ignoreEl === el;
+        })) && (selector != null && (selector[0] === '>' ? el.parentNode === ctx && matches(el, selector) : matches(el, selector)) || includeCTX && el === ctx)) {
           return el;
         }
         if (el === ctx) break;
@@ -305,14 +294,14 @@
     }
   }
 
-  /**
-   * 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;
@@ -379,12 +368,12 @@
     };
   }
 
-  /**
-   * 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
+  /**
+   * 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),
@@ -406,22 +395,24 @@
     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
-   * @param  {boolean} includeDragEl       include dragging item
-   * @param  {HTMLElement} ignoreEl       exclude item
-   * @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
+   * @param  {boolean} includeDragEl       include dragging item
+   * @param  {HTMLElement[]} ignoreEls       exclude item
+   * @return {HTMLElement}          The child at index childNum, or null if not found
    */
-  function getChild(el, childNum, options, includeDragEl, ignoreEl) {
+  function getChild(el, childNum, options, includeDragEl, ignoreEls) {
     var currentChild = 0,
       i = 0,
       children = el.children;
     while (i < children.length) {
-      if (children[i] !== ignoreEl && children[i].style.display !== 'none' && children[i] !== Sortable.ghost && (includeDragEl || children[i] !== Sortable.dragged) && closest(children[i], options.draggable, el, false)) {
+      if (!(ignoreEls !== null && ignoreEls !== void 0 && ignoreEls.some(function (ignoreEl) {
+        return ignoreEl === children[i];
+      })) && children[i].style.display !== 'none' && children[i] !== Sortable.ghost && (includeDragEl || children[i] !== Sortable.dragged) && closest(children[i], options.draggable, el, false, ignoreEls)) {
         if (currentChild === childNum) {
           return children[i];
         }
@@ -432,11 +423,11 @@
     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;
@@ -446,15 +437,15 @@
     return last || null;
   }
 
-  /**
-   * Returns the index of an element within its parent for a selected set of
-   * elements
-   * @param  {HTMLElement} el
-   * @param  {selector} selector
-   * @param  {HTMLElement} ignoreEl
-   * @return {number}
+  /**
+   * Returns the index of an element within its parent for a selected set of
+   * elements
+   * @param  {HTMLElement} el
+   * @param  {selector} selector
+   * @param  {HTMLElement[]} ignoreEls
+   * @return {number}
    */
-  function index(el, selector, ignoreEl) {
+  function index(el, selector, ignoreEls) {
     var index = 0;
     if (!el || !el.parentNode) {
       return -1;
@@ -462,18 +453,20 @@
 
     /* jshint boss:true */
     while (el = el.previousElementSibling) {
-      if (el.nodeName.toUpperCase() !== 'TEMPLATE' && el !== Sortable.clone && (!selector || matches(el, selector)) && el !== ignoreEl) {
+      if (el.nodeName.toUpperCase() !== 'TEMPLATE' && el !== Sortable.clone && (!selector || matches(el, selector)) && !(ignoreEls !== null && ignoreEls !== void 0 && ignoreEls.some(function (ignoreEl) {
+        return ignoreEl === el;
+      }))) {
         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,
@@ -491,11 +484,11 @@
     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) {
@@ -574,25 +567,11 @@
       return el.cloneNode(true);
     }
   }
-  function setRect(el, rect) {
-    css(el, 'position', 'absolute');
-    css(el, 'top', rect.top);
-    css(el, 'left', rect.left);
-    css(el, 'width', rect.width);
-    css(el, 'height', rect.height);
-  }
-  function unsetRect(el) {
-    css(el, 'position', '');
-    css(el, 'top', '');
-    css(el, 'left', '');
-    css(el, 'width', '');
-    css(el, 'height', '');
-  }
-  function getChildContainingRectFromElement(container, options, ghostEl, ignoreEl) {
+  function getChildContainingRectFromElement(container, options, ghostEl, ignoreEls) {
     var rect = {};
     Array.from(container.children).forEach(function (child) {
       var _rect$left, _rect$top, _rect$right, _rect$bottom;
-      if (!closest(child, options.draggable, container, false, ignoreEl) || child.animated || child === ghostEl) return;
+      if (!closest(child, options.draggable, container, false, ignoreEls) || child.animated || child === ghostEl) return;
       var childRect = getRect(child);
       rect.left = Math.min((_rect$left = rect.left) !== null && _rect$left !== void 0 ? _rect$left : Infinity, childRect.left);
       rect.top = Math.min((_rect$top = rect.top) !== null && _rect$top !== void 0 ? _rect$top : Infinity, childRect.top);
@@ -756,12 +735,9 @@
           plugin[option] = defaults[option];
         }
       }
-      plugins.forEach(function (p) {
-        if (p.pluginName === plugin.pluginName) {
-          throw "Sortable: Cannot mount plugin ".concat(plugin.pluginName, " more than once");
-        }
-      });
-      plugins.push(plugin);
+      if (!plugins.some(function (p) {
+        return p.pluginName === plugin.pluginName;
+      })) plugins.push(plugin);
     },
     pluginEvent: function pluginEvent(eventName, sortable, evt) {
       var _this = this;
@@ -831,7 +807,7 @@
     }
   };
 
-  function dispatchEvent(_ref) {
+  function getEvent(_ref) {
     var sortable = _ref.sortable,
       rootEl = _ref.rootEl,
       name = _ref.name,
@@ -848,9 +824,7 @@
       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);
+    var evt;
     // Support for new CustomEvent feature
     if (window.CustomEvent && !IE11OrLess && !Edge) {
       evt = new CustomEvent(name, {
@@ -875,6 +849,43 @@
     for (var option in allEventProperties) {
       evt[option] = allEventProperties[option];
     }
+    return evt;
+  }
+  function dispatchEvent(_ref2) {
+    var sortable = _ref2.sortable,
+      rootEl = _ref2.rootEl,
+      name = _ref2.name,
+      targetEl = _ref2.targetEl,
+      cloneEl = _ref2.cloneEl,
+      toEl = _ref2.toEl,
+      fromEl = _ref2.fromEl,
+      oldIndex = _ref2.oldIndex,
+      newIndex = _ref2.newIndex,
+      oldDraggableIndex = _ref2.oldDraggableIndex,
+      newDraggableIndex = _ref2.newDraggableIndex,
+      originalEvent = _ref2.originalEvent,
+      putSortable = _ref2.putSortable,
+      extraEventProperties = _ref2.extraEventProperties;
+    sortable = sortable || rootEl && rootEl[expando];
+    if (!sortable) return;
+    var options = sortable.options,
+      onName = 'on' + name.charAt(0).toUpperCase() + name.substr(1);
+    var evt = getEvent({
+      sortable: sortable,
+      rootEl: rootEl,
+      name: name,
+      targetEl: targetEl,
+      cloneEl: cloneEl,
+      toEl: toEl,
+      fromEl: fromEl,
+      oldIndex: oldIndex,
+      newIndex: newIndex,
+      oldDraggableIndex: oldDraggableIndex,
+      newDraggableIndex: newDraggableIndex,
+      originalEvent: originalEvent,
+      putSortable: putSortable,
+      extraEventProperties: extraEventProperties
+    });
     if (rootEl) {
       rootEl.dispatchEvent(evt);
     }
@@ -936,6 +947,18 @@
       newDraggableIndex: newDraggableIndex
     }, info));
   }
+  function _getEvent(info) {
+    return getEvent(_objectSpread2({
+      putSortable: putSortable,
+      cloneEl: cloneEl,
+      targetEl: originalDragEl || dragEl,
+      rootEl: rootEl,
+      oldIndex: oldIndex,
+      oldDraggableIndex: oldDraggableIndex,
+      newIndex: newIndex,
+      newDraggableIndex: newDraggableIndex
+    }, info));
+  }
   var dragEl,
     originalDragEl,
     originalDragElDisplay,
@@ -971,7 +994,6 @@
     ghostRelativeParent,
     ghostRelativeParentInitialScroll = [],
     // (left, top)
-
     _silent = false,
     savedInputChecked = [];
 
@@ -994,8 +1016,8 @@
     _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, false, originalDragEl),
-        child2 = getChild(el, 1, options, false, originalDragEl),
+        child1 = getChild(el, 0, options, false, [originalDragEl]),
+        child2 = getChild(el, 1, options, false, [originalDragEl]),
         firstChildCSS = child1 && css(child1),
         secondChildCSS = child2 && css(child2),
         firstChildWidth = firstChildCSS && parseInt(firstChildCSS.marginLeft) + parseInt(firstChildCSS.marginRight) + getRect(child1).width,
@@ -1021,11 +1043,11 @@
         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
+    /**
+     * 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;
@@ -1122,1013 +1144,1040 @@
     }
   };
 
-  /**
-   * @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);
-
-    // Export instance
-    el[expando] = this;
-    var defaults = {
-      group: null,
-      sort: true,
-      disabled: false,
-      store: null,
-      handle: null,
-      draggable: /^[uo]l$/i.test(el.nodeName) ? '>li' : '>*',
-      swapThreshold: 1,
-      // percentage; 0 <= x <= 1
-      invertSwap: false,
-      // invert always
-      invertedSwapThreshold: null,
-      // will be set to same as swapThreshold if default
-      removeCloneOnHide: true,
-      direction: function direction() {
-        return _detectDirection(el, this.options);
-      },
-      ghostClass: 'sortable-ghost',
-      chosenClass: 'sortable-chosen',
-      dragClass: 'sortable-drag',
-      ignore: 'a, img',
-      filter: null,
-      preventOnFilter: true,
-      getGhostFallback: undefined,
-      getPlaceholder: undefined,
-      getPlaceholderOnMove: undefined,
-      tree: false,
-      treeItemLevelAttr: 'data-level',
-      treeIndentThreshold: 10,
-      animation: 0,
-      easing: null,
-      setData: function setData(dataTransfer, dragEl) {
-        dataTransfer.setData('Text', dragEl.textContent);
-      },
-      dropBubble: false,
-      dragoverBubble: false,
-      dataIdAttr: 'data-id',
-      delay: 0,
-      delayOnTouchOnly: false,
-      touchStartThreshold: (Number.parseInt ? Number : window).parseInt(window.devicePixelRatio, 10) || 1,
-      forceFallback: false,
-      fallbackClass: 'sortable-fallback',
-      fallbackOnBody: false,
-      fallbackTolerance: 0,
-      fallbackOffset: {
-        x: 0,
-        y: 0
-      },
-      // Disabled on Safari: #1571; Enabled on Safari IOS: #2244
-      supportPointer: Sortable.supportPointer !== false && 'PointerEvent' in window && (!Safari || IOS),
-      emptyInsertThreshold: 5
-    };
-    PluginManager.initializePlugins(this, el, defaults);
-
-    // Set default options
-    for (var name in defaults) {
-      !(name in options) && (options[name] = defaults[name]);
-    }
-    _prepareGroup(options);
-
-    // Bind all private methods
-    for (var fn in this) {
-      if (fn.charAt(0) === '_' && typeof this[fn] === 'function') {
-        this[fn] = this[fn].bind(this);
+  // Replace the function Sortable and Sortable.prototype with a class
+  var Sortable = /*#__PURE__*/function () {
+    function Sortable(el, options) {
+      _classCallCheck(this, Sortable);
+      _defineProperty(this, "_ignoreWhileAnimating", null);
+      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);
+      el[expando] = this;
+      var defaults = {
+        group: null,
+        sort: true,
+        disabled: false,
+        store: null,
+        handle: null,
+        draggable: /^[uo]l$/i.test(el.nodeName) ? '>li' : '>*',
+        swapThreshold: 1,
+        // percentage; 0 <= x <= 1
+        invertSwap: false,
+        // invert always
+        invertedSwapThreshold: null,
+        // will be set to same as swapThreshold if default
+        removeCloneOnHide: true,
+        direction: function direction() {
+          return _detectDirection(el, this.options);
+        },
+        ghostClass: 'sortable-ghost',
+        chosenClass: 'sortable-chosen',
+        dragClass: 'sortable-drag',
+        ignore: 'a, img',
+        filter: null,
+        preventOnFilter: true,
+        getGhostFallback: undefined,
+        getPlaceholder: undefined,
+        getPlaceholderOnMove: undefined,
+        tree: false,
+        treeItemLevelAttr: 'data-level',
+        treeIndentThreshold: 10,
+        animation: 0,
+        easing: null,
+        setData: function setData(dataTransfer, dragEl) {
+          dataTransfer.setData('Text', dragEl.textContent);
+        },
+        dropBubble: false,
+        dragoverBubble: false,
+        dataIdAttr: 'data-id',
+        delay: 0,
+        delayOnTouchOnly: false,
+        touchStartThreshold: (Number.parseInt ? Number : window).parseInt(window.devicePixelRatio, 10) || 1,
+        forceFallback: false,
+        fallbackClass: 'sortable-fallback',
+        fallbackOnBody: false,
+        fallbackTolerance: 0,
+        fallbackOffset: {
+          x: 0,
+          y: 0
+        },
+        // Disabled on Safari: #1571; Enabled on Safari IOS: #2244
+        supportPointer: Sortable.supportPointer !== false && 'PointerEvent' in window && (!Safari || IOS),
+        emptyInsertThreshold: 5
+      };
+      PluginManager.initializePlugins(this, el, defaults);
+      for (var name in defaults) {
+        !(name in options) && (options[name] = defaults[name]);
       }
-    }
-
-    // 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
-    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);
-
-    // 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 */{
-    constructor: Sortable,
-    _isOutsideThisEl: function _isOutsideThisEl(target) {
-      if (!this.el.contains(target) && target !== this.el) {
-        lastTarget = null;
+      _prepareGroup(options);
+      var _iterator = _createForOfIteratorHelper(Object.getOwnPropertyNames(Object.getPrototypeOf(this))),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var fn = _step.value;
+          if (fn.charAt(0) === '_' && typeof this[fn] === 'function') {
+            this[fn] = this[fn].bind(this);
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
       }
-    },
-    _getDirection: function _getDirection(evt, target) {
-      return typeof this.options.direction === 'function' ? this.options.direction.call(this, evt, target, originalDragEl || dragEl) : this.options.direction;
-    },
-    _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.
-      if (dragEl) {
-        return;
+      this.nativeDraggable = options.forceFallback ? false : supportDraggable;
+      if (this.nativeDraggable) {
+        this.options.touchStartThreshold = 1;
       }
-      if (/mousedown|pointerdown/.test(type) && evt.button !== 0 || options.disabled) {
-        return; // only left button and enabled
+      if (options.supportPointer) {
+        on(el, 'pointerdown', this._onTapStart);
+      } else {
+        on(el, 'mousedown', this._onTapStart);
+        on(el, 'touchstart', this._onTapStart);
       }
-
-      // cancel dnd if original target is content editable
-      if (originalTarget.isContentEditable) {
-        return;
+      if (this.nativeDraggable) {
+        on(el, 'dragover', this);
+        on(el, 'dragenter', this);
       }
+      sortables.push(this.el);
+      options.store && options.store.get && this.sort(options.store.get(this) || []);
+      _extends(this, AnimationStateManager());
+    }
 
-      // Safari ignores further event handling after mousedown
-      if (!this.nativeDraggable && Safari && target && target.tagName.toUpperCase() === 'SELECT') {
-        return;
-      }
-      target = closest(target, options.draggable, el, false, originalDragEl);
-      if (target && target.animated) {
-        return;
+    // All prototype methods go here as class methods (remove prototype)
+    return _createClass(Sortable, [{
+      key: "_isOutsideThisEl",
+      value: function _isOutsideThisEl(target) {
+        if (!this.el.contains(target) && target !== this.el) {
+          lastTarget = null;
+        }
       }
-      if (lastDownEl === target) {
-        // Ignoring duplicate `down`
-        return;
+    }, {
+      key: "_getDirection",
+      value: function _getDirection(evt, target) {
+        return typeof this.options.direction === 'function' ? this.options.direction.call(this, evt, target, originalDragEl || dragEl) : this.options.direction;
       }
+    }, {
+      key: "_onTapStart",
+      value: 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.
+        if (dragEl) {
+          return;
+        }
+        if (/mousedown|pointerdown/.test(type) && evt.button !== 0 || options.disabled) {
+          return; // only left button and enabled
+        }
 
-      // Get the index of the dragged element within its parent
-      oldIndex = index(target, undefined, originalDragEl);
-      oldDraggableIndex = index(target, options.draggable, originalDragEl);
+        // cancel dnd if original target is content editable
+        if (originalTarget.isContentEditable) {
+          return;
+        }
 
-      // Check filter
-      if (typeof filter === 'function') {
-        if (filter.call(this, evt, target, this)) {
-          _dispatchEvent({
-            sortable: _this,
-            rootEl: originalTarget,
-            name: 'filter',
-            targetEl: target,
-            toEl: el,
-            fromEl: el
-          });
-          pluginEvent('filter', _this, {
-            evt: evt
-          });
-          preventOnFilter && evt.preventDefault();
-          return; // cancel dnd
+        // Safari ignores further event handling after mousedown
+        if (!this.nativeDraggable && Safari && target && target.tagName.toUpperCase() === 'SELECT') {
+          return;
         }
-      } else if (filter) {
-        filter = filter.split(',').some(function (criteria) {
-          criteria = closest(originalTarget, criteria.trim(), el, false, originalDragEl);
-          if (criteria) {
+        target = closest(target, options.draggable, el, false, [originalDragEl]);
+        if (target && target.animated) {
+          return;
+        }
+        if (lastDownEl === target) {
+          // Ignoring duplicate `down`
+          return;
+        }
+
+        // Get the index of the dragged element within its parent
+        oldIndex = index(target, undefined, [originalDragEl]);
+        oldDraggableIndex = index(target, options.draggable, [originalDragEl]);
+
+        // Check filter
+        if (typeof filter === 'function') {
+          if (filter.call(this, evt, target, this)) {
             _dispatchEvent({
               sortable: _this,
-              rootEl: criteria,
+              rootEl: originalTarget,
               name: 'filter',
               targetEl: target,
-              fromEl: el,
-              toEl: el
+              toEl: el,
+              fromEl: el
             });
             pluginEvent('filter', _this, {
               evt: evt
             });
-            return true;
+            preventOnFilter && evt.preventDefault();
+            return; // cancel dnd
+          }
+        } else if (filter) {
+          filter = filter.split(',').some(function (criteria) {
+            criteria = closest(originalTarget, criteria.trim(), el, false, [originalDragEl]);
+            if (criteria) {
+              _dispatchEvent({
+                sortable: _this,
+                rootEl: criteria,
+                name: 'filter',
+                targetEl: target,
+                fromEl: el,
+                toEl: el
+              });
+              pluginEvent('filter', _this, {
+                evt: evt
+              });
+              return true;
+            }
+          });
+          if (filter) {
+            preventOnFilter && evt.preventDefault();
+            return; // cancel dnd
           }
-        });
-        if (filter) {
-          preventOnFilter && evt.preventDefault();
-          return; // cancel dnd
         }
+        if (options.handle && !closest(originalTarget, options.handle, el, false, [originalDragEl])) {
+          return;
+        }
+
+        // Prepare `dragstart`
+        this._prepareDragStart(evt, touch, target);
       }
-      if (options.handle && !closest(originalTarget, options.handle, el, false, originalDragEl)) {
-        return;
-      }
+    }, {
+      key: "_prepareDragStart",
+      value: function _prepareDragStart(/** Event */evt, /** Touch */touch, /** HTMLElement */target) {
+        var _this = this,
+          el = _this.el,
+          options = _this.options,
+          ownerDocument = el.ownerDocument,
+          dragStartFn;
+        if (target && !dragEl && target.parentNode === el) {
+          var dragRect = getRect(target);
+          rootEl = el;
+          dragEl = target;
+          parentEl = dragEl.parentNode;
+          nextEl = dragEl.nextSibling;
+          lastDownEl = target;
+          activeGroup = options.group;
+          Sortable.dragged = dragEl;
+          tapEvt = {
+            target: dragEl,
+            clientX: (touch || evt).clientX,
+            clientY: (touch || evt).clientY
+          };
+          tapDistanceLeft = tapEvt.clientX - dragRect.left;
+          tapDistanceTop = tapEvt.clientY - dragRect.top;
+          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
+            // we can re-enable the events: touchmove/mousemove
+            _this._disableDelayedDragEvents();
+            if (!FireFox && _this.nativeDraggable) {
+              dragEl.draggable = true;
+            }
 
-      // Prepare `dragstart`
-      this._prepareDragStart(evt, touch, target);
-    },
-    _prepareDragStart: function _prepareDragStart(/** Event */evt, /** Touch */touch, /** HTMLElement */target) {
-      var _this = this,
-        el = _this.el,
-        options = _this.options,
-        ownerDocument = el.ownerDocument,
-        dragStartFn;
-      if (target && !dragEl && target.parentNode === el) {
-        var dragRect = getRect(target);
-        rootEl = el;
-        dragEl = target;
-        parentEl = dragEl.parentNode;
-        nextEl = dragEl.nextSibling;
-        lastDownEl = target;
-        activeGroup = options.group;
-        Sortable.dragged = dragEl;
-        tapEvt = {
-          target: dragEl,
-          clientX: (touch || evt).clientX,
-          clientY: (touch || evt).clientY
-        };
-        tapDistanceLeft = tapEvt.clientX - dragRect.left;
-        tapDistanceTop = tapEvt.clientY - dragRect.top;
-        this._lastX = (touch || evt).clientX;
-        this._lastY = (touch || evt).clientY;
-        dragEl.style['will-change'] = 'all';
-        dragStartFn = function dragStartFn() {
-          pluginEvent('delayEnded', _this, {
-            evt: evt
+            // Bind the events: dragstart/dragend
+            _this._triggerDragStart(evt, touch);
+
+            // Drag start event
+            _dispatchEvent({
+              sortable: _this,
+              name: 'choose',
+              originalEvent: evt
+            });
+
+            // Chosen item
+            toggleClass(dragEl, options.chosenClass, true);
+          };
+
+          // Disable "draggable"
+          options.ignore.split(',').forEach(function (criteria) {
+            find(dragEl, criteria.trim(), _disableDraggable);
           });
-          if (Sortable.eventCanceled) {
-            _this._onDrop();
-            return;
+          on(ownerDocument, 'dragover', nearestEmptyInsertDetectEvent);
+          on(ownerDocument, 'mousemove', nearestEmptyInsertDetectEvent);
+          on(ownerDocument, 'touchmove', nearestEmptyInsertDetectEvent);
+          if (options.supportPointer) {
+            on(ownerDocument, 'pointerup', _this._onDrop);
+            // Native D&D triggers pointercancel
+            !this.nativeDraggable && on(ownerDocument, 'pointercancel', _this._onDrop);
+          } else {
+            on(ownerDocument, 'mouseup', _this._onDrop);
+            on(ownerDocument, 'touchend', _this._onDrop);
+            on(ownerDocument, 'touchcancel', _this._onDrop);
           }
-          // Delayed drag has been triggered
-          // we can re-enable the events: touchmove/mousemove
-          _this._disableDelayedDragEvents();
-          if (!FireFox && _this.nativeDraggable) {
+
+          // Make dragEl draggable (must be before delay for FireFox)
+          if (FireFox && this.nativeDraggable) {
+            this.options.touchStartThreshold = 4;
             dragEl.draggable = true;
           }
-
-          // Bind the events: dragstart/dragend
-          _this._triggerDragStart(evt, touch);
-
-          // Drag start event
-          _dispatchEvent({
-            sortable: _this,
-            name: 'choose',
-            originalEvent: evt
+          pluginEvent('delayStart', this, {
+            evt: evt
           });
 
-          // Chosen item
-          toggleClass(dragEl, options.chosenClass, true);
-        };
-
-        // Disable "draggable"
-        options.ignore.split(',').forEach(function (criteria) {
-          find(dragEl, criteria.trim(), _disableDraggable);
-        });
-        on(ownerDocument, 'dragover', nearestEmptyInsertDetectEvent);
-        on(ownerDocument, 'mousemove', nearestEmptyInsertDetectEvent);
-        on(ownerDocument, 'touchmove', nearestEmptyInsertDetectEvent);
-        if (options.supportPointer) {
-          on(ownerDocument, 'pointerup', _this._onDrop);
-          // Native D&D triggers pointercancel
-          !this.nativeDraggable && on(ownerDocument, 'pointercancel', _this._onDrop);
-        } else {
-          on(ownerDocument, 'mouseup', _this._onDrop);
-          on(ownerDocument, 'touchend', _this._onDrop);
-          on(ownerDocument, 'touchcancel', _this._onDrop);
+          // 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
+            // before the delay has been reached:
+            // disable the delayed drag
+            if (options.supportPointer) {
+              on(ownerDocument, 'pointerup', _this._disableDelayedDrag);
+              on(ownerDocument, 'pointercancel', _this._disableDelayedDrag);
+            } else {
+              on(ownerDocument, 'mouseup', _this._disableDelayedDrag);
+              on(ownerDocument, 'touchend', _this._disableDelayedDrag);
+              on(ownerDocument, 'touchcancel', _this._disableDelayedDrag);
+            }
+            on(ownerDocument, 'mousemove', _this._delayedDragTouchMoveHandler);
+            on(ownerDocument, 'touchmove', _this._delayedDragTouchMoveHandler);
+            options.supportPointer && on(ownerDocument, 'pointermove', _this._delayedDragTouchMoveHandler);
+            _this._dragStartTimer = setTimeout(dragStartFn, options.delay);
+          } else {
+            dragStartFn();
+          }
         }
-
-        // Make dragEl draggable (must be before delay for FireFox)
-        if (FireFox && this.nativeDraggable) {
-          this.options.touchStartThreshold = 4;
-          dragEl.draggable = true;
+      }
+    }, {
+      key: "_delayedDragTouchMoveHandler",
+      value: 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();
         }
-        pluginEvent('delayStart', this, {
-          evt: evt
-        });
-
-        // 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
-          // before the delay has been reached:
-          // disable the delayed drag
-          if (options.supportPointer) {
-            on(ownerDocument, 'pointerup', _this._disableDelayedDrag);
-            on(ownerDocument, 'pointercancel', _this._disableDelayedDrag);
+      }
+    }, {
+      key: "_disableDelayedDrag",
+      value: function _disableDelayedDrag() {
+        dragEl && _disableDraggable(dragEl);
+        clearTimeout(this._dragStartTimer);
+        this._disableDelayedDragEvents();
+      }
+    }, {
+      key: "_disableDelayedDragEvents",
+      value: function _disableDelayedDragEvents() {
+        var ownerDocument = this.el.ownerDocument;
+        off(ownerDocument, 'mouseup', this._disableDelayedDrag);
+        off(ownerDocument, 'touchend', this._disableDelayedDrag);
+        off(ownerDocument, 'touchcancel', this._disableDelayedDrag);
+        off(ownerDocument, 'pointerup', this._disableDelayedDrag);
+        off(ownerDocument, 'pointercancel', this._disableDelayedDrag);
+        off(ownerDocument, 'mousemove', this._delayedDragTouchMoveHandler);
+        off(ownerDocument, 'touchmove', this._delayedDragTouchMoveHandler);
+        off(ownerDocument, 'pointermove', this._delayedDragTouchMoveHandler);
+      }
+    }, {
+      key: "_triggerDragStart",
+      value: 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);
+          } else if (touch) {
+            on(document, 'touchmove', this._onTouchMove);
           } else {
-            on(ownerDocument, 'mouseup', _this._disableDelayedDrag);
-            on(ownerDocument, 'touchend', _this._disableDelayedDrag);
-            on(ownerDocument, 'touchcancel', _this._disableDelayedDrag);
+            on(document, 'mousemove', this._onTouchMove);
           }
-          on(ownerDocument, 'mousemove', _this._delayedDragTouchMoveHandler);
-          on(ownerDocument, 'touchmove', _this._delayedDragTouchMoveHandler);
-          options.supportPointer && on(ownerDocument, 'pointermove', _this._delayedDragTouchMoveHandler);
-          _this._dragStartTimer = setTimeout(dragStartFn, options.delay);
         } else {
-          dragStartFn();
+          on(dragEl, 'dragend', this);
+          on(rootEl, 'dragstart', this._onDragStart);
         }
+        try {
+          if (document.selection) {
+            _nextTick(function () {
+              document.selection.empty();
+            });
+          } else {
+            window.getSelection().removeAllRanges();
+          }
+        } catch (err) {}
       }
-    },
-    _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();
-      }
-    },
-    _disableDelayedDrag: function _disableDelayedDrag() {
-      dragEl && _disableDraggable(dragEl);
-      clearTimeout(this._dragStartTimer);
-      this._disableDelayedDragEvents();
-    },
-    _disableDelayedDragEvents: function _disableDelayedDragEvents() {
-      var ownerDocument = this.el.ownerDocument;
-      off(ownerDocument, 'mouseup', this._disableDelayedDrag);
-      off(ownerDocument, 'touchend', this._disableDelayedDrag);
-      off(ownerDocument, 'touchcancel', this._disableDelayedDrag);
-      off(ownerDocument, 'pointerup', this._disableDelayedDrag);
-      off(ownerDocument, 'pointercancel', this._disableDelayedDrag);
-      off(ownerDocument, 'mousemove', this._delayedDragTouchMoveHandler);
-      off(ownerDocument, 'touchmove', this._delayedDragTouchMoveHandler);
-      off(ownerDocument, 'pointermove', this._delayedDragTouchMoveHandler);
-    },
-    _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);
-        } else if (touch) {
-          on(document, 'touchmove', this._onTouchMove);
-        } else {
-          on(document, 'mousemove', this._onTouchMove);
+    }, {
+      key: "_getPlaceholder",
+      value: function _getPlaceholder(evt) {
+        if (typeof this.options.getPlaceholder === 'function') {
+          var placeholder = this.options.getPlaceholder(_getEvent({
+            sortable: this,
+            name: 'getPlaceholder',
+            originalEvent: evt
+          }));
+          if (placeholder) {
+            originalDragEl = dragEl;
+            originalDragElDisplay = dragEl.style.display;
+            dragEl = placeholder;
+          }
+          if (dragEl && originalDragEl) {
+            originalDragEl.after(dragEl);
+            css(originalDragEl, 'display', 'none');
+            css(originalDragEl, 'transform', '');
+            toggleClass(originalDragEl, this.options.dragClass, false);
+            toggleClass(originalDragEl, this.options.ghostClass, false);
+            toggleClass(originalDragEl, this.options.chosenClass, false);
+          }
+          pluginEvent('getPlaceholder', this);
         }
-      } else {
-        on(dragEl, 'dragend', this);
-        on(rootEl, 'dragstart', this._onDragStart);
       }
-      try {
-        if (document.selection) {
-          _nextTick(function () {
-            document.selection.empty();
-          });
-        } else {
-          window.getSelection().removeAllRanges();
+    }, {
+      key: "_removeClonedSelectedItem",
+      value: function _removeClonedSelectedItem() {
+        if (typeof this.options.getPlaceholder === 'function' || typeof this.options.getPlaceholderOnMove === 'function') {
+          if (dragEl && originalDragEl) {
+            css(originalDragEl, 'display', originalDragElDisplay || '');
+            dragEl.remove();
+          }
         }
-      } catch (err) {}
-    },
-    _getPlaceholder: function _getPlaceholder() {
-      if (typeof this.options.getPlaceholder === 'function') {
-        originalDragEl = dragEl;
-        originalDragElDisplay = dragEl.style.display;
-        dragEl = this.options.getPlaceholder(dragEl);
-        if (dragEl && originalDragEl) {
-          originalDragEl.after(dragEl);
-          css(originalDragEl, 'display', 'none');
-          css(originalDragEl, 'transform', '');
-          toggleClass(originalDragEl, this.options.dragClass, false);
-          toggleClass(originalDragEl, this.options.ghostClass, false);
-          toggleClass(originalDragEl, this.options.chosenClass, false);
-        }
-        pluginEvent('getPlaceholder', this);
       }
-    },
-    _removeClonedSelectedItem: function _removeClonedSelectedItem() {
-      if (typeof this.options.getPlaceholder === 'function' || typeof this.options.getPlaceholderOnMove === 'function') {
-        if (dragEl && originalDragEl) {
-          css(originalDragEl, 'display', originalDragElDisplay || '');
+    }, {
+      key: "_replacePlaceholder",
+      value: function _replacePlaceholder(newDragEl) {
+        var parent = dragEl.parentNode;
+        if (parent) {
+          parent.replaceChild(newDragEl, dragEl);
+        } else {
           dragEl.remove();
         }
+        dragEl = newDragEl;
       }
-    },
-    _replacePlaceholder: function _replacePlaceholder(newDragEl) {
-      var parent = dragEl.parentNode;
-      if (parent) {
-        parent.replaceChild(newDragEl, dragEl);
-      } else {
-        dragEl.remove();
-      }
-      dragEl = newDragEl;
-    },
-    _getPlaceholderOnMove: function _getPlaceholderOnMove(el, dragRect, target, targetRect, evt, after) {
-      if (typeof this.options.getPlaceholderOnMove === 'function') {
-        var newPlaceholder = this.options.getPlaceholderOnMove(getMoveEvent(rootEl, el, originalDragEl || dragEl, dragRect, target, targetRect, evt, after));
-        if (newPlaceholder) {
-          this._replacePlaceholder(newPlaceholder);
+    }, {
+      key: "_getPlaceholderOnMove",
+      value: function _getPlaceholderOnMove(el, dragRect, target, targetRect, evt, after) {
+        if (typeof this.options.getPlaceholderOnMove === 'function') {
+          var newPlaceholder = this.options.getPlaceholderOnMove(getMoveEvent(rootEl, el, originalDragEl || dragEl, dragRect, target, targetRect, evt, after));
+          if (newPlaceholder) {
+            this._replacePlaceholder(newPlaceholder);
+          }
         }
       }
-    },
-    _dragStarted: function _dragStarted(fallback, evt) {
-      awaitingDragStarted = false;
-      if (rootEl && dragEl) {
-        this._getPlaceholder();
-        pluginEvent('dragStarted', this, {
-          evt: evt
-        });
-        if (this.nativeDraggable) {
-          on(document, 'dragover', _checkOutsideTargetEl);
-        }
-        var options = this.options;
+    }, {
+      key: "_dragStarted",
+      value: function _dragStarted(fallback, evt) {
+        awaitingDragStarted = false;
+        if (rootEl && dragEl) {
+          this._getPlaceholder(evt);
+          pluginEvent('dragStarted', this, {
+            evt: evt
+          });
+          if (this.nativeDraggable) {
+            on(document, 'dragover', _checkOutsideTargetEl);
+          }
+          var options = this.options;
 
-        // Apply effect
-        !fallback && toggleClass(dragEl, options.dragClass, false);
-        toggleClass(dragEl, options.ghostClass, true);
-        Sortable.active = this;
-        fallback && this._appendGhost();
+          // Apply effect
+          !fallback && toggleClass(dragEl, options.dragClass, false);
+          toggleClass(dragEl, options.ghostClass, true);
+          Sortable.active = this;
+          fallback && this._appendGhost();
 
-        // Drag start event
-        _dispatchEvent({
-          sortable: this,
-          name: 'start',
-          originalEvent: evt
-        });
-      } else {
-        this._nulling();
+          // Drag start event
+          _dispatchEvent({
+            sortable: this,
+            name: 'start',
+            originalEvent: evt
+          });
+        } else {
+          this._nulling();
+        }
       }
-    },
-    _emulateDragOver: function _emulateDragOver() {
-      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]) {
-              var inserted = void 0;
-              inserted = parent[expando]._onDragOver({
-                clientX: touchEvt.clientX,
-                clientY: touchEvt.clientY,
-                target: target,
-                rootEl: parent
-              });
-              if (inserted && !this.options.dragoverBubble) {
-                break;
+    }, {
+      key: "_emulateDragOver",
+      value: function _emulateDragOver() {
+        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]) {
+                var inserted = void 0;
+                inserted = parent[expando]._onDragOver({
+                  clientX: touchEvt.clientX,
+                  clientY: touchEvt.clientY,
+                  target: target,
+                  rootEl: parent
+                });
+                if (inserted && !this.options.dragoverBubble) {
+                  break;
+                }
               }
-            }
-            target = parent; // store last element
+              target = parent; // store last element
+            } while ((/* jshint boss:true */
+            parent = getParentOrHost(parent)));
           }
-          /* jshint boss:true */ while (parent = getParentOrHost(parent));
+          _unhideGhostForTarget();
         }
-        _unhideGhostForTarget();
       }
-    },
-    _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
-        if (!Sortable.active && !awaitingDragStarted) {
-          if (fallbackTolerance && Math.max(Math.abs(touch.clientX - this._lastX), Math.abs(touch.clientY - this._lastY)) < fallbackTolerance) {
-            return;
+    }, {
+      key: "_onTouchMove",
+      value: 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
+          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);
           }
-          this._onDragStart(evt, true);
-        }
-        if (ghostEl) {
-          if (ghostMatrix) {
-            ghostMatrix.e += dx - (lastDx || 0);
-            ghostMatrix.f += dy - (lastDy || 0);
-          } else {
-            ghostMatrix = {
-              a: 1,
-              b: 0,
-              c: 0,
-              d: 1,
-              e: dx,
-              f: dy
-            };
+          if (ghostEl) {
+            if (ghostMatrix) {
+              ghostMatrix.e += dx - (lastDx || 0);
+              ghostMatrix.f += dy - (lastDy || 0);
+            } else {
+              ghostMatrix = {
+                a: 1,
+                b: 0,
+                c: 0,
+                d: 1,
+                e: dx,
+                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);
+            css(ghostEl, 'msTransform', cssMatrix);
+            css(ghostEl, 'transform', cssMatrix);
+            lastDx = dx;
+            lastDy = dy;
+            touchEvt = touch;
           }
-          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);
-          css(ghostEl, 'msTransform', cssMatrix);
-          css(ghostEl, 'transform', cssMatrix);
-          lastDx = dx;
-          lastDy = dy;
-          touchEvt = touch;
+          evt.cancelable && evt.preventDefault();
         }
-        evt.cancelable && evt.preventDefault();
       }
-    },
-    _appendGhost: function _appendGhost() {
-      // Bug if using scale(): https://stackoverflow.com/questions/2637058
-      // 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
-        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;
-            rect.left += ghostRelativeParent.scrollLeft;
-          } else {
-            ghostRelativeParent = getWindowScrollingElement();
+    }, {
+      key: "_appendGhost",
+      value: function _appendGhost() {
+        // Bug if using scale(): https://stackoverflow.com/questions/2637058
+        // 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
+          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;
+              rect.left += ghostRelativeParent.scrollLeft;
+            } else {
+              ghostRelativeParent = getWindowScrollingElement();
+            }
+            ghostRelativeParentInitialScroll = getRelativeScrollOffset(ghostRelativeParent);
           }
-          ghostRelativeParentInitialScroll = getRelativeScrollOffset(ghostRelativeParent);
-        }
-        ghostEl = this.options.getGhostFallback && typeof this.options.getGhostFallback === 'function' ? this.options.getGhostFallback(dragEl) : dragEl.cloneNode(true);
-        toggleClass(ghostEl, options.ghostClass, false);
-        toggleClass(ghostEl, options.fallbackClass, true);
-        toggleClass(ghostEl, options.dragClass, true);
-        css(ghostEl, 'transition', '');
-        css(ghostEl, 'transform', '');
-        css(ghostEl, 'box-sizing', 'border-box');
-        css(ghostEl, 'margin', 0);
-        css(ghostEl, 'top', rect.top);
-        css(ghostEl, 'left', rect.left);
-        css(ghostEl, 'width', rect.width);
-        css(ghostEl, 'height', rect.height);
-        css(ghostEl, 'opacity', '0.8');
-        css(ghostEl, 'position', PositionGhostAbsolutely ? 'absolute' : 'fixed');
-        css(ghostEl, 'zIndex', '100000');
-        css(ghostEl, 'pointerEvents', 'none');
-        Sortable.ghost = ghostEl;
-        container.appendChild(ghostEl);
-
-        // Set transform-origin
-        css(ghostEl, 'transform-origin', tapDistanceLeft / parseInt(ghostEl.style.width) * 100 + '% ' + tapDistanceTop / parseInt(ghostEl.style.height) * 100 + '%');
+          ghostEl = this.options.getGhostFallback && typeof this.options.getGhostFallback === 'function' ? this.options.getGhostFallback(_getEvent({
+            sortable: this,
+            name: 'getGhostFallback'
+          })) : dragEl.cloneNode(true);
+          toggleClass(ghostEl, options.ghostClass, false);
+          toggleClass(ghostEl, options.fallbackClass, true);
+          toggleClass(ghostEl, options.dragClass, true);
+          css(ghostEl, 'transition', '');
+          css(ghostEl, 'transform', '');
+          css(ghostEl, 'box-sizing', 'border-box');
+          css(ghostEl, 'margin', 0);
+          css(ghostEl, 'top', rect.top);
+          css(ghostEl, 'left', rect.left);
+          css(ghostEl, 'width', rect.width);
+          css(ghostEl, 'height', rect.height);
+          css(ghostEl, 'opacity', '0.8');
+          css(ghostEl, 'position', PositionGhostAbsolutely ? 'absolute' : 'fixed');
+          css(ghostEl, 'zIndex', '100000');
+          css(ghostEl, 'pointerEvents', 'none');
+          Sortable.ghost = ghostEl;
+          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) {
-      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
-      _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'
+    }, {
+      key: "_onDragStart",
+      value: function _onDragStart(/**Event*/evt, /**boolean*/fallback) {
+        var _this = this;
+        var dataTransfer = evt.dataTransfer;
+        var options = _this.options;
+        pluginEvent('dragStart', this, {
+          evt: evt
         });
-      });
-      !fallback && toggleClass(dragEl, options.dragClass, true);
-
-      // Set proper drop events
-      if (fallback) {
-        ignoreNextClick = true;
-        _this._loopId = setInterval(_this._emulateDragOver, 50);
-      } else {
-        // Undo what was set in _prepareDragStart before drag started
-        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);
-
-        // #1276 fix:
-        css(dragEl, 'transform', 'translateZ(0)');
-      }
-      awaitingDragStarted = true;
-      _this._dragStartId = _nextTick(_this._dragStarted.bind(_this, fallback, evt));
-      on(document, 'selectstart', _this);
-      moved = true;
-      window.getSelection().removeAllRanges();
-      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) {
-      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;
-      if (_silent) return;
-      function dragOverEvent(name, extra) {
-        pluginEvent(name, _this, _objectSpread2({
-          evt: evt,
-          isOwner: isOwner,
-          axis: vertical ? 'vertical' : 'horizontal',
-          revert: revert,
-          dragRect: dragRect,
-          targetRect: targetRect,
-          canSort: canSort,
-          fromSortable: fromSortable,
-          target: target,
-          completed: completed,
-          onMove: function onMove(target, after) {
-            return _onMove(rootEl, el, originalDragEl || dragEl, dragRect, target, getRect(target), evt, after);
-          },
-          changed: changed
-        }, extra));
-      }
-
-      // Capture animation state
-      function capture() {
-        dragOverEvent('dragOverAnimationCapture');
-        _this.captureAnimationState();
-        if (_this !== fromSortable) {
-          fromSortable.captureAnimationState();
+        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;
         }
-      }
-
-      // 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) {
-            activeSortable._hideClone();
-          } 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
-          if (fromSortable === _this) {
-            _this._ignoreWhileAnimating = target;
+        // #1143: IFrame support workaround
+        _this.cloneId = _nextTick(function () {
+          pluginEvent('clone', _this);
+          if (Sortable.eventCanceled) return;
+          if (!_this.options.removeCloneOnHide) {
+            rootEl.insertBefore(cloneEl, dragEl);
           }
-          _this.animateAll(function () {
-            dragOverEvent('dragOverAnimationComplete');
-            _this._ignoreWhileAnimating = null;
+          _this._hideClone();
+          _dispatchEvent({
+            sortable: _this,
+            name: 'clone'
           });
-          if (_this !== fromSortable) {
-            fromSortable.animateAll();
-            fromSortable._ignoreWhileAnimating = null;
+        });
+        !fallback && toggleClass(dragEl, options.dragClass, true);
+
+        // Set proper drop events
+        if (fallback) {
+          ignoreNextClick = true;
+          _this._loopId = setInterval(_this._emulateDragOver, 50);
+        } else {
+          // Undo what was set in _prepareDragStart before drag started
+          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);
 
-        // Null lastTarget if it is not inside a previously swapped element
-        if (target === dragEl && !dragEl.animated || target === el && !target.animated) {
-          lastTarget = null;
+          // #1276 fix:
+          css(dragEl, 'transform', 'translateZ(0)');
         }
-
-        // 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
-          !insertion && nearestEmptyInsertDetectEvent(evt);
+        awaitingDragStarted = true;
+        _this._dragStartId = _nextTick(_this._dragStarted.bind(_this, fallback, evt));
+        on(document, 'selectstart', _this);
+        moved = true;
+        window.getSelection().removeAllRanges();
+        if (Safari) {
+          css(document.body, 'user-select', 'none');
         }
-        !options.dragoverBubble && evt.stopPropagation && evt.stopPropagation();
-        return completedFired = true;
       }
 
-      // Call when dragEl has been inserted
-      function changed() {
-        newIndex = index(dragEl, undefined, originalDragEl);
-        newDraggableIndex = index(dragEl, options.draggable, originalDragEl);
-        _dispatchEvent({
-          sortable: _this,
-          name: 'change',
-          toEl: el,
-          newIndex: newIndex,
-          newDraggableIndex: newDraggableIndex,
-          originalEvent: evt
-        });
-      }
-      if (evt.preventDefault !== void 0) {
-        evt.cancelable && evt.preventDefault();
-      }
-      target = closest(target, options.draggable, el, true, originalDragEl);
-      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, originalDragEl || dragEl, evt)) && group.checkPut(this, activeSortable, originalDragEl || 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);
-            } else {
-              rootEl.appendChild(dragEl);
-            }
+      // Returns true - if no further action is needed (either inserted or another condition)
+    }, {
+      key: "_onDragOver",
+      value: 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;
+        if (_silent) return;
+        function dragOverEvent(name, extra) {
+          pluginEvent(name, _this, _objectSpread2({
+            evt: evt,
+            isOwner: isOwner,
+            axis: vertical ? 'vertical' : 'horizontal',
+            revert: revert,
+            dragRect: dragRect,
+            targetRect: targetRect,
+            canSort: canSort,
+            fromSortable: fromSortable,
+            target: target,
+            completed: completed,
+            onMove: function onMove(target, after) {
+              return _onMove(rootEl, el, originalDragEl || dragEl, dragRect, target, getRect(target), evt, after);
+            },
+            changed: changed
+          }, extra));
+        }
+
+        // Capture animation state
+        function capture() {
+          dragOverEvent('dragOverAnimationCapture');
+          _this.captureAnimationState();
+          if (_this !== fromSortable) {
+            fromSortable.captureAnimationState();
           }
-          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);
+        // 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) {
+              activeSortable._hideClone();
+            } 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
+            if (fromSortable === _this) {
+              _this._ignoreWhileAnimating = target;
+            }
+            _this.animateAll(function () {
+              dragOverEvent('dragOverAnimationComplete');
+              _this._ignoreWhileAnimating = null;
+            });
+            if (_this !== fromSortable) {
+              fromSortable.animateAll();
+              fromSortable._ignoreWhileAnimating = null;
+            }
           }
 
-          // if there is a last element, it is the target
-          if (elLastChild && el === evt.target) {
-            target = elLastChild;
+          // Null lastTarget if it is not inside a previously swapped element
+          if (target === dragEl && !dragEl.animated || target === el && !target.animated) {
+            lastTarget = null;
           }
-          if (target) {
-            targetRect = getRect(target);
+
+          // 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
+            !insertion && nearestEmptyInsertDetectEvent(evt);
           }
-          if (_onMove(rootEl, el, originalDragEl || dragEl, dragRect, target, targetRect, evt, !!target) !== false) {
+          !options.dragoverBubble && evt.stopPropagation && evt.stopPropagation();
+          return completedFired = true;
+        }
+
+        // Call when dragEl has been inserted
+        function changed() {
+          newIndex = index(dragEl, undefined, [originalDragEl]);
+          newDraggableIndex = index(dragEl, options.draggable, [originalDragEl]);
+          _dispatchEvent({
+            sortable: _this,
+            name: 'change',
+            toEl: el,
+            newIndex: newIndex,
+            newDraggableIndex: newDraggableIndex,
+            originalEvent: evt
+          });
+        }
+        if (evt.preventDefault !== void 0) {
+          evt.cancelable && evt.preventDefault();
+        }
+        target = closest(target, options.draggable, el, true, [originalDragEl]);
+        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, originalDragEl || dragEl, evt)) && group.checkPut(this, activeSortable, originalDragEl || 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._getPlaceholderOnMove(el, dragRect, target, targetRect, evt, Boolean(target));
-            if (elLastChild && elLastChild.nextSibling) {
-              // the last draggable element is not the last node
-              el.insertBefore(dragEl, elLastChild.nextSibling);
-            } else {
-              el.appendChild(dragEl);
+            this._hideClone();
+            dragOverEvent('revert');
+            if (!Sortable.eventCanceled) {
+              if (nextEl) {
+                rootEl.insertBefore(dragEl, nextEl);
+              } else {
+                rootEl.appendChild(dragEl);
+              }
             }
-            parentEl = el; // actualization
-
-            changed();
             return completed(true);
           }
-        } else if (elLastChild && _ghostIsFirst(evt, vertical, this)) {
-          // Insert to start of list
-          var firstChild = getChild(el, 0, options, true, originalDragEl);
-          if (firstChild === dragEl) {
-            return completed(false);
-          }
-          target = firstChild;
-          targetRect = getRect(target);
-          if (_onMove(rootEl, el, originalDragEl || dragEl, dragRect, target, targetRect, evt, false) !== false) {
-            this._getPlaceholderOnMove(el, dragRect, target, targetRect, evt, false);
-            capture();
-            el.insertBefore(dragEl, firstChild);
-            parentEl = el; // actualization
+          var elLastChild = lastChild(el, options.draggable);
+          if (!elLastChild || _ghostIsLast(evt, vertical, this) && !elLastChild.animated) {
+            // Insert to end of list
 
-            changed();
-            return completed(true);
-          }
-        } 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;
-          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, undefined, originalDragEl);
-            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 (direction === 0 || sibling === target) {
-            return completed(false);
-          }
-          lastTarget = target;
-          lastDirection = direction;
-          var after = false;
-          after = direction === 1;
-          var moveVector = _onMove(rootEl, el, originalDragEl || dragEl, dragRect, target, targetRect, evt, after);
-          if (moveVector !== false) {
-            if (moveVector === 1 || moveVector === -1) {
-              after = moveVector === 1;
+            // If already at end of list: Do not insert
+            if (elLastChild === dragEl) {
+              return completed(false);
             }
-            _silent = true;
-            setTimeout(_unsilent, 30);
-            capture();
-            this._getPlaceholderOnMove(el, dragRect, target, targetRect, evt, after);
-            var nextSibling = target.nextElementSibling;
-            if (after && !nextSibling) {
-              el.appendChild(dragEl);
-            } else {
-              target.parentNode.insertBefore(dragEl, after ? nextSibling : 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, originalDragEl || dragEl, dragRect, target, targetRect, evt, !!target) !== false) {
+              capture();
+              this._getPlaceholderOnMove(el, dragRect, target, targetRect, evt, Boolean(target));
+              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
 
-            // Undo chrome's scroll adjustment (has no effect on other browsers)
-            if (scrolledPastTop) {
-              scrollBy(scrolledPastTop, 0, scrollBefore - scrolledPastTop.scrollTop);
+              changed();
+              return completed(true);
             }
-            parentEl = dragEl.parentNode; // actualization
+          } else if (elLastChild && _ghostIsFirst(evt, vertical, this)) {
+            // Insert to start of list
+            var firstChild = getChild(el, 0, options, true, [originalDragEl]);
+            if (firstChild === dragEl) {
+              return completed(false);
+            }
+            target = firstChild;
+            targetRect = getRect(target);
+            if (_onMove(rootEl, el, originalDragEl || dragEl, dragRect, target, targetRect, evt, false) !== false) {
+              this._getPlaceholderOnMove(el, dragRect, target, targetRect, evt, false);
+              capture();
+              el.insertBefore(dragEl, firstChild);
+              parentEl = el; // actualization
+
+              changed();
+              return completed(true);
+            }
+          } 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;
+            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, undefined, [originalDragEl]);
+              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 (direction === 0 || sibling === target) {
+              return completed(false);
+            }
+            lastTarget = target;
+            lastDirection = direction;
+            var after = false;
+            after = direction === 1;
+            var moveVector = _onMove(rootEl, el, originalDragEl || dragEl, dragRect, target, targetRect, evt, after);
+            if (moveVector !== false) {
+              if (moveVector === 1 || moveVector === -1) {
+                after = moveVector === 1;
+              }
+              _silent = true;
+              setTimeout(_unsilent, 30);
+              capture();
+              this._getPlaceholderOnMove(el, dragRect, target, targetRect, evt, after);
+              var nextSibling = target.nextElementSibling;
+              if (after && !nextSibling) {
+                el.appendChild(dragEl);
+              } else {
+                target.parentNode.insertBefore(dragEl, after ? nextSibling : target);
+              }
 
-            // must be done before animation
-            if (targetBeforeFirstSwap !== undefined && !isCircumstantialInvert) {
-              targetMoveDistance = Math.abs(targetBeforeFirstSwap - getRect(target)[side1]);
+              // 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
+              if (targetBeforeFirstSwap !== undefined && !isCircumstantialInvert) {
+                targetMoveDistance = Math.abs(targetBeforeFirstSwap - getRect(target)[side1]);
+              }
+              changed();
+              return completed(true);
             }
-            changed();
-            return completed(true);
+          }
+          if (el.contains(dragEl)) {
+            return completed(false);
           }
         }
-        if (el.contains(dragEl)) {
-          return completed(false);
-        }
-      }
-      return false;
-    },
-    _ignoreWhileAnimating: null,
-    _offMoveEvents: function _offMoveEvents() {
-      off(document, 'mousemove', this._onTouchMove);
-      off(document, 'touchmove', this._onTouchMove);
-      off(document, 'pointermove', this._onTouchMove);
-      off(document, 'dragover', nearestEmptyInsertDetectEvent);
-      off(document, 'mousemove', nearestEmptyInsertDetectEvent);
-      off(document, 'touchmove', nearestEmptyInsertDetectEvent);
-    },
-    _offUpEvents: function _offUpEvents() {
-      var ownerDocument = this.el.ownerDocument;
-      off(ownerDocument, 'mouseup', this._onDrop);
-      off(ownerDocument, 'touchend', this._onDrop);
-      off(ownerDocument, 'pointerup', this._onDrop);
-      off(ownerDocument, 'pointercancel', this._onDrop);
-      off(ownerDocument, 'touchcancel', this._onDrop);
-      off(document, 'selectstart', this);
-    },
-    _onDrop: function _onDrop(/**Event*/evt) {
-      var el = this.el,
-        options = this.options;
-
-      // Get the index of the dragged element within its parent
-      newIndex = index(dragEl, undefined, originalDragEl);
-      newDraggableIndex = index(dragEl, options.draggable, originalDragEl);
-      pluginEvent('drop', this, {
-        evt: evt
-      });
-      parentEl = dragEl && dragEl.parentNode;
-
-      // Get again after plugin event
-      newIndex = index(dragEl, undefined, originalDragEl);
-      newDraggableIndex = index(dragEl, options.draggable, originalDragEl);
-      if (Sortable.eventCanceled) {
-        this._nulling();
-        return;
+        return false;
       }
-      awaitingDragStarted = false;
-      isCircumstantialInvert = false;
-      pastFirstInvertThresh = false;
-      clearInterval(this._loopId);
-      clearTimeout(this._dragStartTimer);
-      _cancelNextTick(this.cloneId);
-      _cancelNextTick(this._dragStartId);
-
-      // Unbind events
-      if (this.nativeDraggable) {
-        off(document, 'drop', this);
-        off(el, 'dragstart', this._onDragStart);
+    }, {
+      key: "_offMoveEvents",
+      value: function _offMoveEvents() {
+        off(document, 'mousemove', this._onTouchMove);
+        off(document, 'touchmove', this._onTouchMove);
+        off(document, 'pointermove', this._onTouchMove);
+        off(document, 'dragover', nearestEmptyInsertDetectEvent);
+        off(document, 'mousemove', nearestEmptyInsertDetectEvent);
+        off(document, 'touchmove', nearestEmptyInsertDetectEvent);
       }
-      this._offMoveEvents();
-      this._offUpEvents();
-      if (Safari) {
-        css(document.body, 'user-select', '');
+    }, {
+      key: "_offUpEvents",
+      value: function _offUpEvents() {
+        var ownerDocument = this.el.ownerDocument;
+        off(ownerDocument, 'mouseup', this._onDrop);
+        off(ownerDocument, 'touchend', this._onDrop);
+        off(ownerDocument, 'pointerup', this._onDrop);
+        off(ownerDocument, 'pointercancel', this._onDrop);
+        off(ownerDocument, 'touchcancel', this._onDrop);
+        off(document, 'selectstart', this);
       }
-      css(dragEl, 'transform', '');
-      if (evt) {
-        if (moved) {
-          evt.cancelable && evt.preventDefault();
-          !options.dropBubble && evt.stopPropagation();
+    }, {
+      key: "_onDrop",
+      value: function _onDrop(/**Event*/evt) {
+        var el = this.el,
+          options = this.options;
+
+        // Get the index of the dragged element within its parent
+        newIndex = index(dragEl, undefined, [originalDragEl]);
+        newDraggableIndex = index(dragEl, options.draggable, [originalDragEl]);
+        pluginEvent('drop', this, {
+          evt: evt
+        });
+        parentEl = dragEl && dragEl.parentNode;
+
+        // Get again after plugin event
+        newIndex = index(dragEl, undefined, [originalDragEl]);
+        newDraggableIndex = index(dragEl, options.draggable, [originalDragEl]);
+        if (Sortable.eventCanceled) {
+          this._nulling();
+          return;
         }
-        ghostEl && ghostEl.parentNode && ghostEl.parentNode.removeChild(ghostEl);
-        if (rootEl === parentEl || putSortable && putSortable.lastPutMode !== 'clone') {
-          // Remove clone(s)
-          cloneEl && cloneEl.parentNode && cloneEl.parentNode.removeChild(cloneEl);
+        awaitingDragStarted = false;
+        isCircumstantialInvert = false;
+        pastFirstInvertThresh = false;
+        clearInterval(this._loopId);
+        clearTimeout(this._dragStartTimer);
+        _cancelNextTick(this.cloneId);
+        _cancelNextTick(this._dragStartId);
+
+        // Unbind events
+        if (this.nativeDraggable) {
+          off(document, 'drop', this);
+          off(el, 'dragstart', this._onDragStart);
         }
-        if (dragEl) {
-          if (this.nativeDraggable) {
-            off(dragEl, 'dragend', this);
+        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();
           }
-          _disableDraggable(dragEl);
-          dragEl.style['will-change'] = '';
-
-          // Remove classes
-          // ghostClass is added in dragStarted
-          if (moved && !awaitingDragStarted) {
-            toggleClass(dragEl, putSortable ? putSortable.options.ghostClass : this.options.ghostClass, false);
+          ghostEl && ghostEl.parentNode && ghostEl.parentNode.removeChild(ghostEl);
+          if (rootEl === parentEl || putSortable && putSortable.lastPutMode !== 'clone') {
+            // Remove clone(s)
+            cloneEl && cloneEl.parentNode && cloneEl.parentNode.removeChild(cloneEl);
           }
-          toggleClass(dragEl, this.options.chosenClass, false);
-
-          // Drag stop event
-          _dispatchEvent({
-            sortable: this,
-            name: 'unchoose',
-            toEl: parentEl,
-            newIndex: null,
-            newDraggableIndex: null,
-            originalEvent: evt
-          });
-          if (rootEl !== parentEl) {
-            if (newIndex >= 0) {
-              // Add event
-              _dispatchEvent({
-                rootEl: parentEl,
-                name: 'add',
-                toEl: parentEl,
-                fromEl: rootEl,
-                originalEvent: evt
-              });
-
-              // Remove event
-              _dispatchEvent({
-                sortable: this,
-                name: 'remove',
-                toEl: parentEl,
-                originalEvent: evt
-              });
+          if (dragEl) {
+            if (this.nativeDraggable) {
+              off(dragEl, 'dragend', this);
+            }
+            _disableDraggable(dragEl);
+            dragEl.style['will-change'] = '';
 
-              // drag from one list and drop into another
-              _dispatchEvent({
-                rootEl: parentEl,
-                name: 'sort',
-                toEl: parentEl,
-                fromEl: rootEl,
-                originalEvent: evt
-              });
-              _dispatchEvent({
-                sortable: this,
-                name: 'sort',
-                toEl: parentEl,
-                originalEvent: evt
-              });
+            // Remove classes
+            // ghostClass is added in dragStarted
+            if (moved && !awaitingDragStarted) {
+              toggleClass(dragEl, putSortable ? putSortable.options.ghostClass : this.options.ghostClass, false);
             }
-            putSortable && putSortable.save();
-          } else {
-            if (newIndex !== oldIndex) {
+            toggleClass(dragEl, this.options.chosenClass, false);
+
+            // Drag stop event
+            _dispatchEvent({
+              sortable: this,
+              name: 'unchoose',
+              toEl: parentEl,
+              newIndex: null,
+              newDraggableIndex: null,
+              originalEvent: evt
+            });
+            if (rootEl !== parentEl) {
               if (newIndex >= 0) {
-                // drag & drop within the same list
+                // Add event
+                _dispatchEvent({
+                  rootEl: parentEl,
+                  name: 'add',
+                  toEl: parentEl,
+                  fromEl: rootEl,
+                  originalEvent: evt
+                });
+
+                // Remove event
                 _dispatchEvent({
                   sortable: this,
-                  name: 'update',
+                  name: 'remove',
+                  toEl: parentEl,
+                  originalEvent: evt
+                });
+
+                // drag from one list and drop into another
+                _dispatchEvent({
+                  rootEl: parentEl,
+                  name: 'sort',
                   toEl: parentEl,
+                  fromEl: rootEl,
                   originalEvent: evt
                 });
                 _dispatchEvent({
@@ -2138,198 +2187,289 @@
                   originalEvent: evt
                 });
               }
+              putSortable && putSortable.save();
+            } else {
+              if (newIndex !== oldIndex) {
+                if (newIndex >= 0) {
+                  // drag & drop within the same list
+                  _dispatchEvent({
+                    sortable: this,
+                    name: 'update',
+                    toEl: parentEl,
+                    originalEvent: evt
+                  });
+                  _dispatchEvent({
+                    sortable: this,
+                    name: 'sort',
+                    toEl: parentEl,
+                    originalEvent: evt
+                  });
+                }
+              }
             }
-          }
-          if (Sortable.active) {
-            /* jshint eqnull:true */
-            if (newIndex == null || newIndex === -1) {
-              newIndex = oldIndex;
-              newDraggableIndex = oldDraggableIndex;
-            }
-            _dispatchEvent({
-              sortable: this,
-              name: 'end',
-              toEl: parentEl,
-              originalEvent: evt
-            });
+            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
-            this.save();
+              // Save sorting
+              this.save();
+            }
           }
         }
+        this._nulling();
       }
-      this._nulling();
-    },
-    _nulling: function _nulling() {
-      pluginEvent('nulling', this);
-      this._removeClonedSelectedItem();
-      rootEl = dragEl = originalDragEl = originalDragElDisplay = parentEl = ghostEl = nextEl = cloneEl = lastDownEl = cloneHidden = tapEvt = touchEvt = moved = newIndex = newDraggableIndex = oldIndex = oldDraggableIndex = lastTarget = lastDirection = putSortable = activeGroup = Sortable.dragged = Sortable.ghost = Sortable.clone = Sortable.active = null;
-      var el = this.el;
-      savedInputChecked.forEach(function (checkEl) {
-        if (el.contains(checkEl)) {
-          checkEl.checked = true;
-        }
-      });
-      savedInputChecked.length = lastDx = lastDy = 0;
-    },
-    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);
+    }, {
+      key: "_nulling",
+      value: function _nulling() {
+        pluginEvent('nulling', this);
+        this._removeClonedSelectedItem();
+        rootEl = dragEl = originalDragEl = originalDragElDisplay = parentEl = ghostEl = nextEl = cloneEl = lastDownEl = cloneHidden = tapEvt = touchEvt = moved = newIndex = newDraggableIndex = oldIndex = oldDraggableIndex = lastTarget = lastDirection = putSortable = activeGroup = Sortable.dragged = Sortable.ghost = Sortable.clone = Sortable.active = null;
+        var el = this.el;
+        savedInputChecked.forEach(function (checkEl) {
+          if (el.contains(checkEl)) {
+            checkEl.checked = true;
           }
-          break;
-        case 'selectstart':
-          evt.preventDefault();
-          break;
+        });
+        savedInputChecked.length = lastDx = lastDy = 0;
       }
-    },
-    /**
-     * 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;
-      for (; i < n; i++) {
-        el = children[i];
-        if (closest(el, options.draggable, this.el, false, originalDragEl)) {
-          order.push(el.getAttribute(options.dataIdAttr) || _generateId(el));
+    }, {
+      key: "handleEvent",
+      value: 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;
         }
       }
-      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;
-      this.toArray().forEach(function (id, i) {
-        var el = rootEl.children[i];
-        if (closest(el, this.options.draggable, rootEl, false, originalDragEl)) {
-          items[id] = el;
-        }
-      }, this);
-      useAnimation && this.captureAnimationState();
-      order.forEach(function (id) {
-        if (items[id]) {
-          rootEl.removeChild(items[id]);
-          rootEl.appendChild(items[id]);
+
+      /**
+       * Serializes the item into an array of string.
+       * @returns {String[]}
+       */
+    }, {
+      key: "toArray",
+      value: function toArray() {
+        var order = [],
+          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, [originalDragEl])) {
+            order.push(el.getAttribute(options.dataIdAttr) || _generateId(el));
+          }
         }
-      });
-      useAnimation && this.animateAll();
-    },
-    /**
-     * Save the current sorting
-     */
-    save: function save() {
-      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
-     * @param   {String}       [selector]  default: `options.draggable`
-     * @returns {HTMLElement|null}
-     */
-    closest: function closest$1(el, selector) {
-      return closest(el, selector || this.options.draggable, this.el, false, originalDragEl);
-    },
-    /**
-     * Set/get option
-     * @param   {string} name
-     * @param   {*}      [value]
-     * @returns {*}
-     */
-    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;
+        return order;
+      }
+
+      /**
+       * Sorts the elements according to the array.
+       * @param  {String[]}  order  order of the items
+       */
+    }, {
+      key: "sort",
+      value: function sort(order, useAnimation) {
+        var items = {},
+          rootEl = this.el;
+        this.toArray().forEach(function (id, i) {
+          var el = rootEl.children[i];
+          if (closest(el, this.options.draggable, rootEl, false, [originalDragEl])) {
+            items[id] = el;
+          }
+        }, this);
+        useAnimation && this.captureAnimationState();
+        order.forEach(function (id) {
+          if (items[id]) {
+            rootEl.removeChild(items[id]);
+            rootEl.appendChild(items[id]);
+          }
+        });
+        useAnimation && this.animateAll();
+      }
+
+      /**
+       * Save the current sorting
+       */
+    }, {
+      key: "save",
+      value: function save() {
+        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
+       * @param   {String}       [selector]  default: `options.draggable`
+       * @returns {HTMLElement|null}
+       */
+    }, {
+      key: "closest",
+      value: function closest$1(el, selector) {
+        return closest(el, selector || this.options.draggable, this.el, false, [originalDragEl]);
+      }
+
+      /**
+       * Set/get option
+       * @param   {string} name
+       * @param   {*}      [value]
+       * @returns {*}
+       */
+    }, {
+      key: "option",
+      value: function option(name, value) {
+        var options = this.options;
+        if (value === void 0) {
+          return options[name];
         } else {
-          options[name] = value;
-        }
-        if (name === 'group') {
-          _prepareGroup(options);
+          var modifiedValue = PluginManager.modifyOption(this, name, value);
+          if (typeof modifiedValue !== 'undefined') {
+            options[name] = modifiedValue;
+          } else {
+            options[name] = value;
+          }
+          if (name === 'group') {
+            _prepareGroup(options);
+          }
         }
       }
-    },
-    /**
-     * Destroy
-     */
-    destroy: function destroy() {
-      pluginEvent('destroy', this);
-      var el = this.el;
-      el[expando] = null;
-      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);
+
+      /**
+       * Destroy
+       */
+    }, {
+      key: "destroy",
+      value: function destroy() {
+        pluginEvent('destroy', this);
+        var el = this.el;
+        el[expando] = null;
+        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
+        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;
       }
-      // 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;
-    },
-    _hideClone: function _hideClone() {
-      if (!cloneHidden) {
-        pluginEvent('hideClone', this);
-        if (Sortable.eventCanceled) return;
-        css(cloneEl, 'display', 'none');
-        if (this.options.removeCloneOnHide && cloneEl.parentNode) {
-          cloneEl.parentNode.removeChild(cloneEl);
+    }, {
+      key: "_hideClone",
+      value: function _hideClone() {
+        if (!cloneHidden) {
+          pluginEvent('hideClone', this);
+          if (Sortable.eventCanceled) return;
+          css(cloneEl, 'display', 'none');
+          if (this.options.removeCloneOnHide && cloneEl.parentNode) {
+            cloneEl.parentNode.removeChild(cloneEl);
+          }
+          cloneHidden = true;
         }
-        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 (typeof this.options.getPlaceholder !== 'function' && typeof this.options.getPlaceholderOnMove !== 'function') {
-          if (dragEl.parentNode == rootEl && !this.options.group.revertClone) {
-            rootEl.insertBefore(cloneEl, dragEl);
-          } else if (nextEl) {
-            rootEl.insertBefore(cloneEl, nextEl);
-          } else {
-            rootEl.appendChild(cloneEl);
+    }, {
+      key: "_showClone",
+      value: 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 (typeof this.options.getPlaceholder !== 'function' && typeof this.options.getPlaceholderOnMove !== 'function') {
+            if (dragEl.parentNode == rootEl && !this.options.group.revertClone) {
+              rootEl.insertBefore(cloneEl, dragEl);
+            } else if (nextEl) {
+              rootEl.insertBefore(cloneEl, nextEl);
+            } else {
+              rootEl.appendChild(cloneEl);
+            }
+          }
+          if (this.options.group.revertClone) {
+            this.animate(dragEl, cloneEl);
           }
+          css(cloneEl, 'display', '');
+          cloneHidden = false;
         }
-        if (this.options.group.revertClone) {
-          this.animate(dragEl, cloneEl);
+      }
+    }], [{
+      key: "get",
+      value: function get(element) {
+        return element[expando];
+      }
+    }, {
+      key: "mount",
+      value: function mount() {
+        for (var _len = arguments.length, plugins = new Array(_len), _key = 0; _key < _len; _key++) {
+          plugins[_key] = arguments[_key];
         }
-        css(cloneEl, 'display', '');
-        cloneHidden = false;
+        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);
+        });
       }
-    }
-  };
+    }, {
+      key: "create",
+      value: function create(el, options) {
+        return new Sortable(el, options);
+      }
+    }]);
+  }();
+  _defineProperty(Sortable, "utils", {
+    on: on,
+    off: off,
+    css: css,
+    find: find,
+    is: function is(el, selector) {
+      return !!closest(el, selector, el, false, [originalDragEl]);
+    },
+    extend: extend,
+    throttle: throttle,
+    closest: closest,
+    toggleClass: toggleClass,
+    clone: clone,
+    index: index,
+    nextTick: _nextTick,
+    cancelNextTick: _cancelNextTick,
+    detectDirection: _detectDirection,
+    getChild: getChild,
+    expando: expando
+  });
+  _defineProperty(Sortable, "version", version);
   function _globalDragOver(/**Event*/evt) {
     if (evt.dataTransfer) {
       evt.dataTransfer.dropEffect = 'move';
@@ -2356,6 +2496,15 @@
     evt.relatedRect = targetRect || getRect(toEl);
     evt.willInsertAfter = willInsertAfter;
     evt.originalEvent = originalEvent;
+
+    // Add plugin properties
+    var sortable = fromEl[expando];
+    if (sortable) {
+      var allEventProperties = _objectSpread2({}, PluginManager.getEventProperties('move', sortable));
+      for (var option in allEventProperties) {
+        evt[option] = allEventProperties[option];
+      }
+    }
     return evt;
   };
   function _onMove(fromEl, toEl, dragEl, dragRect, targetEl, targetRect, originalEvent, willInsertAfter) {
@@ -2376,14 +2525,14 @@
     _silent = false;
   }
   function _ghostIsFirst(evt, vertical, sortable) {
-    var firstElRect = getRect(getChild(sortable.el, 0, sortable.options, true, originalDragEl));
-    var childContainingRect = getChildContainingRectFromElement(sortable.el, sortable.options, ghostEl, originalDragEl);
+    var firstElRect = getRect(getChild(sortable.el, 0, sortable.options, true, [originalDragEl]));
+    var childContainingRect = getChildContainingRectFromElement(sortable.el, sortable.options, ghostEl, [originalDragEl]);
     var spacer = 10;
     return vertical ? evt.clientX < childContainingRect.left - spacer || evt.clientY < firstElRect.top && evt.clientX < firstElRect.right : evt.clientY < childContainingRect.top - spacer || evt.clientY < firstElRect.bottom && evt.clientX < firstElRect.left;
   }
   function _ghostIsLast(evt, vertical, sortable) {
     var lastElRect = getRect(lastChild(sortable.el, sortable.options.draggable));
-    var childContainingRect = getChildContainingRectFromElement(sortable.el, sortable.options, ghostEl, originalDragEl);
+    var childContainingRect = getChildContainingRectFromElement(sortable.el, sortable.options, ghostEl, [originalDragEl]);
     var spacer = 10;
     return vertical ? evt.clientX > childContainingRect.right + spacer || evt.clientY > lastElRect.bottom && evt.clientX > lastElRect.left : evt.clientY > childContainingRect.bottom + spacer || evt.clientX > lastElRect.right && evt.clientY > lastElRect.top;
   }
@@ -2428,25 +2577,25 @@
     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
+  /**
+   * 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, undefined, originalDragEl) < index(target, undefined, originalDragEl)) {
+    if (index(dragEl, undefined, [originalDragEl]) < index(target, undefined, [originalDragEl])) {
       return 1;
     } else {
       return -1;
     }
   }
 
-  /**
-   * Generate id
-   * @param   {HTMLElement} el
-   * @returns {String}
-   * @private
+  /**
+   * Generate id
+   * @param   {HTMLElement} el
+   * @returns {String}
+   * @private
    */
   function _generateId(el) {
     var str = el.tagName + el.className + el.src + el.href + el.textContent,
@@ -2489,7 +2638,7 @@
     css: css,
     find: find,
     is: function is(el, selector) {
-      return !!closest(el, selector, el, false, originalDragEl);
+      return !!closest(el, selector, el, false, [originalDragEl]);
     },
     extend: extend,
     throttle: throttle,
@@ -2504,22 +2653,22 @@
     expando: expando
   };
 
-  /**
-   * Get the Sortable instance of an element
-   * @param  {HTMLElement} element The element
-   * @return {Sortable|undefined}         The instance of Sortable
+  /**
+   * 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
+  /**
+   * 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];
+    for (var _len2 = arguments.length, plugins = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+      plugins[_key2] = arguments[_key2];
     }
     if (plugins[0].constructor === Array) plugins = plugins[0];
     plugins.forEach(function (plugin) {
@@ -2531,10 +2680,10 @@
     });
   };
 
-  /**
-   * Create sortable instance
-   * @param {HTMLElement}  el
-   * @param {Object}      [options]
+  /**
+   * Create sortable instance
+   * @param {HTMLElement}  el
+   * @param {Object}      [options]
    */
   Sortable.create = function (el, options) {
     return new Sortable(el, options);
@@ -2760,97 +2909,163 @@
   }, 30);
 
   var originalDragEl$1;
-  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;
-    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({
-        dragEl: dragEl,
-        putSortable: putSortable
-      });
+  var RevertOnSpill = /*#__PURE__*/function () {
+    function RevertOnSpill(sortable) {
+      _classCallCheck(this, RevertOnSpill);
+      _defineProperty(this, "startIndex", null);
+      this.sortable = sortable;
+      this.options = sortable.options;
     }
-  };
-  function Revert() {}
-  Revert.prototype = {
-    startIndex: null,
-    dragStart: function dragStart(_ref2) {
-      var oldDraggableIndex = _ref2.oldDraggableIndex;
-      this.startIndex = oldDraggableIndex;
-    },
-    getPlaceholder: function getPlaceholder(_ref3) {
-      var originalDrag = _ref3.originalDragEl;
-      originalDragEl$1 = originalDrag;
-    },
-    onSpill: function onSpill(_ref4) {
-      var dragEl = _ref4.dragEl,
-        putSortable = _ref4.putSortable;
-      this.sortable.captureAnimationState();
-      if (putSortable) {
-        putSortable.captureAnimationState();
-      }
-      var nextSibling = getChild(this.sortable.el, this.startIndex, this.options, originalDragEl$1);
-      if (nextSibling) {
-        this.sortable.el.insertBefore(dragEl, nextSibling);
-      } else {
-        this.sortable.el.appendChild(dragEl);
+    return _createClass(RevertOnSpill, [{
+      key: "dragStart",
+      value: function dragStart(_ref) {
+        var oldDraggableIndex = _ref.oldDraggableIndex;
+        this.startIndex = oldDraggableIndex;
       }
-      this.sortable.animateAll();
-      if (putSortable) {
-        putSortable.animateAll();
+    }, {
+      key: "getPlaceholder",
+      value: function getPlaceholder(_ref2) {
+        var originalDrag = _ref2.originalDragEl;
+        originalDragEl$1 = originalDrag;
       }
-    },
-    drop: drop
-  };
-  _extends(Revert, {
-    pluginName: 'revertOnSpill'
-  });
-  function Remove() {}
-  Remove.prototype = {
-    onSpill: function onSpill(_ref5) {
-      var dragEl = _ref5.dragEl,
-        putSortable = _ref5.putSortable;
-      var parentSortable = putSortable || this.sortable;
-      parentSortable.captureAnimationState();
-      dragEl.parentNode && dragEl.parentNode.removeChild(dragEl);
-      parentSortable.animateAll();
-    },
-    drop: drop
-  };
-  _extends(Remove, {
-    pluginName: 'removeOnSpill'
-  });
+    }, {
+      key: "onSpill",
+      value: function onSpill(_ref3) {
+        var dragEl = _ref3.dragEl,
+          putSortable = _ref3.putSortable;
+        this.sortable.captureAnimationState();
+        if (putSortable) {
+          putSortable.captureAnimationState();
+        }
+        var nextSibling = getChild(this.sortable.el, this.startIndex, this.options, [originalDragEl$1]);
+        if (nextSibling) {
+          this.sortable.el.insertBefore(dragEl, nextSibling);
+        } else {
+          this.sortable.el.appendChild(dragEl);
+        }
+        this.sortable.animateAll();
+        if (putSortable) {
+          putSortable.animateAll();
+        }
+      }
+    }, {
+      key: "drop",
+      value: function drop(_ref4) {
+        var originalEvent = _ref4.originalEvent,
+          putSortable = _ref4.putSortable,
+          dragEl = _ref4.dragEl,
+          activeSortable = _ref4.activeSortable,
+          dispatchSortableEvent = _ref4.dispatchSortableEvent,
+          hideGhostForTarget = _ref4.hideGhostForTarget,
+          unhideGhostForTarget = _ref4.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({
+            dragEl: dragEl,
+            putSortable: putSortable
+          });
+        }
+      }
+    }]);
+  }();
+  _defineProperty(RevertOnSpill, "pluginName", 'revertOnSpill');
+  var RemoveOnSpill = /*#__PURE__*/function () {
+    function RemoveOnSpill(sortable) {
+      _classCallCheck(this, RemoveOnSpill);
+      this.sortable = sortable;
+      this.options = sortable.options;
+    }
+    return _createClass(RemoveOnSpill, [{
+      key: "onSpill",
+      value: function onSpill(_ref5) {
+        var dragEl = _ref5.dragEl,
+          putSortable = _ref5.putSortable;
+        var parentSortable = putSortable || this.sortable;
+        parentSortable.captureAnimationState();
+        dragEl.parentNode && dragEl.parentNode.removeChild(dragEl);
+        parentSortable.animateAll();
+      }
+    }, {
+      key: "drop",
+      value: function drop(_ref6) {
+        var originalEvent = _ref6.originalEvent,
+          putSortable = _ref6.putSortable,
+          dragEl = _ref6.dragEl,
+          activeSortable = _ref6.activeSortable,
+          dispatchSortableEvent = _ref6.dispatchSortableEvent,
+          hideGhostForTarget = _ref6.hideGhostForTarget,
+          unhideGhostForTarget = _ref6.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({
+            dragEl: dragEl,
+            putSortable: putSortable
+          });
+        }
+      }
+    }]);
+  }();
+  _defineProperty(RemoveOnSpill, "pluginName", 'removeOnSpill');
 
-  var lastSwapEl;
-  function SwapPlugin() {
-    function Swap() {
+  var _excluded$1 = ["activeSortable", "putSortable", "dragEl"];
+  var lastSwapEl, originalDragEl$2, newIndex$1;
+  var Swap = /*#__PURE__*/function () {
+    function Swap(sortable) {
+      _classCallCheck(this, Swap);
+      this.sortable = sortable;
+      this.options = sortable.options;
       this.defaults = {
         swapClass: 'sortable-swap-highlight'
       };
+      // Bind all private methods
+      var _iterator = _createForOfIteratorHelper(Object.getOwnPropertyNames(Object.getPrototypeOf(this))),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var fn = _step.value;
+          if (fn.charAt(0) === '_' && typeof this[fn] === 'function') {
+            this[fn] = this[fn].bind(this);
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
     }
-    Swap.prototype = {
-      dragStart: function dragStart(_ref) {
+    return _createClass(Swap, [{
+      key: "dragStart",
+      value: function dragStart(_ref) {
         var dragEl = _ref.dragEl;
-        lastSwapEl = dragEl;
-      },
-      dragOverValid: function dragOverValid(_ref2) {
-        var completed = _ref2.completed,
-          target = _ref2.target,
-          onMove = _ref2.onMove,
-          activeSortable = _ref2.activeSortable,
-          changed = _ref2.changed,
-          cancel = _ref2.cancel;
+        this.setLastSwapEl(dragEl);
+      }
+    }, {
+      key: "getPlaceholder",
+      value: function getPlaceholder(_ref2) {
+        var originalDrag = _ref2.originalDragEl;
+        originalDragEl$2 = originalDrag;
+      }
+    }, {
+      key: "dragOverValid",
+      value: function dragOverValid(_ref3) {
+        var completed = _ref3.completed,
+          target = _ref3.target,
+          onMove = _ref3.onMove,
+          activeSortable = _ref3.activeSortable,
+          changed = _ref3.changed,
+          cancel = _ref3.cancel;
         if (!activeSortable.options.swap) return;
         var el = this.sortable.el,
           options = this.options;
@@ -2858,9 +3073,9 @@
           var prevSwapEl = lastSwapEl;
           if (onMove(target) !== false) {
             toggleClass(target, options.swapClass, true);
-            lastSwapEl = target;
+            this.setLastSwapEl(target);
           } else {
-            lastSwapEl = null;
+            this.setLastSwapEl(null);
           }
           if (prevSwapEl && prevSwapEl !== lastSwapEl) {
             toggleClass(prevSwapEl, options.swapClass, false);
@@ -2869,11 +3084,48 @@
         changed();
         completed(true);
         cancel();
-      },
-      drop: function drop(_ref3) {
-        var activeSortable = _ref3.activeSortable,
-          putSortable = _ref3.putSortable,
-          dragEl = _ref3.dragEl;
+      }
+    }, {
+      key: "setLastSwapEl",
+      value: function setLastSwapEl(node) {
+        lastSwapEl = node;
+        var parent = node === null || node === void 0 ? void 0 : node.parentNode;
+        var _index = -1;
+        if (parent && node && typeof this.options.getPlaceholder === 'function') {
+          _index = index(node, this.options.draggable, [originalDragEl$2]);
+        }
+        if (_index > -1) {
+          newIndex$1 = _index;
+        } else {
+          newIndex$1 = undefined;
+        }
+      }
+    }, {
+      key: "swapNodes",
+      value: function swapNodes(n1, n2, activeSortable, putSortable) {
+        var _putSortable$options;
+        if (typeof activeSortable.options.getPlaceholder !== 'function' && typeof (putSortable === null || putSortable === void 0 || (_putSortable$options = putSortable.options) === null || _putSortable$options === void 0 ? void 0 : _putSortable$options.getPlaceholder) !== 'function') {
+          var p1 = n1.parentNode,
+            p2 = n2.parentNode,
+            i1,
+            i2;
+          if (!p1 || !p2 || p1.isEqualNode(n2) || p2.isEqualNode(n1)) return;
+          i1 = index(n1, this.options.draggable, [originalDragEl$2]);
+          i2 = index(n2, this.options.draggable, [originalDragEl$2]);
+          if (p1.isEqualNode(p2) && i1 < i2) {
+            i2++;
+          }
+          p1.insertBefore(n2, p1.children[i1]);
+          p2.insertBefore(n1, p2.children[i2]);
+        }
+      }
+    }, {
+      key: "drop",
+      value: function drop(_ref4) {
+        var activeSortable = _ref4.activeSortable,
+          putSortable = _ref4.putSortable,
+          dragEl = _ref4.dragEl,
+          data = _objectWithoutProperties(_ref4, _excluded$1);
         var toSortable = putSortable || this.sortable;
         var options = this.options;
         lastSwapEl && toggleClass(lastSwapEl, options.swapClass, false);
@@ -2881,633 +3133,35 @@
           if (dragEl !== lastSwapEl) {
             toSortable.captureAnimationState();
             if (toSortable !== activeSortable) activeSortable.captureAnimationState();
-            swapNodes(dragEl, lastSwapEl);
+            this.swapNodes(dragEl, lastSwapEl, activeSortable, putSortable);
             toSortable.animateAll();
             if (toSortable !== activeSortable) activeSortable.animateAll();
           }
         }
-      },
-      nulling: function nulling() {
-        lastSwapEl = null;
-      }
-    };
-    return _extends(Swap, {
-      pluginName: 'swap',
-      eventProperties: function eventProperties() {
-        return {
-          swapItem: lastSwapEl
-        };
-      }
-    });
-  }
-  function swapNodes(n1, n2) {
-    var p1 = n1.parentNode,
-      p2 = n2.parentNode,
-      i1,
-      i2;
-    if (!p1 || !p2 || p1.isEqualNode(n2) || p2.isEqualNode(n1)) return;
-    i1 = index(n1);
-    i2 = index(n2);
-    if (p1.isEqualNode(p2) && i1 < i2) {
-      i2++;
-    }
-    p1.insertBefore(n2, p1.children[i1]);
-    p2.insertBefore(n1, p2.children[i2]);
-  }
-
-  var multiDragElements = [],
-    multiDragClones = [],
-    lastMultiDragSelect,
-    // for selection with modifier key down (SHIFT)
-    multiDragSortable,
-    initialFolding = false,
-    // Initial multi-drag fold when drag started
-    folding = false,
-    // Folding any other time
-    dragStarted = false,
-    dragEl$1,
-    originalDragEl$2,
-    clonesFromRect,
-    clonesHidden;
-  function MultiDragPlugin() {
-    function MultiDrag(sortable) {
-      // Bind all private methods
-      for (var fn in this) {
-        if (fn.charAt(0) === '_' && typeof this[fn] === 'function') {
-          this[fn] = this[fn].bind(this);
-        }
-      }
-      if (!sortable.options.avoidImplicitDeselect) {
-        if (sortable.options.supportPointer) {
-          on(document, 'pointerup', this._deselectMultiDrag);
-        } else {
-          on(document, 'mouseup', this._deselectMultiDrag);
-          on(document, 'touchend', this._deselectMultiDrag);
-        }
       }
-      on(document, 'keydown', this._checkKeyDown);
-      on(document, 'keyup', this._checkKeyUp);
-      this.defaults = {
-        selectedClass: 'sortable-selected',
-        multiDragKey: null,
-        avoidImplicitDeselect: false,
-        setData: function setData(dataTransfer, dragEl) {
-          var data = '';
-          if (multiDragElements.length && multiDragSortable === sortable) {
-            multiDragElements.forEach(function (multiDragElement, i) {
-              data += (!i ? '' : ', ') + multiDragElement.textContent;
-            });
-          } else {
-            data = dragEl.textContent;
-          }
-          dataTransfer.setData('Text', data);
-        }
-      };
-    }
-    MultiDrag.prototype = {
-      multiDragKeyDown: false,
-      isMultiDrag: false,
-      delayStartGlobal: function delayStartGlobal(_ref) {
-        var dragged = _ref.dragEl;
-        dragEl$1 = dragged;
-      },
-      delayEnded: function delayEnded() {
-        this.isMultiDrag = ~multiDragElements.indexOf(dragEl$1);
-      },
-      setupClone: function setupClone(_ref2) {
-        var sortable = _ref2.sortable,
-          cancel = _ref2.cancel;
-        if (!this.isMultiDrag) return;
-        for (var i = 0; i < multiDragElements.length; i++) {
-          multiDragClones.push(clone(multiDragElements[i]));
-          multiDragClones[i].sortableIndex = multiDragElements[i].sortableIndex;
-          multiDragClones[i].draggable = false;
-          multiDragClones[i].style['will-change'] = '';
-          toggleClass(multiDragClones[i], this.options.selectedClass, false);
-          multiDragElements[i] === dragEl$1 && toggleClass(multiDragClones[i], this.options.chosenClass, false);
-        }
-        sortable._hideClone();
-        cancel();
-      },
-      clone: function clone(_ref3) {
-        var sortable = _ref3.sortable,
-          rootEl = _ref3.rootEl,
-          dispatchSortableEvent = _ref3.dispatchSortableEvent,
-          cancel = _ref3.cancel;
-        if (!this.isMultiDrag) return;
-        if (!this.options.removeCloneOnHide) {
-          if (multiDragElements.length && multiDragSortable === sortable) {
-            insertMultiDragClones(true, rootEl);
-            dispatchSortableEvent('clone');
-            cancel();
-          }
-        }
-      },
-      showClone: function showClone(_ref4) {
-        var cloneNowShown = _ref4.cloneNowShown,
-          rootEl = _ref4.rootEl,
-          cancel = _ref4.cancel;
-        if (!this.isMultiDrag) return;
-        insertMultiDragClones(false, rootEl);
-        multiDragClones.forEach(function (clone) {
-          css(clone, 'display', '');
-        });
-        cloneNowShown();
-        clonesHidden = false;
-        cancel();
-      },
-      hideClone: function hideClone(_ref5) {
-        var _this = this;
-        var sortable = _ref5.sortable,
-          cloneNowHidden = _ref5.cloneNowHidden,
-          cancel = _ref5.cancel;
-        if (!this.isMultiDrag) return;
-        multiDragClones.forEach(function (clone) {
-          css(clone, 'display', 'none');
-          if (_this.options.removeCloneOnHide && clone.parentNode) {
-            clone.parentNode.removeChild(clone);
-          }
-        });
-        cloneNowHidden();
-        clonesHidden = true;
-        cancel();
-      },
-      dragStartGlobal: function dragStartGlobal(_ref6) {
-        var sortable = _ref6.sortable;
-        if (!this.isMultiDrag && multiDragSortable) {
-          multiDragSortable.multiDrag._deselectMultiDrag();
-        }
-        multiDragElements.forEach(function (multiDragElement) {
-          multiDragElement.sortableIndex = index(multiDragElement);
-        });
-
-        // Sort multi-drag elements
-        multiDragElements = multiDragElements.sort(function (a, b) {
-          return a.sortableIndex - b.sortableIndex;
-        });
-        dragStarted = true;
-      },
-      getPlaceholder: function getPlaceholder(_ref7) {
-        var originalDrag = _ref7.originalDragEl;
-        originalDragEl$2 = originalDrag;
-      },
-      dragStarted: function dragStarted(_ref8) {
-        var _this2 = this;
-        var sortable = _ref8.sortable;
-        if (!this.isMultiDrag) return;
-        if (this.options.sort) {
-          // Capture rects,
-          // hide multi drag elements (by positioning them absolute),
-          // set multi drag elements rects to dragRect,
-          // show multi drag elements,
-          // animate to rects,
-          // unset rects & remove from DOM
-
-          sortable.captureAnimationState();
-          if (this.options.animation) {
-            multiDragElements.forEach(function (multiDragElement) {
-              if (multiDragElement === dragEl$1) return;
-              css(multiDragElement, 'position', 'absolute');
-            });
-            var dragRect = getRect(dragEl$1, false, true, true);
-            multiDragElements.forEach(function (multiDragElement) {
-              if (multiDragElement === dragEl$1) return;
-              setRect(multiDragElement, dragRect);
-            });
-            folding = true;
-            initialFolding = true;
-          }
-        }
-        sortable.animateAll(function () {
-          folding = false;
-          initialFolding = false;
-          if (_this2.options.animation) {
-            multiDragElements.forEach(function (multiDragElement) {
-              unsetRect(multiDragElement);
-            });
-          }
-
-          // Remove all auxiliary multidrag items from el, if sorting enabled
-          if (_this2.options.sort) {
-            removeMultiDragElements();
-          }
-        });
-      },
-      dragOver: function dragOver(_ref9) {
-        var target = _ref9.target,
-          completed = _ref9.completed,
-          cancel = _ref9.cancel;
-        if (folding && ~multiDragElements.indexOf(target)) {
-          completed(false);
-          cancel();
-        }
-      },
-      revert: function revert(_ref0) {
-        var fromSortable = _ref0.fromSortable,
-          rootEl = _ref0.rootEl,
-          sortable = _ref0.sortable,
-          dragRect = _ref0.dragRect;
-        if (multiDragElements.length > 1) {
-          // Setup unfold animation
-          multiDragElements.forEach(function (multiDragElement) {
-            sortable.addAnimationState({
-              target: multiDragElement,
-              rect: folding ? getRect(multiDragElement) : dragRect
-            });
-            unsetRect(multiDragElement);
-            multiDragElement.fromRect = dragRect;
-            fromSortable.removeAnimationState(multiDragElement);
-          });
-          folding = false;
-          insertMultiDragElements(!this.options.removeCloneOnHide, rootEl);
-        }
-      },
-      dragOverCompleted: function dragOverCompleted(_ref1) {
-        var sortable = _ref1.sortable,
-          isOwner = _ref1.isOwner,
-          insertion = _ref1.insertion,
-          activeSortable = _ref1.activeSortable,
-          parentEl = _ref1.parentEl,
-          putSortable = _ref1.putSortable;
-        var options = this.options;
-        if (insertion) {
-          // Clones must be hidden before folding animation to capture dragRectAbsolute properly
-          if (isOwner) {
-            activeSortable._hideClone();
-          }
-          initialFolding = false;
-          // If leaving sort:false root, or already folding - Fold to new location
-          if (options.animation && multiDragElements.length > 1 && (folding || !isOwner && !activeSortable.options.sort && !putSortable)) {
-            // Fold: Set all multi drag elements's rects to dragEl's rect when multi-drag elements are invisible
-            var dragRectAbsolute = getRect(dragEl$1, false, true, true);
-            multiDragElements.forEach(function (multiDragElement) {
-              if (multiDragElement === dragEl$1) return;
-              setRect(multiDragElement, dragRectAbsolute);
-
-              // Move element(s) to end of parentEl so that it does not interfere with multi-drag clones insertion if they are inserted
-              // while folding, and so that we can capture them again because old sortable will no longer be fromSortable
-              parentEl.appendChild(multiDragElement);
-            });
-            folding = true;
-          }
-
-          // Clones must be shown (and check to remove multi drags) after folding when interfering multiDragElements are moved out
-          if (!isOwner) {
-            // Only remove if not folding (folding will remove them anyways)
-            if (!folding) {
-              removeMultiDragElements();
-            }
-            if (multiDragElements.length > 1) {
-              var clonesHiddenBefore = clonesHidden;
-              activeSortable._showClone(sortable);
-
-              // Unfold animation for clones if showing from hidden
-              if (activeSortable.options.animation && !clonesHidden && clonesHiddenBefore) {
-                multiDragClones.forEach(function (clone) {
-                  activeSortable.addAnimationState({
-                    target: clone,
-                    rect: clonesFromRect
-                  });
-                  clone.fromRect = clonesFromRect;
-                  clone.thisAnimationDuration = null;
-                });
-              }
-            } else {
-              activeSortable._showClone(sortable);
-            }
-          }
-        }
-      },
-      dragOverAnimationCapture: function dragOverAnimationCapture(_ref10) {
-        var dragRect = _ref10.dragRect,
-          isOwner = _ref10.isOwner,
-          activeSortable = _ref10.activeSortable;
-        multiDragElements.forEach(function (multiDragElement) {
-          multiDragElement.thisAnimationDuration = null;
-        });
-        if (activeSortable.options.animation && !isOwner && activeSortable.multiDrag.isMultiDrag) {
-          clonesFromRect = _extends({}, dragRect);
-          var dragMatrix = matrix(dragEl$1, true);
-          clonesFromRect.top -= dragMatrix.f;
-          clonesFromRect.left -= dragMatrix.e;
-        }
-      },
-      dragOverAnimationComplete: function dragOverAnimationComplete() {
-        if (folding) {
-          folding = false;
-          removeMultiDragElements();
-        }
-      },
-      drop: function drop(_ref11) {
-        var evt = _ref11.originalEvent,
-          rootEl = _ref11.rootEl,
-          parentEl = _ref11.parentEl,
-          sortable = _ref11.sortable,
-          dispatchSortableEvent = _ref11.dispatchSortableEvent,
-          oldIndex = _ref11.oldIndex,
-          putSortable = _ref11.putSortable;
-        var toSortable = putSortable || this.sortable;
-        if (!evt) return;
-        var options = this.options,
-          children = parentEl.children;
-
-        // Multi-drag selection
-        if (!dragStarted) {
-          if (options.multiDragKey && !this.multiDragKeyDown) {
-            this._deselectMultiDrag();
-          }
-          toggleClass(dragEl$1, options.selectedClass, !~multiDragElements.indexOf(dragEl$1));
-          if (!~multiDragElements.indexOf(dragEl$1)) {
-            multiDragElements.push(dragEl$1);
-            dispatchEvent({
-              sortable: sortable,
-              rootEl: rootEl,
-              name: 'select',
-              targetEl: dragEl$1,
-              originalEvent: evt
-            });
-
-            // Modifier activated, select from last to dragEl
-            if (evt.shiftKey && lastMultiDragSelect && sortable.el.contains(lastMultiDragSelect)) {
-              var lastIndex = index(lastMultiDragSelect),
-                currentIndex = index(dragEl$1);
-              if (~lastIndex && ~currentIndex && lastIndex !== currentIndex) {
-                // Must include lastMultiDragSelect (select it), in case modified selection from no selection
-                // (but previous selection existed)
-                var n, i;
-                if (currentIndex > lastIndex) {
-                  i = lastIndex;
-                  n = currentIndex;
-                } else {
-                  i = currentIndex;
-                  n = lastIndex + 1;
-                }
-                var filter = options.filter;
-                for (; i < n; i++) {
-                  if (~multiDragElements.indexOf(children[i])) continue;
-                  // Check if element is draggable
-                  if (!closest(children[i], options.draggable, parentEl, false, originalDragEl$2)) continue;
-                  // Check if element is filtered
-                  var filtered = filter && (typeof filter === 'function' ? filter.call(sortable, evt, children[i], sortable) : filter.split(',').some(function (criteria) {
-                    return closest(children[i], criteria.trim(), parentEl, false, originalDragEl$2);
-                  }));
-                  if (filtered) continue;
-                  toggleClass(children[i], options.selectedClass, true);
-                  multiDragElements.push(children[i]);
-                  dispatchEvent({
-                    sortable: sortable,
-                    rootEl: rootEl,
-                    name: 'select',
-                    targetEl: children[i],
-                    originalEvent: evt
-                  });
-                }
-              }
-            } else {
-              lastMultiDragSelect = dragEl$1;
-            }
-            multiDragSortable = toSortable;
-          } else {
-            multiDragElements.splice(multiDragElements.indexOf(dragEl$1), 1);
-            lastMultiDragSelect = null;
-            dispatchEvent({
-              sortable: sortable,
-              rootEl: rootEl,
-              name: 'deselect',
-              targetEl: dragEl$1,
-              originalEvent: evt
-            });
-          }
-        }
-
-        // Multi-drag drop
-        if (dragStarted && this.isMultiDrag) {
-          folding = false;
-          // Do not "unfold" after around dragEl if reverted
-          if ((parentEl[expando].options.sort || parentEl !== rootEl) && multiDragElements.length > 1) {
-            var dragRect = getRect(dragEl$1),
-              multiDragIndex = index(dragEl$1, ':not(.' + this.options.selectedClass + ')');
-            if (!initialFolding && options.animation) dragEl$1.thisAnimationDuration = null;
-            toSortable.captureAnimationState();
-            if (!initialFolding) {
-              if (options.animation) {
-                dragEl$1.fromRect = dragRect;
-                multiDragElements.forEach(function (multiDragElement) {
-                  multiDragElement.thisAnimationDuration = null;
-                  if (multiDragElement !== dragEl$1) {
-                    var rect = folding ? getRect(multiDragElement) : dragRect;
-                    multiDragElement.fromRect = rect;
-
-                    // Prepare unfold animation
-                    toSortable.addAnimationState({
-                      target: multiDragElement,
-                      rect: rect
-                    });
-                  }
-                });
-              }
-
-              // Multi drag elements are not necessarily removed from the DOM on drop, so to reinsert
-              // properly they must all be removed
-              removeMultiDragElements();
-              multiDragElements.forEach(function (multiDragElement) {
-                if (children[multiDragIndex]) {
-                  parentEl.insertBefore(multiDragElement, children[multiDragIndex]);
-                } else {
-                  parentEl.appendChild(multiDragElement);
-                }
-                multiDragIndex++;
-              });
-
-              // If initial folding is done, the elements may have changed position because they are now
-              // unfolding around dragEl, even though dragEl may not have his index changed, so update event
-              // must be fired here as Sortable will not.
-              if (oldIndex === index(dragEl$1)) {
-                var update = false;
-                multiDragElements.forEach(function (multiDragElement) {
-                  if (multiDragElement.sortableIndex !== index(multiDragElement)) {
-                    update = true;
-                    return;
-                  }
-                });
-                if (update) {
-                  dispatchSortableEvent('update');
-                  dispatchSortableEvent('sort');
-                }
-              }
-            }
-
-            // Must be done after capturing individual rects (scroll bar)
-            multiDragElements.forEach(function (multiDragElement) {
-              unsetRect(multiDragElement);
-            });
-            toSortable.animateAll();
-          }
-          multiDragSortable = toSortable;
-        }
-
-        // Remove clones if necessary
-        if (rootEl === parentEl || putSortable && putSortable.lastPutMode !== 'clone') {
-          multiDragClones.forEach(function (clone) {
-            clone.parentNode && clone.parentNode.removeChild(clone);
-          });
-        }
-      },
-      nullingGlobal: function nullingGlobal() {
-        this.isMultiDrag = dragStarted = false;
-        multiDragClones.length = 0;
-      },
-      destroyGlobal: function destroyGlobal() {
-        this._deselectMultiDrag();
-        off(document, 'pointerup', this._deselectMultiDrag);
-        off(document, 'mouseup', this._deselectMultiDrag);
-        off(document, 'touchend', this._deselectMultiDrag);
-        off(document, 'keydown', this._checkKeyDown);
-        off(document, 'keyup', this._checkKeyUp);
-      },
-      _deselectMultiDrag: function _deselectMultiDrag(evt) {
-        if (typeof dragStarted !== "undefined" && dragStarted) return;
-
-        // Only deselect if selection is in this sortable
-        if (multiDragSortable !== this.sortable) return;
-
-        // Only deselect if target is not item in this sortable
-        if (evt && closest(evt.target, this.options.draggable, this.sortable.el, false, originalDragEl$2)) return;
-
-        // Only deselect if left click
-        if (evt && evt.button !== 0) return;
-        while (multiDragElements.length) {
-          var el = multiDragElements[0];
-          toggleClass(el, this.options.selectedClass, false);
-          multiDragElements.shift();
-          dispatchEvent({
-            sortable: this.sortable,
-            rootEl: this.sortable.el,
-            name: 'deselect',
-            targetEl: el,
-            originalEvent: evt
-          });
-        }
-      },
-      _checkKeyDown: function _checkKeyDown(evt) {
-        if (evt.key === this.options.multiDragKey) {
-          this.multiDragKeyDown = true;
-        }
-      },
-      _checkKeyUp: function _checkKeyUp(evt) {
-        if (evt.key === this.options.multiDragKey) {
-          this.multiDragKeyDown = false;
-        }
+    }, {
+      key: "nulling",
+      value: function nulling() {
+        this.setLastSwapEl(null);
+        originalDragEl$2 = null;
       }
-    };
-    return _extends(MultiDrag, {
-      // Static methods & properties
-      pluginName: 'multiDrag',
-      utils: {
-        /**
-         * Selects the provided multi-drag item
-         * @param  {HTMLElement} el    The element to be selected
-         */
-        select: function select(el) {
-          var sortable = el.parentNode[expando];
-          if (!sortable || !sortable.options.multiDrag || ~multiDragElements.indexOf(el)) return;
-          if (multiDragSortable && multiDragSortable !== sortable) {
-            multiDragSortable.multiDrag._deselectMultiDrag();
-            multiDragSortable = sortable;
-          }
-          toggleClass(el, sortable.options.selectedClass, true);
-          multiDragElements.push(el);
-        },
-        /**
-         * Deselects the provided multi-drag item
-         * @param  {HTMLElement} el    The element to be deselected
-         */
-        deselect: function deselect(el) {
-          var sortable = el.parentNode[expando],
-            index = multiDragElements.indexOf(el);
-          if (!sortable || !sortable.options.multiDrag || !~index) return;
-          toggleClass(el, sortable.options.selectedClass, false);
-          multiDragElements.splice(index, 1);
-        }
-      },
-      eventProperties: function eventProperties() {
-        var _this3 = this;
-        var oldIndicies = [],
-          newIndicies = [];
-        multiDragElements.forEach(function (multiDragElement) {
-          oldIndicies.push({
-            multiDragElement: multiDragElement,
-            index: multiDragElement.sortableIndex
-          });
-
-          // multiDragElements will already be sorted if folding
-          var newIndex;
-          if (folding && multiDragElement !== dragEl$1) {
-            newIndex = -1;
-          } else if (folding) {
-            newIndex = index(multiDragElement, ':not(.' + _this3.options.selectedClass + ')');
-          } else {
-            newIndex = index(multiDragElement);
-          }
-          newIndicies.push({
-            multiDragElement: multiDragElement,
-            index: newIndex
-          });
-        });
-        return {
-          items: _toConsumableArray(multiDragElements),
-          clones: [].concat(multiDragClones),
-          oldIndicies: oldIndicies,
-          newIndicies: newIndicies
+    }], [{
+      key: "eventProperties",
+      value: function eventProperties() {
+        var obj = {
+          swapItem: lastSwapEl
         };
-      },
-      optionListeners: {
-        multiDragKey: function multiDragKey(key) {
-          key = key.toLowerCase();
-          if (key === 'ctrl') {
-            key = 'Control';
-          } else if (key.length > 1) {
-            key = key.charAt(0).toUpperCase() + key.substr(1);
-          }
-          return key;
+        if (newIndex$1 !== undefined) {
+          obj.newIndex = newIndex$1;
         }
+        return obj;
       }
-    });
-  }
-  function insertMultiDragElements(clonesInserted, rootEl) {
-    multiDragElements.forEach(function (multiDragElement, i) {
-      var target = rootEl.children[multiDragElement.sortableIndex + (clonesInserted ? Number(i) : 0)];
-      if (target) {
-        rootEl.insertBefore(multiDragElement, target);
-      } else {
-        rootEl.appendChild(multiDragElement);
-      }
-    });
-  }
-
-  /**
-   * Insert multi-drag clones
-   * @param  {[Boolean]} elementsInserted  Whether the multi-drag elements are inserted
-   * @param  {HTMLElement} rootEl
-   */
-  function insertMultiDragClones(elementsInserted, rootEl) {
-    multiDragClones.forEach(function (clone, i) {
-      var target = rootEl.children[clone.sortableIndex + (elementsInserted ? Number(i) : 0)];
-      if (target) {
-        rootEl.insertBefore(clone, target);
-      } else {
-        rootEl.appendChild(clone);
-      }
-    });
-  }
-  function removeMultiDragElements() {
-    multiDragElements.forEach(function (multiDragElement) {
-      if (multiDragElement === dragEl$1) return;
-      multiDragElement.parentNode && multiDragElement.parentNode.removeChild(multiDragElement);
-    });
-  }
+    }]);
+  }();
+  _defineProperty(Swap, "pluginName", 'swap');
 
-  var dragParent;
+  var _excluded$2 = ["axis", "originalEvent", "dragEl", "originalDragEl", "sortable", "fromSortable", "onMove", "ghostEl", "changed"];
+  var draggedTreeItemParent, draggedTreeItemLevel, draggedTreeItemBefore, draggedTreeItemAfter;
   var TreePlugin = /*#__PURE__*/function () {
     function TreePlugin(sortable) {
       _classCallCheck(this, TreePlugin);
@@ -3515,7 +3169,6 @@
       this.options = sortable.options;
       this.startX = 0;
       this.startLevel = 1;
-      this.currentLevel = 1;
       this.beforeElement = null;
     }
     return _createClass(TreePlugin, [{
@@ -3525,12 +3178,42 @@
       }
     }, {
       key: "dragStarted",
-      value: function dragStarted(evt) {
+      value: function dragStarted(_ref) {
+        var originalEvent = _ref.originalEvent,
+          dragEl = _ref.dragEl,
+          originalDragEl = _ref.originalDragEl,
+          sortable = _ref.sortable;
         if (!this.options.tree) return;
-        this.startX = evt.originalEvent.clientX;
-        this.startLevel = getLevel(evt.originalDragEl || evt.dragEl, this.options);
-        this.currentLevel = this.startLevel;
-      }
+        this.startX = originalEvent.clientX;
+        this.startLevel = getLevel(originalDragEl || dragEl, this.options);
+        draggedTreeItemLevel = this.startLevel;
+        this._getDraggedTreeItemParent(dragEl, originalDragEl, sortable);
+      }
+
+      // dragOverValid({ completed, target, onMove, activeSortable, changed, cancel }) {
+      // 	if (!this.options.tree) return;
+      //
+      // 	// Check if onMove function exists and call it
+      // 	if (onMove && typeof onMove === 'function') {
+      // 		const moveResult = onMove(target);
+      //
+      // 		// If onMove returns false, cancel the move
+      // 		if (moveResult === false) {
+      // 			cancel();
+      // 			return;
+      // 		}
+      //
+      // 		// If onMove returns a number (1 or -1), it indicates direction
+      // 		if (moveResult === 1 || moveResult === -1) {
+      // 			// Handle direction-based movement if needed
+      // 			// For tree structure, we might want to adjust level based on direction
+      // 		}
+      // 	}
+      //
+      // 	// Continue with normal tree logic
+      // 	changed();
+      // 	completed(true);
+      // }
     }, {
       key: "_findPrevSibling",
       value: function _findPrevSibling(el, originalDragEl) {
@@ -3538,7 +3221,7 @@
         var prev = el.previousElementSibling;
         var levelAttr = this.options.treeItemLevelAttr || 'data-level';
         while (prev) {
-          var match = closest(prev, this.options.draggable, this.sortable.el, false, originalDragEl);
+          var match = closest(prev, this.options.draggable, this.sortable.el, false, [originalDragEl]);
           if (match) {
             if (typeof level === 'number' && match.getAttribute(levelAttr) === level.toString() || level === undefined) return match;
           }
@@ -3551,29 +3234,50 @@
       value: function _findNextSibling(el, originalDragEl) {
         var next = el.nextElementSibling;
         while (next) {
-          var match = closest(next, this.options.draggable, this.sortable.el, false, originalDragEl);
+          var match = closest(next, this.options.draggable, this.sortable.el, false, [originalDragEl]);
           if (match) return match;
           next = next.nextElementSibling;
         }
         return null;
       }
+    }, {
+      key: "_getDraggedTreeItemParent",
+      value: function _getDraggedTreeItemParent(dragEl, originalDragEl, sortable) {
+        var _this$_findPrevSiblin;
+        draggedTreeItemParent = (_this$_findPrevSiblin = this._findPrevSibling(dragEl, originalDragEl, draggedTreeItemLevel - 1)) !== null && _this$_findPrevSiblin !== void 0 ? _this$_findPrevSiblin : sortable.el;
+      }
     }, {
       key: "dragOver",
-      value: function dragOver(evt) {
-        if (!this.options.tree || evt.axis === 'vertical') return;
-        var deltaX = evt.originalEvent.clientX - this.startX;
+      value: function dragOver(_ref2) {
+        var axis = _ref2.axis,
+          originalEvent = _ref2.originalEvent,
+          dragEl = _ref2.dragEl,
+          originalDragEl = _ref2.originalDragEl,
+          sortable = _ref2.sortable,
+          fromSortable = _ref2.fromSortable,
+          onMove = _ref2.onMove,
+          ghostEl = _ref2.ghostEl,
+          changed = _ref2.changed,
+          other = _objectWithoutProperties(_ref2, _excluded$2);
+        if (!this.options.tree || axis === 'vertical') return;
+        var deltaX = originalEvent.clientX - this.startX;
         var indent = this.options.treeIndentThreshold || 10;
         var levelAttr = this.options.treeItemLevelAttr || 'data-level';
-        var before = this._findPrevSibling(evt.dragEl, evt.originalDragEl);
-        var after = this._findNextSibling(evt.dragEl, evt.originalDragEl);
-        var beforeLevel = before ? getLevel(before, this.options) : 1;
-        var afterLevel = after ? getLevel(after, this.options) : 1;
+        draggedTreeItemBefore = this._findPrevSibling(dragEl, originalDragEl);
+        draggedTreeItemAfter = this._findNextSibling(dragEl, originalDragEl);
+        var beforeLevel = draggedTreeItemBefore ? getLevel(draggedTreeItemBefore, this.options) : 1;
+        var afterLevel = draggedTreeItemAfter ? getLevel(draggedTreeItemAfter, this.options) : 1;
+        if (draggedTreeItemBefore) draggedTreeItemBefore.level = beforeLevel;
+        if (draggedTreeItemAfter) draggedTreeItemAfter.level = afterLevel;
         var minLevel = 1;
         var maxLevel = 1;
-        if (before && after) {
-          minLevel = Math.min(beforeLevel + 1, afterLevel, beforeLevel);
+        if (draggedTreeItemBefore && draggedTreeItemAfter) {
+          minLevel = Math.min(beforeLevel + 1, afterLevel);
+          if (beforeLevel >= afterLevel) {
+            minLevel = Math.min(minLevel, beforeLevel);
+          }
           maxLevel = Math.max(beforeLevel + 1, afterLevel);
-        } else if (!after) {
+        } else if (!draggedTreeItemAfter) {
           minLevel = 1;
           maxLevel = beforeLevel + 1;
         } else {
@@ -3581,51 +3285,65 @@
         }
         var levelChange = Math.floor(deltaX / indent);
         var newLevel = Math.max(minLevel, Math.min(maxLevel, this.startLevel + levelChange));
-        if (newLevel !== this.currentLevel || this.beforeElement !== before) {
-          var _evt$dragEl, _evt$dragEl$setAttrib, _evt$ghostEl, _evt$ghostEl$setAttri;
-          this.beforeElement = before;
-          this.currentLevel = newLevel;
-          if (evt.originalDragEl) {
-            evt.originalDragEl.setAttribute("sortable-".concat(levelAttr), this.currentLevel);
-          }
-          (_evt$dragEl = evt.dragEl) === null || _evt$dragEl === void 0 || (_evt$dragEl$setAttrib = _evt$dragEl.setAttribute) === null || _evt$dragEl$setAttrib === void 0 || _evt$dragEl$setAttrib.call(_evt$dragEl, "sortable-".concat(levelAttr), this.currentLevel);
-          (_evt$ghostEl = evt.ghostEl) === null || _evt$ghostEl === void 0 || (_evt$ghostEl$setAttri = _evt$ghostEl.setAttribute) === null || _evt$ghostEl$setAttri === void 0 || _evt$ghostEl$setAttri.call(_evt$ghostEl, "sortable-".concat(levelAttr), this.currentLevel);
+        if (newLevel !== draggedTreeItemLevel || this.beforeElement !== draggedTreeItemBefore || sortable !== fromSortable) {
           this.removeDragPrent();
-          if (newLevel > 1) {
-            dragParent = this._findPrevSibling(evt.dragEl, evt.originalDragEl, newLevel - 1);
-            if (dragParent) dragParent.setAttribute('sortable-data-parent', 'true');
-          }
-          var target = before || after || this.sortable.el;
+          this.beforeElement = draggedTreeItemBefore;
+          draggedTreeItemLevel = newLevel;
+          this._getDraggedTreeItemParent(dragEl, originalDragEl, sortable);
+          var target = draggedTreeItemBefore || draggedTreeItemAfter || this.sortable.el;
           var targetRect = getRect(target);
-          this.sortable._getPlaceholderOnMove(this.sortable.el, getRect(evt.dragEl), target, targetRect, evt, Boolean(before));
+          var moveResult = onMove(target, Boolean(draggedTreeItemBefore));
+          if (moveResult !== false) {
+            var _dragEl$setAttribute, _ghostEl$setAttribute;
+            if (originalDragEl && !(typeof this.options.getPlaceholder === 'function' || typeof this.options.getPlaceholderOnMove === 'function')) {
+              originalDragEl.setAttribute(levelAttr, draggedTreeItemLevel);
+            }
+            dragEl === null || dragEl === void 0 || (_dragEl$setAttribute = dragEl.setAttribute) === null || _dragEl$setAttribute === void 0 || _dragEl$setAttribute.call(dragEl, levelAttr, draggedTreeItemLevel);
+            ghostEl === null || ghostEl === void 0 || (_ghostEl$setAttribute = ghostEl.setAttribute) === null || _ghostEl$setAttribute === void 0 || _ghostEl$setAttribute.call(ghostEl, levelAttr, draggedTreeItemLevel);
+            if (newLevel > 1 && draggedTreeItemParent) draggedTreeItemParent.setAttribute('data-drag-parent', 'true');
+            this.sortable._getPlaceholderOnMove(this.sortable.el, getRect(dragEl), target, targetRect, originalEvent, Boolean(draggedTreeItemBefore));
+            changed();
+          }
         }
       }
     }, {
       key: "drop",
       value: function drop(evt) {
-        var _evt$dragEl2, _evt$dragEl2$setAttri, _evt$ghostEl2, _evt$ghostEl2$setAttr;
         if (!this.options.tree) return;
-        var levelAttr = this.options.treeItemLevelAttr || 'data-level';
-        if (evt.originalDragEl) {
-          evt.originalDragEl.setAttribute("sortable-".concat(levelAttr), this.currentLevel);
-        }
-        (_evt$dragEl2 = evt.dragEl) === null || _evt$dragEl2 === void 0 || (_evt$dragEl2$setAttri = _evt$dragEl2.setAttribute) === null || _evt$dragEl2$setAttri === void 0 || _evt$dragEl2$setAttri.call(_evt$dragEl2, "sortable-".concat(levelAttr), this.currentLevel);
-        (_evt$ghostEl2 = evt.ghostEl) === null || _evt$ghostEl2 === void 0 || (_evt$ghostEl2$setAttr = _evt$ghostEl2.setAttribute) === null || _evt$ghostEl2$setAttr === void 0 || _evt$ghostEl2$setAttr.call(_evt$ghostEl2, "sortable-".concat(levelAttr), this.currentLevel);
       }
     }, {
       key: "removeDragPrent",
       value: function removeDragPrent() {
-        if (dragParent) {
-          dragParent.removeAttribute('sortable-data-parent');
+        if (draggedTreeItemParent) {
+          draggedTreeItemParent.removeAttribute('data-drag-parent');
         }
-        dragParent = null;
+        draggedTreeItemParent = null;
       }
     }, {
       key: "nulling",
       value: function nulling() {
         this.removeDragPrent();
         this.startX = 0;
-        this.startLevel = this.currentLevel = 1;
+        this.startLevel = 1;
+        draggedTreeItemLevel = draggedTreeItemBefore = draggedTreeItemAfter = undefined;
+      }
+    }], [{
+      key: "eventProperties",
+      value: function eventProperties() {
+        var obj = {};
+        if (draggedTreeItemParent !== undefined) {
+          obj.draggedTreeItemParent = draggedTreeItemParent;
+        }
+        if (draggedTreeItemLevel !== undefined) {
+          obj.draggedTreeItemLevel = draggedTreeItemLevel;
+        }
+        if (draggedTreeItemBefore !== undefined) {
+          obj.draggedTreeItemBefore = draggedTreeItemBefore;
+        }
+        if (draggedTreeItemAfter !== undefined) {
+          obj.draggedTreeItemAfter = draggedTreeItemAfter;
+        }
+        return obj;
       }
     }]);
   }();
@@ -3637,10 +3355,9 @@
 
   Sortable.mount(TreePlugin);
   Sortable.mount(AutoScroll);
-  Sortable.mount(Remove, Revert);
+  Sortable.mount(RemoveOnSpill, RevertOnSpill);
 
-  Sortable.mount(new SwapPlugin());
-  Sortable.mount(new MultiDragPlugin());
+  Sortable.mount(Swap);
 
   return Sortable;