From 9f0ed070eb1b0571b8f200b95c6cac4bd17cac0c Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Sun, 22 Apr 2018 14:33:26 +0200
Subject: [PATCH] Ensure the resizer focus on selected component

---
 src/commands/view/Resize.js          | 1 +
 src/commands/view/SelectComponent.js | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/commands/view/Resize.js b/src/commands/view/Resize.js
index a35becd63..90d0e6752 100644
--- a/src/commands/view/Resize.js
+++ b/src/commands/view/Resize.js
@@ -19,6 +19,7 @@ module.exports = {
     }
 
     canvasResizer.setOptions(options);
+    canvasResizer.blur();
     canvasResizer.focus(el);
     return canvasResizer;
   },
diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js
index 59c22af9b..c58decf07 100644
--- a/src/commands/view/SelectComponent.js
+++ b/src/commands/view/SelectComponent.js
@@ -262,8 +262,10 @@ module.exports = {
    * @param {Object}  el
    * @private
    * */
-  onSelect(em, model) {
-    const editor = this.editor;
+  onSelect() {
+    // Get the selected model directly from the Editor as the event might
+    // be triggered manually without the model
+    const model = this.em.getSelected();
     this.updateToolbar(model);
 
     if (model) {
@@ -273,7 +275,7 @@ module.exports = {
       this.hideHighlighter();
       this.initResize(el);
     } else {
-      editor.stopCommand('resize');
+      this.editor.stopCommand('resize');
     }
   },