@gravity-ui/charts 1.47.0 → 1.48.1

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

@@ -0,0 +1,46 @@
+import type { HtmlItem, LabelData } from '../../types';
+import type { BaseTextStyle, ValueFormat } from '../types/chart/base';
+type PointLabelSeries = {
+    id: string;
+    dataLabels: {
+        style: BaseTextStyle;
+        html: boolean;
+        padding: number;
+        format?: ValueFormat;
+    };
+};
+type LabelPoint = {
+    x: number | null;
+    y: number | null;
+    data: {
+        label?: string | number | null;
+        y?: string | number | null;
+    };
+};
+/**
+ * Shared "above-point" dataLabels algorithm used by line, area, and scatter series.
+ *
+ * For each visible point it:
+ * 1. Formats the value via getFormattedValue
+ * 2. Measures the label size (HTML → getLabelsSize, SVG → getTextSizeFn)
+ * 3. Positions the label centered above the point, clamped to chart bounds
+ *
+ * `anchorYOffset` shifts the vertical anchor from the point center upward by the given
+ * number of pixels (e.g. marker radius for scatter), so padding is measured from the
+ * marker edge rather than its center. The top-boundary clamp also respects this offset
+ * so the label never drops below the anchor.
+ *
+ * Overlap filtering is intentionally left to the caller.
+ */
+export declare function preparePointDataLabels<S extends PointLabelSeries, P extends LabelPoint>({ series, points, xMax, yAxisTop, isOutsideBounds, anchorYOffset, }: {
+    series: S;
+    points: P[];
+    xMax: number;
+    yAxisTop: number;
+    isOutsideBounds: (x: number, y: number) => boolean;
+    anchorYOffset?: number;
+}): Promise<{
+    svgLabels: LabelData[];
+    htmlLabels: HtmlItem[];
+}>;
+export {};

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

@@ -0,0 +1,64 @@
+import { getFormattedValue } from './format';
+import { getLabelsSize, getTextSizeFn } from './text';
+/**
+ * Shared "above-point" dataLabels algorithm used by line, area, and scatter series.
+ *
+ * For each visible point it:
+ * 1. Formats the value via getFormattedValue
+ * 2. Measures the label size (HTML → getLabelsSize, SVG → getTextSizeFn)
+ * 3. Positions the label centered above the point, clamped to chart bounds
+ *
+ * `anchorYOffset` shifts the vertical anchor from the point center upward by the given
+ * number of pixels (e.g. marker radius for scatter), so padding is measured from the
+ * marker edge rather than its center. The top-boundary clamp also respects this offset
+ * so the label never drops below the anchor.
+ *
+ * Overlap filtering is intentionally left to the caller.
+ */
+export async function preparePointDataLabels({ series, points, xMax, yAxisTop, isOutsideBounds, anchorYOffset = 0, }) {
+    var _a;
+    const svgLabels = [];
+    const htmlLabels = [];
+    const getTextSize = getTextSizeFn({ style: series.dataLabels.style });
+    for (let i = 0; i < points.length; i++) {
+        const point = points[i];
+        if (point.y === null || point.x === null || isOutsideBounds(point.x, point.y)) {
+            continue;
+        }
+        const text = getFormattedValue(Object.assign({ value: (_a = point.data.label) !== null && _a !== void 0 ? _a : point.data.y }, series.dataLabels));
+        const anchorY = point.y - anchorYOffset;
+        if (series.dataLabels.html) {
+            const size = await getLabelsSize({
+                labels: [text],
+                style: series.dataLabels.style,
+                html: true,
+            });
+            const width = size.maxWidth;
+            const height = size.maxHeight;
+            htmlLabels.push({
+                x: Math.min(xMax - width, Math.max(0, point.x - width / 2)),
+                y: Math.max(yAxisTop, anchorY - series.dataLabels.padding - height),
+                content: text,
+                size: { width, height },
+                style: series.dataLabels.style,
+            });
+        }
+        else {
+            const labelSize = await getTextSize(text);
+            svgLabels.push({
+                text,
+                x: Math.min(xMax - labelSize.width, Math.max(0, point.x - labelSize.width / 2)),
+                y: Math.max(yAxisTop, anchorY -
+                    series.dataLabels.padding -
+                    labelSize.height +
+                    labelSize.hangingOffset),
+                style: series.dataLabels.style,
+                size: labelSize,
+                textAnchor: 'start',
+                series,
+                active: true,
+            });
+        }
+    }
+    return { svgLabels, htmlLabels };
+}

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

