@carto/ps-react-ui 5.4.0 → 5.6.0

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

@@ -96,12 +96,12 @@ export type { ToolboxLabels } from './toolbox/labels.js';
 export type { EchartProps, EchartUIProps, EchartsEventHandler } from './echart/index.js';
 export type { NoteProps, NoteMarkdownProps } from './note/widget-note.js';
 export type { NoteLabels } from './note/labels.js';
-export type { SearcherProps, SearcherToggleProps, StackToggleProps, ShowAllToggleProps, ZoomToggleProps, BrushToggleProps, RelativeDataProps, DownloadProps, DownloadItem, DownloadContext, FullScreenTriggerProps, FullScreenSlotProps, LockSelectionProps, LockSelectionKey, ChangeColumnProps, ChangeColumnItem, } from './actions/index.js';
+export type { SearcherProps, SearcherToggleProps, StackToggleProps, ShowAllToggleProps, ZoomToggleProps, BrushToggleProps, RelativeDataProps, RelativeScale, DownloadProps, DownloadItem, DownloadContext, FullScreenTriggerProps, FullScreenSlotProps, LockSelectionProps, LockSelectionKey, ChangeColumnProps, ChangeColumnItem, } from './actions/index.js';
 export type { FormulaUIProps, FormulaDataItem, FormulaWidgetData, } from './formula/index.js';
 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-5-dVhroJ.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

@@ -1,20 +1,22 @@
 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 { n as t } from "../scale-0elCv3tk.js";
+import { n, t as r } from "../download-DGgFOaXj.js";
+import { n as i, r as a, t as o } from "../utils-Dr6gf3vD.js";
+import { a as s, d as c, f as l, i as u, s as d, u as f } from "../chart-config-B_fdIcD3.js";
+import { t as p } from "../item-color-ZYxH3NM5.js";
+import { c as m } from "react/compiler-runtime";
+import { Box as h, Skeleton as g } from "@mui/material";
+import { jsx as _, jsxs as v } from "react/jsx-runtime";
+import * as y from "echarts";
 //#region src/widgets-v2/bar/options.ts
