@arcgis/charts-components 5.0.0-next.122 → 5.0.0-next.124

package/dist/chunks/serial-chart-data.js

@@ -1,9 +1,9 @@
 import { m as Ae, C as H } from "./model-setter.js";
 import "@arcgis/toolkit/intl";
-import { cloneDeep as re, memoize as le, isEmpty as ve } from "lodash-es";
+import { cloneDeep as re, memoize as ne, isEmpty as ve } from "lodash-es";
 import "d3-array";
-import { aH as Ie, aF as Le, bA as qe, k as Q, q as I, U as Ve, cG as Ne, o as E, de as V, j as we, cE as Oe, bK as De, bW as Me, am as Pe, p as ke, dm as Re, cA as Ee, dn as Z, cb as $e, c7 as We, aS as Xe, Z as $, cX as N, dl as je, dj as P, bJ as W, bP as ne, bQ as oe, dg as de, l as Ye, b as k, bN as Ke, bq as Ue, b2 as _e, b3 as He, aZ as Qe, b5 as ze, bM as ee, aK as Ge, aJ as te, aL as Je } from "./index.js";
-import { w as Ze, a as A, d as et, t as h, g as tt, W as O, m as j, n as st, i as Y } from "./series-types.js";
+import { aH as Ie, aF as Le, bA as qe, k as Q, q as I, U as Ve, cG as Ne, o as $, de as V, j as we, cE as Oe, bK as De, bW as Pe, am as Me, p as ke, dm as Re, cA as Ee, dn as Z, cb as $e, c7 as Ue, aS as We, Z as U, cX as N, dl as Xe, dj as k, bJ as W, bP as le, bQ as oe, dg as de, l as je, b as R, bN as Ye, bq as Ke, b2 as _e, b3 as He, aZ as Qe, b5 as ze, bM as ee, aK as Ge, aJ as te, aL as Je } from "./index.js";
+import { w as Ze, a as A, d as et, t as T, g as tt, W as O, m as j, n as st, i as Y } from "./series-types.js";
 import "@arcgis/core/geometry/support/jsonUtils.js";
 import "@arcgis/core/rest/support/AttributeBinsQuery.js";
 import "@arcgis/core/rest/support/Query.js";
@@ -17,7 +17,7 @@ import { substitute as w } from "@arcgis/core/intl.js";
 import { R as ue, f as it } from "./rest-js-object-literals.js";
 import { h as ce, l as v, o as at, p as rt, j as B, k as b, m as se } from "./index4.js";
 import { S as K } from "./common.js";
-import { s as x, u as U, d as ye, e as lt, f as nt, g as ge, h as ot, j as ie } from "./utils.js";
+import { s as x, u as D, d as ye, e as nt, f as lt, g as ge, h as ot, j as ie } from "./utils.js";
 import { b as M, d as pe, g as z, e as ae, f as dt } from "./data.js";
 import "@arcgis/core/Graphic.js";
 import "@arcgis/core/renderers/support/jsonUtils.js";
