@carto/ps-react-ui 5.4.0 → 5.5.0

package/dist/item-color-ZYxH3NM5.js

@@ -0,0 +1,20 @@
+import { t as e } from "./utils-Dr6gf3vD.js";
+//#region src/widgets-v2/utils/item-color.ts
+function t({ theme: t, datums: r, template: i, fallback: a }) {
+	let o = i?.itemStyle?.color;
+	return (i) => {
+		let s = n(r[i.dataIndex]);
+		if (s) return e(t, s);
+		let c = typeof o == "function" ? o(i) : o;
+		return typeof c == "string" && c !== "" ? e(t, c) : a(i);
+	};
+}
+function n(e) {
+	if (typeof e != "object" || !e) return;
+	let t = e.color;
+	return typeof t == "string" && t !== "" ? t : void 0;
+}
+//#endregion
+export { t };
+
+//# sourceMappingURL=item-color-ZYxH3NM5.js.map

package/dist/item-color-ZYxH3NM5.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"item-color-ZYxH3NM5.js","names":[],"sources":["../src/widgets-v2/utils/item-color.ts"],"sourcesContent":["import type { Theme } from '@mui/material'\nimport type { CallbackDataParams } from 'echarts/types/dist/shared'\nimport { resolveThemeColor } from './resolve-theme-color'\n\n/** ECharts `itemStyle.color` callback, as emitted by the chart widgets. */\nexport type ItemColorCallback = (params: CallbackDataParams) => string\n\n/**\n * Builds the callback that resolves the **base** colour of every item of one\n * series, before any selection dimming. Priority:\n *\n *   1. the datum's own `color` (`datums[params.dataIndex].color`);\n *   2. the consumer's `template.itemStyle.color` (from `optionsOverride`):\n *      a string is used as is, a function is called with the ECharts params;\n *   3. `fallback` — the widget's default (series colour / palette).\n *\n * The datum is looked up by `params.dataIndex` in the widget's own data\n * rather than read off `params.data`, so it works whatever the dataset row\n * shape is (object rows, `[label, count]` tuples, `[x, y]` tuples).\n *\n * Datum and template colours go through {@link resolveThemeColor}, same as\n * per-series colours, so palette paths such as `'primary.main'` work.\n */\nexport function createItemColorResolver({\n  theme,\n  datums,\n  template,\n  fallback,\n}: {\n  theme: Theme\n  datums: readonly unknown[]\n  template: unknown\n  fallback: ItemColorCallback\n}): ItemColorCallback {\n  const templateColor = (template as { itemStyle?: { color?: unknown } })\n    ?.itemStyle?.color\n  return (params) => {\n    const datumColor = readColor(datums[params.dataIndex])\n    if (datumColor) return resolveThemeColor(theme, datumColor)!\n    const custom =\n      typeof templateColor === 'function'\n        ? (templateColor as (p: CallbackDataParams) => unknown)(params)\n        : templateColor\n    if (typeof custom === 'string' && custom !== '') {\n      return resolveThemeColor(theme, custom)!\n    }\n    return fallback(params)\n  }\n}\n\nfunction readColor(datum: unknown): string | undefined {\n  if (datum == null || typeof datum !== 'object') return undefined\n  const color = (datum as { color?: unknown }).color\n  return typeof color === 'string' && color !== '' ? color : undefined\n}\n"],"mappings":";;AAuBA,SAAgB,EAAwB,EACtC,UACA,WACA,aACA,eAMoB;CACpB,IAAM,IAAiB,GACnB,WAAW;CACf,QAAQ,MAAW;EACjB,IAAM,IAAa,EAAU,EAAO,EAAO,UAAU;EACrD,IAAI,GAAY,OAAO,EAAkB,GAAO,CAAU;EAC1D,IAAM,IACJ,OAAO,KAAkB,aACpB,EAAqD,CAAM,IAC5D;EAIN,OAHI,OAAO,KAAW,YAAY,MAAW,KACpC,EAAkB,GAAO,CAAM,IAEjC,EAAS,CAAM;CACxB;AACF;AAEA,SAAS,EAAU,GAAoC;CACrD,IAAqB,OAAO,KAAU,aAAlC,GAA4C;CAChD,IAAM,IAAS,EAA8B;CAC7C,OAAO,OAAO,KAAU,YAAY,MAAU,KAAK,IAAQ,KAAA;AAC7D"}