-function v({ theme: e, formatter: t, labelFormatter: n }) {
+function b({ theme: e, formatter: t, labelFormatter: n }) {
 	let r = 0, i = 1;
 	return {
 		grid: {
 			left: parseInt(e.spacing(1)),
 			top: parseInt(e.spacing(3)),
 			right: parseInt(e.spacing(1)),
-			...o(!1, e),
+			...s(!1, e),
 			containLabel: !0
 		},
 		tooltip: {
@@ -28,10 +30,10 @@ function v({ theme: e, formatter: t, labelFormatter: n }) {
 				fontFamily: e.typography.caption.fontFamily
 			},
 			axisPointer: { type: "line" },
-			position: s(e),
-			formatter: b(t, n)
+			position: c(e),
+			formatter: S(t, n)
 		},
-		legend: { ...u({
+		legend: { ...d({
 			hasLegend: !1,
 			labelFormatter: n
 		}) },
@@ -42,7 +44,7 @@ function v({ theme: e, formatter: t, labelFormatter: n }) {
 			axisLine: { show: !1 },
 			axisTick: { show: !1 },
 			axisLabel: {
-				...l(e),
+				...u(e),
 				padding: [
 					parseInt(e.spacing(.5)),
 					0,
@@ -57,8 +59,8 @@ function v({ theme: e, formatter: t, labelFormatter: n }) {
 		},
 		yAxis: {
 			type: "value",
-			min: (e) => (r = e.min < 0 ? c(e.min) : 0, r),
-			max: (e) => (i = e.max <= 0 ? 1 : c(e.max), i),
+			min: (e) => (r = e.min < 0 ? l(e.min) : 0, r),
+			max: (e) => (i = e.max <= 0 ? 1 : l(e.max), i),
 			axisLine: { show: !1 },
 			axisTick: { show: !1 },
 			splitLine: {
@@ -66,7 +68,7 @@ function v({ theme: e, formatter: t, labelFormatter: n }) {
 				lineStyle: { color: e.palette.black?.[4] ?? e.palette.divider }
 			},
 			axisLabel: {
-				...l(e),
+				...u(e),
 				margin: parseInt(e.spacing(1)),
 				show: !0,
 				showMaxLabel: !0,
@@ -78,76 +80,84 @@ 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) => {
-		if (t == null) {
-			let e = v({
-				theme: n,
-				formatter: o,
-				labelFormatter: s
+function x(n) {
+	let { theme: r, formatter: s, labelFormatter: c, optionsOverride: u } = n, d = n.series, f = n.selection, m = f && f.length > 0 ? new Set(f) : null;
+	return (n, f, h) => {
+		if (n == null) {
+			let e = b({
+				theme: r,
+				formatter: s,
+				labelFormatter: c
 			});
-			return l ? i(e, l) : e;
+			return u ? a(e, u) : e;
 		}
-		let m = Array.isArray(d) ? d : [];
-		if (m.length === 0) return {
-			...t,
+		let g = Array.isArray(f) ? f : [];
+		if (g.length === 0) return {
+			...n,
 			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.length > 1, v = typeof n.legend == "object" && !Array.isArray(n.legend) ? n.legend : {}, x = typeof n.grid == "object" && !Array.isArray(n.grid) ? n.grid : {}, C = typeof n.tooltip == "object" && !Array.isArray(n.tooltip) ? n.tooltip : {}, w = typeof n.yAxis == "object" && !Array.isArray(n.yAxis) ? n.yAxis : {}, T = t(w), E = Array.isArray(n.series) ? n.series : [], D = E[0] ?? {}, O = h?.formatter, k = h?.labelFormatter, A = 0, j = 1, M = i(n.dataZoom, _), N = typeof x.bottom == "number" ? x.bottom : 24, P = _ ? 56 : N, F = M ? P + e.sliderHeight + e.sliderGap : P, I = (e, t) => {
+			let n = p({
+				theme: r,
+				datums: e,
+				template: t,
+				fallback: (e) => e.color
+			});
+			return { color: (e) => {
+				let t = n(e);
+				if (!m) return t;
+				let r = e.value?.name ?? e.name;
+				return r != null && m.has(r) ? t : y.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);
+			...n,
+			dataset: g.map((e) => ({ source: e })),
+			series: g.map((e, t) => {
+				let n = E[t] ?? D, i = o(r, d?.[t]?.color);
 				return {
-					...typeof r == "object" ? r : {},
+					...typeof n == "object" ? n : {},
 					type: "bar",
 					datasetIndex: t,
-					name: u?.[t]?.name ?? `Series ${t + 1}`,
+					name: d?.[t]?.name ?? `Series ${t + 1}`,
 					encode: {
 						x: "name",
 						y: "value"
 					},
 					barMaxWidth: 100,
 					emphasis: { focus: "series" },
-					itemStyle: N,
+					itemStyle: I(e, n),
 					...i ? { color: i } : {}
 				};
 			}),
 			legend: {
-				...g,
-				show: h
+				...v,
+				show: _
 			},
 			grid: {
-				...y,
-				bottom: M
+				...x,
+				bottom: F
 			},
-			...k ? { dataZoom: k } : {},
+			...M ? { dataZoom: M } : {},
 			yAxis: {
-				...S,
-				min: (e) => (D = e.min < 0 ? c(e.min) : 0, D),
-				max: (e) => (O = e.max <= 0 ? 1 : c(e.max), O),
+				...w,
+				min: (e) => (A = e.min < 0 ? T.min ?? l(e.min) : 0, A),
+				max: (e) => (j = e.max <= 0 ? 1 : T.max ?? l(e.max), j),
 				axisLabel: {
-					...S.axisLabel ?? {},
-					formatter: (e) => e !== O && e !== D || e === 0 ? "" : T ? T(e) : String(e)
+					...w.axisLabel ?? {},
+					formatter: (e) => e !== j && e !== A || e === 0 ? "" : O ? O(e) : String(e)
 				}
 			},
 			tooltip: {
-				...x,
-				formatter: b(T, E)
+				...C,
+				formatter: S(O, k)
 			}
 		};
 	};
 }
-function b(e, t) {
-	return d((n) => {
+function S(e, t) {
+	return f((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 {
 			name: String(s),
@@ -159,7 +169,7 @@ function b(e, t) {
 }
 //#endregion
 //#region src/widgets-v2/bar/skeleton.tsx
-var x = {
+var C = {
 	container: {
 		display: "flex",
 		alignItems: "center",
@@ -191,58 +201,58 @@ var x = {
 		alignItems: "center",
 		gap: ({ spacing: e }) => e(1.5)
 	}
-}, S = [
+}, w = [
 	"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 T() {
+	let e = m(2), t;
+	e[0] === Symbol.for("react.memo_cache_sentinel") ? (t = /* @__PURE__ */ _(h, {
+		sx: C.grid,
+		children: w.map(D)
 	}), 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__ */ v(h, {
+		sx: C.container,
+		children: [t, /* @__PURE__ */ _(h, {
+			sx: C.legend,
+			children: [0, 1].map(E)
 		})]
 	}), e[1] = n) : n = e[1], n;
 }
-function w(e) {
-	return /* @__PURE__ */ g(p, {
-		sx: x.legendItem,
-		children: [/* @__PURE__ */ h(m, {
+function E(e) {
+	return /* @__PURE__ */ v(h, {
+		sx: C.legendItem,
+		children: [/* @__PURE__ */ _(g, {
 			variant: "circular",
 			width: 8,
 			height: 8
-		}), /* @__PURE__ */ h(m, {
+		}), /* @__PURE__ */ _(g, {
 			width: 48,
 			height: 8
 		})]
 	}, `legend-${e}`);
 }
-function T(e, t) {
-	return /* @__PURE__ */ h(m, {
-		sx: x.bar,
+function D(e, t) {
+	return /* @__PURE__ */ _(g, {
+		sx: C.bar,
 		variant: "rectangular",
 		height: e
 	}, `bar-${t}`);
 }
 //#endregion
 //#region src/widgets-v2/bar/download.tsx
-function E(e) {
-	let r = [];
-	return e.getCaptureEl && r.push(t({
+function O(e) {
+	let t = [];
+	return e.getCaptureEl && t.push(n({
 		filename: e.filename,
 		getCaptureEl: e.getCaptureEl,
 		pixelRatio: e.pngPixelRatio,
 		backgroundColor: e.pngBackgroundColor
-	})), r.push(n({
+	})), t.push(r({
 		filename: e.filename,
 		getRows: (t) => {
 			let n = e.getData(t), r = [];
@@ -252,9 +262,9 @@ function E(e) {
 			}
 			return r;
 		}
-	})), r;
+	})), t;
 }
 //#endregion
-export { C as BarSkeleton, v as barOptions, E as createBarDownloadConfig, y as createBarOptionFactory };
+export { T as BarSkeleton, b as barOptions, O as createBarDownloadConfig, x as createBarOptionFactory };
 
 //# sourceMappingURL=bar.js.map