@opendata-ai/openchart-engine 7.9.2 → 7.9.3

package/src/layout/plan.ts

@@ -36,7 +36,7 @@ import { legendGap } from '../legend/wrap';
 import { yTickPositionIsInline } from './axes';
 import { resolveBandTickAngle } from './axes/rotation';
 import { buildContinuousTicks, scaleSupportsTickCount, targetTickCount } from './axes/ticks';
-import { computeScales, estimateBandwidth } from './scales';
+import { computeScales, estimateBandStep, estimateBandwidth } from './scales';
 import { bottomMargin, chromeToInput, INLINE_TICK_OVERHANG_PAD, scalePadding } from './shared';
 
 // ---------------------------------------------------------------------------
@@ -342,8 +342,21 @@ export function resolveLayoutPlan(
       // bandwidth = step * (1 - paddingInner). Uses the same override resolution
       // as buildBandScale so paddingInner/paddingOuter are honored here too.
       const bandwidth = estimateBandwidth(encoding.x?.scale, plotWidth, xLabels.length);
+      const step = estimateBandStep(encoding.x?.scale, plotWidth, xLabels.length);
+      // Mirror categoricalTicks' explicit tickCount cap: retained ticks sit a
+      // multiple of the band step apart, so the drawn labels and their anchor
+      // spacing — not the full category set — drive the angle here, matching
+      // what computeAxes measures from actual tick positions.
+      const xTickCount = xAxis?.tickCount as number | undefined;
+      let drawnLabels = xLabels;
+      let anchorSpacing = step;
+      if (xTickCount && xLabels.length > xTickCount) {
+        const capStride = Math.ceil(xLabels.length / xTickCount);
+        drawnLabels = xLabels.filter((_, i) => i % capStride === 0);
+        anchorSpacing = step * capStride;
+      }
       let maxXLabelWidth = 0;
-      for (const label of xLabels) {
+      for (const label of drawnLabels) {
         const w = measure(label, theme.fonts.sizes.axisTick, theme.fonts.weights.normal);
         if (w > maxXLabelWidth) maxXLabelWidth = w;
       }
@@ -351,7 +364,9 @@ export function resolveLayoutPlan(
         undefined,
         maxXLabelWidth,
         bandwidth,
-        xLabels.length,
+        drawnLabels.length,
+        anchorSpacing,
+        theme.fonts.sizes.axisTick,
       );
     }
 

package/src/layout/scales.ts

@@ -470,19 +470,43 @@ function evenRange(start: number, end: number, count: number): number[] {
  * each independently. step = width / (n - paddingInner + 2*paddingOuter);
  * bandwidth = step * (1 - paddingInner).
  */
+/** d3 scaleBand padding resolution: `padding` sets both, overrides win. */
+function resolveBandPadding(scaleConfig: EncodingChannel['scale'] | undefined): {
+  paddingInner: number;
+  paddingOuter: number;
+} {
+  const padding = scaleConfig?.padding ?? 0.35;
+  return {
+    paddingInner: scaleConfig?.paddingInner ?? padding,
+    paddingOuter: scaleConfig?.paddingOuter ?? padding,
+  };
+}
+
 export function estimateBandwidth(
   scaleConfig: EncodingChannel['scale'] | undefined,
   plotWidth: number,
   n: number,
+): number {
+  const { paddingInner } = resolveBandPadding(scaleConfig);
+  return estimateBandStep(scaleConfig, plotWidth, n) * (1 - paddingInner);
+}
+
+/**
+ * Estimate d3 scaleBand step (center-to-center band distance) for a given
+ * plot width and category count, using the same padding resolution as
+ * estimateBandwidth. The step — not the bandwidth — is the anchor spacing
+ * that drives rotated-label collision checks.
+ */
+export function estimateBandStep(
+  scaleConfig: EncodingChannel['scale'] | undefined,
+  plotWidth: number,
+  n: number,
 ): number {
   if (n <= 0) return 0;
-  const padding = scaleConfig?.padding ?? 0.35;
-  const paddingInner = scaleConfig?.paddingInner ?? padding;
-  const paddingOuter = scaleConfig?.paddingOuter ?? padding;
+  const { paddingInner, paddingOuter } = resolveBandPadding(scaleConfig);
   const denom = n - paddingInner + 2 * paddingOuter;
   if (denom <= 0) return 0;
-  const step = plotWidth / denom;
-  return step * (1 - paddingInner);
+  return plotWidth / denom;
 }
 
 function buildBandScale(