package/dist/types/widgets-v2/bar/types.d.ts

@@ -5,6 +5,12 @@ import { WidgetSeries } from '../types.js';
 export interface BarDatum {
     name: string | number;
     value: number;
+    /**
+     * Optional colour for this item (CSS colour or theme palette path such as
+     * `'primary.main'`). Wins over the template's `itemStyle.color` and the
+     * series colour; selection dimming still applies on top.
+     */
+    color?: string;
 }
 /** v2 bar widget data shape: array of series, each a flat list of `{name, value}`. */
 export type BarWidgetData = readonly (readonly BarDatum[])[];

package/dist/types/widgets-v2/histogram/bins.d.ts

@@ -0,0 +1,7 @@
+import { HistogramBin } from './types.js';
+/** Count of a {@link HistogramBin}, whichever form it takes. */
+export declare function getHistogramBinValue(bin: HistogramBin): number;
+/** Whether `v` is a valid {@link HistogramBin} with a finite count. */
+export declare function isHistogramBin(v: unknown): v is HistogramBin;
+/** Same bin with its count replaced; keeps the object form (and `color`). */
+export declare function withHistogramBinValue(bin: HistogramBin, value: number): HistogramBin;

package/dist/types/widgets-v2/histogram/download.d.ts

@@ -1,5 +1,5 @@
 import { DownloadContext, DownloadItem } from '../actions/download/index.js';
