@guardian/interactive-component-library 0.1.0-alpha.19 → 0.1.0-alpha.20

package/dist/interactive-component-library.js

@@ -123,9 +123,7 @@ const defaultStyles$r = {
   label: label$1,
   backgroundRect
 };
-function preventOverlap(labelPositions, iteration = 0, labelSize = 12, coordinate = "y") {
-  const maxIterations = 10;
-  let totalOverlap = 0;
+function preventOverlap(labelPositions, iteration = 0, labelSize = 12, coordinate = "y", moveBothLabels = true) {
   for (let index2 = 1; index2 < labelPositions.length; index2++) {
     const previousElement = labelPositions[index2 - 1];
     const element = labelPositions[index2];
@@ -133,22 +131,22 @@ function preventOverlap(labelPositions, iteration = 0, labelSize = 12, coordinat
     if (overlap < 0) {
       continue;
     }
-    previousElement[coordinate] -= overlap / 2;
-    element[coordinate] += overlap / 2;
-    totalOverlap += overlap;
-  }
-  if (totalOverlap > 0 && iteration < maxIterations) {
-    return preventOverlap(labelPositions, iteration + 1);
+    if (moveBothLabels) {
+      previousElement[coordinate] -= overlap / 2;
+      element[coordinate] += overlap / 2;
+    } else {
+      previousElement[coordinate] -= overlap;
+    }
+    return labelPositions;
   }
-  return labelPositions;
 }
 function uniqueBy(array, key) {
   return [...array.reduce((map, d2) => map.set(d2[key], d2), /* @__PURE__ */ new Map()).values()];
 }
-function positionLabels(labels, coordinate = "y") {
+function positionLabels(labels, labelSize = 12, coordinate = "y", moveBothLabels = true) {
   labels = uniqueBy(labels, "value");
   labels.sort((a, b) => a[coordinate] - b[coordinate]);
-  return preventOverlap(labels);
+  return preventOverlap(labels, 0, labelSize, coordinate, moveBothLabels);
 }
 function scaleLinear(domain, range) {
   const [domainMin, domainMax] = domain;
@@ -168,7 +166,7 @@ function StackedBar({
   width,
   height,
   hideLabels = false,
-  labelType = LabelType.hanging,
+  labelType = LabelType.inline,
   showBackgroundRect = false,
   createSVG = true,
   styles: styles2
@@ -178,7 +176,7 @@ function StackedBar({
   styles2 = mergeStyles({
     ...defaultStyles$r
   }, styles2);
-  const svgHeight = labelType === LabelType.hanging ? height + 20 : height;
+  const svgHeight = labelType === LabelType.hanging && !hideLabels ? height + 20 : height;
   const renderLabel = (config, i) => jsx("text", {
     ref: (element) => textElements.current[i] = element,
     "text-rendering": "optimizeLegibility",
@@ -229,11 +227,10 @@ function StackedBar({
         textAnchor: "end",
         alignmentBaseline: "hanging"
       };
-      console.log(labelConfig);
       totalW += itemWidth;
       return labelConfig;
     });
-    return preventOverlap(labels, 0, 20, "x");
+    return preventOverlap(labels, 0, 20, "x", false);
   }, [stack, height, width]);
   const backgroundRect2 = jsx("g", {
     children: jsx("rect", {