@gravity-ui/charts 1.46.1 → 1.48.0

package/dist/cjs/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/cjs/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/cjs/components/ChartInner/index.js

@@ -55,6 +55,7 @@ export const ChartInner = (props) => {
     const { activeLegendItems, allPreparedSeries, boundsHeight, boundsOffsetLeft, boundsOffsetTop, boundsWidth, handleLegendItemClick, legendConfig, legendItems, preparedLegend, preparedSeries, preparedSeriesOptions, preparedSplit, shapes, shapesData, shapesReady, xAxis, xScale, yAxis, yScale, preparedTitle, preparedChart, } = useChartInnerProps(Object.assign(Object.assign({}, props), { clipPathId,
         dispatcher,
         htmlLayout, plotNode: plotRef.current, rangeSliderState,
+        updateRangeSliderState,
         updateZoomState,
         zoomState }));
     const prevWidth = usePrevious(width);

package/dist/cjs/components/ChartInner/useChartInnerProps.d.ts

@@ -9,6 +9,7 @@ type Props = ChartInnerProps & {
     dispatcher: Dispatch<object>;
     htmlLayout: HTMLElement | null;
     plotNode: SVGGElement | null;
+    updateRangeSliderState: (nextState?: RangeSliderState) => void;
     updateZoomState: (nextZoomState: Partial<ZoomState>) => void;
     zoomState: Partial<ZoomState>;
     rangeSliderState?: RangeSliderState;

package/dist/cjs/components/ChartInner/useChartInnerProps.js

@@ -38,7 +38,7 @@ function getBoundsOffsetLeft(args) {
 }
 export function useChartInnerProps(props) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    const { clipPathId, data, dispatcher, height, htmlLayout, plotNode, rangeSliderState, width, updateZoomState, zoomState, } = props;
+    const { clipPathId, data, dispatcher, height, htmlLayout, plotNode, rangeSliderState, width, updateRangeSliderState, updateZoomState, zoomState, } = props;
     const [selectedLegendItems, setSelectedLegendItems] = React.useState(null);
     const [chartState, setState] = React.useState(null);
     const prevStateValue = React.useRef(chartState);
@@ -48,20 +48,26 @@ export function useChartInnerProps(props) {
         currentRunRef.current++;
         const currentRun = currentRunRef.current;
         (async function () {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e, _f, _g;
             const chartDataChanged = !(previousChartData.current && isEqual(previousChartData.current, data));
+            const axisTypeChanged = ((_b = (_a = previousChartData.current) === null || _a === void 0 ? void 0 : _a.xAxis) === null || _b === void 0 ? void 0 : _b.type) !== undefined &&
+                previousChartData.current.xAxis.type !== ((_c = data.xAxis) === null || _c === void 0 ? void 0 : _c.type);
+            if (axisTypeChanged && rangeSliderState !== undefined) {
+                updateRangeSliderState(undefined);
+                return;
+            }
             const preparedTitle = await getPreparedTitle({
                 title: data.title,
                 chartWidth: width,
                 chartHeight: height,
-                chartMargin: (_a = data.chart) === null || _a === void 0 ? void 0 : _a.margin,
+                chartMargin: (_d = data.chart) === null || _d === void 0 ? void 0 : _d.margin,
             });
             const preparedChart = getPreparedChart({
                 chart: data.chart,
                 seriesData: data.series.data,
                 preparedTitle,
             });
-            const colors = (_b = data.colors) !== null && _b !== void 0 ? _b : DEFAULT_PALETTE;
+            const colors = (_e = data.colors) !== null && _e !== void 0 ? _e : DEFAULT_PALETTE;
             const normalizedSeriesData = getSortedSeriesData({
                 seriesData: data.series.data,
                 xAxis: data.xAxis,
@@ -84,7 +90,7 @@ export function useChartInnerProps(props) {
                 });
             }
             else {
-                allPreparedSeries = (_d = (_c = prevStateValue.current) === null || _c === void 0 ? void 0 : _c.allPreparedSeries) !== null && _d !== void 0 ? _d : [];
+                allPreparedSeries = (_g = (_f = prevStateValue.current) === null || _f === void 0 ? void 0 : _f.allPreparedSeries) !== null && _g !== void 0 ? _g : [];
             }
             const activeLegendItems = selectedLegendItems !== null && selectedLegendItems !== void 0 ? selectedLegendItems : getActiveLegendItems(allPreparedSeries);
             const visiblePreparedSeries = getVisibleSeries({
@@ -243,6 +249,7 @@ export function useChartInnerProps(props) {
         rangeSliderState,
         dispatcher,
         htmlLayout,
+        updateRangeSliderState,
         clipPathId,
     ]);
     // additional start

package/dist/cjs/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/cjs/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/cjs/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/cjs/core/brush/index.d.ts

@@ -0,0 +1,2 @@
+export * from './types';
+export * from './utils';

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

@@ -0,0 +1,2 @@
+export * from './types';
+export * from './utils';

package/dist/cjs/{hooks/useBrush → core/brush}/types.d.ts

@@ -1,6 +1,6 @@
 import type { BrushBehavior } from 'd3-brush';
-import type { ZoomType } from '../../core/constants';
-import type { ChartBrush, DeepRequired } from '../../types';
+import type { ZoomType } from '../constants';
+import type { ChartBrush, DeepRequired } from '../types';
 export type BrushSelection = [number, number] | [[number, number], [number, number]];
 export interface BrushArea {
     /**

package/dist/{esm/hooks/useBrush → cjs/core/brush}/utils.d.ts

@@ -1,5 +1,5 @@
 import type { BrushBehavior } from 'd3-brush';
-import type { ChartBrush, DeepRequired } from '../../types';
+import type { ChartBrush, DeepRequired } from '../types';
 import type { BrushSelection } from './types';
 export declare function isOneDimensionalSelection(selection?: BrushSelection | null): selection is [number, number];
 export declare function setBrushBorder(this: SVGGElement, _brushInstance: BrushBehavior<unknown>, selection: BrushSelection | null, options: {

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

@@ -0,0 +1 @@
+export * from './types';

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

@@ -0,0 +1 @@
+export * from './types';

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

@@ -0,0 +1,8 @@
+import type { ChartBrush, ChartMargin, ChartZoom, DeepRequired } from '../types';
+export type PreparedZoom = DeepRequired<Omit<ChartZoom, 'enabled' | 'brush'>> & DeepRequired<{
+    brush: ChartBrush;
+}>;
+export type PreparedChart = {
+    margin: ChartMargin;
+    zoom: PreparedZoom | null;
+};

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

@@ -8,3 +8,6 @@ export * from './scales';
 export * from './axes';
 export * from './layout';
 export * from './zoom';
+export * from './brush';
+export * from './range-slider';
+export * from './chart';

package/dist/cjs/core/index.js

@@ -8,3 +8,6 @@ export * from './scales';
 export * from './axes';
 export * from './layout';
 export * from './zoom';
+export * from './brush';
+export * from './range-slider';
+export * from './chart';

package/dist/cjs/core/layout/chart-dimensions.d.ts

@@ -1,6 +1,6 @@
-import type { PreparedChart } from '../../hooks/types';
 import type { ChartMargin, LegendConfig } from '../../types';
 import type { PreparedXAxis, PreparedYAxis } from '../axes/types';
+import type { PreparedChart } from '../chart/types';
 import type { PreparedLegend, PreparedSeries } from '../series';
 export declare const getBoundsWidth: (args: {
     chartWidth: number;

package/dist/cjs/core/range-slider/index.d.ts

@@ -0,0 +1,2 @@
+export * from './types';
+export * from './utils';

package/dist/cjs/core/range-slider/index.js

@@ -0,0 +1,2 @@
+export * from './types';
+export * from './utils';

package/dist/cjs/core/range-slider/types.d.ts

@@ -0,0 +1,4 @@
+export type RangeSliderState = {
+    max: number;
+    min: number;
+};

package/dist/cjs/{hooks/useRangeSlider → core/range-slider}/utils.d.ts

@@ -1,8 +1,8 @@
-import type { ChartScale } from '../../core/scales/types';
-import type { PreparedLegend } from '../../core/series/types';
-import type { PreparedChart } from '../types';
-import type { PreparedRangeSlider } from '../useAxis/types';
-import type { BrushSelection } from '../useBrush/types';
+import type { PreparedRangeSlider } from '../axes/types';
+import type { BrushSelection } from '../brush/types';
+import type { PreparedChart } from '../chart/types';
+import type { ChartScale } from '../scales/types';
+import type { PreparedLegend } from '../series/types';
 import type { RangeSliderState } from './types';
 export declare function getRangeSliderOffsetTop(args: {
     height: number;

package/dist/cjs/{hooks/useRangeSlider → core/range-slider}/utils.js

@@ -1,4 +1,4 @@
-import { isBandScale } from '../../core/utils';
+import { isBandScale } from '../utils';
 export function getRangeSliderOffsetTop(args) {
     var _a, _b;
     const { height, preparedChart, preparedLegend, preparedRangeSlider } = args;

package/dist/cjs/core/scales/x-scale.d.ts

@@ -1,7 +1,7 @@
-import type { RangeSliderState } from '../../hooks';
-import type { ChartAxis, ChartSeries } from '../../types';
 import type { PreparedAxis } from '../axes/types';
+import type { RangeSliderState } from '../range-slider/types';
 import type { PreparedSeries } from '../series';
+import type { ChartAxis, ChartSeries } from '../types';
 export declare function createXScale(args: {
     axis: PreparedAxis | ChartAxis;
     boundsWidth: number;

package/dist/cjs/core/scales/y-scale.js

@@ -218,6 +218,27 @@ export function createYScale(args) {
                 else {
                     yMax = hasSeriesWithVolumeOnYAxis ? Math.max(yMaxDomain, 0) : yMaxDomain;
                 }
+                // When the user pins only one of min/max on the wrong side of all data,
+                // d3 produces either an inverted scale (yMax<yMin, silently flips the
+                // axis) or a degenerate one (yMax===yMin, maps everything to the range
+                // midpoint); both leave phantom hover targets inside an empty plot.
+                // Expand the auto-computed side so the scale stays sane. Only applies
+                // when the opposite bound is auto-derived — if the user supplied both
+                // bounds, trust the explicit range and let point filtering hide the
+                // rest. Comparison uses the raw data extent because upstream coercions
+                // like volume-series `yMax = Math.max(yMaxDomain, 0)` can make the
+                // post-coerced yMin/yMax lie about where data actually sits.
+                // Logarithmic has its own guard.
+                if (axis.type === 'linear') {
+                    const minIsUserSet = typeof yMinPropsOrState === 'number';
+                    const maxIsUserSet = typeof yMaxPropsOrState === 'number';
+                    if (minIsUserSet && !maxIsUserSet && yMaxDomain < yMin) {
+                        yMax = yMin + Math.max(Math.abs(yMin), 1);
+                    }
+                    else if (maxIsUserSet && !minIsUserSet && yMinDomain > yMax) {
+                        yMin = yMax - Math.max(Math.abs(yMax), 1);
+                    }
+                }
                 const scaleFn = axis.type === 'logarithmic' ? scaleLog : scaleLinear;
                 let scale = scaleFn().domain([yMin, yMax]).range(range);
                 let offsetMin = 0;

package/dist/cjs/core/series/prepare-legend.d.ts

@@ -1,5 +1,5 @@
-import type { PreparedChart } from '../../hooks/types';
 import type { ChartData } from '../../types';
+import type { PreparedChart } from '../chart/types';
 import type { LegendItem, PreparedLegend, PreparedSeries } from './types';
 export declare function getPreparedLegend(args: {
     legend: ChartData['legend'];

package/dist/cjs/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/cjs/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/cjs/core/shapes/area/prepare-data.js

@@ -2,9 +2,8 @@ import { group, min, sort } from 'd3-array';
 import isNil from 'lodash/isNil';
 import round from 'lodash/round';
 import { prepareAnnotation } from '../../series/prepare-annotation';
-import { getXValue, getYValue } from '../../shapes/utils';
-import { getDataCategoryValue, getLabelsSize, getTextSizeFn } from '../../utils';
-import { getFormattedValue } from '../../utils/format';
+import { getXValue, getYValue, markHiddenPointsOutOfYRange } from '../../shapes/utils';
+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;
@@ -315,6 +268,11 @@ export const prepareAreaData = async (args) => {
                     }
                     return result;
                 }, []);
+                markHiddenPointsOutOfYRange({
+                    points,
+                    yScale: seriesYScale,
+                    yAxisTop,
+                });
                 seriesStackData.push({
                     annotations,
                     points,
@@ -335,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/cjs/core/shapes/area/renderer.js

@@ -5,6 +5,7 @@ import get from 'lodash/get';
 import { block } from '../../../utils';
 import { filterOverlappingLabels } from '../../utils';
 import { renderAnnotations } from '../annotation';
+import { renderDataLabels } from '../data-labels';
 import { getMarkerHaloVisibility, getMarkerVisibility, renderMarker, selectMarkerHalo, selectMarkerSymbol, setMarker, } from '../marker';
 import { setActiveState } from '../utils';
 const b = block('area');
@@ -17,7 +18,7 @@ export function renderArea(elements, preparedData, seriesOptions, allowOverlapDa
     const inactiveOptions = get(seriesOptions, 'area.states.inactive');
     const line = lineGenerator()
         .x((d) => d.x)
-        .defined((d) => d.y !== null)
+        .defined((d) => d.y !== null && !d.hiddenInLine)
         .y((d) => d.y);
     plotSvgElement.selectAll('*').remove();
     markersSvgElement.selectAll('*').remove();
@@ -37,7 +38,7 @@ export function renderArea(elements, preparedData, seriesOptions, allowOverlapDa
         .attr('stroke-linejoin', 'round')
         .attr('stroke-linecap', 'round');
     const area = areaGenerator()
-        .defined((d) => d.y !== null)
+        .defined((d) => d.y !== null && !d.hiddenInLine)
         .x((d) => d.x)
         .y0((d) => d.y0)
         .y1((d) => d.y);
@@ -53,18 +54,11 @@ export function renderArea(elements, preparedData, seriesOptions, allowOverlapDa
     if (!allowOverlapDataLabels) {
         dataLabels = filterOverlappingLabels(dataLabels);
     }
-    const labelsSelection = plotSvgElement
-        .selectAll('text')
-        .data(dataLabels)
-        .join('text')
-        .html((d) => d.text)
-        .attr('class', b('label'))
-        .attr('x', (d) => d.x)
-        .attr('y', (d) => d.y)
-        .attr('text-anchor', (d) => d.textAnchor)
-        .style('font-size', (d) => d.style.fontSize)
-        .style('font-weight', (d) => d.style.fontWeight || null)
-        .style('fill', (d) => d.style.fontColor || null);
+    const labelsSelection = renderDataLabels({
+        container: plotSvgElement,
+        data: dataLabels,
+        className: b('label'),
+    });
     const markers = preparedData.reduce((acc, d) => acc.concat(d.markers), []);
     const markerSelection = markersSvgElement
         .selectAll('marker')

package/dist/cjs/core/shapes/area/types.d.ts

@@ -1,13 +1,14 @@
 import type { AreaSeriesData, HtmlItem, LabelData } from '../../../types';
 import type { AnnotationAnchor, PreparedAnnotation, PreparedAreaSeries } from '../../series/types';
 export type PointData = {
-    y0: number;
-    x: number;
-    y: number | null;
-    data: AreaSeriesData;
-    series: PreparedAreaSeries;
     annotation?: PreparedAnnotation;
     color?: string;
+    data: AreaSeriesData;
+    hiddenInLine?: boolean;
+    series: PreparedAreaSeries;
+    x: number;
+    y: number | null;
+    y0: number;
 };
 export type MarkerPointData = PointData & {
     y: number;