@internetstiftelsen/charts 0.19.2 → 0.19.3

package/dist/tooltip/geometry.js

@@ -725,7 +725,7 @@ function getHorizontalAboveBelowPlacementCost(candidate, layout, preferredEdge,
     return (connectorPenalty +
         edgePenalty +
         xDistance +
-        yDistance * 0.5 +
+        yDistance * 4 +
         overflowPenalty);
 }
 function getPreferredAndOppositeEdges(preferredEdge) {

package/dist/tooltip/xy-interaction.js

@@ -757,8 +757,9 @@ function getTooltipPlacementBounds(svgNode) {
     let bounds = getSplitTooltipViewportBounds();
     let currentElement = svgNode.parentElement;
     while (currentElement) {
-        if (isScrollableElement(currentElement)) {
-            bounds = intersectTooltipBounds(bounds, getElementTooltipBounds(currentElement));
+        const scrollAxes = getScrollableElementAxes(currentElement);
+        if (scrollAxes.horizontal || scrollAxes.vertical) {
+            bounds = intersectTooltipBounds(bounds, getElementTooltipBounds(currentElement), scrollAxes);
         }
         currentElement = currentElement.parentElement;
     }
@@ -775,15 +776,26 @@ function getElementTooltipBounds(element) {
         maxBottom: top + rect.height,
     };
 }
-function intersectTooltipBounds(bounds, nextBounds) {
+function intersectTooltipBounds(bounds, nextBounds, axes = {
+    horizontal: true,
+    vertical: true,
+}) {
     if (nextBounds.maxRight <= nextBounds.minLeft ||
         nextBounds.maxBottom <= nextBounds.minTop) {
         return bounds;
     }
-    const minLeft = Math.max(bounds.minLeft, nextBounds.minLeft);
-    const maxRight = Math.min(bounds.maxRight, nextBounds.maxRight);
-    const minTop = Math.max(bounds.minTop, nextBounds.minTop);
-    const maxBottom = Math.min(bounds.maxBottom, nextBounds.maxBottom);
+    const minLeft = axes.horizontal
+        ? Math.max(bounds.minLeft, nextBounds.minLeft)
+        : bounds.minLeft;
+    const maxRight = axes.horizontal
+        ? Math.min(bounds.maxRight, nextBounds.maxRight)
+        : bounds.maxRight;
+    const minTop = axes.vertical
+        ? Math.max(bounds.minTop, nextBounds.minTop)
+        : bounds.minTop;
+    const maxBottom = axes.vertical
+        ? Math.min(bounds.maxBottom, nextBounds.maxBottom)
+        : bounds.maxBottom;
     if (maxRight <= minLeft || maxBottom <= minTop) {
         return bounds;
     }
@@ -820,6 +832,26 @@ function getTooltipScrollTargets(svgNode) {
     return [...scrollTargets];
 }
 function isScrollableElement(element) {
+    const scrollAxes = getScrollableElementAxes(element);
+    return scrollAxes.horizontal || scrollAxes.vertical;
+}
+function getScrollableElementAxes(element) {
     const style = window.getComputedStyle(element);
-    return [style.overflow, style.overflowX, style.overflowY].some((value) => value === 'auto' || value === 'scroll' || value === 'overlay');
+    return {
+        horizontal: isScrollableOverflowValue(style.overflowX) &&
+            hasScrollableOverflow(element, 'horizontal'),
+        vertical: isScrollableOverflowValue(style.overflowY) &&
+            hasScrollableOverflow(element, 'vertical'),
+    };
+}
+function isScrollableOverflowValue(value) {
+    return value === 'auto' || value === 'scroll' || value === 'overlay';
+}
+function hasScrollableOverflow(element, axis) {
+    const scrollSize = axis === 'horizontal' ? element.scrollWidth : element.scrollHeight;
+    const clientSize = axis === 'horizontal' ? element.clientWidth : element.clientHeight;
+    if (scrollSize === 0 && clientSize === 0) {
+        return true;
+    }
+    return scrollSize > clientSize;
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-    "version": "0.19.2",
+    "version": "0.19.3",
     "name": "@internetstiftelsen/charts",
     "type": "module",
     "sideEffects": false,