@opendata-ai/openchart-engine 6.19.2 → 6.19.3

package/dist/index.js

@@ -7802,9 +7802,19 @@ function effectiveDensity(baseDensity, axisLength, minimalThreshold, reducedThre
 function measureLabel(text, fontSize, fontWeight, measureText) {
   return measureText ? measureText(text, fontSize, fontWeight).width : estimateTextWidth7(text, fontSize, fontWeight);
 }
-function ticksOverlap(ticks2, fontSize, fontWeight, measureText) {
+function ticksOverlap(ticks2, fontSize, fontWeight, measureText, orientation = "horizontal") {
   if (ticks2.length < 2) return false;
   const minGap = fontSize * MIN_TICK_GAP_FACTOR;
+  if (orientation === "vertical") {
+    const sorted = [...ticks2].sort((a, b) => a.position - b.position);
+    const labelHeight = fontSize * 1.2;
+    for (let i = 0; i < sorted.length - 1; i++) {
+      const aBottom = sorted[i].position + labelHeight / 2;
+      const bTop = sorted[i + 1].position - labelHeight / 2;
+      if (aBottom + minGap > bTop) return true;
+    }
+    return false;
+  }
   for (let i = 0; i < ticks2.length - 1; i++) {
     const aWidth = measureLabel(ticks2[i].label, fontSize, fontWeight, measureText);
     const bWidth = measureLabel(ticks2[i + 1].label, fontSize, fontWeight, measureText);
@@ -7814,8 +7824,8 @@ function ticksOverlap(ticks2, fontSize, fontWeight, measureText) {
   }
   return false;
 }
-function thinTicksUntilFit(ticks2, fontSize, fontWeight, measureText) {
-  if (!ticksOverlap(ticks2, fontSize, fontWeight, measureText)) return ticks2;
+function thinTicksUntilFit(ticks2, fontSize, fontWeight, measureText, orientation = "horizontal") {
+  if (!ticksOverlap(ticks2, fontSize, fontWeight, measureText, orientation)) return ticks2;
   let current = ticks2;
   while (current.length > MIN_TICK_COUNT) {
     const thinned = [current[0]];
@@ -7824,7 +7834,7 @@ function thinTicksUntilFit(ticks2, fontSize, fontWeight, measureText) {
     }
     if (current.length > 1) thinned.push(current[current.length - 1]);
     current = thinned;
-    if (!ticksOverlap(current, fontSize, fontWeight, measureText)) break;
+    if (!ticksOverlap(current, fontSize, fontWeight, measureText, orientation)) break;
   }
   return current;
 }
@@ -8011,7 +8021,7 @@ function computeAxes(scales, chartArea, strategy, theme, measureText) {
       allTicks = continuousTicks(scales.y, yDensity);
     }
     const shouldThin = scales.y.type !== "band" && !axisConfig?.tickCount && !axisConfig?.values;
-    const ticks2 = shouldThin ? thinTicksUntilFit(allTicks, fontSize, fontWeight, measureText) : allTicks;
+    const ticks2 = shouldThin ? thinTicksUntilFit(allTicks, fontSize, fontWeight, measureText, "vertical") : allTicks;
     const gridlines = ticks2.map((t) => ({
       position: t.position,
       major: true