@carto/ps-react-ui 4.4.0 → 4.4.1

package/dist/types/widgets/echart/utils.d.ts

@@ -1,6 +1,6 @@
 import { EchartOptionsProps } from './types';
 import { Theme } from '@mui/material';
-export declare function mergeEchartWidgetConfig<T extends EchartOptionsProps>(...options: [T | undefined, T | undefined]): T;
+export declare function mergeEchartWidgetConfig<T extends EchartOptionsProps>(optionA: T | undefined, optionB: T | undefined, customMergeFn?: (key: string) => ((a: unknown, b: unknown) => unknown) | undefined): T;
 export declare function getEChartZoomConfig({ start, end }?: {
     start: number;
     end: number;

package/dist/{utils-Cx3gYUcL.js → utils-BOhInag6.js}

@@ -1,87 +1,106 @@
 import { d } from "./cjs-D4KH3azB.js";
 const m = "stacked";
-function h(...o) {
-  return d(o[0] ?? {}, o[1] ?? {}, {
-    customMerge: (e) => {
-      if (e === "color")
-        return (i, I) => I;
-      if (e === "series")
-        return (i, I) => i.length ? I?.map((r, l) => {
-          const g = i?.[l] ?? {};
-          return d(g, r);
-        }) : i;
+function S(o, i, n) {
+  return d(o ?? {}, i ?? {}, {
+    customMerge: (r) => {
+      const l = n?.(r);
+      if (l) return l;
+      if (r === "color")
+        return (t, e) => e;
+      if (r === "axisLabel")
+        return (t, e) => {
+          const g = {
+            ...t,
+            ...e
+          };
+          if (typeof t?.formatter == "function" && typeof e?.formatter == "function") {
+            const a = t.formatter, c = e.formatter;
+            g.formatter = (I) => a(I) === "" ? "" : c(I);
+          }
+          return g;
+        };
+      if (r === "series")
+        return (t, e) => {
+          const g = Math.max(t?.length ?? 0, e?.length ?? 0);
+          return Array.from({
+            length: g
+          }, (a, c) => {
+            const I = t?.[c] ?? {}, s = e?.[c] ?? {};
+            return d(I, s);
+          });
+        };
     }
   });
 }
 function p({
   start: o,
-  end: e
+  end: i
 } = {
   start: 0,
   end: 100
 }, {
-  inside: i = !0,
-  xSlider: I = !0,
-  ySlider: a = !1,
-  showSliders: r = !0,
-  xAxisLabelFormatter: l,
+  inside: n = !0,
+  xSlider: r = !0,
+  ySlider: l = !1,
+  showSliders: t = !0,
+  xAxisLabelFormatter: e,
   bottomOffset: g = 0
-} = {}, t) {
-  const n = t ? s(t) : {};
+} = {}, a) {
+  const I = a ? y(a) : {};
   return {
-    dataZoom: [i && {
+    dataZoom: [n && {
       throttle: 0,
       type: "inside",
-      xAxisIndex: I ? [0] : [],
-      yAxisIndex: a ? [0] : [],
+      xAxisIndex: r ? [0] : [],
+      yAxisIndex: l ? [0] : [],
       show: !0,
       zoomLock: !1,
       start: o,
-      end: e
-    }, i && a && {
+      end: i
+    }, n && l && {
       throttle: 0,
       type: "inside",
       show: !0,
       zoomLock: !1,
       start: o,
-      end: e,
+      end: i,
       orientation: "vertical"
-    }, I && {
+    }, r && {
       throttle: 0,
       type: "slider",
       xAxisIndex: [0],
       bottom: g,
-      height: parseInt(t?.spacing?.(4) ?? "32"),
-      show: r,
+      height: parseInt(a?.spacing?.(4) ?? "32"),
+      show: t,
       zoomLock: !1,
       start: o,
-      end: e,
-      labelFormatter: l,
+      end: i,
+      labelFormatter: e,
       showDetail: !1,
-      ...n,
+      ...I,
       brushSelect: !1,
       moveHandleSize: 8,
       handleSize: "100%",
       handleIcon: "image://data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iOSIgaGVpZ2h0PSIzNiIgdmlld0JveD0iMCAwIDkgMzYiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHg9IjAuNSIgeT0iLTAuNSIgd2lkdGg9IjgiIGhlaWdodD0iMTgiIHJ4PSI0IiB0cmFuc2Zvcm09Im1hdHJpeCgxIDAgMCAtMSAwIDI3KSIgZmlsbD0id2hpdGUiIHN0cm9rZT0iIzM1OEJFNyIvPgo8cmVjdCB3aWR0aD0iMyIgaGVpZ2h0PSIyIiByeD0iMSIgdHJhbnNmb3JtPSJtYXRyaXgoMSAwIDAgLTEgMyAyMykiIGZpbGw9IiMzNThCRTciLz4KPHJlY3Qgd2lkdGg9IjMiIGhlaWdodD0iMiIgcng9IjEiIHRyYW5zZm9ybT0ibWF0cml4KDEgMCAwIC0xIDMgMTkpIiBmaWxsPSIjMzU4QkU3Ii8+CjxyZWN0IHdpZHRoPSIzIiBoZWlnaHQ9IjIiIHJ4PSIxIiB0cmFuc2Zvcm09Im1hdHJpeCgxIDAgMCAtMSAzIDE1KSIgZmlsbD0iIzM1OEJFNyIvPgo8L3N2Zz4="
-    }, a && {
+    }, l && {
       throttle: 0,
       type: "slider",
-      left: parseInt(t?.spacing?.(6) ?? "48"),
-      width: parseInt(t?.spacing?.(4) ?? "32"),
+      left: parseInt(a?.spacing?.(6) ?? "48"),
+      width: parseInt(a?.spacing?.(4) ?? "32"),
       yAxisIndex: [0],
-      show: r,
+      show: t,
       zoomLock: !1,
       start: o,
-      end: e,
-      ...n,
+      end: i,
+      ...I,
       brushSelect: !1,
       moveHandleSize: 8,
       handleSize: "100%",
       handleIcon: "image://data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzYiIGhlaWdodD0iOSIgdmlld0JveD0iMCAwIDM2IDkiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHg9IjAuNSIgeT0iMC41IiB3aWR0aD0iOCIgaGVpZ2h0PSIxOCIgcng9IjQiIHRyYW5zZm9ybT0icm90YXRlKC05MCAwLjUgMC41KSIgZmlsbD0id2hpdGUiIHN0cm9rZT0iIzM1OEJFNyIvPgo8cmVjdCB3aWR0aD0iMyIgaGVpZ2h0PSIyIiByeD0iMSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDEzIDYpIiBmaWxsPSIjMzU4QkU3Ii8+CjxyZWN0IHdpZHRoPSIzIiBoZWlnaHQ9IjIiIHJ4PSIxIiB0cmFuc2Zvcm09InJvdGF0ZSgtOTAgMTcgNikiIGZpbGw9IiMzNThCRTciLz4KPHJlY3Qgd2lkdGg9IjMiIGhlaWdodD0iMiIgcng9IjEiIHRyYW5zZm9ybT0icm90YXRlKC05MCAyMSA2KSIgZmlsbD0iIzM1OEJFNyIvPgo8L3N2Zz4="
-    }].filter((c) => !!c)
+    }].filter((s) => !!s)
   };
 }
-function s(o) {
+function y(o) {
   return {
     fillerColor: "rgba(53, 139, 231, 0.25)",
     borderColor: "rgba(53, 139, 231, 0.3)",
@@ -122,30 +141,30 @@ function s(o) {
     }
   };
 }
-function z({
+function b({
   brushType: o = "lineX",
-  brushMode: e = "single",
-  xAxisIndex: i = 0
+  brushMode: i = "single",
+  xAxisIndex: n = 0
 } = {}) {
   return {
     brush: {
       toolbox: ["lineX", "clear"],
       brushType: o,
-      brushMode: e,
-      xAxisIndex: i
+      brushMode: i,
+      xAxisIndex: n
     }
   };
 }
-function b(o = m) {
+function u(o = m) {
   return {
     stack: o
   };
 }
 export {
   m as D,
-  b as a,
+  u as a,
   p as b,
-  z as g,
-  h as m
+  b as g,
+  S as m
 };
-//# sourceMappingURL=utils-Cx3gYUcL.js.map
+//# sourceMappingURL=utils-BOhInag6.js.map

package/dist/utils-BOhInag6.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils-BOhInag6.js","sources":["../src/widgets/echart/const.ts","../src/widgets/echart/utils.ts"],"sourcesContent":["export const DEFAULT_STACK_GROUP = 'stacked'\n","import deepmerge from 'deepmerge'\nimport type { EchartOptionsProps } from './types'\nimport type { Theme } from '@mui/material'\nimport { DEFAULT_STACK_GROUP } from './const'\n\nexport function mergeEchartWidgetConfig<T extends EchartOptionsProps>(\n  optionA: T | undefined,\n  optionB: T | undefined,\n  customMergeFn?: (\n    key: string,\n  ) => ((a: unknown, b: unknown) => unknown) | undefined,\n): T {\n  return deepmerge(optionA ?? {}, optionB ?? {}, {\n    customMerge: (key) => {\n      const externalMerge = customMergeFn?.(key)\n      if (externalMerge) return externalMerge\n\n      if (key === 'color') {\n        return (_, b: T['color']) => b\n      }\n      if (key === 'axisLabel') {\n        return (\n          a: Record<string, unknown> | undefined,\n          b: Record<string, unknown> | undefined,\n        ) => {\n          const merged = { ...a, ...b }\n          if (\n            typeof a?.formatter === 'function' &&\n            typeof b?.formatter === 'function'\n          ) {\n            const baseFormatter = a.formatter as (value: unknown) => unknown\n            const customFormatter = b.formatter as (value: unknown) => unknown\n            merged.formatter = (value: unknown) => {\n              const baseResult = baseFormatter(value)\n              if (baseResult === '') return ''\n              return customFormatter(value)\n            }\n          }\n          return merged\n        }\n      }\n      if (key === 'series') {\n        return (a: T['series'][], b: T['series'][]) => {\n          const maxLength = Math.max(a?.length ?? 0, b?.length ?? 0)\n          return Array.from({ length: maxLength }, (_, index) => {\n            const aItem = a?.[index] ?? {}\n            const bItem = b?.[index] ?? {}\n            return deepmerge(aItem, bItem as object)\n          })\n        }\n      }\n    },\n  }) as T\n}\n\nexport function getEChartZoomConfig(\n  { start, end }: { start: number; end: number } = { start: 0, end: 100 },\n  {\n    inside = true,\n    xSlider = true,\n    ySlider = false,\n    showSliders = true,\n    xAxisLabelFormatter,\n    bottomOffset = 0,\n  } = {} as {\n    inside?: boolean\n    xSlider?: boolean\n    ySlider?: boolean\n    showSliders?: boolean\n    xAxisLabelFormatter?: (value: number) => string\n    bottomOffset?: number\n  },\n  theme?: Theme,\n) {\n  const zoom = true\n  const sliderStyles = theme ? getEChartZoomSliderStyles(theme) : {}\n\n  return {\n    dataZoom: [\n      inside && {\n        throttle: 0,\n        type: 'inside',\n        xAxisIndex: xSlider ? [0] : [],\n        yAxisIndex: ySlider ? [0] : [],\n        show: zoom,\n        zoomLock: !zoom,\n        start,\n        end,\n      },\n      inside &&\n        ySlider && {\n          throttle: 0,\n          type: 'inside',\n          show: zoom,\n          zoomLock: !zoom,\n          start,\n          end,\n          orientation: 'vertical',\n        },\n      xSlider && {\n        throttle: 0,\n        type: 'slider',\n        xAxisIndex: [0],\n        bottom: bottomOffset,\n        height: parseInt(theme?.spacing?.(4) ?? '32'),\n        show: zoom && showSliders,\n        zoomLock: !zoom,\n        start,\n        end,\n        labelFormatter: xAxisLabelFormatter,\n        showDetail: false,\n        ...sliderStyles,\n        brushSelect: false,\n        moveHandleSize: 8,\n        handleSize: '100%',\n        handleIcon:\n          'image://data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iOSIgaGVpZ2h0PSIzNiIgdmlld0JveD0iMCAwIDkgMzYiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHg9IjAuNSIgeT0iLTAuNSIgd2lkdGg9IjgiIGhlaWdodD0iMTgiIHJ4PSI0IiB0cmFuc2Zvcm09Im1hdHJpeCgxIDAgMCAtMSAwIDI3KSIgZmlsbD0id2hpdGUiIHN0cm9rZT0iIzM1OEJFNyIvPgo8cmVjdCB3aWR0aD0iMyIgaGVpZ2h0PSIyIiByeD0iMSIgdHJhbnNmb3JtPSJtYXRyaXgoMSAwIDAgLTEgMyAyMykiIGZpbGw9IiMzNThCRTciLz4KPHJlY3Qgd2lkdGg9IjMiIGhlaWdodD0iMiIgcng9IjEiIHRyYW5zZm9ybT0ibWF0cml4KDEgMCAwIC0xIDMgMTkpIiBmaWxsPSIjMzU4QkU3Ii8+CjxyZWN0IHdpZHRoPSIzIiBoZWlnaHQ9IjIiIHJ4PSIxIiB0cmFuc2Zvcm09Im1hdHJpeCgxIDAgMCAtMSAzIDE1KSIgZmlsbD0iIzM1OEJFNyIvPgo8L3N2Zz4=',\n      },\n      ySlider && {\n        throttle: 0,\n        type: 'slider',\n        left: parseInt(theme?.spacing?.(6) ?? '48'),\n        width: parseInt(theme?.spacing?.(4) ?? '32'),\n        yAxisIndex: [0],\n        show: zoom && showSliders,\n        zoomLock: !zoom,\n        start,\n        end,\n        ...sliderStyles,\n        brushSelect: false,\n        moveHandleSize: 8,\n        handleSize: '100%',\n        handleIcon:\n          'image://data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzYiIGhlaWdodD0iOSIgdmlld0JveD0iMCAwIDM2IDkiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHg9IjAuNSIgeT0iMC41IiB3aWR0aD0iOCIgaGVpZ2h0PSIxOCIgcng9IjQiIHRyYW5zZm9ybT0icm90YXRlKC05MCAwLjUgMC41KSIgZmlsbD0id2hpdGUiIHN0cm9rZT0iIzM1OEJFNyIvPgo8cmVjdCB3aWR0aD0iMyIgaGVpZ2h0PSIyIiByeD0iMSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDEzIDYpIiBmaWxsPSIjMzU4QkU3Ii8+CjxyZWN0IHdpZHRoPSIzIiBoZWlnaHQ9IjIiIHJ4PSIxIiB0cmFuc2Zvcm09InJvdGF0ZSgtOTAgMTcgNikiIGZpbGw9IiMzNThCRTciLz4KPHJlY3Qgd2lkdGg9IjMiIGhlaWdodD0iMiIgcng9IjEiIHRyYW5zZm9ybT0icm90YXRlKC05MCAyMSA2KSIgZmlsbD0iIzM1OEJFNyIvPgo8L3N2Zz4=',\n      },\n    ].filter((d) => !!d),\n  }\n}\n\nfunction getEChartZoomSliderStyles(theme: Theme) {\n  return {\n    fillerColor: 'rgba(53, 139, 231, 0.25)',\n    borderColor: 'rgba(53, 139, 231, 0.3)',\n    borderWidth: 0.5,\n    backgroundColor: 'transparent',\n    borderRadius: 4,\n    dataBackground: {\n      lineStyle: {\n        opacity: 0,\n      },\n      areaStyle: {\n        opacity: 1,\n        color: theme.palette.secondary.main,\n      },\n    },\n    selectedDataBackground: {\n      lineStyle: {\n        opacity: 0,\n      },\n      areaStyle: {\n        opacity: 1,\n        color: theme.palette.secondary.main,\n      },\n    },\n    handleStyle: {\n      color: theme.palette.common.white,\n      borderColor: 'rgba(3, 111, 226, 0.08)',\n      borderWidth: 1,\n      shadowBlur: 3,\n      shadowColor: 'rgba(0, 0, 0, 0.1)',\n      shadowOffsetX: 0,\n      shadowOffsetY: 1,\n    },\n    textStyle: {\n      color: theme.palette.black[60],\n      fontSize: parseInt(theme.typography.overlineDelicate.fontSize as string),\n      fontFamily: theme.typography.overlineDelicate.fontFamily,\n    },\n  } as const\n}\n\nexport function getEChartBrushConfig(\n  { brushType = 'lineX', brushMode = 'single', xAxisIndex = 0 } = {} as {\n    brushType?: string\n    brushMode?: string\n    xAxisIndex?: number\n    throttleType?: string\n    throttleDelay?: number\n  },\n) {\n  return {\n    brush: {\n      toolbox: ['lineX', 'clear'],\n      brushType,\n      brushMode,\n      xAxisIndex,\n    },\n  }\n}\n\nexport function getEChartStackConfig(stackGroup: string = DEFAULT_STACK_GROUP) {\n  return { stack: stackGroup }\n}\n"],"names":["DEFAULT_STACK_GROUP","mergeEchartWidgetConfig","optionA","optionB","customMergeFn","deepmerge","customMerge","key","externalMerge","_","b","a","merged","formatter","baseFormatter","customFormatter","value","maxLength","Math","max","length","Array","from","index","aItem","bItem","getEChartZoomConfig","start","end","inside","xSlider","ySlider","showSliders","xAxisLabelFormatter","bottomOffset","theme","sliderStyles","getEChartZoomSliderStyles","dataZoom","throttle","type","xAxisIndex","yAxisIndex","show","zoom","zoomLock","orientation","bottom","height","parseInt","spacing","labelFormatter","showDetail","brushSelect","moveHandleSize","handleSize","handleIcon","left","width","filter","d","fillerColor","borderColor","borderWidth","backgroundColor","borderRadius","dataBackground","lineStyle","opacity","areaStyle","color","palette","secondary","main","selectedDataBackground","handleStyle","common","white","shadowBlur","shadowColor","shadowOffsetX","shadowOffsetY","textStyle","black","fontSize","typography","overlineDelicate","fontFamily","getEChartBrushConfig","brushType","brushMode","brush","toolbox","getEChartStackConfig","stackGroup","stack"],"mappings":"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"}

package/dist/widgets/actions.js

@@ -10,7 +10,7 @@ import { a as Zn, d as Hn } from "../exports-Cr43OCul.js";
 import "../lasso-tool-BYbxrJ-7.js";
 import "../cjs-D4KH3azB.js";
 import { T as se } from "../tooltip-BDnrRKrp.js";
-import { b as et, a as tt, D as nt, g as Te } from "../utils-Cx3gYUcL.js";
+import { b as et, a as tt, D as nt, g as Te } from "../utils-BOhInag6.js";
 import { useSensors as ot, useSensor as _e, PointerSensor as lt, KeyboardSensor as st, DndContext as rt, closestCenter as it } from "@dnd-kit/core";
 import { useSortable as ct, sortableKeyboardCoordinates as at, arrayMove as dt, SortableContext as ut, verticalListSortingStrategy as ft } from "@dnd-kit/sortable";
 import { CSS as gt } from "@dnd-kit/utilities";

package/dist/widgets/bar.js

@@ -5,7 +5,7 @@ import "echarts";
 import "../widget-store-CzDt8oSK.js";
 import "zustand/shallow";
 import { g as _ } from "../options-D9wflre6.js";
-import { m as S } from "../utils-Cx3gYUcL.js";
+import { m as S } from "../utils-BOhInag6.js";
 import { f as v, c as L, a as C, n as u, b as T, d as I, e as N } from "../styles-CAroD5Rc.js";
 import { Box as s, Skeleton as o } from "@mui/material";
 import "@mui/icons-material";

package/dist/widgets/echart.js

@@ -6,7 +6,7 @@ import { u as D } from "../use-widget-ref-wtFLDFCD.js";
 import { u as b } from "../widget-store-CzDt8oSK.js";
 import { useShallow as y } from "zustand/shallow";
 import { g as Q } from "../options-D9wflre6.js";
-import { g as V, a as X, b as Y, m as p } from "../utils-Cx3gYUcL.js";
+import { g as V, a as X, b as Y, m as p } from "../utils-BOhInag6.js";
 function H(t) {
   const e = U(21), {
     id: s,

package/dist/widgets/histogram.js

@@ -5,7 +5,7 @@ import "echarts";
 import "../widget-store-CzDt8oSK.js";
 import "zustand/shallow";
 import { g as _ } from "../options-D9wflre6.js";
-import { m as k } from "../utils-Cx3gYUcL.js";
+import { m as k } from "../utils-BOhInag6.js";
 import { f as S, c as L, a as C, n as m, b as v, d as I, e as N } from "../styles-CAroD5Rc.js";
 import { Box as c, Skeleton as u } from "@mui/material";
 import "@mui/icons-material";

package/dist/widgets/pie.js

@@ -5,7 +5,7 @@ import "echarts";
 import "../widget-store-CzDt8oSK.js";
 import "zustand/shallow";
 import { g as w } from "../options-D9wflre6.js";
-import { m as I } from "../utils-Cx3gYUcL.js";
+import { m as I } from "../utils-BOhInag6.js";
 import { f as C, c as k, b as j, d as A, e as O } from "../styles-CAroD5Rc.js";
 import { Box as d, Skeleton as a } from "@mui/material";
 import "@mui/icons-material";

package/dist/widgets/scatterplot.js

@@ -5,7 +5,7 @@ import "echarts";
 import "../widget-store-CzDt8oSK.js";
 import "zustand/shallow";
 import { g as w } from "../options-D9wflre6.js";
-import { m as S } from "../utils-Cx3gYUcL.js";
+import { m as S } from "../utils-BOhInag6.js";
 import { s as v, c as k, g as L, d as I, e as _ } from "../styles-CAroD5Rc.js";
 import { Box as s, Skeleton as p } from "@mui/material";
 import "@mui/icons-material";

package/dist/widgets/timeseries.js

@@ -5,7 +5,7 @@ import "echarts";
 import "../widget-store-CzDt8oSK.js";
 import "zustand/shallow";
 import { g as k } from "../options-D9wflre6.js";
-import { m as w } from "../utils-Cx3gYUcL.js";
+import { m as w } from "../utils-BOhInag6.js";
 import { f as v, c as L, g as I, b as C, d as S, e as _ } from "../styles-CAroD5Rc.js";
 import { Box as s, Skeleton as o } from "@mui/material";
 import "@mui/icons-material";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carto/ps-react-ui",
-  "version": "4.4.0",
+  "version": "4.4.1",
   "description": "CARTO's Professional Service React Material library",
   "type": "module",
   "devDependencies": {

package/src/widgets/echart/utils.ts

@@ -4,22 +4,49 @@ import type { Theme } from '@mui/material'
 import { DEFAULT_STACK_GROUP } from './const'
 
 export function mergeEchartWidgetConfig<T extends EchartOptionsProps>(
-  ...options: [T | undefined, T | undefined]
+  optionA: T | undefined,
+  optionB: T | undefined,
+  customMergeFn?: (
+    key: string,
+  ) => ((a: unknown, b: unknown) => unknown) | undefined,
 ): T {
-  return deepmerge(options[0] ?? {}, options[1] ?? {}, {
+  return deepmerge(optionA ?? {}, optionB ?? {}, {
     customMerge: (key) => {
+      const externalMerge = customMergeFn?.(key)
+      if (externalMerge) return externalMerge
+
       if (key === 'color') {
         return (_, b: T['color']) => b
       }
+      if (key === 'axisLabel') {
+        return (
+          a: Record<string, unknown> | undefined,
+          b: Record<string, unknown> | undefined,
+        ) => {
+          const merged = { ...a, ...b }
+          if (
+            typeof a?.formatter === 'function' &&
+            typeof b?.formatter === 'function'
+          ) {
+            const baseFormatter = a.formatter as (value: unknown) => unknown
+            const customFormatter = b.formatter as (value: unknown) => unknown
+            merged.formatter = (value: unknown) => {
+              const baseResult = baseFormatter(value)
+              if (baseResult === '') return ''
+              return customFormatter(value)
+            }
+          }
+          return merged
+        }
+      }
       if (key === 'series') {
         return (a: T['series'][], b: T['series'][]) => {
-          if (!a.length) return a // If there is no series in a, return a as is
-
-          const mergedSeries = b?.map((bItem, index) => {
+          const maxLength = Math.max(a?.length ?? 0, b?.length ?? 0)
+          return Array.from({ length: maxLength }, (_, index) => {
             const aItem = a?.[index] ?? {}
+            const bItem = b?.[index] ?? {}
             return deepmerge(aItem, bItem as object)
           })
-          return mergedSeries
         }
       }
     },

package/dist/utils-Cx3gYUcL.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils-Cx3gYUcL.js","sources":["../src/widgets/echart/const.ts","../src/widgets/echart/utils.ts"],"sourcesContent":["export const DEFAULT_STACK_GROUP = 'stacked'\n","import deepmerge from 'deepmerge'\nimport type { EchartOptionsProps } from './types'\nimport type { Theme } from '@mui/material'\nimport { DEFAULT_STACK_GROUP } from './const'\n\nexport function mergeEchartWidgetConfig<T extends EchartOptionsProps>(\n  ...options: [T | undefined, T | undefined]\n): T {\n  return deepmerge(options[0] ?? {}, options[1] ?? {}, {\n    customMerge: (key) => {\n      if (key === 'color') {\n        return (_, b: T['color']) => b\n      }\n      if (key === 'series') {\n        return (a: T['series'][], b: T['series'][]) => {\n          if (!a.length) return a // If there is no series in a, return a as is\n\n          const mergedSeries = b?.map((bItem, index) => {\n            const aItem = a?.[index] ?? {}\n            return deepmerge(aItem, bItem as object)\n          })\n          return mergedSeries\n        }\n      }\n    },\n  }) as T\n}\n\nexport function getEChartZoomConfig(\n  { start, end }: { start: number; end: number } = { start: 0, end: 100 },\n  {\n    inside = true,\n    xSlider = true,\n    ySlider = false,\n    showSliders = true,\n    xAxisLabelFormatter,\n    bottomOffset = 0,\n  } = {} as {\n    inside?: boolean\n    xSlider?: boolean\n    ySlider?: boolean\n    showSliders?: boolean\n    xAxisLabelFormatter?: (value: number) => string\n    bottomOffset?: number\n  },\n  theme?: Theme,\n) {\n  const zoom = true\n  const sliderStyles = theme ? getEChartZoomSliderStyles(theme) : {}\n\n  return {\n    dataZoom: [\n      inside && {\n        throttle: 0,\n        type: 'inside',\n        xAxisIndex: xSlider ? [0] : [],\n        yAxisIndex: ySlider ? [0] : [],\n        show: zoom,\n        zoomLock: !zoom,\n        start,\n        end,\n      },\n      inside &&\n        ySlider && {\n          throttle: 0,\n          type: 'inside',\n          show: zoom,\n          zoomLock: !zoom,\n          start,\n          end,\n          orientation: 'vertical',\n        },\n      xSlider && {\n        throttle: 0,\n        type: 'slider',\n        xAxisIndex: [0],\n        bottom: bottomOffset,\n        height: parseInt(theme?.spacing?.(4) ?? '32'),\n        show: zoom && showSliders,\n        zoomLock: !zoom,\n        start,\n        end,\n        labelFormatter: xAxisLabelFormatter,\n        showDetail: false,\n        ...sliderStyles,\n        brushSelect: false,\n        moveHandleSize: 8,\n        handleSize: '100%',\n        handleIcon:\n          'image://data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iOSIgaGVpZ2h0PSIzNiIgdmlld0JveD0iMCAwIDkgMzYiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHg9IjAuNSIgeT0iLTAuNSIgd2lkdGg9IjgiIGhlaWdodD0iMTgiIHJ4PSI0IiB0cmFuc2Zvcm09Im1hdHJpeCgxIDAgMCAtMSAwIDI3KSIgZmlsbD0id2hpdGUiIHN0cm9rZT0iIzM1OEJFNyIvPgo8cmVjdCB3aWR0aD0iMyIgaGVpZ2h0PSIyIiByeD0iMSIgdHJhbnNmb3JtPSJtYXRyaXgoMSAwIDAgLTEgMyAyMykiIGZpbGw9IiMzNThCRTciLz4KPHJlY3Qgd2lkdGg9IjMiIGhlaWdodD0iMiIgcng9IjEiIHRyYW5zZm9ybT0ibWF0cml4KDEgMCAwIC0xIDMgMTkpIiBmaWxsPSIjMzU4QkU3Ii8+CjxyZWN0IHdpZHRoPSIzIiBoZWlnaHQ9IjIiIHJ4PSIxIiB0cmFuc2Zvcm09Im1hdHJpeCgxIDAgMCAtMSAzIDE1KSIgZmlsbD0iIzM1OEJFNyIvPgo8L3N2Zz4=',\n      },\n      ySlider && {\n        throttle: 0,\n        type: 'slider',\n        left: parseInt(theme?.spacing?.(6) ?? '48'),\n        width: parseInt(theme?.spacing?.(4) ?? '32'),\n        yAxisIndex: [0],\n        show: zoom && showSliders,\n        zoomLock: !zoom,\n        start,\n        end,\n        ...sliderStyles,\n        brushSelect: false,\n        moveHandleSize: 8,\n        handleSize: '100%',\n        handleIcon:\n          'image://data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzYiIGhlaWdodD0iOSIgdmlld0JveD0iMCAwIDM2IDkiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHg9IjAuNSIgeT0iMC41IiB3aWR0aD0iOCIgaGVpZ2h0PSIxOCIgcng9IjQiIHRyYW5zZm9ybT0icm90YXRlKC05MCAwLjUgMC41KSIgZmlsbD0id2hpdGUiIHN0cm9rZT0iIzM1OEJFNyIvPgo8cmVjdCB3aWR0aD0iMyIgaGVpZ2h0PSIyIiByeD0iMSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDEzIDYpIiBmaWxsPSIjMzU4QkU3Ii8+CjxyZWN0IHdpZHRoPSIzIiBoZWlnaHQ9IjIiIHJ4PSIxIiB0cmFuc2Zvcm09InJvdGF0ZSgtOTAgMTcgNikiIGZpbGw9IiMzNThCRTciLz4KPHJlY3Qgd2lkdGg9IjMiIGhlaWdodD0iMiIgcng9IjEiIHRyYW5zZm9ybT0icm90YXRlKC05MCAyMSA2KSIgZmlsbD0iIzM1OEJFNyIvPgo8L3N2Zz4=',\n      },\n    ].filter((d) => !!d),\n  }\n}\n\nfunction getEChartZoomSliderStyles(theme: Theme) {\n  return {\n    fillerColor: 'rgba(53, 139, 231, 0.25)',\n    borderColor: 'rgba(53, 139, 231, 0.3)',\n    borderWidth: 0.5,\n    backgroundColor: 'transparent',\n    borderRadius: 4,\n    dataBackground: {\n      lineStyle: {\n        opacity: 0,\n      },\n      areaStyle: {\n        opacity: 1,\n        color: theme.palette.secondary.main,\n      },\n    },\n    selectedDataBackground: {\n      lineStyle: {\n        opacity: 0,\n      },\n      areaStyle: {\n        opacity: 1,\n        color: theme.palette.secondary.main,\n      },\n    },\n    handleStyle: {\n      color: theme.palette.common.white,\n      borderColor: 'rgba(3, 111, 226, 0.08)',\n      borderWidth: 1,\n      shadowBlur: 3,\n      shadowColor: 'rgba(0, 0, 0, 0.1)',\n      shadowOffsetX: 0,\n      shadowOffsetY: 1,\n    },\n    textStyle: {\n      color: theme.palette.black[60],\n      fontSize: parseInt(theme.typography.overlineDelicate.fontSize as string),\n      fontFamily: theme.typography.overlineDelicate.fontFamily,\n    },\n  } as const\n}\n\nexport function getEChartBrushConfig(\n  { brushType = 'lineX', brushMode = 'single', xAxisIndex = 0 } = {} as {\n    brushType?: string\n    brushMode?: string\n    xAxisIndex?: number\n    throttleType?: string\n    throttleDelay?: number\n  },\n) {\n  return {\n    brush: {\n      toolbox: ['lineX', 'clear'],\n      brushType,\n      brushMode,\n      xAxisIndex,\n    },\n  }\n}\n\nexport function getEChartStackConfig(stackGroup: string = DEFAULT_STACK_GROUP) {\n  return { stack: stackGroup }\n}\n"],"names":["DEFAULT_STACK_GROUP","mergeEchartWidgetConfig","options","deepmerge","customMerge","key","_","b","a","length","map","bItem","index","aItem","getEChartZoomConfig","start","end","inside","xSlider","ySlider","showSliders","xAxisLabelFormatter","bottomOffset","theme","sliderStyles","getEChartZoomSliderStyles","dataZoom","throttle","type","xAxisIndex","yAxisIndex","show","zoom","zoomLock","orientation","bottom","height","parseInt","spacing","labelFormatter","showDetail","brushSelect","moveHandleSize","handleSize","handleIcon","left","width","filter","d","fillerColor","borderColor","borderWidth","backgroundColor","borderRadius","dataBackground","lineStyle","opacity","areaStyle","color","palette","secondary","main","selectedDataBackground","handleStyle","common","white","shadowBlur","shadowColor","shadowOffsetX","shadowOffsetY","textStyle","black","fontSize","typography","overlineDelicate","fontFamily","getEChartBrushConfig","brushType","brushMode","brush","toolbox","getEChartStackConfig","stackGroup","stack"],"mappings":"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"}