easy-drag-and-drop 1.3.145 → 1.3.146

package/src/mixins/drag.js

@@ -40,13 +40,55 @@ function disableDrag() {
   this.offMouseDown(mouseDownHandler, this);
 }
 
+function onCustomDrag(dragCustomHandler, element) {
+  const customEventType = DRAG_CUSTOM_EVENT_TYPE,
+        customHandler = dragCustomHandler;  ///
+
+  this.onCustomEvent(customEventType, customHandler, element);
+}
+
+function offCustomDrag(dragCustomHandler, element) {
+  const customEventType = DRAG_CUSTOM_EVENT_TYPE,
+        customHandler = dragCustomHandler;  ///
+
+  this.offCustomEvent(customEventType, customHandler, element);
+}
+
+function onCustomStopDrag(stopDragCustomHandler, element) {
+  const customEventType = STOP_DRAG_CUSTOM_EVENT_TYPE,
+        customHandler = stopDragCustomHandler;  ///
+
+  this.onCustomEvent(customEventType, customHandler, element);
+}
+
+function offCustomStopDrag(stopDragCustomHandler, element) {
+  const customEventType = STOP_DRAG_CUSTOM_EVENT_TYPE,
+        customHandler = stopDragCustomHandler;  ///
+
+  this.offCustomEvent(customEventType, customHandler, element);
+}
+
+function onCustomStartDrag(startDragCustomHandler, element) {
+  const customEventType = START_DRAG_CUSTOM_EVENT_TYPE,
+        customHandler = startDragCustomHandler;  ///
+
+  this.onCustomEvent(customEventType, customHandler, element);
+}
+
+function offCustomStartDrag(startDragCustomHandler, element) {
+  const customEventType = START_DRAG_CUSTOM_EVENT_TYPE,
+        customHandler = startDragCustomHandler;  ///
+
+  this.offCustomEvent(customEventType, customHandler, element);
+}
+
 function isDragging() {
   const dragging = this.hasClass("dragging");
 
   return dragging;
 }
 
