From fe4af050fcb107a9e3825ccd2725be2c6874d5c9 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Thu, 5 Sep 2019 23:31:12 +0200
Subject: [PATCH] Update toolbar pos

---
 src/commands/view/SelectComponent.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js
index dd54a6099..b65f47451 100644
--- a/src/commands/view/SelectComponent.js
+++ b/src/commands/view/SelectComponent.js
@@ -572,14 +572,14 @@ export default {
 
     if (pos) {
       const frameOffset = canvas.getCanvasView().getFrameOffset();
+      pos.top = this.frameRect(el, 1, pos);
+      pos.left = this.frameRect(el, 0, pos);
 
       // Scroll with the window if the top edge is reached and the
       // element is bigger than the canvas
-      if (
-        pos.top <= pos.canvasTop &&
-        !(pos.elementHeight + pos.targetHeight >= frameOffset.height)
-      ) {
-        pos.top = pos.elementTop + pos.elementHeight;
+      const fullHeight = pos.elementHeight + pos.targetHeight;
+      if (pos.top <= pos.canvasTop && !(fullHeight >= frameOffset.height)) {
+        pos.top = pos.top + fullHeight;
       }
 
       // Check left position of the toolbar