@@ -31,10 +31,10 @@ import { g as G } from "./utils2.js";
 import { c as ut } from "./index2.js";
 /*! All material copyright Esri, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/5.0/esri/copyright.txt for details.
-v5.0.0-next.122 */
+v5.0.0-next.124 */
 var ct = Object.defineProperty, yt = Object.getOwnPropertyDescriptor, gt = (t, e, s, r) => {
-  for (var a = yt(e, s), i = t.length - 1, l; i >= 0; i--)
-    (l = t[i]) && (a = l(e, s, a) || a);
+  for (var a = yt(e, s), i = t.length - 1, n; i >= 0; i--)
+    (n = t[i]) && (a = n(e, s, a) || a);
   return a && ct(e, s, a), a;
 };
 const me = (t) => t.title?.content.text ?? "", pt = (t, e) => {
@@ -75,11 +75,11 @@ const St = (t) => {
   let e;
   const s = t.series[0];
   return I(s) && (e = s.temporalBinning?.unit), e;
-}, Tt = (t) => {
+}, ht = (t) => {
   let e;
   const s = t.series[0];
   return I(s) && (e = s.temporalBinning?.timeAggregationType), e;
-}, ht = (t) => {
+}, Tt = (t) => {
   let e;
   const s = t.series[0];
   return I(s) && (e = s.temporalBinning?.trimIncompleteTimeInterval), e;
@@ -103,11 +103,11 @@ const St = (t) => {
   e.series?.forEach((s) => {
     I(s) && (s.temporalBinning ??= {}, s.temporalBinning.timeAggregationType = t);
   }), x({ config: e, value: null, axisIndex: 1, isMax: !1 }), x({ config: e, value: null, axisIndex: 1, isMax: !0 });
-}, Ts = (t, e) => {
+}, hs = (t, e) => {
   e.series?.forEach((s) => {
     I(s) && (s.temporalBinning ??= {}, s.temporalBinning.trimIncompleteTimeInterval = t);
   }), x({ config: e, value: null, axisIndex: 1, isMax: !1 }), x({ config: e, value: null, axisIndex: 1, isMax: !0 });
-}, hs = (t) => {
+}, Ts = (t) => {
   fe(0, t);
 }, Se = (t) => t.series.length ?? 0;
 class xs extends H {
@@ -139,25 +139,25 @@ function As(t, e) {
 }
 async function bt(t) {
   const { queryObject: e, chartConfig: s, options: r, splitByField: a } = t;
-  let i = [], l;
-  const n = re(s), o = n.series[0], d = Me({
+  let i = [], n;
+  const l = re(s), o = l.series[0], d = Pe({
     queryObject: e,
-    chartConfig: n,
+    chartConfig: l,
     runtimeDataFilters: r?.runtimeDataFilters,
     ignoreViewExtent: r?.ignoreViewExtent
   });
-  if (d.outStatistics?.[0]?.outStatisticFieldName && (d.outStatistics[0].outStatisticFieldName = Pe.outStatistics.outStatisticFieldName), I(o) && ke({
-    xAxisValueFormatType: Re(n),
+  if (d.outStatistics?.[0]?.outStatisticFieldName && (d.outStatistics[0].outStatisticFieldName = Me.outStatistics.outStatisticFieldName), I(o) && ke({
+    xAxisValueFormatType: Re(l),
     setTimeBinningInfoWhenNotProvided: r?.setTimeBinningInfoWhenNotProvided,
     seriesConfig: o
   }) && Ee(e)) {
     const { temporalBinning: f, x: u } = o, { uniqueQuery: F } = await Z({
-      chartConfig: n,
+      chartConfig: l,
       queryConfig: d,
       queryObject: e,
       options: r
     });
-    l = await $e({
+    n = await $e({
       queryObject: e,
       dateField: u,
       splitByField: a,
@@ -165,7 +165,7 @@ async function bt(t) {
       temporalBinning: f
     }), i = Array.from(
       new Set(
-        l.flatMap((S) => {
+        n.flatMap((S) => {
           const { stackedAttributes: y } = S;
           let c = [];
           return y && (c = y.map((m) => m[a]).filter((m) => m !== void 0)), c;
@@ -174,22 +174,22 @@ async function bt(t) {
     );
   } else {
     const { uniqueQuery: f } = await Z({
-      chartConfig: n,
+      chartConfig: l,
       queryObject: e,
       queryConfig: d,
       options: r
     });
-    l = await We({
+    n = await Ue({
       queryObject: e,
       queryConfig: f,
       featureCount: 1
     }), i = Array.from(
       new Set(
-        l.map((u) => u.attributes[a]).filter((u) => u !== void 0)
+        n.map((u) => u.attributes[a]).filter((u) => u !== void 0)
       ).values()
     );
   }
-  return { allValues: i, preFetchedQueryResponse: l };
+  return { allValues: i, preFetchedQueryResponse: n };
 }
 function At(t, e) {
   const s = /* @__PURE__ */ new Map();
@@ -214,11 +214,11 @@ function At(t, e) {
 function vt(t) {
   const { allValues: e, configUniqueValuesPerSeriesType: s, initialConfigWasEmpty: r } = t, a = /* @__PURE__ */ new Map();
   return Array.from(s.keys()).forEach((i) => {
-    const l = s.get(i) ?? [];
-    let n = [];
-    r ? n = e : e.forEach((o) => {
-      l.includes(o) || n.push(o);
-    }), a.set(i, n);
+    const n = s.get(i) ?? [];
+    let l = [];
+    r ? l = e : e.forEach((o) => {
+      n.includes(o) || l.push(o);
+    }), a.set(i, l);
   }), a;
 }
 function It(t) {
@@ -230,21 +230,21 @@ function It(t) {
   );
   if (i.query) {
     if (i.id = `${s}-${e.series.length}-${Date.now()}`, i.name = `${s}`, i.query.outStatistics?.[0] !== void 0) {
-      const n = i.id;
-      i.query.outStatistics[0].outStatisticFieldName = n, "y" in i && (i.y = n);
+      const l = i.id;
+      i.query.outStatistics[0].outStatisticFieldName = l, "y" in i && (i.y = l);
     }
-    const l = typeof s == "number" || s === null ? s : `'${s}'`;
-    i.query.where = `${r}=${l}`;
+    const n = typeof s == "number" || s === null ? s : `'${s}'`;
+    i.query.where = `${r}=${n}`;
   }
   return i;
 }
 async function Lt(t) {
   const { updateSplitBySeries: e, config: s, options: r, queryObject: a } = t, { seriesTemplate: i } = e ?? {};
-  let l;
+  let n;
   if (e !== void 0 && s !== void 0 && (s.series.length > 0 || i !== void 0) && e.addMissingSeries) {
-    const n = s.series.length === 0;
+    const l = s.series.length === 0;
     s.series.length === 0 && i !== void 0 && s.series.push(i);
-    const o = E(s.series);
+    const o = $(s.series);
     if ((o === V.BoxPlotMonoFieldAndSplitBy || o === V.BoxPlotMultiFieldsAndSplitBy || o === V.BoxPlotMonoFieldAndCategoryAndSplitBy || o === V.BarAndLineSplitBy || o === V.BarAndLineSplitByNoAggregation) && a !== void 0) {
       const d = we(s.series[0]?.query?.where), f = Oe(a);
       await f.load();
@@ -254,40 +254,40 @@ async function Lt(t) {
         splitByField: d,
         options: r
       }), { allValues: y } = S;
-      if ({ preFetchedQueryResponse: l } = S, y.length > 0) {
+      if ({ preFetchedQueryResponse: n } = S, y.length > 0) {
         const c = At(s, F), m = vt({
           allValues: y,
           configUniqueValuesPerSeriesType: c,
-          initialConfigWasEmpty: n
+          initialConfigWasEmpty: l
         });
         Array.from(m.keys()).forEach((p) => {
-          (m.get(p) ?? []).forEach((T) => {
+          (m.get(p) ?? []).forEach((h) => {
             s.series.push(
               It({
                 chartConfig: s,
                 seriesTemplate: i,
-                missingValue: T,
+                missingValue: h,
                 splitByField: d
               })
             );
-          }), n && s.series.shift();
+          }), l && s.series.shift();
         });
       }
     }
   }
-  return l;
+  return n;
 }
 function qt(t, e) {
   e && !ce(e) && (e = Ne({ chartConfig: e, queryObject: t }));
 }
 async function vs(t) {
-  const { configToAlter: e, layer: s, addMissingSeries: r, updateSplitBySeries: a, chartContainer: i, queryObject: l, options: n } = t;
+  const { configToAlter: e, layer: s, addMissingSeries: r, updateSplitBySeries: a, chartContainer: i, queryObject: n, options: l } = t;
   let o = e, d;
   return o && (qt(s, o), o = await ut(o, s), r && (d = await Lt({
     updateSplitBySeries: a,
     config: o,
-    options: n,
-    queryObject: l
+    options: l,
+    queryObject: n
   })), o = Ve(o, i)), { alteredConfig: o, preFetchedQueryResponse: d };
 }
 const Is = (t) => t.hideEmptyRowsAndColumns, Ls = (t, e) => {
@@ -299,34 +299,40 @@ const Is = (t) => t.hideEmptyRowsAndColumns, Ls = (t, e) => {
   const s = t.series[0];
   s.gradientRules = e;
 }, ws = (t) => t.series[0].gradientRules, Os = (t) => {
-  const { yField: e, config: s, layerInfo: r } = t, { layerFieldsInfo: a } = r, i = G(1, s), l = Vt(s), n = $(s), o = s.series[0];
-  if (typeof e == "string" && l !== e && o && (o.y = e, Bt(s), l === i || n)) {
+  const { yField: e, config: s, layerInfo: r } = t, { layerFieldsInfo: a } = r, i = G(1, s), n = Vt(s), l = U(s), o = s.series[0];
+  if (typeof e == "string" && n !== e && o && (o.y = e, Bt(s), n === i || l)) {
     const d = N(a, e);
-    U(s, 1, d);
+    D(s, 1, d);
+  }
+}, Vt = (t) => t.series[0].y ?? "", Ds = (t) => {
+  const { binning: e, config: s, commonStrings: r } = t, a = s.series[0];
+  if (a.xTemporalBinning = e, e?.unit !== void 0 && e.unit in r.utilsStrings.heatChartCalendarDatePartsUnits) {
+    const i = r.utilsStrings.heatChartCalendarDatePartsUnits[e.unit];
+    D(s, 0, i);
+  }
+}, Ps = (t) => t.series[0].xTemporalBinning, Ms = (t) => {
+  const { binning: e, config: s, commonStrings: r } = t, a = s.series[0];
+  if (a.yTemporalBinning = e, e?.unit !== void 0 && e.unit in r.utilsStrings.heatChartCalendarDatePartsUnits) {
+    const i = r.utilsStrings.heatChartCalendarDatePartsUnits[e.unit];
+    D(s, 1, i);
   }
-}, Vt = (t) => t.series[0].y ?? "", Ds = (t, e) => {
-  const s = e.series[0];
-  s.xTemporalBinning = t;
-}, Ms = (t) => t.series[0].xTemporalBinning, Ps = (t, e) => {
-  const s = e.series[0];
-  s.yTemporalBinning = t;
 }, ks = (t) => t.series[0].yTemporalBinning, Nt = (t, e) => {
   e.orderOptions ??= {};
-  const s = e.axes?.[0]?.valueFormat?.type === "category" ? h.Category : h.YValue, r = _(e)[0], a = e.axes?.[1]?.valueFormat?.type === "category" ? h.Category : h.YValue, i = _(e)[1], l = {
+  const s = e.axes?.[0]?.valueFormat?.type === "category" ? T.Category : T.YValue, r = _(e)[0], a = e.axes?.[1]?.valueFormat?.type === "category" ? T.Category : T.YValue, i = _(e)[1], n = {
     ...e.orderOptions.data ?? {},
-    orderType: h.MultiAxes
+    orderType: T.MultiAxes
   };
-  r === K.customSort && s === h.Category && (l.orderByX = [...t]), i === K.customSort && a === h.Category && (l.orderByY = [...t]), Object.keys(l).length > 1 && (e.orderOptions.data = l);
+  r === K.customSort && s === T.Category && (n.orderByX = [...t]), i === K.customSort && a === T.Category && (n.orderByY = [...t]), Object.keys(n).length > 1 && (e.orderOptions.data = n);
 }, Rs = (t, e) => {
   const s = e.series[0];
   s.gridLine && (s.gridLine.width = t);
 }, Es = (t) => t.series[0].gridLine?.width, $s = (t, e) => {
   const s = e.series[0], r = t?.length === 4 && t.every((a) => typeof a == "number");
   s.gridLine && r && (s.gridLine.color = t);
-}, Ws = (t) => t.series[0].gridLine?.color, Xs = (t, e) => {
+}, Us = (t) => t.series[0].gridLine?.color, Ws = (t, e) => {
   const s = e.legend;
   s && (s.position = t);
-}, js = (t) => t.legend?.position ?? et.Bottom, Ys = (t) => t.series[0].query?.outStatistics?.[0]?.onStatisticField, Ks = (t, e) => {
+}, Xs = (t) => t.legend?.position ?? et.Bottom, js = (t) => t.series[0].query?.outStatistics?.[0]?.onStatisticField, Ys = (t, e) => {
   const s = e.series[0].query?.outStatistics?.[0];
   s ? (s.onStatisticField = t, s.outStatisticFieldName = `${s.statisticType}_${t}`) : e.series[0].query = {
     outStatistics: [
@@ -337,7 +343,7 @@ const Is = (t) => t.hideEmptyRowsAndColumns, Ls = (t, e) => {
       }
     ]
   };
-}, Us = (t) => t.series[0].query?.outStatistics?.[0].statisticType ?? A.Count, _s = (t, e) => {
+}, Ks = (t) => t.series[0].query?.outStatistics?.[0].statisticType ?? A.Count, _s = (t, e) => {
   const s = e.series[0]?.query?.outStatistics?.[0];
   s && t !== A.NoAggregation && (s.statisticType = t, s.outStatisticFieldName = `${t}_${s.onStatisticField}`);
 }, Hs = (t) => t.nullPolicy, Qs = (t, e) => {
@@ -352,20 +358,20 @@ const Is = (t) => t.hideEmptyRowsAndColumns, Ls = (t, e) => {
   e.series[0].emptyCells ? e.series[0].emptyCells.symbol = t : e.series[0].emptyCells = { symbol: t };
 };
 function ai(t) {
-  return Xe(t);
+  return We(t);
 }
 function ri(t) {
   return t.viewType;
 }
-function li(t, e) {
-  je(e) || (e.viewType = t);
+function ni(t, e) {
+  Xe(e) || (e.viewType = t);
 }
-function ni(t) {
-  return t.series[0].classBreaksRules?.breaksCount ?? P.classBreaks.breaksCount;
+function li(t) {
+  return t.series[0].classBreaksRules?.breaksCount ?? k.classBreaks.breaksCount;
 }
 function oi(t, e) {
-  e.series[0].classBreaksRules !== void 0 ? e.series[0].classBreaksRules.breaksCount = t ?? P.classBreaks.breaksCount : e.series[0].classBreaksRules = {
-    breaksCount: t ?? P.classBreaks.breaksCount
+  e.series[0].classBreaksRules !== void 0 ? e.series[0].classBreaksRules.breaksCount = t ?? k.classBreaks.breaksCount : e.series[0].classBreaksRules = {
+    breaksCount: t ?? k.classBreaks.breaksCount
   };
 }
 function di(t) {
@@ -374,10 +380,10 @@ function di(t) {
 function ui(t, e) {
   e.series[0].classBreaksRules !== void 0 ? e.series[0].classBreaksRules.classificationMethod = t : e.series[0].classBreaksRules = {
     classificationMethod: t
-  }, e.series[0].classBreaksRules.breaksCount = e.series[0].classBreaksRules.breaksCount ?? P.classBreaks.breaksCount;
+  }, e.series[0].classBreaksRules.breaksCount = e.series[0].classBreaksRules.breaksCount ?? k.classBreaks.breaksCount;
 }
-function D(t) {
-  const { seriesIndex: e, xAxisField: s, aggregationType: r, config: a, layerInfo: i, commonStrings: l } = t, n = W(i?.layer).idField;
+function P(t) {
+  const { seriesIndex: e, xAxisField: s, aggregationType: r, config: a, layerInfo: i, commonStrings: n } = t, l = W(i?.layer).idField;
   let o;
   const d = a.series[e ?? 0];
   let f = !1, u = !1, F = !1;
@@ -387,17 +393,17 @@ function D(t) {
   } else
     f = B(d), u = b(d), F = se(d);
   f ? o = _e({
-    commonStrings: l,
+    commonStrings: n,
     seriesIndex: e,
-    objectIDField: n
+    objectIDField: l
   }) : u ? o = He({
-    commonStrings: l,
+    commonStrings: n,
     seriesIndex: e,
-    objectIDField: n
-  }) : F ? o = Qe(l, n) : o = ze({
+    objectIDField: l
+  }) : F ? o = Qe(n, l) : o = ze({
     seriesIndex: e,
-    objectIDField: n,
-    commonStrings: l
+    objectIDField: l,
+    commonStrings: n
   });
   const S = a.series[0]?.dataLabels, y = {
     ...o,
@@ -412,25 +418,25 @@ function D(t) {
   };
   if (y.query = {
     groupByFieldsForStatistics: [s]
-  }, r !== A.NoAggregation && n !== void 0) {
-    const c = `${r}_${n}_0`.toUpperCase();
+  }, r !== A.NoAggregation && l !== void 0) {
+    const c = `${r}_${l}_0`.toUpperCase();
     y.y = c, y.query.outStatistics = [
       {
         statisticType: r,
-        onStatisticField: n,
+        onStatisticField: l,
         outStatisticFieldName: c
       }
     ];
   }
   if (B(y) || b(y) || v(y) && a.series[0]?.binTemporalData) {
     let c;
-    if (a?.series?.[0] !== void 0 && (c = E(a.series)), c !== V.BarAndLineNoAggregation && c !== V.BarAndLineSplitByNoAggregation) {
+    if (a?.series?.[0] !== void 0 && (c = $(a.series)), c !== V.BarAndLineNoAggregation && c !== V.BarAndLineSplitByNoAggregation) {
       let m = Ft(a);
       m === Y.Quarter && (m = Y.Month), y.temporalBinning = {
         size: St(a),
         unit: m,
-        timeAggregationType: Tt(a),
-        trimIncompleteTimeInterval: ht(a),
+        timeAggregationType: ht(a),
+        trimIncompleteTimeInterval: Tt(a),
         nullPolicy: xt(a)
       };
     }
@@ -438,11 +444,11 @@ function D(t) {
   return re(y);
 }
 function Fe(t, e, s) {
-  const { layerFieldsInfo: r } = e, { idField: a, isTraditionalTypeOID: i } = W(e.layer), l = M(t), n = J(t), o = he(t), d = R(t), f = i && (n.length === 0 || n.includes(a)), u = Ue(o, s), F = f ? "" : n.map((T) => N(r ?? [], T)).join(", "), S = N(r ?? [], l), y = N(r ?? [], d), c = t.series.some((T) => v(T)), m = c ? "category" : "xAxisField", p = S;
+  const { layerFieldsInfo: r } = e, { idField: a, isTraditionalTypeOID: i } = W(e.layer), n = M(t), l = J(t), o = Te(t), d = E(t), f = i && (l.length === 0 || l.includes(a)), u = Ke(o, s), F = f ? "" : l.map((h) => N(r ?? [], h)).join(", "), S = N(r ?? [], n), y = N(r ?? [], d), c = t.series.some((h) => v(h)), m = c ? "category" : "xAxisField", p = S;
   let g = "";
   if (pe({
-    fieldName: l,
-    numericFields: n,
+    fieldName: n,
+    numericFields: l,
     fieldList: r
   }))
     g = w(s.titleLabels.aggrTypeOfAggrFields, {
@@ -450,47 +456,47 @@ function Fe(t, e, s) {
       aggregationFields: F
     });
   else if (o === A.NoAggregation) {
-    const T = f ? a : F;
+    const h = f ? a : F;
     if (d === "") {
       const L = c ? "aggrTypeCategory" : "aggrTypeXAxisField";
       g = w(s.titleLabels[L], {
-        aggregationType: T,
+        aggregationType: h,
         [m]: p
       });
     } else {
       const L = c ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
       g = w(s.titleLabels[L], {
-        aggregationType: T,
+        aggregationType: h,
         [m]: p,
         splitByField: y
       });
     }
   } else if (o === A.Count)
     if (d === "") {
-      const T = c ? "aggrTypeCategory" : "aggrTypeXAxisField";
-      g = w(s.titleLabels[T], {
+      const h = c ? "aggrTypeCategory" : "aggrTypeXAxisField";
+      g = w(s.titleLabels[h], {
         aggregationType: u,
         [m]: p
       });
     } else {
-      const T = c ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
-      g = w(s.titleLabels[T], {
+      const h = c ? "aggrTypeCategoryBySplitBy" : "aggrTypeXAxisFieldBySplitBy";
+      g = w(s.titleLabels[h], {
         aggregationType: u,
         [m]: p,
         splitByField: y
       });
     }
   else if (d !== "") {
-    const T = c ? "aggrTypeOfAggrFieldByCategoryBySplitByField" : "aggrTypeOfAggrFieldByXAxisFieldBySplitByField";
-    g = w(s.titleLabels[T], {
+    const h = c ? "aggrTypeOfAggrFieldByCategoryBySplitByField" : "aggrTypeOfAggrFieldByXAxisFieldBySplitByField";
+    g = w(s.titleLabels[h], {
       aggregationType: u,
       aggregationField: F,
       [m]: p,
       splitByField: y
     });
-  } else if (n.length > 0) {
-    const T = c ? "aggrTypeOfAggrFieldsByCategory" : "aggrTypeOfAggrFieldsByXAxisField";
-    g = w(s.titleLabels[T], {
+  } else if (l.length > 0) {
+    const h = c ? "aggrTypeOfAggrFieldsByCategory" : "aggrTypeOfAggrFieldsByXAxisField";
+    g = w(s.titleLabels[h], {
       aggregationType: u,
       aggregationFields: F,
       [m]: p
@@ -498,22 +504,22 @@ function Fe(t, e, s) {
   }
   return g;
 }
-const Te = (t) => Q({
+const he = (t) => Q({
   where: t.query?.where,
   normalize: !1,
   escape: !1
-}) ?? "", he = (t) => t?.series?.[0]?.query?.outStatistics?.[0]?.statisticType ?? A.NoAggregation, R = le(
+}) ?? "", Te = (t) => t?.series?.[0]?.query?.outStatistics?.[0]?.statisticType ?? A.NoAggregation, E = ne(
   (t) => {
     const e = t?.series?.[0]?.query?.where?.split("=")[0].trim() ?? "";
-    return Ye(t?.series?.[0]?.query?.where) ? "" : e;
+    return je(t?.series?.[0]?.query?.where) ? "" : e;
   },
   (t) => t?.series?.[0]?.query?.where
-), J = le(
+), J = ne(
   // without memoizing, the worst case efficiency is O(series.length), best case is O(1)
   // with memoizing, the worst case efficiency for repeated calls becomes O(1)
   (t) => {
     let e = [];
-    if (R(t) === "")
+    if (E(t) === "")
       e = t?.series.map((s) => {
         const r = s.query?.outStatistics?.map((a) => a.onStatisticField) ?? [];
         return r?.length > 0 ? r : s.y;
@@ -534,8 +540,8 @@ function wt(t) {
     const d = a.layerFieldsInfo.find((f) => f.name === o);
     return d !== void 0 ? ee(d) : !1;
   })), ie(r, 1, i);
-  const l = r.series.some((o) => B(o)), n = r.series.some((o) => b(o));
-  if (l || n) {
+  const n = r.series.some((o) => B(o)), l = r.series.some((o) => b(o));
+  if (n || l) {
     const o = M(r), d = a.layerFieldsInfo.find((u) => u.name === o), f = d !== void 0 && ee(d);
     ie(r, 0, f);
   }
@@ -543,36 +549,36 @@ function wt(t) {
 const _ = (t) => {
   let e;
   if (de(t)) {
-    const s = t.orderOptions?.data?.orderByX ?? [""], r = t.orderOptions?.data?.orderByY ?? [""], a = t.axes?.[0]?.valueFormat?.type === "category" ? h.Category : h.YValue, i = t.axes?.[1]?.valueFormat?.type === "category" ? h.Category : h.YValue;
+    const s = t.orderOptions?.data?.orderByX ?? [""], r = t.orderOptions?.data?.orderByY ?? [""], a = t.axes?.[0]?.valueFormat?.type === "category" ? T.Category : T.YValue, i = t.axes?.[1]?.valueFormat?.type === "category" ? T.Category : T.YValue;
     e = [ae(s, a), ae(r, i)];
   } else {
-    const s = t.orderOptions?.data?.orderType ?? h.Category, r = t.orderOptions?.data && "orderBy" in t.orderOptions.data ? t.orderOptions.data.orderBy : tt.Ascending;
+    const s = t.orderOptions?.data?.orderType ?? T.Category, r = t.orderOptions?.data && "orderBy" in t.orderOptions.data ? t.orderOptions.data.orderBy : tt.Ascending;
     e = [dt(r, s)];
   }
   return e;
 };
 function Ot(t) {
-  const { xAxisField: e, numericFields: s, aggregationType: r, config: a, layerInfo: i, commonStrings: l } = t, { layerFieldsInfo: n } = i;
+  const { xAxisField: e, numericFields: s, aggregationType: r, config: a, layerInfo: i, commonStrings: n } = t, { layerFieldsInfo: l } = i;
   let o = !1;
-  const d = D({
+  const d = P({
     config: a,
     xAxisField: e,
     aggregationType: r,
     layerInfo: i,
     seriesIndex: 0,
-    commonStrings: l
+    commonStrings: n
   }), f = z({
     config: a,
     xAxisField: e,
     numericFields: s,
     aggregationType: r,
     layer: i.layer,
-    fieldList: n
+    fieldList: l
   }).name, u = {
     ...d,
     id: `series_${Date.now()}`,
-    name: l.axisLabels.values,
-    x: k,
+    name: n.axisLabels.values,
+    x: R,
     y: f
   }, F = [];
   for (const y of s)
@@ -586,16 +592,16 @@ function Ot(t) {
   return S !== void 0 && (u.id = S.id, a.colorMatch || (v(S) && v(u) ? u.fillSymbol = S.fillSymbol : (B(u) && B(S) || b(u) && b(S)) && (u.lineSymbol = S.lineSymbol, u.markerSymbol = S.markerSymbol), o = !0), u.id = S.id, S.name !== d.name && (u.name = S.name)), a.series.length === 1 && !a.colorMatch && (v(u) ? u.fillSymbol = a.series[0].fillSymbol : (B(u) || b(u)) && (u.lineSymbol = a.series[0].lineSymbol, u.markerSymbol = a.series[0].markerSymbol), o = !0), a.colorMatch = !o, [u];
 }
 function xe(t) {
-  const { xAxisField: e, numericFields: s, aggregationType: r, config: a, layerInfo: i, commonStrings: l } = t, { layerFieldsInfo: n } = i, o = W(i.layer).idField, d = [];
+  const { xAxisField: e, numericFields: s, aggregationType: r, config: a, layerInfo: i, commonStrings: n } = t, { layerFieldsInfo: l } = i, o = W(i.layer).idField, d = [];
   let f = !1;
   for (let u = 0; u < s.length; u += 1) {
-    const F = D({
+    const F = P({
       config: a,
       xAxisField: e,
       aggregationType: r,
       layerInfo: i,
       seriesIndex: u,
-      commonStrings: l
+      commonStrings: n
     }), S = z({
       config: a,
       xAxisField: e,
@@ -603,7 +609,7 @@ function xe(t) {
       aggregationType: r,
       layer: i.layer,
       numericFieldIndex: u,
-      fieldList: n
+      fieldList: l
     }).name, y = s[u];
     let c = {
       ...F,
@@ -614,7 +620,7 @@ function xe(t) {
     s && y !== o && (c = {
       ...c,
       id: y,
-      name: N(n, y)
+      name: N(l, y)
     });
     let m = y;
     c.query !== void 0 && (r !== A.NoAggregation ? (m = S, c.query.outStatistics = [
@@ -630,13 +636,13 @@ function xe(t) {
     );
     if (p !== void 0 && typeof p.y == "string" && p.y.trim() !== "") {
       a.colorMatch || (v(c) && v(p) ? c.fillSymbol = p.fillSymbol : (B(c) && B(p) || b(c) && b(p)) && (c.lineSymbol = p.lineSymbol, c.markerSymbol = p.markerSymbol), f = !0);
-      const g = D({
+      const g = P({
         config: a,
         xAxisField: e,
         aggregationType: r,
         layerInfo: i,
         seriesIndex: u,
-        commonStrings: l
+        commonStrings: n
       });
       c.id = p.id, p.id !== g.id && p.name !== g.name && (c.id = p.id, c.name = p.name);
     }
@@ -645,7 +651,7 @@ function xe(t) {
   return a.series.length === 1 && d.length === 1 && !a.colorMatch && (v(a.series[0]) && v(d[0]) ? d[0].fillSymbol = a.series[0].fillSymbol : (B(a.series[0]) && B(d[0]) || b(a.series[0]) && b(d[0])) && (d[0].lineSymbol = a.series[0].lineSymbol, d[0].markerSymbol = a.series[0].markerSymbol), f = !0), a.colorMatch = !f, d;
 }
 async function Dt(t) {
-  const { splitByField: e, xAxisField: s, numericFields: r, aggregationType: a, config: i, layerInfo: l, commonStrings: n } = t, { layer: o, layerFieldsInfo: d } = l, { fetchNullValues: f } = i?.series?.[0]?.query ?? {}, u = s !== k ? s : void 0, { categoriesArray: F, splitByFieldType: S, numericalField: y } = await ot({
+  const { splitByField: e, xAxisField: s, numericFields: r, aggregationType: a, config: i, layerInfo: n, commonStrings: l } = t, { layer: o, layerFieldsInfo: d } = n, { fetchNullValues: f } = i?.series?.[0]?.query ?? {}, u = s !== R ? s : void 0, { categoriesArray: F, splitByFieldType: S, numericalField: y } = await ot({
     config: i,
     layer: o,
     layerFieldsInfo: d,
@@ -661,39 +667,39 @@ async function Dt(t) {
       numericFields: r,
       aggregationType: a,
       config: i,
-      layerInfo: l,
-      commonStrings: n
+      layerInfo: n,
+      commonStrings: l
     });
     for (const p of c)
       p.query && (p.query.where = `${e}=''`);
   } else
     for (let p = 0; p < F.length; p += 1) {
-      const g = F[p], T = z({
+      const g = F[p], h = z({
         config: i,
         xAxisField: s,
         numericFields: r,
         aggregationType: a,
-        layer: l.layer,
+        layer: n.layer,
         seriesIndex: p,
         splitByField: e,
         fieldList: d
-      }).name, L = D({
+      }).name, L = P({
         config: i,
         xAxisField: s,
         aggregationType: a,
-        layerInfo: l,
+        layerInfo: n,
         seriesIndex: p,
-        commonStrings: n
+        commonStrings: l
       }), Ce = {
         fieldName: e,
         fieldValueToMatch: g ?? "",
-        subtypeInfo: ne(l.layer),
-        fieldList: l.layerFieldsInfo
+        subtypeInfo: le(n.layer),
+        fieldList: n.layerFieldsInfo
       }, Be = oe(Ce), X = `${g}`, C = {
         ...L,
         id: X,
         name: Be ?? X,
-        y: T,
+        y: h,
         query: {
           ...L.query,
           where: `${e}=${S === ue.String && g !== null ? `'${g}'` : g}`,
@@ -701,7 +707,7 @@ async function Dt(t) {
             {
               ...L.query?.outStatistics?.[0] ?? {},
               onStatisticField: y,
-              outStatisticFieldName: T,
+              outStatisticFieldName: h,
               statisticType: a
             }
           ] : void 0
@@ -709,22 +715,22 @@ async function Dt(t) {
       };
       a === A.NoAggregation && (C.query !== void 0 && (delete C.query.outStatistics, delete C.query.groupByFieldsForStatistics), C.y = y);
       const q = i.series.find(
-        (be) => String(Te(be)).trim().replace(/'/gu, "") === X
+        (be) => String(he(be)).trim().replace(/'/gu, "") === X
       );
       q !== void 0 && (i.colorMatch || (v(C) && v(q) ? C.fillSymbol = q.fillSymbol : (B(C) && B(q) || b(C) && b(q)) && (C.lineSymbol = q.lineSymbol, C.markerSymbol = q.markerSymbol), m = !0), C.id = q.id, C.name = q.name), c.push(C);
     }
   return i.colorMatch = !m, c;
 }
 const ci = async (t) => {
-  const { xAxisField: e, splitByField: s, numericFields: r, aggregationType: a, config: i, layerInfo: l, commonStrings: n } = t, { layerFieldsInfo: o } = l ?? {}, d = Se(i), f = M(i), u = Mt(i, l, n), F = Pt(i, l, n), S = kt(i, l);
+  const { xAxisField: e, splitByField: s, numericFields: r, aggregationType: a, config: i, layerInfo: n, commonStrings: l } = t, { layerFieldsInfo: o } = n ?? {}, d = Se(i), f = M(i), u = Pt(i, n, l), F = Mt(i, n, l), S = kt(i, n);
   let y = ye(i);
   const c = i.series.some((g) => v(g)), m = at(i.series), p = rt(i.series);
   if (o !== void 0) {
-    const g = Ke(o);
-    !g.includes(f) && g.includes(e) ? y = Ge() : g.includes(f) && !g.includes(e) && (c ? y = te() : y = Je()), o.find((L) => L.name === e)?.type === ue.String && (y = te()), y !== void 0 && nt(i, n, y);
+    const g = Ye(o);
+    !g.includes(f) && g.includes(e) ? y = Ge() : g.includes(f) && !g.includes(e) && (c ? y = te() : y = Je()), o.find((L) => L.name === e)?.type === ue.String && (y = te()), y !== void 0 && lt(i, l, y);
   }
   if (d === 0 && (i.series = [
-    D({ config: i, xAxisField: e, aggregationType: a, layerInfo: l, commonStrings: n })
+    P({ config: i, xAxisField: e, aggregationType: a, layerInfo: n, commonStrings: l })
   ]), i.series.forEach((g) => {
     g.x = e, g.query !== void 0 && (g.query.groupByFieldsForStatistics = [e]);
   }), s === "" || r.length > 1 ? pe({
@@ -733,99 +739,99 @@ const ci = async (t) => {
     fieldList: o
   }) ? i.series = Ot({
     config: i,
-    layerInfo: l,
+    layerInfo: n,
     xAxisField: e,
     numericFields: r,
     aggregationType: a,
-    commonStrings: n
+    commonStrings: l
   }) : i.series = xe({
     config: i,
-    layerInfo: l,
+    layerInfo: n,
     xAxisField: e,
     numericFields: r,
     aggregationType: a,
-    commonStrings: n
+    commonStrings: l
   }) : (await Promise.resolve(), i.series = await Dt({
     config: i,
-    layerInfo: l,
+    layerInfo: n,
     splitByField: s,
     xAxisField: e,
     numericFields: r,
     aggregationType: a,
-    commonStrings: n
+    commonStrings: l
   })), S) {
     const g = N(o, e);
-    U(i, 0, g);
+    D(i, 0, g);
   }
   if (F) {
     const g = ge({
       config: i,
-      layerInfo: l,
-      commonStrings: n,
+      layerInfo: n,
+      commonStrings: l,
       numericFields: r,
       aggregationType: a
     });
-    U(i, 1, g);
+    D(i, 1, g);
   }
-  if (i.title && u && (i.title.content.text = Fe(i, l, n)), x({ config: i, value: null, axisIndex: 1, isMax: !1 }), x({ config: i, value: null, axisIndex: 1, isMax: !0 }), wt({ numericFields: r, aggregationType: a, config: i, layerInfo: l }), m || p) {
+  if (i.title && u && (i.title.content.text = Fe(i, n, l)), x({ config: i, value: null, axisIndex: 1, isMax: !1 }), x({ config: i, value: null, axisIndex: 1, isMax: !0 }), wt({ numericFields: r, aggregationType: a, config: i, layerInfo: n }), m || p) {
     x({ config: i, value: null, axisIndex: 0, isMax: !1 }), x({ config: i, value: null, axisIndex: 0, isMax: !0 }), fe(0, i);
     const g = y?.type === O.DateAxisFormat ? j.Null : j.Interpolate;
     Ct(g, i);
   }
 }, yi = (t) => {
-  const { config: e, seriesIndex: s, layerInfo: r, commonStrings: a } = t, i = e.series?.[s], l = R(e);
-  let n;
-  if (E(e.series) === V.BarAndLineFromFields)
-    n = a.axisLabels.values;
-  else if (ve(l)) {
+  const { config: e, seriesIndex: s, layerInfo: r, commonStrings: a } = t, i = e.series?.[s], n = E(e);
+  let l;
+  if ($(e.series) === V.BarAndLineFromFields)
+    l = a.axisLabels.values;
+  else if (ve(n)) {
     const d = i.query?.outStatistics?.[0]?.onStatisticField;
-    d !== void 0 && d !== W(r.layer).idField && (n = N(r.layerFieldsInfo, d));
+    d !== void 0 && d !== W(r.layer).idField && (l = N(r.layerFieldsInfo, d));
   } else {
-    const d = String(Te(i)).trim().replace(/'/gu, ""), f = {
-      fieldName: R(e),
+    const d = String(he(i)).trim().replace(/'/gu, ""), f = {
+      fieldName: E(e),
       fieldValueToMatch: d ?? "",
-      subtypeInfo: ne(r.layer),
+      subtypeInfo: le(r.layer),
       fieldList: r.layerFieldsInfo
     };
-    n = oe(f) ?? d;
+    l = oe(f) ?? d;
   }
-  return n ?? i.id;
+  return l ?? i.id;
 }, gi = (t, e) => {
   if (de(e))
     Nt(t, e);
   else {
     e.orderOptions ??= {};
     const s = e.orderOptions?.data?.orderType;
-    _(e)[0] === K.customSort && s === h.Category && (e.orderOptions.data = {
-      orderType: h.Category,
+    _(e)[0] === K.customSort && s === T.Category && (e.orderOptions.data = {
+      orderType: T.Category,
       orderBy: [...t]
     });
   }
 }, pi = async (t, e) => {
-  const s = M(t), r = ye(t)?.type, a = J(t), i = E(t.series);
-  let l = [];
-  return r === O.CategoryAxisFormat && (i === V.BarAndLineFromFields || s === k ? l = a.map((n) => N(e?.layerFieldsInfo, n)) : s.trim() !== "" && s !== k && e !== void 0 && (l = await lt({
+  const s = M(t), r = ye(t)?.type, a = J(t), i = $(t.series);
+  let n = [];
+  return r === O.CategoryAxisFormat && (i === V.BarAndLineFromFields || s === R ? n = a.map((l) => N(e?.layerFieldsInfo, l)) : s.trim() !== "" && s !== R && e !== void 0 && (n = await nt({
     layerInfo: e,
     config: t,
     category: s
-  }))), l;
+  }))), n;
 };
-function Mt(t, e, s) {
-  const r = Fe(t, e, s), a = me(t), i = $(t);
+function Pt(t, e, s) {
+  const r = Fe(t, e, s), a = me(t), i = U(t);
   return r === a || i;
 }
-function Pt(t, e, s) {
+function Mt(t, e, s) {
   const r = ge({
     config: t,
     layerInfo: e,
     commonStrings: s,
     numericFields: J(t),
-    aggregationType: he(t)
-  }), a = G(1, t), i = $(t);
+    aggregationType: Te(t)
+  }), a = G(1, t), i = U(t);
   return r === a || i;
 }
 function kt(t, e) {
-  const s = N(e.layerFieldsInfo, M(t)), r = G(0, t), a = $(t);
+  const s = N(e.layerFieldsInfo, M(t)), r = G(0, t), a = U(t);
   return s === r || a;
 }
 function mi(t) {
@@ -847,18 +853,18 @@ export {
   Ls as A,
   Es as B,
   Rs as C,
-  Ws as D,
+  Us as D,
   $s as E,
   Vs as F,
   qs as G,
   ws as H,
   Ns as I,
-  Ys as J,
-  Ks as K,
-  Us as L,
+  js as J,
+  Ys as K,
+  Ks as L,
   _s as M,
-  js as N,
-  Xs as O,
+  Xs as N,
+  Ws as O,
   Hs as P,
   Qs as Q,
   zs as R,
@@ -877,13 +883,13 @@ export {
   fe as a2,
   Ft as a3,
   Ss as a4,
-  Tt as a5,
+  ht as a5,
   Fs as a6,
-  ht as a7,
-  Ts as a8,
+  Tt as a7,
+  hs as a8,
   xt as a9,
   Ct as aa,
-  hs as ab,
+  Ts as ab,
   vs as ac,
   As as ad,
   bs as ae,
@@ -894,9 +900,9 @@ export {
   pi as c,
   mi as d,
   fi as e,
-  he as f,
+  Te as f,
   me as g,
-  R as h,
+  E as h,
   J as i,
   ci as j,
   Fe as k,
@@ -904,13 +910,13 @@ export {
   Vt as m,
   Os as n,
   ri as o,
-  li as p,
-  Ms as q,
+  ni as p,
+  Ps as q,
   Ds as r,
   gi as s,
   ks as t,
-  Ps as u,
-  ni as v,
+  Ms as u,
+  li as v,
   oi as w,
   di as x,
   ui as y,