Merge pull request #7 from FormAPI/master

Prevent click event after item has been dragged, and ignore the right mouse button

Author: zyzo

src/MouseBackend.js

@@ -44,6 +44,10 @@ export default class MouseBackend {
       this.handleWindowMoveCapture.bind(this)
     this.handleWindowMoveEndCapture =
       this.handleWindowMoveEndCapture.bind(this)
+    this.handleWindowClick =
+      this.handleWindowClick.bind(this)
+    this.handleWindowDragstart =
+      this.handleWindowDragstart.bind(this)
   }
 
   setup() {
@@ -64,6 +68,10 @@ export default class MouseBackend {
       this.handleWindowMoveCapture, true)
     window.addEventListener('mouseup',
       this.handleWindowMoveEndCapture, true)
+    window.addEventListener('click',
+      this.handleWindowClick, true)
+    window.addEventListener('dragstart',
+      this.handleWindowDragstart, true)
   }
 
   getSourceClientOffset (sourceId) {
@@ -86,6 +94,10 @@ export default class MouseBackend {
       'mousemove', this.handleWindowMoveCapture, true)
     window.removeEventListener(
       'mouseup', this.handleWindowMoveEndCapture, true)
+    window.removeEventListener(
+      'click', this.handleWindowClick, true)
+    window.removeEventListener(
+      'dragstart', this.handleWindowDragstart, true)
   }
 
   connectDragSource(sourceId, node) {
@@ -124,7 +136,9 @@ export default class MouseBackend {
     this.moveStartSourceIds = []
   }
 
-  handleMoveStart (sourceId) {
+  handleMoveStart (sourceId, e) {
+    // Ignore right mouse button.
+    if (e.which === 3) return
     this.moveStartSourceIds.unshift(sourceId)
   }
 
@@ -185,6 +199,7 @@ export default class MouseBackend {
       this.moveStartSourceIds = null
       return
     }
+    this.preventClick = true
 
     e.preventDefault()
 
@@ -195,6 +210,16 @@ export default class MouseBackend {
     this.actions.endDrag()
   }
 
+  handleWindowClick(e) {
+    if (this.preventClick) e.stopPropagation()
+    this.preventClick = false
+  }
+
+  // Disable drag on images (Firefox)
+  handleWindowDragstart(e) {
+    e.preventDefault()
+  }
+
   installSourceNodeRemovalObserver (node) {
     this.uninstallSourceNodeRemovalObserver()