-import { HistogramWidgetData } from './types.js';
+import { HistogramBin, HistogramWidgetData } from './types.js';
 /**
  * Download menu items for histograms. Always includes a CSV item with
  * `bin_low, bin_high, series_1_count, series_2_count, …` columns (one row
@@ -8,7 +8,7 @@ import { HistogramWidgetData } from './types.js';
  */
 export declare function createHistogramDownloadConfig(args: {
     filename: string;
-    getData: (ctx: DownloadContext) => HistogramWidgetData;
+    getData: (ctx: DownloadContext) => HistogramWidgetData<HistogramBin>;
     getTicks: () => readonly number[];
     seriesNames?: readonly string[];
     getCaptureEl?: (ctx: DownloadContext) => HTMLElement | null;

package/dist/types/widgets-v2/histogram/index.d.ts

@@ -2,4 +2,5 @@ export { histogramOptions, createHistogramOptionFactory } from './options.js';
 export { HistogramSkeleton, type HistogramSkeletonProps } from './skeleton.js';
 export { createHistogramDownloadConfig } from './download.js';
 export { toRelativeHistogramData, filterHistogramByLockedBins, } from './transforms.js';
-export type { HistogramWidgetData, HistogramOptionsInput, HistogramOptionFactoryInput, HistogramEChartsOption, } from './types.js';
+export { getHistogramBinValue } from './bins.js';
+export type { HistogramBin, HistogramBinObject, HistogramWidgetData, HistogramOptionsInput, HistogramOptionFactoryInput, HistogramEChartsOption, } from './types.js';

package/dist/types/widgets-v2/histogram/options.d.ts

@@ -31,7 +31,7 @@ export declare function histogramOptions({ theme, formatter, }: HistogramOptions
  *     the consumer-supplied `optionsOverride`. Called once by Provider to
  *     seed `rawOptions` in the store.
  *   - **Merge phase** (`option != null`) — fuses post-pipeline `state.data`
- *     (`HistogramWidgetData` — `number[][]`) into the option via the
+ *     (`HistogramWidgetData` — `HistogramBin[][]`) into the option via the
  *     dataset API. Each series gets its own dataset of `[binLabel, count]`
  *     pairs derived from `ticks`; series reference their dataset by
  *     `datasetIndex` and are encoded by column position. Reactive

package/dist/types/widgets-v2/histogram/transforms.d.ts

@@ -1,6 +1,7 @@
 /**
  * Histogram-specific `RelativeData` transform. Histogram data is
- * `number[][]` — each series is a flat list of bin counts. This
+ * `HistogramBin[][]` — each series is a flat list of bin counts (plain
+ * numbers or `{ value, color? }`, whose shape is kept). This
  * rewrites each count to its share of the series total (0–100), so
  * pairing with `createPercentFormatter` renders the y-axis as
  * percentages.
@@ -11,13 +12,13 @@
  * inputs produce sane signed shares-of-magnitude. A series whose total
  * magnitude is zero (all-zero or empty input) is returned unchanged so
  * a stalled or empty data set doesn't show misleading 0% values. Inputs
- * whose shape isn't `number[][]` fall through untouched (same defensive
+ * whose shape isn't `HistogramBin[][]` fall through untouched (same defensive
  * shape-check pattern as the default transform).
  */
 export declare const toRelativeHistogramData: (input: unknown) => unknown;
 /**
- * `LockSelection` filter for Histogram. Data is `number[][]` — a flat list
- * of bin counts per series, positionally paired with `ticks` (bin `i` covers
+ * `LockSelection` filter for Histogram. Data is `HistogramBin[][]` — a flat
+ * list of bin counts per series, positionally paired with `ticks` (bin `i` covers
  * `[ticks[i], ticks[i+1])`). Unlike name-keyed widgets, locked-out bins can't
  * be REMOVED — that would shift every later bin's index and desync it from
  * its `ticks` range. Zeroing them out instead preserves array length/position,

package/dist/types/widgets-v2/histogram/types.d.ts

@@ -2,12 +2,29 @@ import { Theme } from '@mui/material';
 import { EChartsOption } from 'echarts';
 import { WidgetSeries } from '../types.js';
 /**
- * Histogram widget data — array of series, each a flat array of bin counts.
- * The option factory's merge phase (see {@link createHistogramOptionFactory})
- * combines this with `ticks` to produce a 2-column dataset (`[binLabel, count]`)
- * for ECharts.
+ * One histogram bin: either its count, or `{ value, color? }` to give the
+ * bar its own colour (CSS colour or theme palette path such as
+ * `'primary.main'`). A bin `color` wins over the template's
+ * `itemStyle.color` and the series colour; selection dimming still applies.
  */
-export type HistogramWidgetData = readonly (readonly number[])[];
+export type HistogramBin = number | HistogramBinObject;
+/** Object form of a {@link HistogramBin}. */
+export interface HistogramBinObject {
+    value: number;
+    color?: string;
+}
+/**
+ * Histogram widget data — array of series, each a flat array of bins. The
+ * option factory's merge phase (see {@link createHistogramOptionFactory})
+ * combines this with `ticks` to produce a 2-column dataset
+ * (`[binLabel, count]`) for ECharts.
+ *
+ * Defaults to plain counts (`number[][]`) so existing code that reads bins
+ * as numbers keeps type-checking; use `HistogramWidgetData<HistogramBin>`
+ * to also accept `{ value, color? }` bins. Every histogram API (option
+ * factory, transforms, download) accepts both forms.
+ */
+export type HistogramWidgetData<B extends HistogramBin = number> = readonly (readonly B[])[];
 /** Inputs to the structural-only {@link histogramOptions} builder. */
 export interface HistogramOptionsInput {
     theme: Theme;

package/dist/types/widgets-v2/index.d.ts

@@ -101,7 +101,7 @@ export type { FormulaUIProps, FormulaDataItem, FormulaWidgetData, } from './form
 export type { MarkdownUIProps, MarkdownWidgetData } from './markdown/index.js';
 export type { PieDatum, PieWidgetData } from './pie/index.js';
 export type { TimeseriesDatum, TimeseriesWidgetData } from './timeseries/index.js';
-export type { ScatterplotDatum, ScatterplotWidgetData } from './scatterplot/index.js';
+export type { ScatterplotDatum, ScatterplotPoint, ScatterplotItem, ScatterplotWidgetData, } from './scatterplot/index.js';
 export type { SpreadUIProps, SpreadDataItem, SpreadWidgetData, SpreadVariant, } from './spread/index.js';
 export type { RangeProps, RangeUIProps, RangeDataItem, RangeWidgetData, RangeItemValue, } from './range/index.js';
 export type { CategoryProps, CategoryUIProps, CategoryDataItem, CategoryWidgetData, CategoryKey, CategorySeriesConfig, CategoryLabels, } from './category/index.js';

package/dist/types/widgets-v2/pie/types.d.ts

@@ -5,6 +5,12 @@ import { WidgetSeries } from '../types.js';
 export interface PieDatum {
     name: string | number;
     value: number;
+    /**
+     * Optional colour for this item (CSS colour or theme palette path such as
+     * `'primary.main'`). Wins over the template's `itemStyle.color` and the
+     * series colour; selection dimming still applies on top.
+     */
+    color?: string;
 }
 /** Pie widget data — one slice array per series (rendered as side-by-side donuts). */
 export type PieWidgetData = readonly (readonly PieDatum[])[];

package/dist/types/widgets-v2/scatterplot/download.d.ts

@@ -1,5 +1,5 @@
 import { DownloadContext, DownloadItem } from '../actions/download/index.js';
-import { ScatterplotWidgetData } from './types.js';
+import { ScatterplotItem, ScatterplotWidgetData } from './types.js';
 /**
  * Download menu items for the Scatterplot widget. Always includes a CSV
  * item with `series, x, y` columns (one row per point). When
@@ -8,7 +8,7 @@ import { ScatterplotWidgetData } from './types.js';
  */
 export declare function createScatterplotDownloadConfig(args: {
     filename: string;
-    getData: (ctx: DownloadContext) => ScatterplotWidgetData;
+    getData: (ctx: DownloadContext) => ScatterplotWidgetData<ScatterplotItem>;
     seriesNames?: readonly string[];
     getCaptureEl?: (ctx: DownloadContext) => HTMLElement | null;
     pngPixelRatio?: number;

package/dist/types/widgets-v2/scatterplot/index.d.ts

@@ -2,4 +2,5 @@ export { scatterplotOptions, createScatterplotOptionFactory } from './options.js
 export { ScatterplotSkeleton, type ScatterplotSkeletonProps } from './skeleton.js';
 export { createScatterplotDownloadConfig } from './download.js';
 export { toRelativeScatterplotData, filterScatterplotByLockedPoints, } from './transforms.js';
-export type { ScatterplotDatum, ScatterplotWidgetData, ScatterplotOptionsInput, ScatterplotOptionFactoryInput, ScatterplotEChartsOption, } from './types.js';
+export { getScatterplotXY } from './points.js';
+export type { ScatterplotDatum, ScatterplotPoint, ScatterplotItem, ScatterplotWidgetData, ScatterplotOptionsInput, ScatterplotOptionFactoryInput, ScatterplotEChartsOption, } from './types.js';

package/dist/types/widgets-v2/scatterplot/points.d.ts

@@ -0,0 +1,7 @@
+import { ScatterplotItem } from './types.js';
+/** `[x, y]` of a {@link ScatterplotItem}, whichever form it takes. */
+export declare function getScatterplotXY(point: ScatterplotItem): readonly [number, number];
+/** Whether `v` is a valid {@link ScatterplotItem} with finite coordinates. */
+export declare function isScatterplotDatum(v: unknown): v is ScatterplotItem;
+/** Same point with new coordinates; keeps the object form (and `color`). */
+export declare function withScatterplotXY(point: ScatterplotItem, x: number, y: number): ScatterplotItem;

package/dist/types/widgets-v2/scatterplot/transforms.d.ts

@@ -1,6 +1,7 @@
 /**
  * Scatterplot-specific `RelativeData` transform. Scatter data is
- * `[number, number][]` — each series is a list of `[x, y]` tuples.
+ * `ScatterplotItem[][]` — each series is a list of `[x, y]` tuples or
+ * `{ x, y, color? }` points (whose shape is kept).
  * Relative is a values-axis concept, so this rewrites `y` to its
  * share of the series's total `y` (0–100) and leaves `x` raw — x is
  * coordinate space, not part of the cohort total.
@@ -11,12 +12,12 @@
  * y values produce sane signed shares-of-magnitude. A series whose
  * total y-magnitude is zero (all-zero or empty input) is returned
  * unchanged so a stalled or empty data set doesn't show misleading 0%
- * values. Inputs whose shape isn't `[number, number][]` fall through
+ * values. Inputs whose shape isn't `ScatterplotItem[]` fall through
  * untouched.
  */
 export declare const toRelativeScatterplotData: (input: unknown) => unknown;
 /**
- * `LockSelection` filter for Scatterplot. Data is `[number, number][][]` —
+ * `LockSelection` filter for Scatterplot. Data is `ScatterplotItem[][]` —
  * points have no `name`, so selection (and locking) is keyed on a synthetic
  * `${seriesIndex}:${dataIndex}` string (same format `useChartSelection`'s
  * `keyFromClick`/`keysFromBrush` produce for this widget). Unlike Histogram,

package/dist/types/widgets-v2/scatterplot/types.d.ts

@@ -3,8 +3,27 @@ import { EChartsOption } from 'echarts';
 import { WidgetSeries } from '../types.js';
 /** A single point — `[x, y]` tuple. */
 export type ScatterplotDatum = readonly [number, number];
-/** Scatterplot widget data — array of series, each a list of `[x, y]` tuples. */
-export type ScatterplotWidgetData = readonly (readonly ScatterplotDatum[])[];
+/**
+ * Object form of a point, to give it its own colour. `color` (CSS colour or
+ * theme palette path such as `'primary.main'`) wins over the template's
+ * `itemStyle.color` and the series colour; selection dimming still applies.
+ */
+export interface ScatterplotPoint {
+    x: number;
+    y: number;
+    color?: string;
+}
+/** Any accepted point: an `[x, y]` tuple or a {@link ScatterplotPoint}. */
+export type ScatterplotItem = ScatterplotDatum | ScatterplotPoint;
+/**
+ * Scatterplot widget data — array of series, each a list of points.
+ *
+ * Defaults to `[x, y]` tuples so existing code that destructures points
+ * keeps type-checking; use `ScatterplotWidgetData<ScatterplotItem>` to also
+ * accept `{ x, y, color? }` points. Every scatterplot API (option factory,
+ * transforms, download) accepts both forms.
+ */
+export type ScatterplotWidgetData<P extends ScatterplotItem = ScatterplotDatum> = readonly (readonly P[])[];
 /** Inputs to the structural-only {@link scatterplotOptions} builder. */
 export interface ScatterplotOptionsInput {
     theme: Theme;

package/dist/types/widgets-v2/timeseries/types.d.ts

@@ -9,6 +9,12 @@ import { WidgetSeries } from '../types.js';
 export interface TimeseriesDatum {
     name: Date | number | string;
     value: number;
+    /**
+     * Optional colour for this item (CSS colour or theme palette path such as
+     * `'primary.main'`). Wins over the template's `itemStyle.color` and the
+     * series colour; selection dimming still applies on top.
+     */
+    color?: string;
 }
 /** Timeseries widget data — one array of points per series. */
 export type TimeseriesWidgetData = readonly (readonly TimeseriesDatum[])[];

package/dist/types/widgets-v2/utils/item-color.d.ts

@@ -0,0 +1,26 @@
+import { Theme } from '@mui/material';
+import { CallbackDataParams } from 'echarts/types/dist/shared';
+/** ECharts `itemStyle.color` callback, as emitted by the chart widgets. */
+export type ItemColorCallback = (params: CallbackDataParams) => string;
+/**
+ * Builds the callback that resolves the **base** colour of every item of one
+ * series, before any selection dimming. Priority:
+ *
+ *   1. the datum's own `color` (`datums[params.dataIndex].color`);
+ *   2. the consumer's `template.itemStyle.color` (from `optionsOverride`):
+ *      a string is used as is, a function is called with the ECharts params;
+ *   3. `fallback` — the widget's default (series colour / palette).
+ *
+ * The datum is looked up by `params.dataIndex` in the widget's own data
+ * rather than read off `params.data`, so it works whatever the dataset row
+ * shape is (object rows, `[label, count]` tuples, `[x, y]` tuples).
+ *
+ * Datum and template colours go through {@link resolveThemeColor}, same as
+ * per-series colours, so palette paths such as `'primary.main'` work.
+ */
+export declare function createItemColorResolver({ theme, datums, template, fallback, }: {
+    theme: Theme;
+    datums: readonly unknown[];
+    template: unknown;
+    fallback: ItemColorCallback;
+}): ItemColorCallback;

package/dist/widgets-v2/actions.js

@@ -1,4 +1,4 @@
-import { C as e, E as t, S as n, T as r, _ as i, a, b as o, c as s, d as c, f as l, g as u, h as d, i as f, l as p, m, n as h, o as g, p as _, r as v, s as y, t as b, u as x, v as S, w as C, x as w, y as T } from "../actions-Dhlz_adK.js";
+import { C as e, E as t, S as n, T as r, _ as i, a, b as o, c as s, d as c, f as l, g as u, h as d, i as f, l as p, m, n as h, o as g, p as _, r as v, s as y, t as b, u as x, v as S, w as C, x as w, y as T } from "../actions-CwjqEm8Y.js";
 import { a as E, i as D, n as O, r as k, t as A } from "../zoom-toggle-IsF8BnAp.js";
 import { a as j, c as M, d as N, f as P, i as F, l as I, n as L, o as R, r as z, s as B, t as V, u as H } from "../download-DGgFOaXj.js";
 export { l as BrushToggle, F as CSVIcon, b as ChangeColumn, _ as DEFAULT_BRUSH_TOGGLE_LABELS, h as DEFAULT_CHANGE_COLUMN_LABELS, M as DEFAULT_DOWNLOAD_LABELS, y as DEFAULT_FULLSCREEN_LABELS, f as DEFAULT_LOCK_SELECTION_LABELS, p as DEFAULT_RELATIVE_DATA_LABELS, r as DEFAULT_SEARCHER_LABELS, S as DEFAULT_SHOW_ALL_LABELS, o as DEFAULT_STACK_TOGGLE_LABELS, O as DEFAULT_ZOOM_TOGGLE_LABELS, z as DOWNLOAD_ITEM_IDS, B as Download, g as FullScreen, v as LockSelection, j as MarkdownIcon, R as PNGIcon, s as RelativeData, d as SHOW_ALL_ID, n as Searcher, e as SearcherToggle, u as ShowAllToggle, T as StackToggle, k as ZOOM_LAYOUT, A as ZoomToggle, m as addBrush, w as addStack, D as addZoom, V as buildCsvDownloadItem, L as buildPngDownloadItem, E as createAddZoom, x as createPercentFormatter, I as downloadDOMToPNG, H as downloadToCSV, a as filterByLockedItems, t as filterBySearchText, C as setSearcherText, i as setShowAll, N as toCsvString, c as toRelativeData, P as triggerLinkDownload };

package/dist/widgets-v2/bar.js

@@ -2,12 +2,13 @@ import { r as e } from "../zoom-toggle-IsF8BnAp.js";
 import { n as t, t as n } from "../download-DGgFOaXj.js";
 import { n as r, r as i, t as a } from "../utils-Dr6gf3vD.js";
 import { a as o, d as s, f as c, i as l, s as u, u as d } from "../chart-config-B_fdIcD3.js";
-import { c as f } from "react/compiler-runtime";
-import { Box as p, Skeleton as m } from "@mui/material";
-import { jsx as h, jsxs as g } from "react/jsx-runtime";
-import * as _ from "echarts";
+import { t as f } from "../item-color-ZYxH3NM5.js";
+import { c as p } from "react/compiler-runtime";
+import { Box as m, Skeleton as h } from "@mui/material";
+import { jsx as g, jsxs as _ } from "react/jsx-runtime";
+import * as v from "echarts";
 //#region src/widgets-v2/bar/options.ts
-function v({ theme: e, formatter: t, labelFormatter: n }) {
+function y({ theme: e, formatter: t, labelFormatter: n }) {
 	let r = 0, i = 1;
 	return {
 		grid: {
@@ -29,7 +30,7 @@ function v({ theme: e, formatter: t, labelFormatter: n }) {
 			},
 			axisPointer: { type: "line" },
 			position: s(e),
-			formatter: b(t, n)
+			formatter: x(t, n)
 		},
 		legend: { ...u({
 			hasLegend: !1,
@@ -78,34 +79,42 @@ function v({ theme: e, formatter: t, labelFormatter: n }) {
 		}
 	};
 }
-function y(t) {
-	let { theme: n, formatter: o, labelFormatter: s, optionsOverride: l } = t, u = t.series, d = t.selection, f = d && d.length > 0 ? new Set(d) : null;
-	return (t, d, p) => {
+function b(t) {
+	let { theme: n, formatter: o, labelFormatter: s, optionsOverride: l } = t, u = t.series, d = t.selection, p = d && d.length > 0 ? new Set(d) : null;
+	return (t, d, m) => {
 		if (t == null) {
-			let e = v({
+			let e = y({
 				theme: n,
 				formatter: o,
 				labelFormatter: s
 			});
 			return l ? i(e, l) : e;
 		}
-		let m = Array.isArray(d) ? d : [];
-		if (m.length === 0) return {
+		let h = Array.isArray(d) ? d : [];
+		if (h.length === 0) return {
 			...t,
 			dataset: [],
 			series: []
 		};
-		let h = m.length > 1, g = typeof t.legend == "object" && !Array.isArray(t.legend) ? t.legend : {}, y = typeof t.grid == "object" && !Array.isArray(t.grid) ? t.grid : {}, x = typeof t.tooltip == "object" && !Array.isArray(t.tooltip) ? t.tooltip : {}, S = typeof t.yAxis == "object" && !Array.isArray(t.yAxis) ? t.yAxis : {}, C = Array.isArray(t.series) ? t.series : [], w = C[0] ?? {}, T = p?.formatter, E = p?.labelFormatter, D = 0, O = 1, k = r(t.dataZoom, h), A = typeof y.bottom == "number" ? y.bottom : 24, j = h ? 56 : A, M = k ? j + e.sliderHeight + e.sliderGap : j, N = { color: (e) => {
-			let t = e.color;
-			if (!f) return t;
-			let n = e.value?.name ?? e.name;
-			return n != null && f.has(n) ? t : _.color.modifyAlpha(t, .15);
-		} };
+		let g = h.length > 1, _ = typeof t.legend == "object" && !Array.isArray(t.legend) ? t.legend : {}, b = typeof t.grid == "object" && !Array.isArray(t.grid) ? t.grid : {}, S = typeof t.tooltip == "object" && !Array.isArray(t.tooltip) ? t.tooltip : {}, C = typeof t.yAxis == "object" && !Array.isArray(t.yAxis) ? t.yAxis : {}, w = Array.isArray(t.series) ? t.series : [], T = w[0] ?? {}, E = m?.formatter, D = m?.labelFormatter, O = 0, k = 1, A = r(t.dataZoom, g), j = typeof b.bottom == "number" ? b.bottom : 24, M = g ? 56 : j, N = A ? M + e.sliderHeight + e.sliderGap : M, P = (e, t) => {
+			let r = f({
+				theme: n,
+				datums: e,
+				template: t,
+				fallback: (e) => e.color
+			});
+			return { color: (e) => {
+				let t = r(e);
+				if (!p) return t;
+				let n = e.value?.name ?? e.name;
+				return n != null && p.has(n) ? t : v.color.modifyAlpha(t, .15);
+			} };
+		};
 		return {
 			...t,
-			dataset: m.map((e) => ({ source: e })),
-			series: m.map((e, t) => {
-				let r = C[t] ?? w, i = a(n, u?.[t]?.color);
+			dataset: h.map((e) => ({ source: e })),
+			series: h.map((e, t) => {
+				let r = w[t] ?? T, i = a(n, u?.[t]?.color);
 				return {
 					...typeof r == "object" ? r : {},
 					type: "bar",
@@ -117,36 +126,36 @@ function y(t) {
 					},
 					barMaxWidth: 100,
 					emphasis: { focus: "series" },
-					itemStyle: N,
+					itemStyle: P(e, r),
 					...i ? { color: i } : {}
 				};
 			}),
 			legend: {
-				...g,
-				show: h
+				..._,
+				show: g
 			},
 			grid: {
-				...y,
-				bottom: M
+				...b,
+				bottom: N
 			},
-			...k ? { dataZoom: k } : {},
+			...A ? { dataZoom: A } : {},
 			yAxis: {
-				...S,
-				min: (e) => (D = e.min < 0 ? c(e.min) : 0, D),
-				max: (e) => (O = e.max <= 0 ? 1 : c(e.max), O),
+				...C,
+				min: (e) => (O = e.min < 0 ? c(e.min) : 0, O),
+				max: (e) => (k = e.max <= 0 ? 1 : c(e.max), k),
 				axisLabel: {
-					...S.axisLabel ?? {},
-					formatter: (e) => e !== O && e !== D || e === 0 ? "" : T ? T(e) : String(e)
+					...C.axisLabel ?? {},
+					formatter: (e) => e !== k && e !== O || e === 0 ? "" : E ? E(e) : String(e)
 				}
 			},
 			tooltip: {
-				...x,
-				formatter: b(T, E)
+				...S,
+				formatter: x(E, D)
 			}
 		};
 	};
 }
-function b(e, t) {
+function x(e, t) {
 	return d((n) => {
 		let r = n.value?.value, i = typeof r == "number" && e ? e(r) : r ?? "", a = typeof n.marker == "string" ? n.marker : "", o = n.seriesName ? `${n.seriesName}: ` : "", s = t ? String(t(n.name ?? "")) : n.name ?? "";
 		return {
@@ -159,7 +168,7 @@ function b(e, t) {
 }
 //#endregion
 //#region src/widgets-v2/bar/skeleton.tsx
-var x = {
+var S = {
 	container: {
 		display: "flex",
 		alignItems: "center",
@@ -191,51 +200,51 @@ var x = {
 		alignItems: "center",
 		gap: ({ spacing: e }) => e(1.5)
 	}
-}, S = [
+}, C = [
 	"20%",
 	"40%",
 	"60%",
 	"20%",
 	"80%"
 ];
-function C() {
-	let e = f(2), t;
-	e[0] === Symbol.for("react.memo_cache_sentinel") ? (t = /* @__PURE__ */ h(p, {
-		sx: x.grid,
-		children: S.map(T)
+function w() {
+	let e = p(2), t;
+	e[0] === Symbol.for("react.memo_cache_sentinel") ? (t = /* @__PURE__ */ g(m, {
+		sx: S.grid,
+		children: C.map(E)
 	}), e[0] = t) : t = e[0];
 	let n;
-	return e[1] === Symbol.for("react.memo_cache_sentinel") ? (n = /* @__PURE__ */ g(p, {
-		sx: x.container,
-		children: [t, /* @__PURE__ */ h(p, {
-			sx: x.legend,
-			children: [0, 1].map(w)
+	return e[1] === Symbol.for("react.memo_cache_sentinel") ? (n = /* @__PURE__ */ _(m, {
+		sx: S.container,
+		children: [t, /* @__PURE__ */ g(m, {
+			sx: S.legend,
+			children: [0, 1].map(T)
 		})]
 	}), e[1] = n) : n = e[1], n;
 }
-function w(e) {
-	return /* @__PURE__ */ g(p, {
-		sx: x.legendItem,
-		children: [/* @__PURE__ */ h(m, {
+function T(e) {
+	return /* @__PURE__ */ _(m, {
+		sx: S.legendItem,
+		children: [/* @__PURE__ */ g(h, {
 			variant: "circular",
 			width: 8,
 			height: 8
-		}), /* @__PURE__ */ h(m, {
+		}), /* @__PURE__ */ g(h, {
 			width: 48,
 			height: 8
 		})]
 	}, `legend-${e}`);
 }
-function T(e, t) {
-	return /* @__PURE__ */ h(m, {
-		sx: x.bar,
+function E(e, t) {
+	return /* @__PURE__ */ g(h, {
+		sx: S.bar,
 		variant: "rectangular",
 		height: e
 	}, `bar-${t}`);
 }
 //#endregion
 //#region src/widgets-v2/bar/download.tsx
-function E(e) {
+function D(e) {
 	let r = [];
 	return e.getCaptureEl && r.push(t({
 		filename: e.filename,
@@ -255,6 +264,6 @@ function E(e) {
 	})), r;
 }
 //#endregion
-export { C as BarSkeleton, v as barOptions, E as createBarDownloadConfig, y as createBarOptionFactory };
+export { w as BarSkeleton, y as barOptions, D as createBarDownloadConfig, b as createBarOptionFactory };
 
 //# sourceMappingURL=bar.js.map