0.9.2

react-dnd · Mar 1, 2015 · 2c34aaa · 2c34aaa
1 parent 43a9802
commit 2c34aaa
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 31 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "react-dnd",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "homepage": "https://github.com/gaearon/react-dnd",
   "authors": [
     "Dan Abramov <dan.abramov@me.com>"

diff --git a/dist-modules/backends/HTML5.js b/dist-modules/backends/HTML5.js
@@ -24,6 +24,13 @@ function getElementRect(el) {
   return { top: rect.top, left: rect.left, width: rect.width, height: rect.height };
 }
 
+function getClientOffset(e) {
+  return {
+    x: e.clientX,
+    y: e.clientY
+  };
+}
+
 function checkIfCurrentDragTargetRectChanged() {
   if (!_dragTargetRectDidChange) {
     var currentRect = getElementRect(_currentDragTarget);
@@ -52,6 +59,13 @@ function preventDefaultNativeDropAction(e) {
   }
 }
 
+function handleTopDragStart(e) {
+  // If by this time no drag source reacted, tell browser not to drag.
+  if (!DragOperationStore.isDragging()) {
+    e.preventDefault();
+  }
+}
+
 function handleTopDragEnter(e) {
   // IE requires this to not show a nodrag icon over the container
   e.preventDefault();
@@ -69,7 +83,7 @@ function handleTopDragEnter(e) {
 function handleTopDragOver(e) {
   preventDefaultNativeDropAction(e);
 
-  var offsetFromClient = HTML5.getOffsetFromClient(_currentComponent, e);
+  var offsetFromClient = getClientOffset(e);
   DragDropActionCreators.drag(offsetFromClient);
 
   // At the top level of event bubbling, use previously set drop effect and reset it.
@@ -106,22 +120,24 @@ function handleTopDrop(e) {
 }
 
 var HTML5 = {
-  setup: function setup(component) {
+  setup: function setup() {
     if (typeof window === "undefined") {
       return;
     }
 
+    window.addEventListener("dragstart", handleTopDragStart);
     window.addEventListener("dragenter", handleTopDragEnter);
     window.addEventListener("dragover", handleTopDragOver);
     window.addEventListener("dragleave", handleTopDragLeave);
     window.addEventListener("drop", handleTopDrop);
   },
 
-  teardown: function teardown(component) {
+  teardown: function teardown() {
     if (typeof window === "undefined") {
       return;
     }
 
+    window.removeEventListener("dragstart", handleTopDragStart);
     window.removeEventListener("dragenter", handleTopDragEnter);
     window.removeEventListener("dragover", handleTopDragOver);
     window.removeEventListener("dragleave", handleTopDragLeave);
@@ -145,7 +161,7 @@ var HTML5 = {
     window.addEventListener("mousemove", triggerDragEndIfDragSourceWasRemovedFromDOM, true);
   },
 
-  endDrag: function endDrag(component) {
+  endDrag: function endDrag() {
     _currentDragTarget = null;
     _currentComponent = null;
     _initialDragTargetRect = null;
@@ -179,10 +195,7 @@ var HTML5 = {
   },
 
   getOffsetFromClient: function getOffsetFromClient(component, e) {
-    return {
-      x: e.clientX,
-      y: e.clientY
-    };
+    return getClientOffset(e);
   }
 };
 

diff --git a/dist-modules/constants/NativeDragItemTypes.js b/dist-modules/constants/NativeDragItemTypes.js
@@ -1,7 +1,5 @@
 "use strict";
 
-var keyMirror = require("react/lib/keyMirror");
-
 var NativeDragItemTypes = {
   FILE: "__NATIVE_FILE__",
   URL: "__NATIVE_URL__"

diff --git a/dist-modules/utils/createDragDropMixin.js b/dist-modules/utils/createDragDropMixin.js
@@ -14,8 +14,7 @@ var DragDropActionCreators = require("../actions/DragDropActionCreators"),
     assign = require("react/lib/Object.assign"),
     defaults = require("lodash/object/defaults"),
     isArray = require("lodash/lang/isArray"),
-    isObject = require("lodash/lang/isObject"),
-    noop = require("lodash/utility/noop");
+    isObject = require("lodash/lang/isObject");
 
 function checkValidType(component, type) {
   /*jshint -W122 */
@@ -174,10 +173,7 @@ function createDragDropMixin(backend) {
       var _dragSources$type = this._dragSources[type];
       var canDrag = _dragSources$type.canDrag;
       var beginDrag = _dragSources$type.beginDrag;
-
-
-      if (!canDrag(this)) {
-        e.preventDefault();
+      if (DragOperationStore.isDragging() || !canDrag(this)) {
         return;
       }
 
@@ -197,6 +193,10 @@ function createDragDropMixin(backend) {
         y: offsetFromClient.y - containerRect.top
       };
 
+      if (!dragPreview) {
+        dragPreview = containerNode;
+      }
+
       if (!effectsAllowed) {
         // Move is a sensible default drag effect.
         // Browser shows a drag preview anyway so we usually don't want "+" icon.
@@ -222,7 +222,7 @@ function createDragDropMixin(backend) {
       });
     },
 
-    handleDragEnd: function handleDragEnd(type, e) {
+    handleDragEnd: function handleDragEnd(type) {
       backend.endDrag(this);
 
       var endDrag = this._dragSources[type].endDrag;
@@ -298,9 +298,7 @@ function createDragDropMixin(backend) {
 
       e.preventDefault();
 
-      var _dropTargets$state$draggedItemType = this._dropTargets[this.state.draggedItemType];
-      var over = _dropTargets$state$draggedItemType.over;
-      var getDropEffect = _dropTargets$state$draggedItemType.getDropEffect;
+      var over = this._dropTargets[this.state.draggedItemType].over;
       over(this, this.state.draggedItem);
 
       // Don't use `none` because this will prevent browser from firing `dragend`

diff --git a/dist/ReactDND.min.js b/dist/ReactDND.min.js
diff --git a/examples/bundle.js b/examples/bundle.js
diff --git a/examples/bundle.js.map b/examples/bundle.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-dnd",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "Drag and drop for React with full DOM control",
   "main": "dist-modules/index.js",
   "scripts": {