@opendata-ai/openchart-engine 2.8.1 → 2.9.1

package/dist/index.js

@@ -21,6 +21,26 @@ var DARK_TEXT_FILL = "#d1d5db";
 var LIGHT_REFLINE_STROKE = "#888888";
 var DARK_REFLINE_STROKE = "#9ca3af";
 var ANCHOR_OFFSET = 8;
+function interpolateInDomain(numValue, domain, positionOf) {
+  if (domain.length < 2) return null;
+  const nums = domain.map(Number);
+  if (!nums.every(Number.isFinite)) return null;
+  const sorted = nums.map((n, i) => ({ n, i })).sort((a, b) => a.n - b.n);
+  let lower = 0;
+  let upper = sorted.length - 1;
+  for (let i = 0; i < sorted.length; i++) {
+    if (sorted[i].n <= numValue) lower = i;
+    if (sorted[i].n >= numValue) {
+      upper = i;
+      break;
+    }
+  }
+  const lowerPos = positionOf(domain[sorted[lower].i]);
+  const upperPos = positionOf(domain[sorted[upper].i]);
+  if (lower === upper) return lowerPos;
+  const t = (numValue - sorted[lower].n) / (sorted[upper].n - sorted[lower].n);
+  return lowerPos + t * (upperPos - lowerPos);
+}
 function resolvePosition(value, scale) {
   if (!scale) return null;
   const s = scale.scale;
@@ -37,15 +57,28 @@ function resolvePosition(value, scale) {
   }
   if (type === "band") {
     const bandScale = s;
-    const pos = bandScale(String(value));
-    if (pos === void 0) return null;
-    return pos + (bandScale.bandwidth?.() ?? 0) / 2;
+    const strValue2 = String(value);
+    const pos = bandScale(strValue2);
+    if (pos !== void 0) return pos + (bandScale.bandwidth?.() ?? 0) / 2;
+    const bw = bandScale.bandwidth?.() ?? 0;
+    return interpolateInDomain(
+      Number(strValue2),
+      bandScale.domain(),
+      (entry) => (bandScale(entry) ?? 0) + bw / 2
+    );
   }
-  try {
-    return s(String(value));
-  } catch {
-    return null;
+  const strValue = String(value);
+  const directResult = s(strValue);
+  if (directResult !== void 0) return directResult;
+  if (type === "point" || type === "ordinal") {
+    const domain = s.domain();
+    return interpolateInDomain(
+      Number(strValue),
+      domain,
+      (entry) => s(entry) ?? 0
+    );
   }
+  return null;
 }
 function makeAnnotationLabelStyle(fontSize, fontWeight, fill, isDark) {
   const defaultFill = isDark ? DARK_TEXT_FILL : LIGHT_TEXT_FILL;