@gravity-ui/charts 1.11.3 → 1.12.0

package/dist/cjs/components/Tooltip/utils.js

@@ -0,0 +1,126 @@
+import get from 'lodash/get';
+import { i18n } from '../../i18n';
+import { getDataCategoryValue } from '../../utils';
+import { getFormattedValue } from '../../utils/chart/format';
+const DEFAULT_DATE_FORMAT = 'DD.MM.YY';
+function getRowData(fieldName, data, axis) {
+    switch (axis === null || axis === void 0 ? void 0 : axis.type) {
+        case 'category': {
+            const categories = get(axis, 'categories', []);
+            return getDataCategoryValue({ axisDirection: fieldName, categories, data });
+        }
+        default: {
+            return get(data, fieldName);
+        }
+    }
+}
+export function getXRowData(data, xAxis) {
+    return getRowData('x', data, xAxis);
+}
+function getYRowData(data, yAxis) {
+    return getRowData('y', data, yAxis);
+}
+export function getDefaultValueFormat({ axis, }) {
+    switch (axis === null || axis === void 0 ? void 0 : axis.type) {
+        case 'linear':
+        case 'logarithmic': {
+            return {
+                type: 'number',
+            };
+        }
+        case 'datetime': {
+            return {
+                type: 'date',
+                format: DEFAULT_DATE_FORMAT,
+            };
+        }
+        default:
+            return undefined;
+    }
+}
+export const getMeasureValue = ({ data, xAxis, yAxis, valueFormat, }) => {
+    var _a, _b, _c, _d;
+    if (data.every((item) => ['pie', 'treemap', 'waterfall', 'sankey'].includes(item.series.type))) {
+        return null;
+    }
+    if (data.some((item) => item.series.type === 'radar')) {
+        return (_b = (_a = data[0].category) === null || _a === void 0 ? void 0 : _a.key) !== null && _b !== void 0 ? _b : null;
+    }
+    if (data.some((item) => item.series.type === 'bar-y')) {
+        const format = valueFormat !== null && valueFormat !== void 0 ? valueFormat : getDefaultValueFormat({ axis: yAxis });
+        return getFormattedValue({
+            value: getYRowData((_c = data[0]) === null || _c === void 0 ? void 0 : _c.data, yAxis),
+            format,
+        });
+    }
+    const format = valueFormat !== null && valueFormat !== void 0 ? valueFormat : getDefaultValueFormat({ axis: xAxis });
+    return getFormattedValue({
+        value: getXRowData((_d = data[0]) === null || _d === void 0 ? void 0 : _d.data, xAxis),
+        format,
+    });
+};
+export function getHoveredValues(args) {
+    const { hovered, xAxis, yAxis } = args;
+    return hovered.map((seriesItem) => {
+        var _a;
+        const { data, series } = seriesItem;
+        switch (series.type) {
+            case 'area':
+            case 'line':
+            case 'bar-x':
+            case 'scatter': {
+                return getYRowData(data, yAxis);
+            }
+            case 'bar-y': {
+                return getXRowData(data, xAxis);
+            }
+            case 'pie':
+            case 'radar':
+            case 'treemap': {
+                const seriesData = data;
+                return seriesData.value;
+            }
+            case 'sankey': {
+                const { target, data: source } = seriesItem;
+                return (_a = source.links.find((d) => d.name === (target === null || target === void 0 ? void 0 : target.name))) === null || _a === void 0 ? void 0 : _a.value;
+            }
+            case 'waterfall': {
+                return getYRowData(data, yAxis);
+            }
+            default: {
+                return undefined;
+            }
+        }
+    });
+}
+export function getBuiltInAggregatedValue(args) {
+    const { aggregation, values } = args;
+    switch (aggregation) {
+        case 'sum':
+            return values.reduce((acc, value) => {
+                return acc + (typeof value === 'number' ? value : 0);
+            }, 0);
+        default:
+            return undefined;
+    }
+}
+export function getBuiltInAggregationLabel(args) {
+    const { aggregation } = args;
+    switch (aggregation) {
+        case 'sum':
+            return i18n('tooltip', 'label_totals_sum');
+        default:
+            return '';
+    }
+}
+export function getPreparedAggregation(args) {
+    const { hovered, totals, xAxis, yAxis } = args;
+    const aggregation = totals === null || totals === void 0 ? void 0 : totals.aggregation;
+    if (typeof aggregation === 'string') {
+        return aggregation;
+    }
+    if (typeof aggregation === 'function') {
+        return () => aggregation({ hovered, xAxis, yAxis });
+    }
+    return 'sum';
+}

