@gravity-ui/charts 1.43.0 → 1.44.0

package/dist/cjs/core/types/chart/tooltip.d.ts

@@ -15,6 +15,7 @@ import type { SankeySeries, SankeySeriesData } from './sankey';
 import type { ScatterSeries, ScatterSeriesData } from './scatter';
 import type { TreemapSeries, TreemapSeriesData } from './treemap';
 import type { WaterfallSeries, WaterfallSeriesData } from './waterfall';
+import type { XRangeSeries, XRangeSeriesData } from './x-range';
 export interface TooltipDataChunkBarX<T = MeaningfulAny> {
     data: BarXSeriesData<T>;
     series: BarXSeries<T>;
@@ -87,7 +88,11 @@ export interface TooltipDataChunkFunnel<T = MeaningfulAny> {
         name: string;
     };
 }
-export type TooltipDataChunk<T = MeaningfulAny> = (TooltipDataChunkBarX<T> | TooltipDataChunkBarY<T> | TooltipDataChunkPie<T> | TooltipDataChunkScatter<T> | TooltipDataChunkLine<T> | TooltipDataChunkArea<T> | TooltipDataChunkTreemap<T> | TooltipDataChunkSankey<T> | TooltipDataChunkWaterfall<T> | TooltipDataChunkRadar<T> | TooltipDataChunkHeatmap<T> | TooltipDataChunkFunnel<T>) & {
+export interface TooltipDataChunkXRange<T = MeaningfulAny> {
+    data: XRangeSeriesData<T>;
+    series: XRangeSeries<T>;
+}
+export type TooltipDataChunk<T = MeaningfulAny> = (TooltipDataChunkBarX<T> | TooltipDataChunkBarY<T> | TooltipDataChunkPie<T> | TooltipDataChunkScatter<T> | TooltipDataChunkLine<T> | TooltipDataChunkArea<T> | TooltipDataChunkTreemap<T> | TooltipDataChunkSankey<T> | TooltipDataChunkWaterfall<T> | TooltipDataChunkRadar<T> | TooltipDataChunkHeatmap<T> | TooltipDataChunkFunnel<T> | TooltipDataChunkXRange<T>) & {
     closest?: boolean;
 };
 export interface ChartTooltipRendererArgs<T = MeaningfulAny> {

package/dist/cjs/core/types/chart/x-range.d.ts

@@ -0,0 +1,59 @@
+import type { DashStyle, SERIES_TYPE } from '../../constants';
+import type { MeaningfulAny } from '../misc';
+import type { BaseSeries, BaseSeriesData, BaseSeriesLegend } from './base';
+import type { RectLegendSymbolOptions } from './legend';
+export interface XRangeSeriesData<T = MeaningfulAny> extends BaseSeriesData<T> {
+    /**
+     * The start value of the bar on the x-axis. Can be a numeric or timestamp value.
+     */
+    x0: number | string;
+    /**
+     * The end value of the bar on the x-axis. Can be a numeric or timestamp value.
+     */
+    x1: number | string;
+    /**
+     * The `y` value. Depending on the context it may represent:
+     * - a category value (for `category` y axis). If string, it is the category itself. If number, it is the index in `yAxis[0].categories`.
+     * - a numeric value (for `linear` y axis)
+     */
+    y?: string | number;
+    /** Individual color for the bar. Overrides the series color. */
+    color?: string;
+    /** Data label value. If not specified, the series name is used. */
+    label?: string | number;
+    /** Individual opacity for the bar. */
+    opacity?: number;
+}
+export interface XRangeSeries<T = MeaningfulAny> extends BaseSeries {
+    type: typeof SERIES_TYPE.XRange;
+    data: XRangeSeriesData<T>[];
+    /** The name of the series (used in legend, tooltip etc) */
+    name: string;
+    /** The main color of the series (hex, rgba) */
+    color?: string;
+    /** Individual opacity for the entire series. */
+    opacity?: number | null;
+    /**
+     * The corner radius of the border surrounding each bar.
+     * @default 0
+     */
+    borderRadius?: number;
+    /**
+     * The width of the border surrounding each bar.
+     * @default 0
+     */
+    borderWidth?: number;
+    /**
+     * The color of the border surrounding each bar.
+     */
+    borderColor?: string;
+    /**
+     * The dash style of the border surrounding each bar.
+     * @default 'Solid'
+     */
+    borderDashStyle?: DashStyle;
+    /** Individual series legend options. Has higher priority than legend options in widget data */
+    legend?: BaseSeriesLegend & {
+        symbol?: RectLegendSymbolOptions;
+    };
+}

package/dist/cjs/core/types/chart/x-range.js

@@ -0,0 +1 @@
+export {};

package/dist/cjs/core/types/chart/zoom.d.ts

@@ -18,7 +18,7 @@ export interface ChartZoom {
      *
      * Supported zoom types by series type:
      * - `Area`, `Line`, `Scatter`: `x`, `y`, `xy`
-     * - `BarX`: `x`
+     * - `BarX`, `XRange`: `x`
      * - `BarY`: `y`
      *
      * Default zoom type by series type:

package/dist/cjs/core/types/index.d.ts

@@ -30,6 +30,7 @@ export * from './chart/radar';
 export * from './chart/heatmap';
 export * from './chart/funnel';
 export * from './chart/brush';
+export * from './chart/x-range';
 export interface ChartData<T = MeaningfulAny> {
     /**
      * General options for the chart.

package/dist/cjs/core/types/index.js

@@ -22,3 +22,4 @@ export * from './chart/radar';
 export * from './chart/heatmap';
 export * from './chart/funnel';
 export * from './chart/brush';
+export * from './chart/x-range';

package/dist/cjs/core/utils/axis/x-axis.js

@@ -12,7 +12,15 @@ function getTicksCount(args) {
     if (series) {
         const xDataSet = new Set();
         series === null || series === void 0 ? void 0 : series.forEach((item) => {
-            if (isSeriesWithNumericalXValues(item)) {
+            if (item.type === 'x-range') {
+                item.data.forEach((d) => {
+                    if (d.x0 !== null && d.x1 !== null) {
+                        xDataSet.add(d.x0);
+                        xDataSet.add(d.x1);
+                    }
+                });
+            }
+            else if (isSeriesWithNumericalXValues(item)) {
                 item.data.forEach((data) => {
                     xDataSet.add(data.x);
                 });

package/dist/cjs/core/utils/color.js

@@ -22,6 +22,12 @@ export function getDomainForContinuousColorScale(args) {
                 acc.push(...s.data.map((d) => Number(d.y)));
                 break;
             }
+            case 'x-range': {
+                // Use bar duration (x1 - x0) as the color domain value so that
+                // longer bars can be visually distinguished by color intensity.
+                acc.push(...s.data.map((d) => Math.abs(Number(d.x1) - Number(d.x0))));
+                break;
+            }
             default: {
                 throw Error(`The method for calculation a domain for a continuous color scale for the "${s.type}" series is not defined`);
             }

package/dist/cjs/core/utils/common.js

@@ -57,6 +57,16 @@ export const getDomainDataXBySeries = (series) => {
                 acc.push(...getDomainDataForStackedSeries(seriesList, 'y', 'x'));
                 break;
             }
+            case 'x-range': {
+                seriesList.forEach((s) => {
+                    s.data.forEach((d) => {
+                        if (!isNil(d.x0) && !isNil(d.x1)) {
+                            acc.push(d.x0, d.x1);
+                        }
+                    });
+                });
+                break;
+            }
             default: {
                 seriesList.filter(isSeriesWithNumericalXValues).forEach((s) => {
                     acc.push(...s.data.map((d) => d.x));

package/dist/cjs/core/utils/get-closest-data.js

@@ -288,6 +288,25 @@ export function getClosestPoints(args) {
                 }
                 break;
             }
+            case 'x-range': {
+                const data = list;
+                const pointsInXRange = data.filter((d) => pointerX >= d.x &&
+                    pointerX <= d.x + d.width &&
+                    pointerY >= d.y &&
+                    pointerY <= d.y + d.height);
+                if (pointsInXRange.length === 0) {
+                    break;
+                }
+                const closestByX = pointsInXRange.length === 1
+                    ? pointsInXRange[0]
+                    : sort(pointsInXRange, (d) => Math.abs(d.x + d.width / 2 - pointerX))[0];
+                result.push(...pointsInXRange.map((d) => ({
+                    data: d.data,
+                    series: d.series,
+                    closest: d === closestByX,
+                })));
+                break;
+            }
         }
     });
     if (closestPointsByXValue.length) {

package/dist/cjs/core/utils/labels.d.ts

@@ -3,7 +3,7 @@ export declare function getLeftPosition(label: LabelData): number;
 export declare function getOverlappingByX(rect1: LabelData | HtmlItem, rect2: LabelData | HtmlItem, gap?: number): number;
 export declare function getOverlappingByY(rect1: LabelData | HtmlItem, rect2: LabelData | HtmlItem, gap?: number): number;
 export declare function isLabelsOverlapping<T extends LabelData | HtmlItem>(label1: T, label2: T, padding?: number): boolean;
-export declare function filterOverlappingLabels<T extends LabelData | HtmlItem>(labels: T[]): T[];
+export declare function filterOverlappingLabels<T extends LabelData | HtmlItem>(labels: T[], renderedSvgLabels?: T[]): T[];
 export declare function getSvgLabelConstraintedPosition(args: {
     boundsHeight: number;
     boundsWidth: number;

package/dist/cjs/core/utils/labels.js

@@ -32,11 +32,12 @@ export function getOverlappingByY(rect1, rect2, gap = 0) {
 export function isLabelsOverlapping(label1, label2, padding = 0) {
     return Boolean(getOverlappingByX(label1, label2, padding) && getOverlappingByY(label1, label2, padding));
 }
-export function filterOverlappingLabels(labels) {
+export function filterOverlappingLabels(labels, renderedSvgLabels) {
     const result = [];
     const sorted = sortBy(labels, (d) => d.y, (d) => ('textAnchor' in d ? getLeftPosition(d) : d.x));
     sorted.forEach((label) => {
-        if (!result.some((l) => isLabelsOverlapping(label, l))) {
+        if (!(renderedSvgLabels === null || renderedSvgLabels === void 0 ? void 0 : renderedSvgLabels.some((l) => isLabelsOverlapping(label, l))) &&
+            !result.some((l) => isLabelsOverlapping(label, l))) {
             result.push(label);
         }
     });

package/dist/cjs/core/validation/index.js

@@ -265,6 +265,18 @@ function validateStacking({ series }) {
         });
     }
 }
+function validateStackingAreaNullMode({ series }) {
+    const availableStackingValues = ['normal', 'percent'];
+    const invalid = series.find((s) => s.type === 'area' &&
+        availableStackingValues.includes(s.stacking) &&
+        s.nullMode === 'connect');
+    if (invalid) {
+        throw new ChartError({
+            code: CHART_ERROR_CODE.INVALID_DATA,
+            message: i18n('error', 'label_stacking-area-connect-null-mode'),
+        });
+    }
+}
 function validateTreemapSeries({ series }) {
     const parentIds = {};
     series.data.forEach((d) => {
@@ -379,6 +391,7 @@ export function validateData(data) {
     }
     validateAxes({ xAxis: data.xAxis, yAxis: data.yAxis });
     validateTooltip({ tooltip: data.tooltip });
+    validateStackingAreaNullMode({ series: data.series.data });
     if (data.series.data.some((s) => isEmpty(s.data))) {
         throw new ChartError({
             code: CHART_ERROR_CODE.INVALID_DATA,

package/dist/cjs/core/zoom/zoom.js

@@ -69,13 +69,30 @@ export function getZoomedSeriesData(args) {
             prevPointInRange = currentPointInRange;
             if (zoomState.x) {
                 const [xMin, xMax] = zoomState.x;
-                const x = 'x' in point ? ((_a = point.x) !== null && _a !== void 0 ? _a : undefined) : undefined;
-                inXRange = isValueInRange({
-                    axis: xAxis,
-                    value: x,
-                    min: xMin,
-                    max: xMax,
-                });
+                if ('x0' in point && 'x1' in point) {
+                    const isStartInRange = isValueInRange({
+                        axis: xAxis,
+                        value: point.x0,
+                        min: xMin,
+                        max: xMax,
+                    });
+                    const isEndInRange = isValueInRange({
+                        axis: xAxis,
+                        value: point.x1,
+                        min: xMin,
+                        max: xMax,
+                    });
+                    inXRange = isStartInRange || isEndInRange;
+                }
+                else {
+                    const x = 'x' in point ? ((_a = point.x) !== null && _a !== void 0 ? _a : undefined) : undefined;
+                    inXRange = isValueInRange({
+                        axis: xAxis,
+                        value: x,
+                        min: xMin,
+                        max: xMax,
+                    });
+                }
             }
             if (zoomState.y) {
                 const yAxisIndex = 'yAxis' in seriesItem && typeof seriesItem.yAxis === 'number'

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

@@ -13,14 +13,20 @@ export const getVisibleSeries = ({ preparedSeries, activeLegendItems, }) => {
 export const getPreparedSeries = async ({ seriesData, seriesOptions, colors, preparedLegend, }) => {
     const seriesNames = getSeriesNames(seriesData);
     const colorScale = scaleOrdinal(seriesNames, colors);
-    const groupedSeries = group(seriesData, (item) => item.type);
+    const groupedSeries = group(seriesData, (item, index) => {
+        if (item.type === 'line') {
+            return `${item.type}_${index}`;
+        }
+        return 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];
+        const [_groupId, seriesList] = list[i];
+        const seriesType = seriesList[0].type;
         acc.push(...(await prepareSeries({
             type: seriesType,
             series: seriesList,

package/dist/cjs/hooks/useShapes/area/index.js

@@ -60,7 +60,7 @@ export const AreaSeriesShapes = (args) => {
             .attr('fill', (d) => d.color)
             .attr('opacity', (d) => d.opacity);
         let dataLabels = preparedData.reduce((acc, d) => {
-            return acc.concat(d.labels);
+            return acc.concat(d.svgLabels);
         }, []);
         if (!allowOverlapDataLabels) {
             dataLabels = filterOverlappingLabels(dataLabels);
@@ -191,7 +191,7 @@ export const AreaSeriesShapes = (args) => {
         };
     }, [allowOverlapDataLabels, dispatcher, preparedData, seriesOptions]);
     const htmlLayerData = React.useMemo(() => {
-        const items = preparedData.map((d) => d === null || d === void 0 ? void 0 : d.htmlElements).flat();
+        const items = preparedData.map((d) => d === null || d === void 0 ? void 0 : d.htmlLabels).flat();
         if (allowOverlapDataLabels) {
             return { htmlElements: items };
         }

package/dist/cjs/hooks/useShapes/area/prepare-data.js

@@ -1,4 +1,4 @@
-import { group, min } from 'd3-array';
+import { group, min, sort } from 'd3-array';
 import isNil from 'lodash/isNil';
 import round from 'lodash/round';
 import { getDataCategoryValue, getLabelsSize, getTextSizeFn } from '../../../core/utils';
@@ -27,7 +27,7 @@ function getXValues(series, xAxis, xScale) {
             return acc;
         }, []);
     }
-    return Array.from(xValues);
+    return sort(Array.from(xValues), (d) => d[1]);
 }
 async function prepareDataLabels({ series, points, xMax, yAxisTop, isOutsideBounds, }) {
     var _a;
@@ -166,13 +166,14 @@ export const prepareAreaData = async (args) => {
                     return m.set(key, d);
                 }, new Map());
                 const points = xValues.reduce((pointsAcc, [x, xValue], index) => {
-                    var _a, _b, _c, _d, _e, _f, _g, _h;
-                    const d = (_a = seriesData.get(x)) !== null && _a !== void 0 ? _a : {
+                    var _a, _b, _c, _d, _e, _f, _g;
+                    const rawData = seriesData.get(x);
+                    const d = rawData !== null && rawData !== void 0 ? rawData : {
                         x,
                         y: 0,
                     };
-                    let yDataValue = (_b = d.y) !== null && _b !== void 0 ? _b : null;
-                    if (s.nullMode === 'connect' && yDataValue === null) {
+                    let yDataValue = (_a = d.y) !== null && _a !== void 0 ? _a : null;
+                    if (s.nullMode === 'connect' && (yDataValue === null || !rawData)) {
                         return pointsAcc;
                     }
                     if (yDataValue && isPercentStacking) {
@@ -187,13 +188,13 @@ export const prepareAreaData = async (args) => {
                     });
                     if (typeof yDataValue === 'number' && yValue !== null) {
                         yValue = round(yValue, 2);
-                        const prevPoint = seriesData.get((_c = xValues[index - 1]) === null || _c === void 0 ? void 0 : _c[0]);
-                        const nextPoint = seriesData.get((_d = xValues[index + 1]) === null || _d === void 0 ? void 0 : _d[0]);
+                        const prevPoint = seriesData.get((_b = xValues[index - 1]) === null || _b === void 0 ? void 0 : _b[0]);
+                        const nextPoint = seriesData.get((_c = xValues[index + 1]) === null || _c === void 0 ? void 0 : _c[0]);
                         const currentPointStackHeight = Math.abs(yMin - yValue);
                         if (yDataValue >= 0) {
                             const positiveStackHeights = positiveStackValues.get(x);
-                            let prevSectionStackHeight = (_e = positiveStackHeights === null || positiveStackHeights === void 0 ? void 0 : positiveStackHeights.prev) !== null && _e !== void 0 ? _e : 0;
-                            let nextSectionStackHeight = (_f = positiveStackHeights === null || positiveStackHeights === void 0 ? void 0 : positiveStackHeights.next) !== null && _f !== void 0 ? _f : 0;
+                            let prevSectionStackHeight = (_d = positiveStackHeights === null || positiveStackHeights === void 0 ? void 0 : positiveStackHeights.prev) !== null && _d !== void 0 ? _d : 0;
+                            let nextSectionStackHeight = (_e = positiveStackHeights === null || positiveStackHeights === void 0 ? void 0 : positiveStackHeights.next) !== null && _e !== void 0 ? _e : 0;
                             const point = {
                                 y0: yAxisTop + yMin - prevSectionStackHeight,
                                 x: xValue,
@@ -219,11 +220,11 @@ export const prepareAreaData = async (args) => {
                                     point2.y = newYValue;
                                 }
                             }
-                            if ((prevPoint === null || prevPoint === void 0 ? void 0 : prevPoint.y) !== null) {
+                            if ((prevPoint === null || prevPoint === void 0 ? void 0 : prevPoint.y) !== null || s.nullMode === 'zero') {
                                 prevSectionStackHeight =
                                     prevSectionStackHeight + currentPointStackHeight;
                             }
-                            if ((nextPoint === null || nextPoint === void 0 ? void 0 : nextPoint.y) !== null) {
+                            if ((nextPoint === null || nextPoint === void 0 ? void 0 : nextPoint.y) !== null || s.nullMode === 'zero') {
                                 nextSectionStackHeight =
                                     nextSectionStackHeight + currentPointStackHeight;
                             }
@@ -234,8 +235,8 @@ export const prepareAreaData = async (args) => {
                         }
                         else {
                             const negativeStackHeights = negativeStackValues.get(x);
-                            let prevSectionStackHeight = (_g = negativeStackHeights === null || negativeStackHeights === void 0 ? void 0 : negativeStackHeights.prev) !== null && _g !== void 0 ? _g : 0;
-                            let nextSectionStackHeight = (_h = negativeStackHeights === null || negativeStackHeights === void 0 ? void 0 : negativeStackHeights.next) !== null && _h !== void 0 ? _h : 0;
+                            let prevSectionStackHeight = (_f = negativeStackHeights === null || negativeStackHeights === void 0 ? void 0 : negativeStackHeights.prev) !== null && _f !== void 0 ? _f : 0;
+                            let nextSectionStackHeight = (_g = negativeStackHeights === null || negativeStackHeights === void 0 ? void 0 : negativeStackHeights.next) !== null && _g !== void 0 ? _g : 0;
                             pointsAcc.push({
                                 y0: yAxisTop + yMin + prevSectionStackHeight,
                                 x: xValue,
@@ -300,7 +301,7 @@ export const prepareAreaData = async (args) => {
                 seriesStackData.push({
                     points,
                     markers,
-                    labels: [],
+                    svgLabels: [],
                     color: s.color,
                     opacity: s.opacity,
                     width: s.lineWidth,
@@ -308,7 +309,7 @@ export const prepareAreaData = async (args) => {
                     hovered: false,
                     active: true,
                     id: s.id,
-                    htmlElements: [],
+                    htmlLabels: [],
                 });
             }
             for (let itemIndex = 0; itemIndex < seriesStackData.length; itemIndex++) {
@@ -323,8 +324,8 @@ export const prepareAreaData = async (args) => {
                         yAxisTop: itemYAxisTop,
                         isOutsideBounds,
                     });
-                    item.labels.push(...labelsData.svgLabels);
-                    item.htmlElements.push(...labelsData.htmlLabels);
+                    item.svgLabels.push(...labelsData.svgLabels);
+                    item.htmlLabels.push(...labelsData.htmlLabels);
                 }
             }
             result.push(...seriesStackData);

package/dist/cjs/hooks/useShapes/area/types.d.ts

@@ -27,6 +27,6 @@ export type PreparedAreaData = {
     series: PreparedAreaSeries;
     hovered: boolean;
     active: boolean;
-    labels: LabelData[];
-    htmlElements: HtmlItem[];
+    svgLabels: LabelData[];
+    htmlLabels: HtmlItem[];
 };

package/dist/cjs/hooks/useShapes/bar-x/index.js

@@ -49,7 +49,7 @@ export const BarXSeriesShapes = (args) => {
             .attr('fill', (d) => d.data.color || d.series.color)
             .attr('opacity', (d) => d.opacity)
             .attr('cursor', (d) => d.series.cursor);
-        let dataLabels = preparedData.map((d) => d.label).filter(Boolean);
+        let dataLabels = preparedData.map((d) => d.svgLabels).flat();
         if (!allowOverlapDataLabels) {
             dataLabels = filterOverlappingLabels(dataLabels);
         }
@@ -114,7 +114,7 @@ export const BarXSeriesShapes = (args) => {
         };
     }, [allowOverlapDataLabels, dispatcher, preparedData, seriesOptions]);
     const htmlLayerData = React.useMemo(() => {
-        const items = preparedData.map((d) => d === null || d === void 0 ? void 0 : d.htmlElements).flat();
+        const items = preparedData.map((d) => d === null || d === void 0 ? void 0 : d.htmlLabels).flat();
         if (allowOverlapDataLabels) {
             return { htmlElements: items };
         }

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

@@ -110,8 +110,8 @@ export const prepareBarXData = async (args) => {
             const currentGroupWidth = rectWidth * stacks.length + rectGap * (stacks.length - 1);
             for (let groupItemIndex = 0; groupItemIndex < stacks.length; groupItemIndex++) {
                 const yValues = stacks[groupItemIndex];
-                let positiveStackHeight = 0;
-                let negativeStackHeight = 0;
+                let positiveStackSum = 0;
+                let negativeStackSum = 0;
                 const stackItems = [];
                 let sortedData = yValues;
                 if (sortKey) {
@@ -144,7 +144,6 @@ export const prepareBarXData = async (args) => {
                     }
                     const x = xCenter - currentGroupWidth / 2 + (rectWidth + rectGap) * groupItemIndex;
                     const yDataValue = ((_d = yValue.data.y) !== null && _d !== void 0 ? _d : 0);
-                    const y = seriesYScale(yDataValue);
                     let base = 0;
                     if (seriesYAxis.type === 'logarithmic') {
                         const domainData = seriesYScale.domain();
@@ -155,7 +154,22 @@ export const prepareBarXData = async (args) => {
                         base = seriesYScale(0);
                     }
                     const isLastStackItem = yValueIndex === sortedData.length - 1;
-                    const height = Math.abs(base - y);
+                    let height;
+                    let barPositionY;
+                    if (yDataValue > 0) {
+                        const newSum = positiveStackSum + yDataValue;
+                        const topPixel = seriesYScale(newSum);
+                        const bottomPixel = positiveStackSum === 0 ? base : seriesYScale(positiveStackSum);
+                        height = Math.abs(bottomPixel - topPixel);
+                        barPositionY = yAxisTop + topPixel;
+                    }
+                    else {
+                        const newSum = negativeStackSum + yDataValue;
+                        const bottomPixel = negativeStackSum === 0 ? base : seriesYScale(negativeStackSum);
+                        const topPixel = seriesYScale(newSum);
+                        height = Math.abs(bottomPixel - topPixel);
+                        barPositionY = yAxisTop + bottomPixel;
+                    }
                     let shapeHeight = height - (stackItems.length ? stackGap : 0);
                     if (shapeHeight < 0) {
                         shapeHeight = height;
@@ -165,28 +179,28 @@ export const prepareBarXData = async (args) => {
                     }
                     const barData = {
                         x,
-                        y: yDataValue > 0
-                            ? yAxisTop + y - positiveStackHeight
-                            : yAxisTop + base + negativeStackHeight,
+                        y: barPositionY,
                         width: rectWidth,
                         height: shapeHeight,
                         _height: height,
                         opacity: get(yValue.data, 'opacity', null),
                         data: yValue.data,
                         series: yValue.series,
-                        htmlElements: [],
+                        htmlLabels: [],
+                        svgLabels: [],
                         isLastStackItem,
                     };
                     stackItems.push(barData);
                     if (yDataValue > 0) {
-                        positiveStackHeight += height;
+                        positiveStackSum += yDataValue;
                     }
                     else {
-                        negativeStackHeight += height;
+                        negativeStackSum += yDataValue;
                     }
                 }
                 if (series.some((s) => s.stacking === 'percent')) {
                     let acc = 0;
+                    const positiveStackHeight = stackItems.reduce((sum, item) => sum + item._height, 0);
                     const ratio = plotHeight / positiveStackHeight;
                     stackItems.forEach((item) => {
                         item.height = item._height * ratio;
@@ -211,17 +225,19 @@ export const prepareBarXData = async (args) => {
             !isRangeSlider &&
             (!isBarOutsideBounds || isZeroValue)) {
             const label = await getLabelData(barData, xMax);
-            if (barData.series.dataLabels.html && label) {
-                barData.htmlElements.push({
-                    x: label.x,
-                    y: label.y,
-                    content: label.text,
-                    size: label.size,
-                    style: label.style,
-                });
-            }
-            else {
-                barData.label = label;
+            if (label) {
+                if (barData.series.dataLabels.html) {
+                    barData.htmlLabels.push({
+                        x: label.x,
+                        y: label.y,
+                        content: label.text,
+                        size: label.size,
+                        style: label.style,
+                    });
+                }
+                else {
+                    barData.svgLabels.push(label);
+                }
             }
         }
     }

package/dist/cjs/hooks/useShapes/bar-x/types.d.ts

@@ -7,8 +7,8 @@ export type PreparedBarXData = Omit<TooltipDataChunkBarX, 'series'> & {
     height: number;
     opacity: number | null;
     series: PreparedBarXSeries;
-    label?: LabelData;
-    htmlElements: HtmlItem[];
+    svgLabels: LabelData[];
+    htmlLabels: HtmlItem[];
     isLastStackItem: boolean;
     /**
      * the utility field for storing the original height (for recalculations, etc.)

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

@@ -19,8 +19,9 @@ import type { PreparedScatterData } from './scatter/types';
 export type { PreparedBarXData } from './bar-x';
 export type { PreparedScatterData } from './scatter/types';
 import type { PreparedWaterfallData } from './waterfall';
+import type { PreparedXRangeData } from './x-range';
 import './styles.css';
-export type ShapeData = PreparedBarXData | PreparedBarYData | PreparedScatterData | PreparedLineData | PreparedPieData | PreparedAreaData | PreparedWaterfallData | PreparedSankeyData | PreparedRadarData | PreparedHeatmapData | PreparedFunnelData;
+export type ShapeData = PreparedBarXData | PreparedBarYData | PreparedScatterData | PreparedLineData | PreparedPieData | PreparedAreaData | PreparedWaterfallData | PreparedSankeyData | PreparedRadarData | PreparedHeatmapData | PreparedFunnelData | PreparedXRangeData;
 export type ClipPathBySeriesType = Partial<Record<SeriesType, boolean>>;
 type Args = {
     boundsWidth: number;