Firedeselectedalsowithmouse (#3716)

* added code * added test
fabricjs · Feb 19, 2017 · 54f76a1 · 54f76a1
1 parent b9d4888
commit 54f76a1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/mixins/canvas_events.mixin.js b/src/mixins/canvas_events.mixin.js
@@ -497,10 +497,13 @@
           this._beforeTransform(e, target);
           this._setupCurrentTransform(e, target);
         }
-
-        if (target !== this.getActiveGroup() && target !== this.getActiveObject()) {
+        var activeObject = this.getActiveObject();
+        if (target !== this.getActiveGroup() && target !== activeObject) {
           this.deactivateAll();
-          target.selectable && this.setActiveObject(target, e);
+          if (target.selectable) {
+            activeObject.fire('deselected', { e: e });
+            this.setActiveObject(target, e);
+          }
         }
       }
       this._handleEvent(e, 'down', target ? target : null);

diff --git a/test/unit/canvas.js b/test/unit/canvas.js
@@ -296,6 +296,17 @@
     equal(isFired, true, 'removing active object should fire "selection:cleared"');
   });
 
+  test('setActiveObject fires deselected', function() {
+    var isFired = false;
+    var rect1 = new fabric.Rect();
+    var rect2 = new fabric.Rect();
+    rect1.on('deselected', function() { isFired = true; });
+
+    canvas.setActiveObject(rect1);
+    canvas.setActiveObject(rect2);
+    equal(isFired, true, 'switching active group fires deselected');
+  });
+
   test('getContext', function() {
     ok(typeof canvas.getContext == 'function');
   });