@primeui/chart-core 0.0.1-alpha.1 → 1.0.0-rc.1

package/dist/{chunk-WY4AURRE.mjs → chunks/chunk-P2Q4DYOS.mjs}

@@ -1,20 +1,26 @@
-import { advanceCategoryLerp, initCategoryLerp, snapCategoryLerp, initTimeDomainLerp, initDomainLerp, initDomainLerpTickFade, snapDomainLerp, snapTimeDomainLerp, advanceDomainLerp, advanceTimeDomainLerp } from './chunk-KNDZP446.mjs';
-import { transformValues, computeStackBases, detectCartesianMode, computeWaterfallBases } from './chunk-WFTX4AQJ.mjs';
-import { renderCartesianOverlay } from './chunk-QQBXUDM4.mjs';
-import { computeBarDatasetTotals } from './chunk-7QQ6ETB4.mjs';
-import { calculateAxisSpace, calculateAxisLayout } from './chunk-ZTL2FQEW.mjs';
-import { parseAnimationConfig } from './chunk-3WEMHXZI.mjs';
-import { getResponsiveTier, getAdaptiveDefaults, getAdaptiveTickCount } from './chunk-YBJ56XJS.mjs';
-import { cancelRaf, raf } from './chunk-EDAKJLNA.mjs';
-import { computeCartesianDomain, selectGroupingInterval, groupTimeData, resolveIncludeZero, computeDomainContribution, mergeDomainContributions, expandScatterBubblePadding, expandDataLabelPadding, computeVisibleValues } from './chunk-22ST6YPP.mjs';
-import { collectItems } from './chunk-FFMT6OCO.mjs';
-import { measureTextWidth } from './chunk-XTVE4P3L.mjs';
-import { resolveFontSize, DEFAULT_GROUP_LABEL_FONT_SIZE, DEFAULT_TICK_FONT_SIZE, DEFAULT_DATA_LABEL_FONT_SIZE, DEFAULT_BRACKET_GAP, DEFAULT_BRACKET_DEPTH_LAYER_SIZE } from './chunk-NKUYIWAP.mjs';
-import { decimate } from './chunk-OWW3K55O.mjs';
-import { batchResolveRequired, batchResolveAccessor, FIELD_DEFAULTS, resolveAccessor, makeItemContext } from './chunk-O2X6FF45.mjs';
-import { generateNiceTicks, calculateNiceDomain, toTimestamp, generateTimeTicks, formatTimeTick, generateIntervalTicks, createBandScale, calculateNiceTimeDomain, MS, createOrdinalTimeScale, createOrdinalTimeBandAdapter, createTimeScale, createTimeBandAdapter, createVariwideBandScale, createLogScale, createLinearScale, calculateGroupedBarLayout, calculateNiceLogDomain } from './chunk-RQ3CKQOX.mjs';
+import { advanceCategoryLerp, initCategoryLerp, snapCategoryLerp, initTimeDomainLerp, initDomainLerp, initDomainLerpTickFade, snapDomainLerp, snapTimeDomainLerp, advanceDomainLerp, advanceTimeDomainLerp } from './chunk-FSWYYRPX.mjs';
+import { transformValues, computeStackBases, detectCartesianMode, computeWaterfallBases } from './chunk-RKNL7UWZ.mjs';
+import { renderCartesianOverlay } from './chunk-G3DYNMWT.mjs';
+import { computeBarDatasetTotals } from './chunk-LBNP5PJA.mjs';
+import { calculateAxisSpace, calculateAxisLayout } from './chunk-AETETRB4.mjs';
+import { parseAnimationConfig } from './chunk-LTQH3LQJ.mjs';
+import { getResponsiveTier, getAdaptiveDefaults, getAdaptiveTickCount } from './chunk-T2UAEMHY.mjs';
+import { cancelRaf, raf } from './chunk-5WFF272M.mjs';
+import { computeCartesianDomain, selectGroupingInterval, groupTimeData, resolveIncludeZero, computeDomainContribution, mergeDomainContributions, expandScatterBubblePadding, expandDataLabelPadding, computeVisibleValues } from './chunk-GTX6MLTG.mjs';
+import { collectItems } from './chunk-FRVJH7ZG.mjs';
+import { safeFormat } from './chunk-DIJFKY6H.mjs';
+import { measureTextWidth } from './chunk-56MASQS2.mjs';
+import { resolveFontSize, DEFAULT_GROUP_LABEL_FONT_SIZE, DEFAULT_TICK_FONT_SIZE, DEFAULT_DATA_LABEL_FONT_SIZE, DEFAULT_BRACKET_GAP, DEFAULT_BRACKET_DEPTH_LAYER_SIZE } from './chunk-6LUIVTNV.mjs';
+import { batchResolveRequired, batchResolveAccessor, FIELD_DEFAULTS, resolveAccessor, makeItemContext } from './chunk-BDCNBS6W.mjs';
+import { decimate } from './chunk-RIAPS5AW.mjs';
+import { validateCartesianAccessors, resolveCartesianAccessors } from './chunk-G3DIMENH.mjs';
+import { generateNiceTicks, calculateNiceDomain, toTimestamp, generateTimeTicks, formatTimeTick, generateIntervalTicks, createBandScale, calculateNiceTimeDomain, MS, createOrdinalTimeScale, createOrdinalTimeBandAdapter, createTimeScale, createTimeBandAdapter, createVariwideBandScale, createLogScale, createLinearScale, warnChartDevOnce, createNumericBandScale, calculateGroupedBarLayout, calculateNiceLogDomain } from './chunk-K7AGQTVK.mjs';
 
 // src/cartesian/chart-area.ts
+function resolveAreaAccessors(props) {
+  const acc = resolveCartesianAccessors(props);
+  return { category: acc.independentField, value: acc.measureField, isCategory: acc.independentIsCategory };
+}
 function isLayoutCriticalFeature(type) {
   return type.startsWith("axisGroup") || type === "stacking";
 }
