fix(Tree): can`t drag external element

alibaba-fusion · Feb 22, 2019 · a247a09 · a247a09
1 parent d6a9afc
commit a247a09
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/docs/tree/demo/draggable.md b/docs/tree/demo/draggable.md
@@ -57,6 +57,9 @@ class Demo extends React.Component {
     }
 
     onDrop(info) {
+        if (!info.dragNode) {
+            return;
+        }
         const dragKey = info.dragNode.props.eventKey;
         const dropKey = info.node.props.eventKey;
         const dropPosition = info.dropPosition;

diff --git a/src/tree/view/tree.jsx b/src/tree/view/tree.jsx
@@ -782,7 +782,7 @@ export default class Tree extends Component {
     handleDragEnter(e, node) {
         const dragOverNodeKey = node.props.eventKey;
         this.dropPosition = this.getDropPosition(e, node);
-        if (this.dragNode.props.eventKey === dragOverNodeKey && this.dropPosition === 0) {
+        if (this.dragNode && this.dragNode.props.eventKey === dragOverNodeKey && this.dropPosition === 0) {
             this.setState({
                 dragOverNodeKey: null
             });
@@ -835,7 +835,7 @@ export default class Tree extends Component {
     }
 
     handleDrop(e, node) {
-        if (isDescendantOrSelf(this._k2n[this.dragNode.props.eventKey].pos, this._k2n[node.props.eventKey].pos)) {
+        if (this.dragNode && isDescendantOrSelf(this._k2n[this.dragNode.props.eventKey].pos, this._k2n[node.props.eventKey].pos)) {
             return;
         }