@opendata-ai/openchart-engine 7.9.3 → 7.10.0

package/dist/index.js

@@ -10637,7 +10637,7 @@ var NUMERIC_SCALE_TYPES = /* @__PURE__ */ new Set([
   "threshold"
 ]);
 var TEMPORAL_SCALE_TYPES = /* @__PURE__ */ new Set(["time", "utc"]);
-function formatTickLabel(value2, resolvedScale) {
+function formatTickLabel(value2, resolvedScale, compact = false) {
   const axisConfig = resolvedScale.channel.axis || void 0;
   const formatStr = axisConfig?.format;
   const suffix = axisConfig?.labelSuffix ?? "";
@@ -10645,7 +10645,7 @@ function formatTickLabel(value2, resolvedScale) {
     const temporalFmt = buildTemporalFormatter(formatStr);
     if (temporalFmt) return temporalFmt(value2) + suffix;
     const useUtc = resolvedScale.type === "utc";
-    return formatDate(value2, void 0, void 0, useUtc) + suffix;
+    return formatDate(value2, void 0, void 0, useUtc, compact) + suffix;
   }
   if (NUMERIC_SCALE_TYPES.has(resolvedScale.type)) {
     const num = value2;
@@ -10672,7 +10672,7 @@ function continuousTicks(resolvedScale, density, targetCount) {
   const count = axCfg?.tickCount ?? targetCount ?? TICK_COUNTS[density];
   return buildContinuousTicks(resolvedScale, count);
 }
-function buildContinuousTicks(resolvedScale, count) {
+function buildContinuousTicks(resolvedScale, count, compact = false) {
   const scale = resolvedScale.scale;
   if (!("ticks" in scale) || typeof scale.ticks !== "function") {
     return continuousTicks(resolvedScale, "full");
@@ -10695,7 +10695,7 @@ function buildContinuousTicks(resolvedScale, count) {
   return ticks2.map((value2) => ({
     value: value2,
     position: scale(value2),
-    label: formatTickLabel(value2, resolvedScale)
+    label: formatTickLabel(value2, resolvedScale, compact)
   }));
 }
 function scaleSupportsTickCount(resolvedScale) {
@@ -10810,12 +10810,12 @@ function effectiveDensity(baseDensity, axisLength, minimalThreshold, reducedThre
 var CONTINUOUS_TICK_FLOOR = 4;
 var OVERSHOOT_TOLERANCE = 1.5;
 var MIN_QUANTITATIVE_TICKS = 2;
-function ensureMinContinuousTicks(scale, ticks2, requestedCount) {
+function ensureMinContinuousTicks(scale, ticks2, requestedCount, compact = false) {
   if (ticks2.length >= MIN_QUANTITATIVE_TICKS) return ticks2;
   if (!scale || !scaleSupportsTickCount(scale)) return ticks2;
   let best = ticks2;
   for (let n = Math.max(requestedCount, MIN_QUANTITATIVE_TICKS) + 1; n <= 10; n++) {
-    const candidate = buildContinuousTicks(scale, n);
+    const candidate = buildContinuousTicks(scale, n, compact);
     if (candidate.length >= MIN_QUANTITATIVE_TICKS) return candidate;
     if (candidate.length > best.length) best = candidate;
   }
@@ -10828,26 +10828,30 @@ function fitContinuousTicks(scale, initialTicks, initialCount, fontSize, fontWei
   const overshoots = flooredTicks.length > tolerance;
   const overlaps = ticksOverlap(flooredTicks, fontSize, fontWeight, measureText, orientation);
   if (!overshoots && !overlaps) return flooredTicks;
+  const useCompact = (scale.type === "time" || scale.type === "utc") && orientation === "horizontal";
+  const fitsCleanly = (candidate) => candidate.length <= tolerance && !ticksOverlap(candidate, fontSize, fontWeight, measureText, orientation);
+  if (useCompact) {
+    const compactAtInitial = buildContinuousTicks(scale, initialCount, true);
+    if (fitsCleanly(compactAtInitial)) return compactAtInitial;
+  }
   const minThreshold = orientation === "vertical" ? HEIGHT_MINIMAL_THRESHOLD : WIDTH_MINIMAL_THRESHOLD;
   const floor = axisLength >= minThreshold ? CONTINUOUS_TICK_FLOOR : 2;
   let bestWithinFloor;
+  let bestWithinFloorCount;
   for (let n = initialCount - 1; n >= 2; n--) {
     const candidate = buildContinuousTicks(scale, n);
-    const candidateOvershoots = candidate.length > tolerance;
-    const candidateOverlaps = ticksOverlap(
-      candidate,
-      fontSize,
-      fontWeight,
-      measureText,
-      orientation
-    );
-    if (!candidateOvershoots && !candidateOverlaps) {
-      return candidate;
+    if (fitsCleanly(candidate)) return candidate;
+    if (useCompact) {
+      const compact = buildContinuousTicks(scale, n, true);
+      if (fitsCleanly(compact)) return compact;
+    }
+    if (candidate.length >= floor) {
+      bestWithinFloor = candidate;
+      bestWithinFloorCount = n;
     }
-    if (candidate.length >= floor) bestWithinFloor = candidate;
   }
-  const rawFallback = bestWithinFloor ?? buildContinuousTicks(scale, floor);
-  const fallback = ensureMinContinuousTicks(scale, rawFallback, floor);
+  const rawFallback = useCompact ? buildContinuousTicks(scale, bestWithinFloorCount ?? floor, true) : bestWithinFloor ?? buildContinuousTicks(scale, floor);
+  const fallback = ensureMinContinuousTicks(scale, rawFallback, floor, useCompact);
   return thinTicksUntilFit(fallback, fontSize, fontWeight, measureText, orientation);
 }
 function applyBandLabelStride(ticks2, stride) {