actions/drop/DopEvent: fix for failing tests

taye · Mar 22, 2018 · 19bbc29 · 19bbc29
1 parent 0d84db4
commit 19bbc29
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/actions/drop/DropEvent.js b/src/actions/drop/DropEvent.js
@@ -2,11 +2,9 @@ import * as arr from '../../utils/arr';
 
 export default class DropEvent {
   constructor (dropStatus, dragEvent, type) {
-    const { element, dropzone } = type === 'deactivate'
-      ? { element: null, dropzone: null }
-      : type === 'dragleave'
-        ? dropStatus.prev
-        : dropStatus.cur;
+    const { element, dropzone } = type === 'dragleave'
+      ? dropStatus.prev
+      : dropStatus.cur;
 
     this.type          = type;
     this.target        = element;
@@ -40,10 +38,6 @@ export default class DropEvent {
 
     this.stopImmediatePropagation();
 
-    if (this.type === 'dragenter') {
-      this.dropzone.fire(new DropEvent(dropStatus, this.dragEvent, 'dragleave'));
-    }
-
     if (this.type === 'dropactivate') {
       const activeDrops = dropStatus.activeDrops;
       const index = arr.findIndex(activeDrops, ({ dropzone, element }) =>
@@ -61,6 +55,9 @@ export default class DropEvent {
 
       this.dropzone.fire(deactivateEvent);
     }
+    else {
+      this.dropzone.fire(new DropEvent(dropStatus, this.dragEvent, 'dragleave'));
+    }
   }
 
   preventDefault () {}