From 68a84a7da7325ab781a24432254ebfb9808a8b0e Mon Sep 17 00:00:00 2001
From: Andrea Bogazzi <andreabogazzi79@gmail.com>
Date: Sat, 29 Sep 2018 10:10:06 -0400
Subject: [PATCH] Avoid enter editing if there is another active object on the
 canvas (#5261)

* better-than-nothing
* check that the active object exist
* test
* added a test
---
 src/mixins/canvas_events.mixin.js        |  2 +-
 src/mixins/itext_click_behavior.mixin.js | 10 ++++++++++
 test/unit/itext_click_behaviour.js       | 14 ++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/mixins/canvas_events.mixin.js b/src/mixins/canvas_events.mixin.js
index a8f1b249753..f092534a339 100644
--- a/src/mixins/canvas_events.mixin.js
+++ b/src/mixins/canvas_events.mixin.js
@@ -620,7 +620,7 @@
       }
       this._handleEvent(e, 'down');
       // we must renderAll so that we update the visuals
-      shouldRender && this.requestRenderAll();
+      (shouldRender || shouldGroup) && this.requestRenderAll();
     },
 
     /**
diff --git a/src/mixins/itext_click_behavior.mixin.js b/src/mixins/itext_click_behavior.mixin.js
index 14ceb0c4301..2aea508f156 100644
--- a/src/mixins/itext_click_behavior.mixin.js
+++ b/src/mixins/itext_click_behavior.mixin.js
@@ -139,6 +139,16 @@ fabric.util.object.extend(fabric.IText.prototype, /** @lends fabric.IText.protot
       return;
     }
 
+    if (this.canvas) {
+      var currentActive = this.canvas._activeObject;
+      if (currentActive && currentActive !== this) {
+        // avoid running this logic when there is an active object
+        // this because is possible with shift click and fast clicks,
+        // to rapidly deselect and reselect this object and trigger an enterEdit
+        return;
+      }
+    }
+
     if (this.__lastSelected && !this.__corner) {
       this.selected = false;
       this.__lastSelected = false;
diff --git a/test/unit/itext_click_behaviour.js b/test/unit/itext_click_behaviour.js
index 76220dc428a..7a9ce0123b4 100644
--- a/test/unit/itext_click_behaviour.js
+++ b/test/unit/itext_click_behaviour.js
@@ -61,12 +61,26 @@
     iText.renderCursorOrSelection = function() {};
     assert.equal(iText.isEditing, false, 'iText not editing');
     iText.canvas = canvas;
+    canvas._activeObject = null;
     iText.selected = true;
     iText.__lastSelected = true;
     iText.mouseUpHandler({ e: {} });
     assert.equal(iText.isEditing, true, 'iText entered editing');
     iText.exitEditing();
   });
+  QUnit.test('_mouseUpHandler on a selected object does enter edit if there is an activeObject', function(assert) {
+    var iText = new fabric.IText('test');
+    iText.initDelayedCursor = function() {};
+    iText.renderCursorOrSelection = function() {};
+    assert.equal(iText.isEditing, false, 'iText not editing');
+    iText.canvas = canvas;
+    canvas._activeObject = new fabric.IText('test2');
+    iText.selected = true;
+    iText.__lastSelected = true;
+    iText.mouseUpHandler({ e: {} });
+    assert.equal(iText.isEditing, false, 'iText did not enter editing');
+    iText.exitEditing();
+  });
   QUnit.test('_mouseUpHandler on a selected text in a group DOES NOT enter edit', function(assert) {
     var iText = new fabric.IText('test');
     iText.initDelayedCursor = function() {};