@@ -15,3 +15,4 @@ export * from '../layout/chart-dimensions';
 export * from './common';
 export * from './misc';
 export * from './dispatcher';
+export * from './data-labels';

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

@@ -15,3 +15,4 @@ export * from '../layout/chart-dimensions';
 export * from './common';
 export * from './misc';
 export * from './dispatcher';
+export * from './data-labels';

package/dist/cjs/core/utils/ticks/datetime.js

@@ -21,6 +21,10 @@ const tickIntervals = [
     [utcMonth, 3, 3 * MONTH],
     [utcYear, 1, YEAR],
 ];
+// utcDay.every(2) resets its day counter at the start of each month (field = getUTCDate() - 1),
+// so in a 31-day month the last tick lands on day 31 and the next tick is day 1 of the following
+// month — only 1 day apart. Filtering by absolute Unix day number avoids the monthly reset.
+const utcEvery2Days = utcDay.filter((d) => Math.floor(d.getTime() / DAY) % 2 === 0);
 function getDateTimeTickInterval(start, stop, count) {
     const target = Math.abs(stop - start) / count;
     const i = bisector(([, , step]) => step).right(tickIntervals, target);
@@ -31,6 +35,9 @@ function getDateTimeTickInterval(start, stop, count) {
         return utcMillisecond.every(Math.max(tickStep(start, stop, count), 1));
     }
     const [t, step] = tickIntervals[target / tickIntervals[i - 1][2] < tickIntervals[i][2] / target ? i - 1 : i];
+    if (t === utcDay && step === 2) {
+        return utcEvery2Days;
+    }
     return t.every(step);
 }
 /**

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

@@ -146,18 +146,20 @@ export async function getShapes(args) {
             }
             case SERIES_TYPE.Scatter: {
                 if (xAxis && xScale && (yScale === null || yScale === void 0 ? void 0 : yScale.length)) {
-                    const preparedData = prepareScatterData({
+                    const scatterShapeData = await prepareScatterData({
                         series: chartSeries,
                         xAxis,
                         xScale,
                         yAxis,
                         yScale,
+                        split,
                         isOutsideBounds,
+                        isRangeSlider,
                     });
                     shapes[index] = (React.createElement(ScatterSeriesShape, { key: SERIES_TYPE.Scatter, clipPathId: shouldUseClipPathId(SERIES_TYPE.Scatter, clipPathBySeriesType)
                             ? clipPathId
-                            : undefined, dispatcher: dispatcher, preparedData: preparedData, seriesOptions: seriesOptions, htmlLayout: htmlLayout }));
-                    shapesData.splice(index, 0, ...preparedData);
+                            : undefined, dispatcher: dispatcher, preparedData: scatterShapeData, seriesOptions: seriesOptions, htmlLayout: htmlLayout }));
+                    shapesData.splice(index, 0, ...scatterShapeData.markers);
                 }
                 break;
             }

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

@@ -1,11 +1,11 @@
 import React from 'react';
 import type { Dispatch } from 'd3-dispatch';
 import type { PreparedSeriesOptions } from '../../../core/series/types';
-import type { PreparedScatterData } from '../../../core/shapes/scatter/types';
+import type { PreparedScatterShapeData } from '../../../core/shapes/scatter/types';
 export { prepareScatterData } from '../../../core/shapes/scatter/prepare-data';
 type ScatterSeriesShapeProps = {
     htmlLayout: HTMLElement | null;
-    preparedData: PreparedScatterData[];
+    preparedData: PreparedScatterShapeData;
     seriesOptions: PreparedSeriesOptions;
     clipPathId?: string;
     dispatcher?: Dispatch<object>;

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

@@ -13,7 +13,10 @@ export function ScatterSeriesShape(props) {
         }
         return renderScatter({ plot: ref.current }, preparedData, seriesOptions, dispatcher);
     }, [dispatcher, preparedData, seriesOptions]);
+    const htmlLayerData = React.useMemo(() => {
+        return { htmlElements: preparedData.htmlLabels };
+    }, [preparedData]);
     return (React.createElement(React.Fragment, null,
         React.createElement("g", { ref: ref, className: b(), clipPath: clipPathId ? `url(#${clipPathId})` : undefined }),
-        React.createElement(HtmlLayer, { preparedData: preparedData, htmlLayout: htmlLayout })));
+        React.createElement(HtmlLayer, { preparedData: htmlLayerData, htmlLayout: htmlLayout })));
 }

package/dist/cjs/hooks/useShapes/styles.css

@@ -1,8 +1,15 @@
 .gcharts-line__label,
 .gcharts-area__label,
 .gcharts-radar__label,
+.gcharts-bar-x__label,
+.gcharts-bar-y__label,
 .gcharts-heatmap__label,
-.gcharts-funnel__label {
+.gcharts-funnel__label,
+.gcharts-treemap__label,
+.gcharts-pie__label,
+.gcharts-scatter__label {
+  user-select: none;
+  pointer-events: none;
   dominant-baseline: hanging;
 }
 
@@ -13,30 +20,6 @@
 .gcharts-pie__segment {
   stroke: var(--g-color-base-background);
 }
-.gcharts-pie__label {
-  font-size: 11px;
-  font-weight: bold;
-  fill: var(--g-color-text-complementary);
-  dominant-baseline: hanging;
-}
-
-.gcharts-bar-x__label {
-  user-select: none;
-  fill: var(--g-color-text-complementary);
-}
-
-.gcharts-bar-y__label {
-  user-select: none;
-  fill: var(--g-color-text-complementary);
-  dominant-baseline: hanging;
-}
-
-.gcharts-treemap__label {
-  user-select: none;
-  pointer-events: none;
-  fill: var(--g-color-text-complementary);
-  dominant-baseline: hanging;
-}
 
 .gcharts-waterfall__connector {
   stroke: var(--g-color-line-generic-active);

package/dist/esm/components/AxisX/prepare-axis-data.js

@@ -1,6 +1,6 @@
 import { getUniqId } from '@gravity-ui/uikit';
 import { select } from 'd3-selection';
-import { calculateCos, calculateSin, formatAxisTickLabel, getBandsPosition, getLabelsSize, getMinSpaceBetween, getTextSizeFn, getTextWithElipsis, } from '../../core/utils';
+import { calculateCos, calculateNumericProperty, calculateSin, formatAxisTickLabel, getBandsPosition, getLabelsSize, getMinSpaceBetween, getTextSizeFn, getTextWithElipsis, } from '../../core/utils';
 import { getXAxisTickValues } from '../../core/utils/axis/x-axis';
 import { getMultilineTitleContentRows } from '../utils/axis-title';
 async function getSvgAxisLabel({ getTextSize, text, axis, top, left, labelMaxWidth, axisWidth, boundsOffsetLeft, boundsOffsetRight, }) {
@@ -72,7 +72,7 @@ async function getSvgAxisLabel({ getTextSize, text, axis, top, left, labelMaxWid
     return svgLabel;
 }
 export async function prepareXAxisData({ axis, boundsOffsetLeft, boundsOffsetRight, boundsWidth, height, scale, series, split, yAxis, }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const xAxisItems = [];
     const splitPlots = (_a = split === null || split === void 0 ? void 0 : split.plots) !== null && _a !== void 0 ? _a : [];
     for (let plotIndex = 0; plotIndex < splitPlots.length; plotIndex++) {
@@ -267,6 +267,9 @@ export async function prepareXAxisData({ axis, boundsOffsetLeft, boundsOffsetRig
             if (plotBandWidth < 0) {
                 continue;
             }
+            const perpExtent = (_g = calculateNumericProperty({ value: plotBand.size, base: axisHeight })) !== null && _g !== void 0 ? _g : axisHeight;
+            // X axis is positioned at the bottom of the plot area, so 'start' = bottom edge.
+            const bandY = plotBand.align === 'end' ? axisTop : axisTop + axisHeight - perpExtent;
             const getPlotLabelSize = getTextSizeFn({ style: plotBand.label.style });
             const labelSize = plotBand.label.text
                 ? await getPlotLabelSize(plotBand.label.text)
@@ -274,17 +277,17 @@ export async function prepareXAxisData({ axis, boundsOffsetLeft, boundsOffsetRig
             plotBands.push({
                 layerPlacement: plotBand.layerPlacement,
                 x: Math.max(0, startPos),
-                y: axisTop,
+                y: bandY,
                 width: plotBandWidth,
-                height: axisHeight,
+                height: perpExtent,
                 color: plotBand.color,
                 opacity: plotBand.opacity,
                 label: plotBand.label.text
                     ? {
                         text: plotBand.label.text,
                         style: plotBand.label.style,
-                        x: plotBand.label.padding + ((_g = labelSize === null || labelSize === void 0 ? void 0 : labelSize.hangingOffset) !== null && _g !== void 0 ? _g : 0),
-                        y: plotBand.label.padding + ((_h = labelSize === null || labelSize === void 0 ? void 0 : labelSize.width) !== null && _h !== void 0 ? _h : 0),
+                        x: plotBand.label.padding + ((_h = labelSize === null || labelSize === void 0 ? void 0 : labelSize.hangingOffset) !== null && _h !== void 0 ? _h : 0),
+                        y: plotBand.label.padding + ((_j = labelSize === null || labelSize === void 0 ? void 0 : labelSize.width) !== null && _j !== void 0 ? _j : 0),
                         rotate: -90,
                         qa: plotBand.label.qa,
                     }

package/dist/esm/components/AxisY/prepare-axis-data.js

@@ -1,6 +1,6 @@
 import { getUniqId } from '@gravity-ui/uikit';
 import { select } from 'd3-selection';
-import { calculateCos, calculateSin, formatAxisTickLabel, getBandsPosition, getLabelsSize, getMinSpaceBetween, getTextSizeFn, getTextWithElipsis, wrapText, } from '../../core/utils';
+import { calculateCos, calculateNumericProperty, calculateSin, formatAxisTickLabel, getBandsPosition, getLabelsSize, getMinSpaceBetween, getTextSizeFn, getTextWithElipsis, wrapText, } from '../../core/utils';
 import { prepareHtmlYAxisTitle, prepareSvgYAxisTitle } from './prepare-axis-title';
 import { getTickValues } from './utils';
 async function getSvgAxisLabel({ getTextSize, text, axis, top, left, labelMaxHeight, topOffset, }) {
@@ -113,7 +113,7 @@ async function getSvgAxisLabel({ getTextSize, text, axis, top, left, labelMaxHei
     return svgLabel;
 }
 export async function prepareYAxisData({ axis, split, scale, top: topOffset, width, height, series, }) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const axisPlotTopPosition = ((_a = split === null || split === void 0 ? void 0 : split.plots[axis.plotIndex]) === null || _a === void 0 ? void 0 : _a.top) || 0;
     const axisHeight = ((_b = split === null || split === void 0 ? void 0 : split.plots[axis.plotIndex]) === null || _b === void 0 ? void 0 : _b.height) || height;
     const domainX = axis.position === 'left' ? 0 : width;
@@ -231,11 +231,18 @@ export async function prepareYAxisData({ axis, split, scale, top: topOffset, wid
         if (plotBandHeight < 0) {
             continue;
         }
+        const perpExtent = (_f = calculateNumericProperty({ value: plotBand.size, base: width })) !== null && _f !== void 0 ? _f : width;
+        // 'start' = at the main Y axis line. For a left axis that's x=0;
+        // for a right axis that's x = width - perpExtent. 'end' is mirrored.
+        const isLeftAxis = axis.position === 'left';
+        const atMainAxis = isLeftAxis ? 0 : width - perpExtent;
+        const atOpposite = isLeftAxis ? width - perpExtent : 0;
+        const bandX = plotBand.align === 'end' ? atOpposite : atMainAxis;
         const plotBandItem = {
             layerPlacement: plotBand.layerPlacement,
-            x: 0,
+            x: bandX,
             y: axisPlotTopPosition + top,
-            width,
+            width: perpExtent,
             height: plotBandHeight,
             color: plotBand.color,
             opacity: plotBand.opacity,

package/dist/esm/core/axes/types.d.ts

@@ -1,4 +1,4 @@
-import type { AxisCrosshair, AxisPlotBand, AxisPlotShape, BaseTextStyle, ChartAxis, ChartAxisLabels, ChartAxisRangeSlider, ChartAxisTitleAlignment, ChartAxisTitleRotation, ChartAxisType, DeepRequired, MeaningfulAny, PlotLayerPlacement } from '../../types';
+import type { AxisCrosshair, AxisPlotBand, AxisPlotShape, BaseTextStyle, ChartAxis, ChartAxisLabels, ChartAxisRangeSlider, ChartAxisTitleAlignment, ChartAxisTitleRotation, ChartAxisType, DeepRequired, MeaningfulAny, PlotBandAlign, PlotLayerPlacement } from '../../types';
 import type { DashStyle } from '../constants';
 type PreparedAxisLabels = Omit<ChartAxisLabels, 'enabled' | 'padding' | 'style' | 'autoRotation'> & Required<Pick<ChartAxisLabels, 'enabled' | 'padding' | 'margin' | 'rotation' | 'html'>> & {
     style: BaseTextStyle;
@@ -8,7 +8,8 @@ type PreparedAxisLabels = Omit<ChartAxisLabels, 'enabled' | 'padding' | 'style'
     lineHeight: number;
     maxWidth: number;
 };
-export type PreparedAxisPlotBand = Required<AxisPlotBand> & {
+export type PreparedAxisPlotBand = Required<Omit<AxisPlotBand, 'size' | 'align'>> & {
+    align: PlotBandAlign;
     custom?: MeaningfulAny;
     label: {
         text: string;
@@ -16,6 +17,7 @@ export type PreparedAxisPlotBand = Required<AxisPlotBand> & {
         padding: number;
         qa?: string;
     };
+    size?: number | string;
 };
 type PreparedAxisCrosshair = Required<AxisCrosshair>;
 export type PreparedAxisPlotLine = {

package/dist/esm/core/axes/x-axis.js

@@ -166,6 +166,8 @@ export const getPreparedXAxis = async ({ xAxis, seriesData, width, boundsWidth,
             opacity: get(d, 'opacity', 1),
             from: get(d, 'from', 0),
             to: get(d, 'to', 0),
+            align: get(d, 'align', 'start'),
+            size: d.size,
             layerPlacement: get(d, 'layerPlacement', 'before'),
             custom: d.custom,
             label: prepareAxisPlotLabel(d),

package/dist/esm/core/axes/y-axis.js

@@ -181,6 +181,8 @@ export const getPreparedYAxis = ({ height, boundsHeight, width, seriesData, yAxi
                 opacity: get(d, 'opacity', 1),
                 from: get(d, 'from', 0),
                 to: get(d, 'to', 0),
+                align: get(d, 'align', 'start'),
+                size: d.size,
                 layerPlacement: get(d, 'layerPlacement', 'before'),
                 custom: d.custom,
                 label: prepareAxisPlotLabel(d),

package/dist/esm/core/series/prepare-scatter.js

@@ -1,8 +1,8 @@
 import get from 'lodash/get';
 import merge from 'lodash/merge';
-import { seriesRangeSliderOptionsDefaults } from '../constants';
+import { DEFAULT_DATALABELS_STYLE, seriesRangeSliderOptionsDefaults } from '../constants';
 import { getSymbolType, getUniqId } from '../utils';
-import { DEFAULT_HALO_OPTIONS, DEFAULT_POINT_MARKER_OPTIONS } from './constants';
+import { DEFAULT_DATALABELS_PADDING, DEFAULT_HALO_OPTIONS, DEFAULT_POINT_MARKER_OPTIONS, } from './constants';
 import { prepareLegendSymbol } from './utils';
 function prepareMarker(series, seriesOptions, index) {
     const seriesHoverState = get(seriesOptions, 'scatter.states.hover');
@@ -39,7 +39,7 @@ function prepareSeriesData(series) {
 export function prepareScatterSeries(args) {
     const { colorScale, series, seriesOptions, legend } = args;
     return series.map((s, index) => {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const id = getUniqId();
         const name = 'name' in s && s.name ? s.name : '';
         const symbolType = s.symbolType || getSymbolType(index);
@@ -56,6 +56,14 @@ export function prepareScatterSeries(args) {
                 itemText: (_f = (_e = s.legend) === null || _e === void 0 ? void 0 : _e.itemText) !== null && _f !== void 0 ? _f : name,
             },
             data: prepareSeriesData(s),
+            dataLabels: {
+                enabled: ((_g = s.dataLabels) === null || _g === void 0 ? void 0 : _g.enabled) || false,
+                style: Object.assign({}, DEFAULT_DATALABELS_STYLE, (_h = s.dataLabels) === null || _h === void 0 ? void 0 : _h.style),
+                padding: get(s, 'dataLabels.padding', DEFAULT_DATALABELS_PADDING),
+                allowOverlap: get(s, 'dataLabels.allowOverlap', false),
+                html: get(s, 'dataLabels.html', false),
+                format: (_j = s.dataLabels) === null || _j === void 0 ? void 0 : _j.format,
+            },
             marker: prepareMarker(s, seriesOptions, index),
             cursor: get(s, 'cursor', null),
             yAxis: get(s, 'yAxis', 0),

package/dist/esm/core/series/types.d.ts

@@ -101,6 +101,14 @@ type BasePreparedAxisRelatedSeries = {
 export type PreparedScatterSeries = {
     type: ScatterSeries['type'];
     data: ScatterSeriesData[];
+    dataLabels: {
+        enabled: boolean;
+        style: BaseTextStyle;
+        padding: number;
+        allowOverlap: boolean;
+        html: boolean;
+        format?: ValueFormat;
+    };
     marker: {
         states: {
             normal: {

package/dist/esm/core/shapes/area/prepare-data.js

@@ -3,8 +3,7 @@ import isNil from 'lodash/isNil';
 import round from 'lodash/round';
 import { prepareAnnotation } from '../../series/prepare-annotation';
 import { getXValue, getYValue, markHiddenPointsOutOfYRange } from '../../shapes/utils';
-import { getDataCategoryValue, getLabelsSize, getTextSizeFn } from '../../utils';
-import { getFormattedValue } from '../../utils/format';
+import { getDataCategoryValue, preparePointDataLabels } from '../../utils';
 function getXValues(series, xAxis, xScale) {
     const categories = xAxis.categories || [];
     const xValues = series.reduce((acc, s) => {
@@ -30,52 +29,6 @@ function getXValues(series, xAxis, xScale) {
     }
     return sort(Array.from(xValues), (d) => d[1]);
 }
-async function prepareDataLabels({ series, points, xMax, yAxisTop, isOutsideBounds, }) {
-    var _a;
-    const svgLabels = [];
-    const htmlLabels = [];
-    const getTextSize = getTextSizeFn({ style: series.dataLabels.style });
-    for (let pointsIndex = 0; pointsIndex < points.length; pointsIndex++) {
-        const point = points[pointsIndex];
-        if (point.y === null || isOutsideBounds(point.x, point.y)) {
-            continue;
-        }
-        const text = getFormattedValue(Object.assign({ value: (_a = point.data.label) !== null && _a !== void 0 ? _a : point.data.y }, series.dataLabels));
-        if (series.dataLabels.html) {
-            const size = await getLabelsSize({
-                labels: [text],
-                style: series.dataLabels.style,
-                html: series.dataLabels.html,
-            });
-            const labelSize = { width: size.maxWidth, height: size.maxHeight };
-            const x = Math.min(xMax - labelSize.width, Math.max(0, point.x - labelSize.width / 2));
-            const y = Math.max(yAxisTop, point.y - series.dataLabels.padding - labelSize.height);
-            htmlLabels.push({
-                x,
-                y,
-                content: text,
-                size: labelSize,
-                style: series.dataLabels.style,
-            });
-        }
-        else {
-            const labelSize = await getTextSize(text);
-            const x = Math.min(xMax - labelSize.width, Math.max(0, point.x - labelSize.width / 2));
-            const y = Math.max(yAxisTop, point.y - series.dataLabels.padding - labelSize.height + labelSize.hangingOffset);
-            svgLabels.push({
-                text,
-                x,
-                y,
-                style: series.dataLabels.style,
-                size: labelSize,
-                textAnchor: 'start',
-                series,
-                active: true,
-            });
-        }
-    }
-    return { svgLabels, htmlLabels };
-}
 export const prepareAreaData = async (args) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     const { series, seriesOptions, xAxis, xScale, yAxis, yScale, split, isOutsideBounds, isRangeSlider, } = args;
@@ -340,7 +293,7 @@ export const prepareAreaData = async (args) => {
                 const currentYAxis = yAxis[item.series.yAxis];
                 const itemYAxisTop = ((_p = split.plots[currentYAxis.plotIndex]) === null || _p === void 0 ? void 0 : _p.top) || 0;
                 if (item.series.dataLabels.enabled && !isRangeSlider) {
-                    const labelsData = await prepareDataLabels({
+                    const labelsData = await preparePointDataLabels({
                         series: item.series,
                         points: item.points,
                         xMax,

package/dist/esm/core/shapes/bar-x/prepare-data.js

@@ -3,37 +3,59 @@ import get from 'lodash/get';
 import { prepareAnnotation } from '../../series/prepare-annotation';
 import { getSeriesStackId } from '../../series/utils';
 import { MIN_BAR_GAP, MIN_BAR_GROUP_GAP, MIN_BAR_WIDTH } from '../../shapes/bar-constants';
-import { getDataCategoryValue, getLabelsSize } from '../../utils';
+import { getDataCategoryValue, getLabelsSize, getTextSizeFn } from '../../utils';
 import { getBandSize } from '../../utils/band-size';
 import { getFormattedValue } from '../../utils/format';
 const isSeriesDataValid = (d) => d.y !== null;
 async function getLabelData(d, xMax) {
     var _a;
     if (!d.series.dataLabels.enabled) {
-        return undefined;
+        return {};
     }
     const text = getFormattedValue(Object.assign({ value: (_a = d.data.label) !== null && _a !== void 0 ? _a : d.data.y }, d.series.dataLabels));
     const style = d.series.dataLabels.style;
-    const html = d.series.dataLabels.html;
-    const { maxHeight: height, maxWidth: width } = await getLabelsSize({
-        labels: [text],
-        style,
-        html,
-    });
-    let y = Math.max(height, d.y - d.series.dataLabels.padding);
-    if (d.series.dataLabels.inside) {
-        y = d.y + d.height / 2;
+    if (d.series.dataLabels.html) {
+        const { maxHeight: height, maxWidth: width } = await getLabelsSize({
+            labels: [text],
+            style,
+            html: true,
+        });
+        let y = Math.max(height, d.y - d.series.dataLabels.padding);
+        if (d.series.dataLabels.inside) {
+            y = d.y + d.height / 2;
+        }
+        const centerX = Math.min(xMax - width / 2, Math.max(width / 2, d.x + d.width / 2));
+        return {
+            htmlLabel: {
+                content: text,
+                x: centerX - width / 2,
+                y: y - height,
+                size: { width, height },
+                style,
+            },
+        };
+    }
+    else {
+        const getTextSize = getTextSizeFn({ style });
+        const { width, height, hangingOffset } = await getTextSize(text);
+        let y = Math.max(hangingOffset, d.y - height + hangingOffset - d.series.dataLabels.padding);
+        if (d.series.dataLabels.inside) {
+            const centerY = d.y + d.height / 2;
+            y = Math.min(d.y + d.height - height + hangingOffset, centerY - height / 2 + hangingOffset);
+        }
+        const centerX = Math.min(xMax - width / 2, Math.max(width / 2, d.x + d.width / 2));
+        return {
+            svgLabel: {
+                text,
+                x: centerX,
+                y,
+                style,
+                size: { width, height, hangingOffset },
+                textAnchor: 'middle',
+                series: d.series,
+            },
+        };
     }
-    const centerX = Math.min(xMax - width / 2, Math.max(width / 2, d.x + d.width / 2));
-    return {
-        text,
-        x: html ? centerX - width / 2 : centerX,
-        y: html ? y - height : y,
-        style,
-        size: { width, height },
-        textAnchor: 'middle',
-        series: d.series,
-    };
 }
 export const prepareBarXData = async (args) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
@@ -232,20 +254,12 @@ export const prepareBarXData = async (args) => {
         if (barData.series.dataLabels.enabled &&
             !isRangeSlider &&
             (!isBarOutsideBounds || isZeroValue)) {
-            const label = await getLabelData(barData, xMax);
-            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);
-                }
+            const { svgLabel, htmlLabel } = await getLabelData(barData, xMax);
+            if (svgLabel) {
+                barData.svgLabels.push(svgLabel);
+            }
+            if (htmlLabel) {
+                barData.htmlLabels.push(htmlLabel);
             }
         }
     }