@opendata-ai/openchart-engine 2.12.1 → 2.13.0

package/dist/index.js

@@ -6100,7 +6100,7 @@ function thinTicksUntilFit(ticks2, fontSize, fontWeight, measureText) {
   }
   return current;
 }
-function continuousTicks(resolvedScale, density, fontSize, fontWeight, measureText) {
+function continuousTicks(resolvedScale, density) {
   const scale = resolvedScale.scale;
   const explicitCount = resolvedScale.channel.axis?.tickCount;
   const count = explicitCount ?? TICK_COUNTS[density];
@@ -6110,10 +6110,9 @@ function continuousTicks(resolvedScale, density, fontSize, fontWeight, measureTe
     position: scale(value),
     label: formatTickLabel(value, resolvedScale)
   }));
-  if (explicitCount) return ticks2;
-  return thinTicksUntilFit(ticks2, fontSize, fontWeight, measureText);
+  return ticks2;
 }
-function categoricalTicks(resolvedScale, density, fontSize, fontWeight, measureText) {
+function categoricalTicks(resolvedScale, density) {
   const scale = resolvedScale.scale;
   const domain = scale.domain();
   const explicitTickCount = resolvedScale.channel.axis?.tickCount;
@@ -6132,9 +6131,6 @@ function categoricalTicks(resolvedScale, density, fontSize, fontWeight, measureT
       label: value
     };
   });
-  if (resolvedScale.type !== "band" && !explicitTickCount) {
-    return thinTicksUntilFit(ticks2, fontSize, fontWeight, measureText);
-  }
   return ticks2;
 }
 function formatTickLabel(value, resolvedScale) {
@@ -6187,11 +6183,13 @@ function computeAxes(scales, chartArea, strategy, theme, measureText) {
   const { fontSize } = tickLabelStyle;
   const { fontWeight } = tickLabelStyle;
   if (scales.x) {
-    const ticks2 = scales.x.type === "band" || scales.x.type === "point" || scales.x.type === "ordinal" ? categoricalTicks(scales.x, xDensity, fontSize, fontWeight, measureText) : continuousTicks(scales.x, xDensity, fontSize, fontWeight, measureText);
-    const gridlines = ticks2.map((t) => ({
+    const allTicks = scales.x.type === "band" || scales.x.type === "point" || scales.x.type === "ordinal" ? categoricalTicks(scales.x, xDensity) : continuousTicks(scales.x, xDensity);
+    const gridlines = allTicks.map((t) => ({
       position: t.position,
       major: true
     }));
+    const shouldThin = scales.x.type !== "band" && !scales.x.channel.axis?.tickCount;
+    const ticks2 = shouldThin ? thinTicksUntilFit(allTicks, fontSize, fontWeight, measureText) : allTicks;
     let tickAngle = scales.x.channel.axis?.tickAngle;
     if (tickAngle === void 0 && scales.x.type === "band" && ticks2.length > 1) {
       const bandwidth = scales.x.scale.bandwidth();
@@ -6216,11 +6214,13 @@ function computeAxes(scales, chartArea, strategy, theme, measureText) {
     };
   }
   if (scales.y) {
-    const ticks2 = scales.y.type === "band" || scales.y.type === "point" || scales.y.type === "ordinal" ? categoricalTicks(scales.y, yDensity, fontSize, fontWeight, measureText) : continuousTicks(scales.y, yDensity, fontSize, fontWeight, measureText);
-    const gridlines = ticks2.map((t) => ({
+    const allTicks = scales.y.type === "band" || scales.y.type === "point" || scales.y.type === "ordinal" ? categoricalTicks(scales.y, yDensity) : continuousTicks(scales.y, yDensity);
+    const gridlines = allTicks.map((t) => ({
       position: t.position,
       major: true
     }));
+    const shouldThin = scales.y.type !== "band" && !scales.y.channel.axis?.tickCount;
+    const ticks2 = shouldThin ? thinTicksUntilFit(allTicks, fontSize, fontWeight, measureText) : allTicks;
     result.y = {
       ticks: ticks2,
       // Y-axis gridlines are shown by default (standard editorial practice)