gridviz 2.0.35 → 2.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gridviz",
-    "version": "2.0.35",
+    "version": "2.0.37",
     "description": "Visualization tool for gridded statistics",
     "keywords": [
         "statistics",

package/src/Tooltip.js

@@ -100,8 +100,8 @@ export class Tooltip {
      */
     setPosition(event) {
         this.tooltip
-            .style('left', event.pageX + this.xOffset + 'px')
-            .style('top', event.pageY - this.yOffset + 'px')
+            .style('left', event.pageX - this.parentElement.offsetLeft + this.xOffset + 'px')
+            .style('top', event.pageY - this.parentElement.offsetTop - this.yOffset + 'px')
 
         this.ensureTooltipInsideContainer(event)
     }
@@ -141,26 +141,26 @@ export class Tooltip {
      * @param {MouseEvent} event
      */
     ensureTooltipInsideContainer = function (event) {
-        let node = this.tooltip.node()
-        let rect = this.parentElement.getBoundingClientRect()
-        let parentWidth = rect.width
-        let parentHeight = rect.height
+        let ttNode = this.tooltip.node()
+        let parentRect = this.parentElement.getBoundingClientRect()
 
         //too far right
-        if (node.offsetLeft > rect.left + parentWidth - node.clientWidth) {
-            let left = event.x - node.clientWidth - this.xOffset
-            node.style.left = left + 'px'
+        let maxRight = parentRect.width
+        let ttRight = ttNode.offsetLeft + ttNode.clientWidth
+        if (ttRight > maxRight) {
+            let left = event.pageX - this.parentElement.offsetLeft - ttNode.clientWidth - this.xOffset
+            ttNode.style.left = left + 'px'
             // check if mouse covers tooltip
-            if (node.offsetLeft + node.clientWidth > event.x) {
+            if (ttNode.offsetLeft + ttNode.clientWidth + this.parentElement.offsetLeft > event.pageX) {
                 //move tooltip left so it doesnt cover mouse
-                let left2 = event.x - (node.clientWidth + this.xOffset)
-                node.style.left = left2 + 'px'
+                let left2 = event.pageX - (ttNode.clientWidth + this.xOffset + this.parentElement.offsetLeft)
+                ttNode.style.left = left2 + 'px'
             }
         }
 
         //too far down
-        if (node.offsetTop + node.clientHeight > rect.top + parentHeight) {
-            node.style.top = node.offsetTop - node.clientHeight + 'px'
+        if (ttNode.offsetTop + ttNode.clientHeight > parentRect.height) {
+            ttNode.style.top = ttNode.offsetTop - ttNode.clientHeight + 'px'
         }
     }
 }