-function startDrag(mouseTop, mouseLeft) {
+function startDrag(event, element, mouseTop, mouseLeft) {
   const bounds = this.getBounds(),
         boundsTop = bounds.getTop(),
         boundsLeft = bounds.getLeft(),
@@ -79,12 +121,12 @@ function startDrag(mouseTop, mouseLeft) {
 
   this.setStartMouseLeft(startMouseLeft);
 
-  this.callCustomHandlers(customEventType);
+  this.callCustomHandlers(customEventType, event, element);
 
-  this.drag(mouseTop, mouseLeft);
+  this.drag(event, element, mouseTop, mouseLeft);
 }
 
-function stopDrag(aborted) {
+function stopDrag(event, element, aborted) {
   const { dropElement } = globalThis,
         customEventType = STOP_DRAG_CUSTOM_EVENT_TYPE;
 
@@ -93,7 +135,7 @@ function stopDrag(aborted) {
   window.offMouseMove(mouseMoveHandler, this);
 
   const done = () => {
-    this.callCustomHandlersAsync(customEventType, dropElement, aborted, () => {
+    this.callCustomHandlersAsync(customEventType, event, element, dropElement, aborted, () => {
       const dragElement = null;
 
       Object.assign(globalThis, {
@@ -113,13 +155,13 @@ function stopDrag(aborted) {
       dragElement = null;
     }
 
-    dropElement.drop(dragElement, aborted, done);
+    dropElement.drop(event, element, dragElement, aborted, done);
   } else {
     done();
   }
 }
 
-function drag(mouseTop, mouseLeft) {
+function drag(event, element, mouseTop, mouseLeft) {
   const scrollTop = window.getScrollTop(),
         scrollLeft = window.getScrollLeft(),
         topOffset = this.getTopOffset(),
@@ -143,59 +185,17 @@ function drag(mouseTop, mouseLeft) {
 
   this.css(css);
 
-  this.callCustomHandlers(customEventType, relativeMouseTop, relativeMouseLeft);
-}
-
-function onCustomDrag(dragCustomHandler, element) {
-  const customEventType = DRAG_CUSTOM_EVENT_TYPE,
-        customHandler = dragCustomHandler;  ///
-
-  this.onCustomEvent(customEventType, customHandler, element);
-}
-
-function offCustomDrag(dragCustomHandler, element) {
-  const customEventType = DRAG_CUSTOM_EVENT_TYPE,
-        customHandler = dragCustomHandler;  ///
-
-  this.offCustomEvent(customEventType, customHandler, element);
-}
-
-function onCustomStopDrag(stopDragCustomHandler, element) {
-  const customEventType = STOP_DRAG_CUSTOM_EVENT_TYPE,
-        customHandler = stopDragCustomHandler;  ///
-
-  this.onCustomEvent(customEventType, customHandler, element);
-}
-
-function offCustomStopDrag(stopDragCustomHandler, element) {
-  const customEventType = STOP_DRAG_CUSTOM_EVENT_TYPE,
-        customHandler = stopDragCustomHandler;  ///
-
-  this.offCustomEvent(customEventType, customHandler, element);
-}
-
-function onCustomStartDrag(startDragCustomHandler, element) {
-  const customEventType = START_DRAG_CUSTOM_EVENT_TYPE,
-        customHandler = startDragCustomHandler;  ///
-
-  this.onCustomEvent(customEventType, customHandler, element);
+  this.callCustomHandlers(event, element, customEventType, relativeMouseTop, relativeMouseLeft);
 }
 
-function offCustomStartDrag(startDragCustomHandler, element) {
-  const customEventType = START_DRAG_CUSTOM_EVENT_TYPE,
-        customHandler = startDragCustomHandler;  ///
-
-  this.offCustomEvent(customEventType, customHandler, element);
-}
-
-function startWaitingToDrag(mouseTop, mouseLeft) {
+function startWaitingToDrag(event, element, mouseTop, mouseLeft) {
   let timeout = this.getTimeout();
 
   if (timeout === null) {
     timeout = setTimeout(() => {
       this.resetTimeout();
 
-      this.startDrag(mouseTop, mouseLeft);
+      this.startDrag(event, element, mouseTop, mouseLeft);
     }, START_DRAGGING_DELAY);
 
     this.updateTimeout(timeout);
@@ -281,16 +281,16 @@ function setStartMouseLeft(startMouseLeft) {
 export default {
   enableDrag,
   disableDrag,
-  isDragging,
-  startDrag,
-  stopDrag,
-  drag,
   onCustomDrag,
   offCustomDrag,
   onCustomStopDrag,
   offCustomStopDrag,
   onCustomStartDrag,
   offCustomStartDrag,
+  isDragging,
+  startDrag,
+  stopDrag,
+  drag,
   startWaitingToDrag,
   stopWaitingToDrag,
   getTimeout,
@@ -312,7 +312,7 @@ function keyDownHandler(event, element) {
         aborted = true;
 
   if (escapeKey) {
-    this.stopDrag(aborted);
+    this.stopDrag(event, element, aborted);
 
     event.stopPropagation();
   }
@@ -323,7 +323,7 @@ function mouseUpHandler(event, element) {
         aborted = false;
 
   dragging ?
-    this.stopDrag(aborted) :
+    this.stopDrag(event, element, aborted) :
       this.stopWaitingToDrag();
 
   event.stopPropagation();
@@ -343,7 +343,7 @@ function mouseDownHandler(event, element) {
       const mouseTop = mouseTopFromEvent(event),
             mouseLeft = mouseLeftFromEvent(event);
 
-      this.startWaitingToDrag(mouseTop, mouseLeft);
+      this.startWaitingToDrag(event, element, mouseTop, mouseLeft);
     }
   }
 
@@ -361,7 +361,7 @@ function mouseMoveHandler(event, element) {
     const mouseTop = mouseTopFromEvent(event),
           mouseLeft = mouseLeftFromEvent(event);
 
-    this.drag(mouseTop, mouseLeft);
+    this.drag(event, element, mouseTop, mouseLeft);
   }
 
   event.stopPropagation();

package/src/mixins/drop.js

@@ -9,10 +9,10 @@ Object.assign(globalThis, {
   dropElement
 });
 
-function drop(dragElement, aborted, done) {
+function drop(event, element, dragElement, aborted, done) {
   const customEventType = DROP_CUSTOM_EVENT_TYPE;
 
-  this.callCustomHandlersAsync(customEventType, dragElement, aborted, done);
+  this.callCustomHandlersAsync(customEventType, event, element, dragElement, aborted, done);
 }
 
 function dragOut(dragElement) {