gridviz 2.0.36 → 2.0.38

package/package.json

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

package/src/Tooltip.js

@@ -99,11 +99,13 @@ export class Tooltip {
      * @param {MouseEvent} event
      */
     setPosition(event) {
+        let parentRect = this.parentElement.getBoundingClientRect()
+
         this.tooltip
-            .style('left', event.pageX + this.xOffset + 'px')
-            .style('top', event.pageY - this.yOffset + 'px')
+            .style('left', event.pageX - parentRect.left + this.xOffset + 'px')
+            .style('top', event.pageY - parentRect.top - this.yOffset + 'px')
 
-        this.ensureTooltipInsideContainer(event)
+        this.ensureTooltipInsideContainer(event, parentRect)
     }
 
     /*
@@ -139,26 +141,28 @@ export class Tooltip {
      * @function ensureTooltipInsideContainer
      * @description Prevents the tooltip from overflowing out of the App container (ensures that the tooltip is inside the gridviz container)
      * @param {MouseEvent} event
+     * @param {DOMRect} parentRect
      */
-    ensureTooltipInsideContainer = function (event) {
+    ensureTooltipInsideContainer = function (event, parentRect) {
         let ttNode = this.tooltip.node()
-        let parentRect = this.parentElement.getBoundingClientRect()
 
         //too far right
-        if (ttNode.offsetLeft > parentRect.left + parentRect.width - ttNode.clientWidth) {
-            let left = event.pageX - ttNode.clientWidth - this.xOffset
+        let maxRight = parentRect.width
+        let ttRight = ttNode.offsetLeft + ttNode.clientWidth
+        if (ttRight > maxRight) {
+            let left = event.pageX - parentRect.left - ttNode.clientWidth - this.xOffset
             ttNode.style.left = left + 'px'
             // check if mouse covers tooltip
-            if (ttNode.offsetLeft + ttNode.clientWidth > event.pageX) {
+            if (ttNode.offsetLeft + ttNode.clientWidth + parentRect.left > event.pageX) {
                 //move tooltip left so it doesnt cover mouse
-                let left2 = event.pageX - (ttNode.clientWidth + this.xOffset)
+                let left2 = event.pageX - (ttNode.clientWidth + this.xOffset + parentRect.left)
                 ttNode.style.left = left2 + 'px'
             }
         }
 
         //too far down
-        if (event.pageY + ttNode.clientHeight > parentRect.top + parentRect.height) {
-            ttNode.style.top = event.pageY - ttNode.clientHeight + 'px'
+        if (ttNode.offsetTop + ttNode.clientHeight > parentRect.height) {
+            ttNode.style.top = ttNode.offsetTop - ttNode.clientHeight + 'px'
         }
     }
 }