@@ -32,7 +38,7 @@ function estimateStackedValueDomain(perDataset, distinctStackIds, tickCount, exa
   if (perDataset.length === 0) return null;
   const series = perDataset.map((d) => ({
     values: d.values,
-    categories: d.categoryField ? batchResolveRequired(d.categoryField, d.data, "categoryField") : d.values.map((_, i) => String(i)),
+    categories: d.categoryAccessor ? batchResolveRequired(d.categoryAccessor, d.data, "categoryField") : d.values.map((_, i) => String(i)),
     stackId: d.stackId
   }));
   const catIndex = /* @__PURE__ */ new Map();
@@ -85,8 +91,8 @@ function estimateStackedValueDomain(perDataset, distinctStackIds, tickCount, exa
 function calculateCartesianArea(outerArea, axes, datasets, features, globalFont, locale, renderersByType, minPadding) {
   let orientation = "vertical";
   for (const [, dataset] of datasets) {
-    if (dataset.type === "bar") {
-      orientation = dataset.props.orientation ?? "vertical";
+    if (dataset.props.categoryYField != null) {
+      orientation = "horizontal";
       break;
     }
   }
@@ -155,8 +161,9 @@ function calculateCartesianArea(outerArea, axes, datasets, features, globalFont,
     let yTickLabels;
     if (orientation === "horizontal") {
       for (const [, dataset] of datasets) {
-        if (!dataset.props.categoryField || !Array.isArray(dataset.props.data)) continue;
-        yTickLabels = batchResolveRequired(dataset.props.categoryField, dataset.props.data, "categoryField");
+        const acc = resolveAreaAccessors(dataset.props);
+        if (!acc.isCategory || !Array.isArray(dataset.props.data)) continue;
+        yTickLabels = batchResolveRequired(acc.category, dataset.props.data, "categoryField");
         break;
       }
     } else {
@@ -182,12 +189,13 @@ function calculateCartesianArea(outerArea, axes, datasets, features, globalFont,
               continue;
             }
           }
-          if (dataset.props.valueField) {
-            const values = batchResolveRequired(dataset.props.valueField, dataset.props.data, "valueField");
+          const acc = resolveAreaAccessors(dataset.props);
+          if (acc.value) {
+            const values = batchResolveRequired(acc.value, dataset.props.data, "valueField");
             for (const v of values) allValues.push(v);
             perDatasetValues.push(values);
             const sid = dataset.props.stackId;
-            valueDatasets.push({ data: dataset.props.data, categoryField: dataset.props.categoryField, values, stackId: sid });
+            valueDatasets.push({ data: dataset.props.data, categoryAccessor: acc.category, values, stackId: sid });
             if (sid !== void 0) stackIdSet.add(sid);
           }
         }
@@ -210,7 +218,13 @@ function calculateCartesianArea(outerArea, axes, datasets, features, globalFont,
           const formatter = yAxisProps?.tickFormat;
           const labelsForDomain = (d) => {
             const ticks = tickInterval !== void 0 ? generateIntervalTicks(d[0], d[1], tickInterval) : generateNiceTicks(d[0], d[1], tickCount, yAxisProps?.tickCount !== void 0);
-            return ticks.map((v, i) => formatter && typeof formatter === "function" ? formatter(v, i) : v.toLocaleString(locale, { maximumFractionDigits: 2 }));
+            return ticks.map(
+              (v, i) => formatter && typeof formatter === "function" ? safeFormat(
+                () => formatter(v, i),
+                () => v.toLocaleString(locale, { maximumFractionDigits: 2 }),
+                "tick"
+              ) : v.toLocaleString(locale, { maximumFractionDigits: 2 })
+            );
           };
           const domainPinned = typeof explicitMin === "number" && typeof explicitMax === "number";
           const labels = new Set(labelsForDomain(domain));
@@ -256,8 +270,9 @@ function calculateCartesianArea(outerArea, axes, datasets, features, globalFont,
       if (isTimeAxis) {
         const allTimestamps = [];
         for (const [, dataset] of datasets) {
-          if (!Array.isArray(dataset.props.data) || !dataset.props.categoryField) continue;
-          const rawValues = batchResolveAccessor(dataset.props.categoryField, dataset.props.data);
+          const acc = resolveAreaAccessors(dataset.props);
+          if (!Array.isArray(dataset.props.data) || !acc.isCategory) continue;
+          const rawValues = batchResolveAccessor(acc.category, dataset.props.data);
           for (const v of rawValues) {
             const ts = toTimestamp(v);
             if (!isNaN(ts)) allTimestamps.push(ts);
@@ -286,8 +301,9 @@ function calculateCartesianArea(outerArea, axes, datasets, features, globalFont,
               break;
             }
           }
-          if (dataset.props.categoryField) {
-            xTickLabels = batchResolveRequired(dataset.props.categoryField, dataset.props.data, "categoryField");
+          const acc = resolveAreaAccessors(dataset.props);
+          if (acc.isCategory) {
+            xTickLabels = batchResolveRequired(acc.category, dataset.props.data, "categoryField");
             break;
           }
         }
@@ -302,13 +318,23 @@ function calculateCartesianArea(outerArea, axes, datasets, features, globalFont,
         const valueDatasets = [];
         const stackIdSet = /* @__PURE__ */ new Set();
         for (const [, dataset] of datasets) {
-          if (!dataset.props.valueField || !Array.isArray(dataset.props.data)) continue;
+          if (!Array.isArray(dataset.props.data)) continue;
           const targetId = dataset.props.xAxisId ?? firstXAxisId;
           if (targetId !== xAxisId) continue;
-          const values = batchResolveRequired(dataset.props.valueField, dataset.props.data, "valueField");
+          const r = renderersByType?.get(dataset.type);
+          if (r?.getAxisHints) {
+            const hints = r.getAxisHints(dataset.props, dataset.props.data);
+            if (hints.domainValues?.length) {
+              for (const v of hints.domainValues) allValues.push(v);
+              continue;
+            }
+          }
+          const acc = resolveAreaAccessors(dataset.props);
+          if (!acc.value) continue;
+          const values = batchResolveRequired(acc.value, dataset.props.data, "valueField");
           for (const v of values) allValues.push(v);
           const sid = dataset.props.stackId;
-          valueDatasets.push({ data: dataset.props.data, categoryField: dataset.props.categoryField, values, stackId: sid });
+          valueDatasets.push({ data: dataset.props.data, categoryAccessor: acc.category, values, stackId: sid });
           if (sid !== void 0) stackIdSet.add(sid);
         }
         const isStacked = stackIdSet.size > 0 && !hasWaterfall;
@@ -319,7 +345,13 @@ function calculateCartesianArea(outerArea, axes, datasets, features, globalFont,
           const tickCount = xAxisProps?.tickCount ?? 5;
           const ticks = tickInterval !== void 0 ? generateIntervalTicks(domain[0], domain[1], tickInterval) : generateNiceTicks(domain[0], domain[1], tickCount, xAxisProps?.tickCount !== void 0);
           const formatter = xAxisProps?.tickFormat;
-          xTickLabels = ticks.map((v, i) => formatter && typeof formatter === "function" ? formatter(v, i) : v.toLocaleString(locale, { maximumFractionDigits: 2 }));
+          xTickLabels = ticks.map(
+            (v, i) => formatter && typeof formatter === "function" ? safeFormat(
+              () => formatter(v, i),
+              () => v.toLocaleString(locale, { maximumFractionDigits: 2 }),
+              "tick"
+            ) : v.toLocaleString(locale, { maximumFractionDigits: 2 })
+          );
         }
       }
     }
@@ -460,7 +492,7 @@ function buildStaticFrame(ctx, cached, axisTransition) {
     axisLayouts: transitioned,
     valueScales: cached.valueScales,
     valueDomains: cached.valueDomains,
-    valueXScales: cached.scatterXScales
+    valueXScales: cached.valueXScales
   });
 }
 function buildAnimatedFrame(ctx, cached, axisTransition, animatedInput) {
@@ -563,7 +595,7 @@ function runSettleLoop(driver, opts) {
     driver.settleRafId = raf(loop);
   }
 }
-function driveCartesianUpdate(layout, driver, axisTransition, animConfig, renderFrame, buildStatic, buildAnimated, globalFont, locale) {
+function driveCartesianUpdate(layout, driver, axisTransition, animConfig, renderFrame, buildStatic, buildAnimated, globalFont, locale, interactive) {
   const currentSortOrder = layout.sortedCategoryOrder?.join(",") ?? "";
   const isSortChange = currentSortOrder !== driver.prevSortOrder && driver.prevSortOrder !== "" && currentSortOrder !== "";
   if (isSortChange && driver.cachedLayout) {
@@ -579,8 +611,8 @@ function driveCartesianUpdate(layout, driver, axisTransition, animConfig, render
   const { enabled: animEnabled, duration, easing } = parseAnimationConfig(animConfig);
   const timeDomainFp = layout.timeDomain ? `${layout.timeDomain[0]},${layout.timeDomain[1]}` : "";
   const lerpTargets = new Map(layout.valueDomains);
-  if (layout.scatterXScales) {
-    for (const [id, scale] of layout.scatterXScales) lerpTargets.set(`x:${id}`, scale.domain());
+  if (layout.valueXScales) {
+    for (const [id, scale] of layout.valueXScales) lerpTargets.set(`x:${id}`, scale.domain());
   }
   const currentFingerprint = `${[...lerpTargets.entries()].map(([k, v]) => `${k}:${v[0]},${v[1]}`).join(";")}|${layout.orientation}|${currentSortOrder}|${timeDomainFp}`;
   const phase = detectPhase(driver, currentFingerprint);
@@ -591,8 +623,8 @@ function driveCartesianUpdate(layout, driver, axisTransition, animConfig, render
   } else {
     driver.timeDomainLerp = null;
   }
-  const hasDomains = layout.valueDomains.size > 0 || !!layout.scatterXScales?.size;
-  const animationActive = animEnabled && phase === "update" && (hasDomains || isSortChange || hasTimeDomain);
+  const hasDomains = layout.valueDomains.size > 0 || !!layout.valueXScales?.size;
+  const animationActive = animEnabled && !interactive && phase === "update" && (hasDomains || isSortChange || hasTimeDomain);
   const isStreamingAppend = hasTimeDomain && (!prevTimeDomain || prevTimeDomain[0] !== layout.timeDomain[0] || prevTimeDomain[1] !== layout.timeDomain[1]);
   if (animationActive) {
     initDomainLerp(driver.domainLerpStates, lerpTargets, { expansionStart: isStreamingAppend });
@@ -829,9 +861,9 @@ function computeAxisLayouts(params) {
     sharedValueScale,
     sharedTimeScale,
     sharedCategoryScale,
-    scatterXScales,
+    valueXScales,
     valueDomains,
-    scatterXDomains,
+    valueXDomains,
     mode,
     adaptive,
     cartesianArea,
@@ -940,9 +972,9 @@ function computeAxisLayouts(params) {
     if (isPrimary) sidePrimarySet.add(xPos);
     const isValueAxis = orientation === "horizontal";
     const xAxisType = xAxisConfig.props?.type;
-    const scatterXScale = scatterXScales.get(xAxisId);
-    const useScatterScale = !!scatterXScale && (xAxisType === "linear" || xAxisType === "logarithmic" || !xAxisType);
-    const xScale = isValueAxis ? valueScales.get(xAxisId) ?? sharedValueScale : useScatterScale ? scatterXScale : sharedTimeScale ?? sharedCategoryScale;
+    const valueXScale = valueXScales.get(xAxisId);
+    const useScatterScale = !!valueXScale && (xAxisType === "linear" || xAxisType === "logarithmic" || !xAxisType);
+    const xScale = isValueAxis ? valueScales.get(xAxisId) ?? sharedValueScale : useScatterScale ? valueXScale : sharedTimeScale ?? sharedCategoryScale;
     let xProps = xAxisConfig.props;
     if (isValueAxis || useScatterScale) {
       if (mode.isPercentStacked && !xProps.tickFormat) {
@@ -1006,7 +1038,7 @@ function computeAxisLayouts(params) {
       position: xPos,
       layout,
       scale: xScale,
-      domain: isValueAxis ? valueDomains.get(xAxisId) : scatterXDomains.get(xAxisId) ?? (sharedTimeScale ? sharedTimeScale.domain() : void 0),
+      domain: isValueAxis ? valueDomains.get(xAxisId) : valueXDomains.get(xAxisId) ?? (sharedTimeScale ? sharedTimeScale.domain() : void 0),
       props: xProps,
       isPrimary,
       offset,
@@ -1101,7 +1133,9 @@ function computeBarPipeline(params) {
   const variwideProps = barDatasets.find((d) => d.props.weightField)?.props;
   isVariwide = variwideProps?.weightField !== void 0;
   const weights = isVariwide ? batchResolveRequired(variwideProps.weightField, variwideProps.data, "weightField") : void 0;
-  const rawResolvedPerDataset = barDatasets.map((d) => d.visible ? batchResolveAccessor(d.props.valueField, d.props.data) : []);
+  const rawResolvedPerDataset = barDatasets.map(
+    (d) => d.visible ? batchResolveAccessor(resolveCartesianAccessors(d.props).measureField, d.props.data) : []
+  );
   const barRawResolved = rawResolvedPerDataset;
   const openResolvedPerDataset = barDatasets.map((d) => {
     const openAccessor = d.props.openField;
@@ -1365,8 +1399,9 @@ function computeDomainContributions(params) {
   const scatterLogXValues = /* @__PURE__ */ new Map();
   for (const sd of scatterDatasets) {
     if (!sd.visible) continue;
+    const acc = resolveCartesianAccessors(sd.props);
     const targetYAxisId = sd.props.yAxisId ?? firstValueAxisId;
-    const rawYValues = batchResolveAccessor(sd.props.yField, sd.props.data ?? []);
+    const rawYValues = batchResolveAccessor(acc.measureField, sd.props.data ?? []);
     const stackBases = scatterStackBasesMap?.get(sd.id);
     const effectiveYValues = stackBases ? rawYValues.map((v, i) => v === null || v === void 0 || isNaN(Number(v)) ? null : Number(v) + (stackBases[i] ?? 0)) : rawYValues;
     const yValues = effectiveYValues.filter((v) => v !== null && v !== void 0 && !isNaN(Number(v))).map(Number);
@@ -1374,8 +1409,39 @@ function computeDomainContributions(params) {
       valueSeries.push({ axisId: targetYAxisId, values: yValues, includeZero: false });
       collectLogValues(targetYAxisId, yValues);
     }
+    if (acc.independentIsCategory) continue;
     const targetXAxisId = sd.props.xAxisId ?? firstCategoryAxisId;
-    const xValues = batchResolveAccessor(sd.props.xField, sd.props.data ?? []).filter((v) => v !== null && v !== void 0 && !isNaN(Number(v))).map(Number);
+    const xValues = batchResolveAccessor(acc.independentField, sd.props.data ?? []).filter((v) => v !== null && v !== void 0 && !isNaN(Number(v))).map(Number);
+    if (xValues.length > 0) {
+      categorySeries.push({ axisId: targetXAxisId, values: xValues, includeZero: false });
+      if (categoryAxes.get(targetXAxisId)?.props?.type === "logarithmic") {
+        const bucket = scatterLogXValues.get(targetXAxisId) ?? [];
+        for (const v of xValues) if (v > 0) bucket.push(v);
+        scatterLogXValues.set(targetXAxisId, bucket);
+      }
+    }
+  }
+  for (const ld of lineDatasets) {
+    if (!ld.visible) continue;
+    const acc = resolveCartesianAccessors(ld.props);
+    if (acc.independentIsCategory) continue;
+    const targetXAxisId = ld.props.xAxisId ?? firstCategoryAxisId;
+    const xValues = batchResolveAccessor(acc.independentField, ld.props.data ?? []).filter((v) => v !== null && v !== void 0 && !isNaN(Number(v))).map(Number);
+    if (xValues.length > 0) {
+      categorySeries.push({ axisId: targetXAxisId, values: xValues, includeZero: false });
+      if (categoryAxes.get(targetXAxisId)?.props?.type === "logarithmic") {
+        const bucket = scatterLogXValues.get(targetXAxisId) ?? [];
+        for (const v of xValues) if (v > 0) bucket.push(v);
+        scatterLogXValues.set(targetXAxisId, bucket);
+      }
+    }
+  }
+  for (const bd of barDatasets) {
+    if (!bd.visible) continue;
+    const acc = resolveCartesianAccessors(bd.props);
+    if (acc.independentIsCategory) continue;
+    const targetXAxisId = bd.props.xAxisId ?? firstCategoryAxisId;
+    const xValues = batchResolveAccessor(acc.independentField, bd.props.data ?? []).filter((v) => v !== null && v !== void 0 && !isNaN(Number(v))).map(Number);
     if (xValues.length > 0) {
       categorySeries.push({ axisId: targetXAxisId, values: xValues, includeZero: false });
       if (categoryAxes.get(targetXAxisId)?.props?.type === "logarithmic") {
@@ -1392,29 +1458,50 @@ function computeDomainContributions(params) {
     const highs = batchResolveAccessor(cd.props.highField, cd.props.data ?? []);
     const validValues = [...lows.filter((v) => v !== null && v !== void 0 && !isNaN(Number(v))).map(Number), ...highs.filter((v) => v !== null && v !== void 0 && !isNaN(Number(v))).map(Number)];
     if (validValues.length > 0) valueSeries.push({ axisId: targetAxisId, values: validValues, includeZero: false });
+    const acc = resolveCartesianAccessors(cd.props);
+    if (acc.independentIsCategory) continue;
+    const targetXAxisId = cd.props.xAxisId ?? firstCategoryAxisId;
+    const xValues = batchResolveAccessor(acc.independentField, cd.props.data ?? []).filter((v) => v !== null && v !== void 0 && !isNaN(Number(v))).map(Number);
+    if (xValues.length > 0) {
+      categorySeries.push({ axisId: targetXAxisId, values: xValues, includeZero: false });
+      if (categoryAxes.get(targetXAxisId)?.props?.type === "logarithmic") {
+        const bucket = scatterLogXValues.get(targetXAxisId) ?? [];
+        for (const v of xValues) if (v > 0) bucket.push(v);
+        scatterLogXValues.set(targetXAxisId, bucket);
+      }
+    }
   }
   const domainContributions = [];
   if (valueSeries.length > 0 || categorySeries.length > 0) {
     domainContributions.push(computeDomainContribution(valueSeries, categorySeries.length > 0 ? categorySeries : void 0));
   }
-  const scatterXDomains = mergeDomainContributions(valueDomains, domainContributions);
+  const valueXDomains = mergeDomainContributions(valueDomains, domainContributions);
   for (const [axisId, positives] of scatterLogYValues) {
     if (positives.length > 0) valueDomains.set(axisId, calculateNiceLogDomain(positives));
   }
   for (const [axisId, positives] of scatterLogXValues) {
-    if (positives.length > 0) scatterXDomains.set(axisId, calculateNiceLogDomain(positives));
+    if (positives.length > 0) valueXDomains.set(axisId, calculateNiceLogDomain(positives));
   }
   if (scatterDatasets.length > 0) {
+    const barBaselineMins = /* @__PURE__ */ new Map();
+    for (const axisId of barAxisIds) {
+      const d = valueDomains.get(axisId);
+      if (d) barBaselineMins.set(axisId, d[0]);
+    }
     expandScatterBubblePadding({
       scatterDatasets,
       valueDomains,
-      scatterXDomains,
+      valueXDomains,
       firstValueAxisId,
       firstCategoryAxisId,
       chartArea: cartesianArea,
       isLogValueAxis: (axisId) => valueAxes.get(axisId)?.props?.type === "logarithmic",
       isLogCategoryAxis: (axisId) => categoryAxes.get(axisId)?.props?.type === "logarithmic"
     });
+    for (const [axisId, min] of barBaselineMins) {
+      const d = valueDomains.get(axisId);
+      if (d) valueDomains.set(axisId, [min, d[1]]);
+    }
   }
   const dataLabelProps = features.get("dataLabels")?.props;
   if (dataLabelProps && !dataLabelProps.render) {
@@ -1457,7 +1544,7 @@ function computeDomainContributions(params) {
     if (typeof axisMin === "number") domain[0] = axisMin;
     if (typeof axisMax === "number") domain[1] = axisMax;
   }
-  for (const [axisId, domain] of scatterXDomains) {
+  for (const [axisId, domain] of valueXDomains) {
     const axisConfig = categoryAxes.get(axisId);
     const axisMin = axisConfig?.props?.min;
     const axisMax = axisConfig?.props?.max;
@@ -1490,12 +1577,38 @@ function computeDomainContributions(params) {
         const targetAxisId = ld.props[axisIdProp] ?? firstValueAxisId;
         if (targetAxisId !== axisId) continue;
         const vals = lineTransformedValues?.get(ld.id);
+        const lineBases = lineStackBasesMap?.get(ld.id);
         if (vals) {
-          for (const v of vals) {
+          for (let i = 0; i < vals.length; i++) {
+            const v = (lineBases?.[i] ?? 0) + vals[i];
             if (!Number.isNaN(v) && v > rawMax) rawMax = v;
           }
         }
       }
+      for (const sd of scatterDatasets) {
+        if (!sd.visible) continue;
+        const targetAxisId = sd.props.yAxisId ?? firstValueAxisId;
+        if (targetAxisId !== axisId) continue;
+        const acc = resolveCartesianAccessors(sd.props);
+        const rawYValues = batchResolveAccessor(acc.measureField, sd.props.data ?? []);
+        const stackBases = scatterStackBasesMap?.get(sd.id);
+        for (let i = 0; i < rawYValues.length; i++) {
+          const raw = rawYValues[i];
+          if (raw === null || raw === void 0 || isNaN(Number(raw))) continue;
+          const v = Number(raw) + (stackBases?.[i] ?? 0);
+          if (v > rawMax) rawMax = v;
+        }
+      }
+      for (const cd of candlestickDatasets) {
+        if (!cd.visible) continue;
+        const targetAxisId = cd.props.yAxisId ?? firstValueAxisId;
+        if (targetAxisId !== axisId) continue;
+        const highs = batchResolveAccessor(cd.props.highField, cd.props.data ?? []);
+        for (const raw of highs) {
+          if (raw === null || raw === void 0 || isNaN(Number(raw))) continue;
+          if (Number(raw) > rawMax) rawMax = Number(raw);
+        }
+      }
       const tickStep = ticks[ticks.length - 1] - ticks[ticks.length - 2];
       if (rawMax > -Infinity && !isLinePercentStacked && !mode.isStacked && !mode.isPercentStacked && !mode.isWaterfall) {
         if (userTickCount === void 0 && tickStep > 0) {
@@ -1510,7 +1623,7 @@ function computeDomainContributions(params) {
     }
   }
   const scatterAxisLength = orientation === "vertical" ? cartesianArea.width : cartesianArea.height;
-  for (const [axisId, domain] of scatterXDomains) {
+  for (const [axisId, domain] of valueXDomains) {
     const axisProps = categoryAxes.get(axisId)?.props;
     if (axisProps?.type === "logarithmic") continue;
     const userTickCount = axisProps?.tickCount;
@@ -1573,8 +1686,8 @@ function computeDomainContributions(params) {
       originalDomains.x = [...primaryValueDomain];
     }
   }
-  if (scatterXDomains.size > 0) {
-    const firstScatterXDomain = scatterXDomains.values().next().value;
+  if (valueXDomains.size > 0) {
+    const firstScatterXDomain = valueXDomains.values().next().value;
     if (firstScatterXDomain) {
       if (orientation === "vertical" && !originalDomains.x) {
         originalDomains.x = [...firstScatterXDomain];
@@ -1585,7 +1698,7 @@ function computeDomainContributions(params) {
   }
   const zoomCategoryAxisForAdaptive = orientation === "vertical" ? zoomState?.x : zoomState?.y;
   const zoomValueAxisExplicit = orientation === "vertical" ? zoomState?.y : zoomState?.x;
-  if (zoomCategoryAxisForAdaptive && !zoomValueAxisExplicit && (isTimeAxis && timestamps || scatterXDomains.size > 0)) {
+  if (zoomCategoryAxisForAdaptive && !zoomValueAxisExplicit && (isTimeAxis && timestamps || valueXDomains.size > 0)) {
     const xMin = zoomCategoryAxisForAdaptive.min;
     const xMax = zoomCategoryAxisForAdaptive.max;
     const adaptiveSeries = [];
@@ -1613,10 +1726,11 @@ function computeDomainContributions(params) {
     }
     for (const sd of scatterDatasets) {
       if (!sd.visible) continue;
+      const acc = resolveCartesianAccessors(sd.props);
       adaptiveSeries.push({
         axisId: sd.props.yAxisId ?? firstValueAxisId,
-        xValues: batchResolveAccessor(sd.props.xField, sd.props.data ?? []),
-        yValues: batchResolveAccessor(sd.props.yField, sd.props.data ?? [])
+        xValues: acc.independentIsCategory ? [] : batchResolveAccessor(acc.independentField, sd.props.data ?? []),
+        yValues: batchResolveAccessor(acc.measureField, sd.props.data ?? [])
       });
     }
     const adaptiveValues = computeVisibleValues(adaptiveSeries, xMin, xMax);
@@ -1637,12 +1751,12 @@ function computeDomainContributions(params) {
     valueDomain[1] = zoomValueAxisExplicit.max;
   }
   const zoomCategoryAxis = orientation === "vertical" ? zoomState?.x : zoomState?.y;
-  if (zoomCategoryAxis && scatterXDomains.size > 0) {
-    for (const [axisId] of scatterXDomains) {
-      scatterXDomains.set(axisId, [zoomCategoryAxis.min, zoomCategoryAxis.max]);
+  if (zoomCategoryAxis && valueXDomains.size > 0) {
+    for (const [axisId] of valueXDomains) {
+      valueXDomains.set(axisId, [zoomCategoryAxis.min, zoomCategoryAxis.max]);
     }
   }
-  return { scatterXDomains, valueDomain, originalDomains };
+  return { valueXDomains, valueDomain, originalDomains };
 }
 
 // src/cartesian/layout.data-reduction.ts
@@ -1658,7 +1772,7 @@ function applyDataGrouping(params) {
       const catKey = categoryKey;
       for (const ds of barDatasets) {
         if (!ds.props.data || ds.props.data.length === 0) continue;
-        const valueKey = ds.props.valueField ?? FIELD_DEFAULTS.valueField;
+        const valueKey = resolveCartesianAccessors(ds.props).measureField;
         const grouped = groupTimeData(ds.props.data, catKey, valueKey, interval, method);
         if (grouped.length < ds.props.data.length) {
           ds.props = { ...ds.props, data: grouped };
@@ -1666,7 +1780,7 @@ function applyDataGrouping(params) {
       }
       for (const ds of lineDatasets) {
         if (!ds.props.data || ds.props.data.length === 0) continue;
-        const valueKey = ds.props.valueField ?? FIELD_DEFAULTS.valueField;
+        const valueKey = resolveCartesianAccessors(ds.props).measureField;
         const grouped = groupTimeData(ds.props.data, catKey, valueKey, interval, method);
         if (grouped.length < ds.props.data.length) {
           ds.props = { ...ds.props, data: grouped };
@@ -1694,7 +1808,7 @@ function applyDecimation(params) {
     const allBarLineDatasets = [...barDatasets, ...lineDatasets];
     const firstVisible = allBarLineDatasets.find((d) => d.visible) ?? allBarLineDatasets[0];
     if (firstVisible && firstVisible.props.data.length > threshold) {
-      const yField = firstVisible.props.valueField;
+      const yField = resolveCartesianAccessors(firstVisible.props).measureField;
       const sourceData = firstVisible.props.data;
       let keptIndicesArr;
       if (zoomX && timestamps) {
@@ -1749,6 +1863,10 @@ function computeCartesianLayout(input, lastVisibleLayouts) {
   if (barDatasets.length === 0 && lineDatasets.length === 0 && scatterDatasets.length === 0 && candlestickDatasets.length === 0) {
     return null;
   }
+  validateCartesianAccessors(
+    [...barDatasets, ...lineDatasets, ...scatterDatasets].map((d) => ({ id: d.id, props: d.props })),
+    axes
+  );
   const visibleBarDatasets = barDatasets.filter((d) => d.visible);
   const { width, height } = dimensions;
   const responsiveFeature = features.get("responsive")?.props;
@@ -1756,17 +1874,24 @@ function computeCartesianLayout(input, lastVisibleLayouts) {
   const adaptive = responsiveFeature?.disableAutoAdaptive ? getAdaptiveDefaults("lg", globalFont) : getAdaptiveDefaults(tier, globalFont);
   const allCatSources = [];
   for (const ds of barDatasets) {
-    const key = ds.props.categoryField ?? FIELD_DEFAULTS.categoryField;
+    const key = resolveCartesianAccessors(ds.props).independentField ?? FIELD_DEFAULTS.categoryField;
     const data = ds.props.data ?? [];
     if (data.length > 0) allCatSources.push({ key, data, tier: 0 });
   }
   for (const ds of candlestickDatasets) {
-    const key = ds.props.timeField;
+    const key = resolveCartesianAccessors(ds.props).independentField ?? FIELD_DEFAULTS.categoryField;
     const data = ds.props.data ?? [];
     if (data.length > 0) allCatSources.push({ key, data, tier: 1 });
   }
   for (const ds of lineDatasets) {
-    const key = ds.props.categoryField ?? FIELD_DEFAULTS.categoryField;
+    const key = resolveCartesianAccessors(ds.props).independentField ?? FIELD_DEFAULTS.categoryField;
+    const data = ds.props.data ?? [];
+    if (data.length > 0) allCatSources.push({ key, data, tier: 2 });
+  }
+  for (const ds of scatterDatasets) {
+    const sp = ds.props;
+    const key = sp.categoryXField ?? sp.categoryYField;
+    if (key == null) continue;
     const data = ds.props.data ?? [];
     if (data.length > 0) allCatSources.push({ key, data, tier: 2 });
   }
@@ -1781,7 +1906,8 @@ function computeCartesianLayout(input, lastVisibleLayouts) {
     categoryKey = "__scatter_no_category__";
     categoryDataSource = [];
   }
-  const orientation = barDatasets[0]?.props?.orientation ?? "vertical";
+  const usesCategoryY = [...barDatasets, ...lineDatasets, ...scatterDatasets, ...candlestickDatasets].some((d) => d.props.categoryYField != null);
+  const orientation = usesCategoryY ? "horizontal" : "vertical";
   const categoryAxes = orientation === "vertical" ? axes.x : axes.y;
   const primaryCategoryAxisConfig = categoryAxes.size > 0 ? categoryAxes.values().next().value : void 0;
   const isTimeAxis = primaryCategoryAxisConfig?.props?.type === "time";
@@ -1892,7 +2018,7 @@ function computeCartesianLayout(input, lastVisibleLayouts) {
   if (stackedLineDatasets.length > 0) {
     const rawLineValues = stackedLineDatasets.map((ld) => {
       if (!ld.visible) return new Array(categories.length).fill(0);
-      const valueKey = ld.props.valueField ?? FIELD_DEFAULTS.valueField;
+      const valueKey = resolveCartesianAccessors(ld.props).measureField;
       const raw = batchResolveAccessor(valueKey, ld.props.data ?? []);
       return raw.map((v) => v === null || v === void 0 || Number.isNaN(Number(v)) ? 0 : Number(v));
     });
@@ -1906,7 +2032,7 @@ function computeCartesianLayout(input, lastVisibleLayouts) {
       lineTransformedValues.set(stackedLineDatasets[i].id, lineValuesPerDataset[i]);
     }
     const lineSignsPerDataset = isLinePercentStacked ? void 0 : stackedLineDatasets.map((ld) => {
-      const valueKey = ld.props.valueField ?? FIELD_DEFAULTS.valueField;
+      const valueKey = resolveCartesianAccessors(ld.props).measureField;
       const raw = batchResolveAccessor(valueKey, ld.props.data ?? []);
       return (raw ?? []).map((v) => typeof v === "number" && isFinite(v) && v < 0 ? -1 : v === 0 ? 0 : 1);
     });
@@ -1921,7 +2047,7 @@ function computeCartesianLayout(input, lastVisibleLayouts) {
   }
   for (const ld of lineDatasets) {
     if (ld.stackId !== void 0) continue;
-    const valueKey = ld.props.valueField ?? FIELD_DEFAULTS.valueField;
+    const valueKey = resolveCartesianAccessors(ld.props).measureField;
     const raw = batchResolveAccessor(valueKey, ld.props.data ?? []);
     const resolved = raw.map((v) => v === null || v === void 0 || isNaN(Number(v)) ? NaN : Number(v));
     if (!lineTransformedValues) lineTransformedValues = /* @__PURE__ */ new Map();
@@ -1933,7 +2059,8 @@ function computeCartesianLayout(input, lastVisibleLayouts) {
     const scatterPointCount = stackedScatterDatasets.reduce((max, sd) => Math.max(max, sd.props.data?.length ?? 0), 0);
     const rawScatterValues = stackedScatterDatasets.map((sd) => {
       if (!sd.visible) return new Array(scatterPointCount).fill(0);
-      const raw = batchResolveAccessor(sd.props.yField, sd.props.data ?? []);
+      const measureKey = resolveCartesianAccessors(sd.props).measureField;
+      const raw = batchResolveAccessor(measureKey, sd.props.data ?? []);
       const padded = new Array(scatterPointCount).fill(0);
       for (let i = 0; i < raw.length; i++) {
         const v = raw[i];
@@ -1942,7 +2069,8 @@ function computeCartesianLayout(input, lastVisibleLayouts) {
       return padded;
     });
     const scatterSignsPerDataset = stackedScatterDatasets.map((sd) => {
-      const raw = batchResolveAccessor(sd.props.yField, sd.props.data ?? []);
+      const measureKey = resolveCartesianAccessors(sd.props).measureField;
+      const raw = batchResolveAccessor(measureKey, sd.props.data ?? []);
       const signs = new Array(scatterPointCount).fill(1);
       for (let i = 0; i < raw.length; i++) {
         const v = raw[i];
@@ -1959,7 +2087,7 @@ function computeCartesianLayout(input, lastVisibleLayouts) {
       scatterSignsPerDataset
     );
   }
-  const { scatterXDomains, valueDomain, originalDomains } = computeDomainContributions({
+  const { valueXDomains, valueDomain, originalDomains } = computeDomainContributions({
     orientation,
     axes,
     barDatasets,
@@ -2129,9 +2257,9 @@ function computeCartesianLayout(input, lastVisibleLayouts) {
   const primaryReversed = valueAxes.get(firstValueAxisId)?.props?.reversed ?? false;
   const primaryRange = primaryReversed ? [valueScaleRange[1], valueScaleRange[0]] : valueScaleRange;
   const sharedValueScale = valueScales.get(firstValueAxisId) ?? createLinearScale(valueDomain, primaryRange);
-  const scatterXScales = /* @__PURE__ */ new Map();
+  const valueXScales = /* @__PURE__ */ new Map();
   const categoryScaleRange = orientation === "vertical" ? [cartesianArea.x, cartesianArea.x + cartesianArea.width] : [cartesianArea.y, cartesianArea.y + cartesianArea.height];
-  for (const [axisId, domain] of scatterXDomains) {
+  for (const [axisId, domain] of valueXDomains) {
     const scatterAxisConfig = categoryAxes.get(axisId);
     const scatterAxisProps = scatterAxisConfig?.props;
     const scatterReversed = scatterAxisProps?.reversed ?? false;
@@ -2151,15 +2279,44 @@ function computeCartesianLayout(input, lastVisibleLayouts) {
         const span = domain[1] - domain[0];
         paddedDomain = [domain[0] - span * padMin, domain[1] + span * padMax];
       }
-      scatterXDomains.set(axisId, paddedDomain);
+      valueXDomains.set(axisId, paddedDomain);
+    }
+    valueXScales.set(axisId, scatterAxisType === "logarithmic" ? createLogScale(paddedDomain, scatterRange) : createLinearScale(paddedDomain, scatterRange));
+  }
+  if (valueXScales.size > 0 && (barDatasets.some((bd) => bd.visible) || candlestickDatasets.some((cd) => cd.visible))) {
+    const numericBarXs = [];
+    let numericBarXScale;
+    for (const cd of candlestickDatasets) {
+      if (!cd.visible) continue;
+      const acc = resolveCartesianAccessors(cd.props);
+      if (acc.independentIsCategory) continue;
+      const xs = batchResolveAccessor(acc.independentField, cd.props.data ?? []);
+      for (const x of xs) if (x !== null && x !== void 0 && !isNaN(Number(x))) numericBarXs.push(String(Number(x)));
+      const cdXAxisId = cd.props.xAxisId;
+      numericBarXScale = (cdXAxisId ? valueXScales.get(cdXAxisId) : void 0) ?? (valueXScales.size === 1 ? valueXScales.values().next().value : void 0);
+    }
+    for (const bd of barDatasets) {
+      if (!bd.visible) continue;
+      const acc = resolveCartesianAccessors(bd.props);
+      if (acc.independentIsCategory) continue;
+      if (bd.props.weightField != null) {
+        warnChartDevOnce("variwide-numeric-axis", `bar series "${bd.id}" sets weightField on a numeric (valueXField) axis \u2014 variwide weights are ignored; bar width derives from the spacing between points.`);
+      }
+      const xs = batchResolveAccessor(acc.independentField, bd.props.data ?? []);
+      for (const x of xs) if (x !== null && x !== void 0 && !isNaN(Number(x))) numericBarXs.push(String(Number(x)));
+      const xAxisId = bd.props.xAxisId;
+      numericBarXScale = (xAxisId ? valueXScales.get(xAxisId) : void 0) ?? (valueXScales.size === 1 ? valueXScales.values().next().value : void 0);
+    }
+    if (numericBarXs.length > 0 && numericBarXScale) {
+      sharedCategoryScale = createNumericBandScale([...new Set(numericBarXs)], numericBarXScale, bandScaleOptions);
     }
-    scatterXScales.set(axisId, scatterAxisType === "logarithmic" ? createLogScale(paddedDomain, scatterRange) : createLinearScale(paddedDomain, scatterRange));
   }
   let stackBasesMap;
   let groupLayout;
   if (mode.isStacked || mode.isWaterfall) {
     const signsPerDataset = mode.isPercentStacked ? void 0 : barDatasets.map((d, i) => {
-      const raw = d.visible ? barRawResolved?.[i] : batchResolveAccessor(d.props.valueField, d.props.data);
+      const measureKey = resolveCartesianAccessors(d.props).measureField;
+      const raw = d.visible ? barRawResolved?.[i] : batchResolveAccessor(measureKey, d.props.data);
       return (raw ?? []).map((v) => typeof v === "number" && isFinite(v) && v < 0 ? -1 : v === 0 ? 0 : 1);
     });
     if (mode.isGrouped) {
@@ -2220,9 +2377,9 @@ function computeCartesianLayout(input, lastVisibleLayouts) {
     sharedValueScale,
     sharedTimeScale,
     sharedCategoryScale,
-    scatterXScales,
+    valueXScales,
     valueDomains,
-    scatterXDomains,
+    valueXDomains,
     mode,
     adaptive,
     cartesianArea,
@@ -2400,7 +2557,7 @@ function computeCartesianLayout(input, lastVisibleLayouts) {
     groupedDataOverride,
     decimatedIndices,
     // Scatter layouts are computed by useScatterRenderer (independent hook)
-    scatterXScales: scatterXScales.size > 0 ? scatterXScales : void 0,
+    valueXScales: valueXScales.size > 0 ? valueXScales : void 0,
     scatterStackBasesMap,
     // Candlestick layouts are computed by useCandlestickRenderer (independent hook)
     // Heatmap layouts are computed by useHeatmapRenderer (independent hook)