package/dist/cjs/constants/axis.d.ts

@@ -0,0 +1,6 @@
+export declare const AXIS_TYPE: {
+    readonly CATEGORY: "category";
+    readonly DATETIME: "datetime";
+    readonly LINEAR: "linear";
+    readonly LOGARITHMIC: "logarithmic";
+};

package/dist/cjs/constants/axis.js

@@ -0,0 +1,6 @@
+export const AXIS_TYPE = {
+    CATEGORY: 'category',
+    DATETIME: 'datetime',
+    LINEAR: 'linear',
+    LOGARITHMIC: 'logarithmic',
+};

package/dist/cjs/constants/index.d.ts

@@ -1,8 +1,10 @@
-export * from './defaults';
-export * from './misc';
+export * from './axis';
 export * from './chart-types';
-export * from './line-styles';
-export * from './symbol-types';
+export * from './defaults';
 export * from './layout-algorithms';
+export * from './line-styles';
+export * from './misc';
 export * from './palette';
+export * from './symbol-types';
+export * from './tooltip';
 export * from './typography';

package/dist/cjs/constants/index.js

@@ -1,8 +1,10 @@
-export * from './defaults';
-export * from './misc';
+export * from './axis';
 export * from './chart-types';
-export * from './line-styles';
-export * from './symbol-types';
+export * from './defaults';
 export * from './layout-algorithms';
+export * from './line-styles';
+export * from './misc';
 export * from './palette';
+export * from './symbol-types';
+export * from './tooltip';
 export * from './typography';

package/dist/cjs/constants/tooltip.d.ts

@@ -0,0 +1,3 @@
+export declare const TOOLTIP_TOTALS_BUILT_IN_AGGREGATION: {
+    readonly SUM: "sum";
+};

package/dist/cjs/constants/tooltip.js

@@ -0,0 +1,3 @@
+export const TOOLTIP_TOTALS_BUILT_IN_AGGREGATION = {
+    SUM: 'sum',
+};

package/dist/cjs/hooks/useAxisScales/index.d.ts

@@ -1,13 +1,14 @@
 import type { ScaleBand, ScaleLinear, ScaleTime } from 'd3';
 import type { ChartAxis, ChartSeries } from '../../types';
 import type { PreparedAxis } from '../useChartOptions/types';
