From 6e0658bf8bd1dde13cf744442fff3a70eb3c8ce7 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Wed, 4 Sep 2019 22:12:51 +0200
Subject: [PATCH] Update highlighter and offset position update logic

---
 src/canvas/view/CanvasView.js        | 12 ++++++------
 src/commands/view/SelectComponent.js | 16 +++++++++++++---
 src/commands/view/ShowOffset.js      |  8 ++++++++
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/canvas/view/CanvasView.js b/src/canvas/view/CanvasView.js
index 931241a70..8523b6c8b 100644
--- a/src/canvas/view/CanvasView.js
+++ b/src/canvas/view/CanvasView.js
@@ -127,12 +127,12 @@ export default Backbone.View.extend({
    * @private
    */
   onFrameScroll({ body = {} } = {}) {
-    const u = 'px';
-    const bodyEl = this.frame.el.contentDocument.body;
-    const zoom = this.getZoom();
-    this.toolsEl.style.top = '-' + bodyEl.scrollTop * zoom + u;
-    this.toolsEl.style.left = '-' + bodyEl.scrollLeft * zoom + u;
-    this.em.trigger('canvasScroll');
+    // const u = 'px';
+    // const bodyEl = this.frame.el.contentDocument.body;
+    // const zoom = this.getZoom();
+    // this.toolsEl.style.top = '-' + bodyEl.scrollTop * zoom + u;
+    // this.toolsEl.style.left = '-' + bodyEl.scrollLeft * zoom + u;
+    // this.em.trigger('canvasScroll');
   },
 
   /**
diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js
index 3fbe81e5b..13c47e47d 100644
--- a/src/commands/view/SelectComponent.js
+++ b/src/commands/view/SelectComponent.js
@@ -54,6 +54,7 @@ export default {
       em[method]('change:componentHovered', this.onHovered, this);
       em[method]('component:update', this.updateAttached, this);
       em[method]('change:canvasOffset', this.updateAttached, this);
+      em[method]('frame:scroll', this.onFrameScroll);
     };
     trigger(win, body); // TODO remove
     em.get('Canvas')
@@ -138,7 +139,9 @@ export default {
     this.editor.runCommand('show-offset', {
       el,
       elPos: pos,
-      force: 1
+      force: 1,
+      top: this.frameRect(el, 1, pos),
+      left: this.frameRect(el, 0, pos)
     });
   },
 
@@ -313,6 +316,13 @@ export default {
     }
   },
 
+  frameRect(el, top = 1, pos) {
+    const side = top ? 'top' : 'left';
+    const { scrollTop = 0, scrollLeft = 0 } = el.ownerDocument.body || {};
+
+    return pos[side] - (top ? scrollTop : scrollLeft);
+  },
+
   /**
    * Update highlighter element
    * @param {HTMLElement} el
@@ -334,8 +344,8 @@ export default {
     var hlEl = this.canvas.getHighlighter();
     var hlStyle = hlEl.style;
     var unit = 'px';
-    hlStyle.left = pos.left + unit;
-    hlStyle.top = pos.top + unit;
+    hlStyle.left = this.frameRect(el, 0, pos) + unit;
+    hlStyle.top = this.frameRect(el, 1, pos) + unit;
     hlStyle.height = pos.height + unit;
     hlStyle.width = pos.width + unit;
     hlStyle.display = 'block';
diff --git a/src/commands/view/ShowOffset.js b/src/commands/view/ShowOffset.js
index f4a096239..7f8df14e6 100644
--- a/src/commands/view/ShowOffset.js
+++ b/src/commands/view/ShowOffset.js
@@ -26,6 +26,14 @@ export default {
 
     var canvas = editor.Canvas;
     var pos = opt.elPos || canvas.getElementPos(el);
+
+    if (opt.top) {
+      pos.top = opt.top;
+    }
+    if (opt.left) {
+      pos.left = opt.left;
+    }
+
     var style = window.getComputedStyle(el);
     var ppfx = this.ppfx;
     var stateVar = state + 'State';