update CHANGELOG with new version

CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 7.0.3 - 2020-07-09
+
+* Fix wring `dragend` trigger on `draggable` property change inside `click`
 * Fix incorrect text rendering with `letterSpacing !== 0`
 * Typescript fixes
 

src/Layer.ts

@@ -64,10 +64,10 @@ export class Layer extends Container<Group | Shape> {
 
   constructor(config?: LayerConfig) {
     super(config);
-    this.on('visibleChange', this._checkVisibility);
+    this.on('visibleChange.konva', this._checkVisibility);
     this._checkVisibility();
 
-    this.on('imageSmoothingEnabledChange', this._setSmoothEnabled);
+    this.on('imageSmoothingEnabledChange.konva', this._setSmoothEnabled);
     this._setSmoothEnabled();
   }
   // for nodejs?

src/Node.ts

@@ -2461,8 +2461,17 @@ export abstract class Node<Config extends NodeConfig = NodeConfig> {
        * drag and drop mode
        */
       var stage = this.getStage();
-      if (stage && DD._dragElements.has(this._id)) {
+      if (!stage) {
+        return;
+      }
+      const dragElement = DD._dragElements.get(this._id);
+      const isDragging = dragElement && dragElement.dragStatus === 'dragging';
+      const isReady = dragElement && dragElement.dragStatus === 'ready';
+
+      if (isDragging) {
         this.stopDrag();
+      } else if (isReady) {
+        DD._dragElements.delete(this._id);
       }
     }
   }

test/unit/DragAndDrop-test.js

@@ -1126,4 +1126,46 @@ suite('DragAndDrop', function () {
     assert.equal(circle.x(), 70);
     assert.equal(circle.y(), 70);
   });
+
+  test('disable drag on click', function () {
+    var stage = addStage();
+    stage.draggable(true);
+    var layer = new Konva.Layer();
+    stage.add(layer);
+
+    var circle = new Konva.Circle({
+      x: 70,
+      y: 70,
+      radius: 70,
+      fill: 'green',
+      stroke: 'black',
+      strokeWidth: 4,
+      name: 'myCircle',
+      draggable: true,
+    });
+    layer.add(circle);
+    layer.draw();
+
+    circle.on('click', function () {
+      circle.draggable(false);
+      circle.draggable(true);
+    });
+
+    var dragstart = 0;
+    var dragend = 0;
+
+    stage.on('dragstart', function (e) {
+      dragstart += 1;
+    });
+    stage.on('dragend', function (e) {
+      dragend += 1;
+    });
+
+    stage.simulateMouseDown({ x: 70, y: 75 });
+    stage.simulateMouseUp({ x: 70, y: 70 });
+
+    // drag events should not be called
+    assert.equal(dragstart, 0);
+    assert.equal(dragend, 0);
+  });
 });