-import type { PreparedSeries } from '../useSeries/types';
+import type { PreparedSeries, PreparedSeriesOptions } from '../useSeries/types';
 import type { PreparedSplit } from '../useSplit/types';
 export type ChartScale = ScaleLinear<number, number> | ScaleBand<string> | ScaleTime<number, number>;
 type Args = {
     boundsWidth: number;
     boundsHeight: number;
     series: PreparedSeries[];
+    seriesOptions: PreparedSeriesOptions;
     xAxis: PreparedAxis | null;
     yAxis: PreparedAxis[];
     split: PreparedSplit;
@@ -18,8 +19,18 @@ type ReturnValue = {
     xScale?: ChartScale;
     yScale?: ChartScale[];
 };
-export declare function createYScale(axis: PreparedAxis, series: PreparedSeries[], boundsHeight: number): ScaleBand<string> | ScaleLinear<number, number, never> | ScaleTime<number, number, never>;
-export declare function createXScale(axis: PreparedAxis | ChartAxis, series: (PreparedSeries | ChartSeries)[], boundsWidth: number, hasZoomX?: boolean): ScaleBand<string> | ScaleLinear<number, number, never> | ScaleTime<number, number, never>;
+export declare function createYScale(args: {
+    axis: PreparedAxis;
+    boundsHeight: number;
+    series: (PreparedSeries | ChartSeries)[];
+    seriesOptions: PreparedSeriesOptions;
+}): ScaleBand<string> | ScaleLinear<number, number, never> | ScaleTime<number, number, never>;
+export declare function createXScale(args: {
+    axis: PreparedAxis | ChartAxis;
+    boundsWidth: number;
+    series: (PreparedSeries | ChartSeries)[];
+    hasZoomX?: boolean;
+}): ScaleBand<string> | ScaleLinear<number, number, never> | ScaleTime<number, number, never>;
 /**
  * Uses to create scales for axis related series
  */

package/dist/cjs/hooks/useAxisScales/index.js

@@ -1,13 +1,14 @@
 import React from 'react';
 import { extent, scaleBand, scaleLinear, scaleLog, scaleUtc } from 'd3';
 import get from 'lodash/get';
-import { DEFAULT_AXIS_TYPE } from '../../constants';
+import { DEFAULT_AXIS_TYPE, SeriesType } from '../../constants';
 import { CHART_SERIES_WITH_VOLUME_ON_Y_AXIS, getAxisHeight, getDataCategoryValue, getDefaultMaxXAxisValue, getDefaultMinXAxisValue, getDomainDataXBySeries, getDomainDataYBySeries, getOnlyVisibleSeries, isAxisRelatedSeries, isSeriesWithCategoryValues, } from '../../utils';
+import { getBarYLayoutForNumericScale } from '../utils';
 const X_AXIS_ZOOM_PADDING = 0.02;
-const isNumericalArrayData = (data) => {
+function isNumericalArrayData(data) {
     return data.every((d) => typeof d === 'number' || d === null);
-};
-const filterCategoriesByVisibleSeries = (args) => {
+}
+function filterCategoriesByVisibleSeries(args) {
     const { axisDirection, categories, series } = args;
     const visibleCategories = new Set();
     series.forEach((s) => {
@@ -18,18 +19,61 @@ const filterCategoriesByVisibleSeries = (args) => {
         }
     });
     return categories.filter((c) => visibleCategories.has(c));
-};
-export function createYScale(axis, series, boundsHeight) {
-    const yType = get(axis, 'type', DEFAULT_AXIS_TYPE);
+}
+// axis is validated in `validation/index.ts`, so the value of `axis.type` is definitely valid.
+// eslint-disable-next-line consistent-return
+function getYScaleRange(args) {
+    const { axis, boundsHeight, series, seriesOptions } = args;
+    switch (axis.type) {
+        case 'datetime':
+        case 'linear':
+        case 'logarithmic': {
+            const barYSeries = series.filter((s) => s.type === SeriesType.BarY);
+            if (barYSeries.length) {
+                const { barSize, dataLength } = getBarYLayoutForNumericScale({
+                    plotHeight: boundsHeight - boundsHeight * axis.maxPadding,
+                    series: barYSeries,
+                    seriesOptions: seriesOptions,
+                });
+                if (dataLength > 1) {
+                    const alreadyCountedStackingIds = new Set();
+                    const offsetMultiplier = barYSeries.reduce((acc, s) => {
+                        let count = 0;
+                        if (s.stackId) {
+                            if (!alreadyCountedStackingIds.has(s.stackId)) {
+                                alreadyCountedStackingIds.add(s.stackId);
+                                count = 1;
+                            }
+                        }
+                        else {
+                            count = 1;
+                        }
+                        return acc + count;
+                    }, 0);
+                    const offset = (barSize * Math.max(offsetMultiplier, 1)) / 2;
+                    const start = boundsHeight - offset;
+                    const end = boundsHeight * axis.maxPadding + offset;
+                    return [start, end];
+                }
+            }
+            return [boundsHeight, boundsHeight * axis.maxPadding];
+        }
+        case 'category': {
+            return [boundsHeight, 0];
+        }
+    }
+}
+export function createYScale(args) {
+    const { axis, boundsHeight, series, seriesOptions } = args;
     const yMinProps = get(axis, 'min');
     const yMaxProps = get(axis, 'max');
     const yCategories = get(axis, 'categories');
     const yTimestamps = get(axis, 'timestamps');
-    switch (yType) {
+    const range = getYScaleRange({ axis, boundsHeight, series, seriesOptions });
+    switch (axis.type) {
         case 'linear':
         case 'logarithmic': {
             const domain = getDomainDataYBySeries(series);
-            const range = [boundsHeight, boundsHeight * axis.maxPadding];
             if (isNumericalArrayData(domain)) {
                 const [yMinDomain, yMaxDomain] = extent(domain);
                 const yMin = typeof yMinProps === 'number' ? yMinProps : yMinDomain;
@@ -41,7 +85,7 @@ export function createYScale(axis, series, boundsHeight) {
                     const hasSeriesWithVolumeOnYAxis = series.some((s) => CHART_SERIES_WITH_VOLUME_ON_Y_AXIS.includes(s.type));
                     yMax = hasSeriesWithVolumeOnYAxis ? Math.max(yMaxDomain, 0) : yMaxDomain;
                 }
-                const scaleFn = yType === 'logarithmic' ? scaleLog : scaleLinear;
+                const scaleFn = axis.type === 'logarithmic' ? scaleLog : scaleLinear;
                 return scaleFn().domain([yMin, yMax]).range(range).nice();
             }
             break;
@@ -53,12 +97,11 @@ export function createYScale(axis, series, boundsHeight) {
                     categories: yCategories,
                     series: series,
                 });
-                return scaleBand().domain(filteredCategories).range([boundsHeight, 0]);
+                return scaleBand().domain(filteredCategories).range(range);
             }
             break;
         }
         case 'datetime': {
-            const range = [boundsHeight, boundsHeight * axis.maxPadding];
             if (yTimestamps) {
                 const [yMinTimestamp, yMaxTimestamp] = extent(yTimestamps);
                 const yMin = typeof yMinProps === 'number' ? yMinProps : yMinTimestamp;
@@ -74,7 +117,6 @@ export function createYScale(axis, series, boundsHeight) {
                     return scaleUtc().domain([yMin, yMax]).range(range).nice();
                 }
             }
-            break;
         }
     }
     throw new Error('Failed to create yScale');
@@ -97,7 +139,8 @@ function calculateXAxisPadding(series) {
     return result;
 }
 // eslint-disable-next-line complexity
-export function createXScale(axis, series, boundsWidth, hasZoomX) {
+export function createXScale(args) {
+    const { axis, boundsWidth, series, hasZoomX } = args;
     const xMinProps = get(axis, 'min');
     const xMaxProps = get(axis, 'max');
     const xType = get(axis, 'type', DEFAULT_AXIS_TYPE);
@@ -193,13 +236,15 @@ export function createXScale(axis, series, boundsWidth, hasZoomX) {
     throw new Error('Failed to create xScale');
 }
 const createScales = (args) => {
-    const { boundsWidth, boundsHeight, series, xAxis, yAxis, split, hasZoomX } = args;
+    const { boundsWidth, boundsHeight, hasZoomX, series, seriesOptions, split, xAxis, yAxis } = args;
     let visibleSeries = getOnlyVisibleSeries(series);
     // Reassign to all series in case of all series unselected,
     // otherwise we will get an empty space without grid
     visibleSeries = visibleSeries.length === 0 ? series : visibleSeries;
     return {
-        xScale: xAxis ? createXScale(xAxis, visibleSeries, boundsWidth, hasZoomX) : undefined,
+        xScale: xAxis
+            ? createXScale({ axis: xAxis, boundsWidth, series: visibleSeries, hasZoomX })
+            : undefined,
         yScale: yAxis.map((axis, index) => {
             const axisSeries = series.filter((s) => {
                 const seriesAxisIndex = get(s, 'yAxis', 0);
@@ -207,7 +252,12 @@ const createScales = (args) => {
             });
             const visibleAxisSeries = getOnlyVisibleSeries(axisSeries);
             const axisHeight = getAxisHeight({ boundsHeight, split });
-            return createYScale(axis, visibleAxisSeries.length ? visibleAxisSeries : axisSeries, axisHeight);
+            return createYScale({
+                axis,
+                boundsHeight: axisHeight,
+                series: visibleAxisSeries.length ? visibleAxisSeries : axisSeries,
+                seriesOptions,
+            });
         }),
     };
 };
@@ -215,7 +265,7 @@ const createScales = (args) => {
  * Uses to create scales for axis related series
  */
 export const useAxisScales = (args) => {
-    const { boundsWidth, boundsHeight, series, xAxis, yAxis, split, hasZoomX, hasZoomY } = args;
+    const { boundsWidth, boundsHeight, hasZoomX, hasZoomY, series, seriesOptions, split, xAxis, yAxis, } = args;
     return React.useMemo(() => {
         let xScale;
         let yScale;
@@ -224,14 +274,15 @@ export const useAxisScales = (args) => {
             ({ xScale, yScale } = createScales({
                 boundsWidth,
                 boundsHeight,
+                hasZoomX,
+                hasZoomY,
                 series,
+                seriesOptions,
+                split,
                 xAxis,
                 yAxis,
-                split,
-                hasZoomX,
-                hasZoomY,
             }));
         }
         return { xScale, yScale };
-    }, [boundsWidth, boundsHeight, series, xAxis, yAxis, split, hasZoomX, hasZoomY]);
+    }, [boundsWidth, boundsHeight, hasZoomX, hasZoomY, series, seriesOptions, split, xAxis, yAxis]);
 };

package/dist/cjs/hooks/useChartOptions/x-axis.js

@@ -3,7 +3,7 @@ import { DASH_STYLE, DEFAULT_AXIS_LABEL_FONT_SIZE, axisCrosshairDefaults, axisLa
 import { calculateCos, formatAxisTickLabel, getClosestPointsRange, getHorisontalSvgTextHeight, getLabelsSize, getMaxTickCount, getTicksCount, getXAxisItems, hasOverlappingLabels, wrapText, } from '../../utils';
 import { createXScale } from '../useAxisScales';
 async function getLabelSettings({ axis, seriesData, width, autoRotation = true, }) {
-    const scale = createXScale(axis, seriesData, width);
+    const scale = createXScale({ axis, series: seriesData, boundsWidth: width });
     const tickCount = getTicksCount({ axis, range: width });
     const ticks = getXAxisItems({
         scale: scale,

package/dist/cjs/hooks/useChartOptions/y-axis.d.ts

@@ -1,7 +1,9 @@
 import type { ChartSeries, ChartYAxis } from '../../types';
+import type { PreparedSeriesOptions } from '../useSeries/types';
 import type { PreparedAxis } from './types';
-export declare const getPreparedYAxis: ({ seriesData, yAxis, height, }: {
+export declare const getPreparedYAxis: ({ height, seriesData, seriesOptions, yAxis, }: {
+    height: number;
     seriesData: ChartSeries[];
+    seriesOptions: PreparedSeriesOptions;
     yAxis: ChartYAxis[] | undefined;
-    height: number;
 }) => Promise<PreparedAxis[]>;

package/dist/cjs/hooks/useChartOptions/y-axis.js

@@ -3,11 +3,16 @@ import { DASH_STYLE, DEFAULT_AXIS_LABEL_FONT_SIZE, DEFAULT_AXIS_TYPE, axisCrossh
 import { formatAxisTickLabel, getClosestPointsRange, getDefaultMinYAxisValue, getHorisontalSvgTextHeight, getLabelsSize, getScaleTicks, isAxisRelatedSeries, wrapText, } from '../../utils';
 import { createYScale } from '../useAxisScales';
 const getAxisLabelMaxWidth = async (args) => {
-    const { axis, seriesData } = args;
+    const { axis, seriesData, seriesOptions } = args;
     if (!axis.labels.enabled) {
         return 0;
     }
-    const scale = createYScale(axis, seriesData, 1);
+    const scale = createYScale({
+        axis,
+        boundsHeight: 1,
+        series: seriesData,
+        seriesOptions,
+    });
     const ticks = getScaleTicks(scale);
     // FIXME: it is necessary to filter data, since we do not draw overlapping ticks
     const step = getClosestPointsRange(axis, ticks);
@@ -23,7 +28,7 @@ const getAxisLabelMaxWidth = async (args) => {
     });
     return size.maxWidth;
 };
-export const getPreparedYAxis = ({ seriesData, yAxis, height, }) => {
+export const getPreparedYAxis = ({ height, seriesData, seriesOptions, yAxis, }) => {
     const axisByPlot = [];
     const axisItems = yAxis || [{}];
     const hasAxisRelatedSeries = seriesData.some(isAxisRelatedSeries);
@@ -126,6 +131,7 @@ export const getPreparedYAxis = ({ seriesData, yAxis, height, }) => {
             preparedAxis.labels.width = await getAxisLabelMaxWidth({
                 axis: preparedAxis,
                 seriesData,
+                seriesOptions,
             });
         }
         return preparedAxis;

package/dist/cjs/hooks/useSeries/index.d.ts

@@ -13,4 +13,13 @@ export declare const useSeries: (args: Args) => {
     preparedSeries: PreparedSeries[];
     handleLegendItemClick: OnLegendItemClick;
 };
+export declare const useShapeSeries: ({ seriesData, seriesOptions, colors, preparedLegend, activeLegendItems, }: {
+    colors: string[];
+    seriesData: ChartData["series"]["data"];
+    seriesOptions: ChartData["series"]["options"];
+    activeLegendItems: string[];
+    preparedLegend?: PreparedLegend | null;
+}) => {
+    preparedSeries: PreparedSeries[];
+};
 export {};

package/dist/cjs/hooks/useSeries/index.js

@@ -5,6 +5,38 @@ import { usePrevious } from '../usePrevious';
 import { getPreparedLegend } from './prepare-legend';
 import { prepareSeries } from './prepareSeries';
 import { getActiveLegendItems, getAllLegendItems } from './utils';
+const useVisibleSeries = ({ preparedSeries, activeLegendItems, }) => {
+    return React.useMemo(() => {
+        return preparedSeries.map((singleSeries) => {
+            if (singleSeries.legend.enabled) {
+                return Object.assign(Object.assign({}, singleSeries), { visible: activeLegendItems.includes(singleSeries.name) });
+            }
+            return singleSeries;
+        });
+    }, [preparedSeries, activeLegendItems]);
+};
+const getPreparedSeries = async ({ seriesData, seriesOptions, colors, preparedLegend, }) => {
+    const seriesNames = getSeriesNames(seriesData);
+    const colorScale = scaleOrdinal(seriesNames, colors);
+    const groupedSeries = group(seriesData, (item) => item.type);
+    const acc = [];
+    if (!preparedLegend) {
+        return acc;
+    }
+    const list = Array.from(groupedSeries);
+    for (let i = 0; i < list.length; i++) {
+        const [seriesType, seriesList] = list[i];
+        acc.push(...(await prepareSeries({
+            type: seriesType,
+            series: seriesList,
+            seriesOptions,
+            legend: preparedLegend,
+            colorScale,
+            colors,
+        })));
+    }
+    return acc;
+};
 export const useSeries = (args) => {
     const { legend, originalSeriesData, seriesData, seriesOptions, colors, preparedLegend: preparedLegendProps = null, } = args;
     const [preparedLegend, setPreparedLegend] = React.useState(preparedLegendProps);
@@ -17,38 +49,18 @@ export const useSeries = (args) => {
     const [activeLegendItems, setActiveLegendItems] = React.useState(getActiveLegendItems(preparedSeries));
     React.useEffect(() => {
         (async () => {
-            const seriesNames = getSeriesNames(seriesData);
-            const colorScale = scaleOrdinal(seriesNames, colors);
-            const groupedSeries = group(seriesData, (item) => item.type);
-            const acc = [];
-            if (!preparedLegend) {
-                return;
-            }
-            const list = Array.from(groupedSeries);
-            for (let i = 0; i < list.length; i++) {
-                const [seriesType, seriesList] = list[i];
-                acc.push(...(await prepareSeries({
-                    type: seriesType,
-                    series: seriesList,
-                    seriesOptions,
-                    legend: preparedLegend,
-                    colorScale,
-                    colors,
-                })));
-            }
-            setPreparedSeries(acc);
-            setActiveLegendItems(getActiveLegendItems(acc));
+            const items = await getPreparedSeries({
+                seriesData,
+                seriesOptions,
+                preparedLegend,
+                colors,
+            });
+            setPreparedSeries(items);
+            setActiveLegendItems(getActiveLegendItems(items));
         })();
     }, [seriesData, seriesOptions, preparedLegend, colors]);
     const prevOriginalSeriesData = usePrevious(originalSeriesData);
-    const chartSeries = React.useMemo(() => {
-        return preparedSeries.map((singleSeries) => {
-            if (singleSeries.legend.enabled) {
-                return Object.assign(Object.assign({}, singleSeries), { visible: activeLegendItems.includes(singleSeries.name) });
-            }
-            return singleSeries;
-        });
-    }, [preparedSeries, activeLegendItems]);
+    const chartSeries = useVisibleSeries({ preparedSeries, activeLegendItems });
     const handleLegendItemClick = React.useCallback(({ name, metaKey }) => {
         const allItems = getAllLegendItems(preparedSeries);
         const onlyItemSelected = activeLegendItems.length === 1 && activeLegendItems.includes(name);
@@ -81,3 +93,21 @@ export const useSeries = (args) => {
         handleLegendItemClick,
     };
 };
+export const useShapeSeries = ({ seriesData, seriesOptions, colors, preparedLegend, activeLegendItems, }) => {
+    const [preparedSeries, setPreparedSeries] = React.useState([]);
+    React.useEffect(() => {
+        (async () => {
+            const items = await getPreparedSeries({
+                seriesData,
+                seriesOptions,
+                preparedLegend,
+                colors,
+            });
+            setPreparedSeries(items);
+        })();
+    }, [seriesData, seriesOptions, preparedLegend, colors]);
+    const chartSeries = useVisibleSeries({ preparedSeries, activeLegendItems });
+    return {
+        preparedSeries: chartSeries,
+    };
+};

package/dist/cjs/hooks/useSeries/prepare-legend.d.ts

@@ -1,5 +1,5 @@
 import type { ChartData } from '../../types';
-import type { PreparedAxis, PreparedChart } from '../useChartOptions/types';
+import type { PreparedChart } from '../useChartOptions/types';
 import type { LegendItem, PreparedLegend, PreparedSeries } from './types';
 export declare function getPreparedLegend(args: {
     legend: ChartData['legend'];
@@ -11,7 +11,6 @@ export declare function getLegendComponents(args: {
     chartMargin: PreparedChart['margin'];
     series: PreparedSeries[];
     preparedLegend: PreparedLegend;
-    preparedYAxis: PreparedAxis[];
 }): {
     legendConfig: {
         offset: {
@@ -24,6 +23,7 @@ export declare function getLegendComponents(args: {
                 end: number;
             }[];
         } | undefined;
+        maxWidth: number;
     };
     legendItems: LegendItem[][];
 };

package/dist/cjs/hooks/useSeries/prepare-legend.js

@@ -4,8 +4,6 @@ import get from 'lodash/get';
 import merge from 'lodash/merge';
 import { CONTINUOUS_LEGEND_SIZE, legendDefaults } from '../../constants';
 import { getDefaultColorStops, getDomainForContinuousColorScale, getLabelsSize } from '../../utils';
-import { getBoundsWidth } from '../useChartDimensions';
-import { getYAxisWidth } from '../useChartDimensions/utils';
 export async function getPreparedLegend(args) {
     var _a, _b, _c, _d, _e, _f, _g;
     const { legend, series } = args;
@@ -168,8 +166,8 @@ function getPagination(args) {
     return { pages };
 }
 export function getLegendComponents(args) {
-    const { chartWidth, chartHeight, chartMargin, series, preparedLegend, preparedYAxis } = args;
-    const maxLegendWidth = getBoundsWidth({ chartWidth, chartMargin, preparedYAxis });
+    const { chartWidth, chartHeight, chartMargin, series, preparedLegend } = args;
+    const maxLegendWidth = chartWidth - chartMargin.right - chartMargin.left;
     const maxLegendHeight = (chartHeight - chartMargin.top - chartMargin.bottom - preparedLegend.margin) / 2;
     const flattenLegendItems = getFlattenLegendItems(series, preparedLegend);
     const items = getGroupedLegendItems({
@@ -199,8 +197,8 @@ export function getLegendComponents(args) {
     }
     const top = chartHeight - chartMargin.bottom - preparedLegend.height;
     const offset = {
-        left: chartMargin.left + getYAxisWidth(preparedYAxis[0]),
+        left: chartMargin.left,
         top,
     };
-    return { legendConfig: { offset, pagination }, legendItems: items };
+    return { legendConfig: { offset, pagination, maxWidth: maxLegendWidth }, legendItems: items };
 }

package/dist/cjs/hooks/useSeries/types.d.ts

@@ -53,6 +53,7 @@ export type LegendConfig = {
         left: number;
         top: number;
     };
+    maxWidth: number;
     pagination?: {
         pages: {
             start: number;

package/dist/cjs/hooks/useShapes/bar-x/prepare-data.js

@@ -2,7 +2,7 @@ import { ascending, descending, max, sort } from 'd3';
 import get from 'lodash/get';
 import { getDataCategoryValue, getLabelsSize } from '../../../utils';
 import { getFormattedValue } from '../../../utils/chart/format';
-import { MIN_BAR_GAP, MIN_BAR_GROUP_GAP, MIN_BAR_WIDTH } from '../constants';
+import { MIN_BAR_GAP, MIN_BAR_GROUP_GAP, MIN_BAR_WIDTH } from '../../constants';
 async function getLabelData(d) {
     if (!d.series.dataLabels.enabled) {
         return undefined;