@gravity-ui/charts 1.46.1 → 1.48.0

package/dist/cjs/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);
             }
         }
     }

package/dist/cjs/core/shapes/bar-x/renderer.js

@@ -4,6 +4,7 @@ import get from 'lodash/get';
 import { block } from '../../../utils';
 import { filterOverlappingLabels } from '../../utils';
 import { renderAnnotations } from '../annotation';
+import { renderDataLabels } from '../data-labels';
 import { getRectPath } from '../utils';
 const b = block('bar-x');
 export function renderBarX(elements, preparedData, seriesOptions, allowOverlapDataLabels, dispatcher) {
@@ -37,18 +38,11 @@ export function renderBarX(elements, preparedData, seriesOptions, allowOverlapDa
     if (!allowOverlapDataLabels) {
         dataLabels = filterOverlappingLabels(dataLabels);
     }
-    const labelSelection = svgElement
-        .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 labelSelection = renderDataLabels({
+        container: svgElement,
+        data: dataLabels,
+        className: b('label'),
+    });
     const annotationAnchors = [];
     for (const d of preparedData) {
         if (d.annotation) {

package/dist/cjs/core/shapes/bar-y/renderer.js

@@ -2,6 +2,7 @@ import { color } from 'd3-color';
 import { select } from 'd3-selection';
 import get from 'lodash/get';
 import { block } from '../../../utils';
+import { renderDataLabels } from '../data-labels';
 import { getAdjustedRectBorderPath, getAdjustedRectPath } from './utils';
 const b = block('bar-y');
 export function renderBarY(elements, preparedData, seriesOptions, dispatcher) {
@@ -31,18 +32,11 @@ export function renderBarY(elements, preparedData, seriesOptions, dispatcher) {
         .attr('fill-rule', 'evenodd')
         .attr('opacity', (d) => d.data.opacity || null)
         .attr('pointer-events', 'none');
-    const labelSelection = svgElement
-        .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 labelSelection = renderDataLabels({
+        container: svgElement,
+        data: dataLabels,
+        className: b('label'),
+    });
     const hoverOptions = get(seriesOptions, 'bar-y.states.hover');
     const inactiveOptions = get(seriesOptions, 'bar-y.states.inactive');
     function handleShapeHover(data) {

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

@@ -0,0 +1,15 @@
+import type { Selection } from 'd3-selection';
+import type { BaseTextStyle } from '../types/chart/base';
+type RenderableLabelData = {
+    text: string;
+    x: number;
+    y: number;
+    textAnchor: 'start' | 'end' | 'middle';
+    style: BaseTextStyle;
+};
+export declare function renderDataLabels<T extends RenderableLabelData>(args: {
+    container: Selection<SVGGElement, unknown, null, undefined>;
+    data: T[];
+    className: string;
+}): Selection<SVGTextElement, T, SVGGElement, unknown>;
+export {};

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

@@ -0,0 +1,15 @@
+export function renderDataLabels(args) {
+    const { container, data, className } = args;
+    return container
+        .selectAll('text')
+        .data(data)
+        .join('text')
+        .html((d) => d.text)
+        .attr('class', className)
+        .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);
+}

package/dist/cjs/core/shapes/funnel/renderer.js

@@ -2,6 +2,7 @@ import { color } from 'd3-color';
 import { select } from 'd3-selection';
 import { block } from '../../../utils';
 import { getLineDashArray } from '../../utils';
+import { renderDataLabels } from '../data-labels';
 const b = block('funnel');
 export function renderFunnel(elements, preparedData, seriesOptions, dispatcher) {
     var _a, _b;
@@ -44,17 +45,11 @@ export function renderFunnel(elements, preparedData, seriesOptions, dispatcher)
     connectorLines.append('path').attr('d', (d) => d.linePath[0].toString());
     connectorLines.append('path').attr('d', (d) => d.linePath[1].toString());
     // dataLabels
-    svgElement
-        .selectAll('text')
-        .data(preparedData.svgLabels)
-        .join('text')
-        .html((d) => d.text)
-        .attr('class', b('label'))
-        .attr('x', (d) => d.x)
-        .attr('y', (d) => d.y)
-        .style('font-size', (d) => d.style.fontSize)
-        .style('font-weight', (d) => d.style.fontWeight || null)
-        .style('fill', (d) => d.style.fontColor || null);
+    renderDataLabels({
+        container: svgElement,
+        data: preparedData.svgLabels,
+        className: b('label'),
+    });
     function handleShapeHover(data) {
         const hoverEnabled = hoverOptions === null || hoverOptions === void 0 ? void 0 : hoverOptions.enabled;
         if (hoverEnabled) {

package/dist/cjs/core/shapes/heatmap/prepare-data.js

@@ -84,6 +84,7 @@ export async function prepareHeatmapData({ series, xAxis, xScale, yAxis, yScale,
                             x: item.x + item.width / 2 - size.width / 2,
                             y: item.y + item.height / 2 - size.height / 2 + size.hangingOffset,
                             text,
+                            textAnchor: 'start',
                             style: series.dataLabels.style,
                         });
                     }

package/dist/cjs/core/shapes/heatmap/renderer.js

@@ -1,6 +1,7 @@
 import { color } from 'd3-color';
 import { select } from 'd3-selection';
 import { block } from '../../../utils';
+import { renderDataLabels } from '../data-labels';
 const b = block('heatmap');
 export function renderHeatmap(elements, preparedData, seriesOptions, dispatcher) {
     var _a, _b;
@@ -20,17 +21,11 @@ export function renderHeatmap(elements, preparedData, seriesOptions, dispatcher)
         .attr('stroke', (d) => d.borderColor)
         .attr('stroke-width', (d) => d.borderWidth);
     // dataLabels
-    svgElement
-        .selectAll('text')
-        .data(preparedData.labels)
-        .join('text')
-        .html((d) => d.text)
-        .attr('class', b('label'))
-        .attr('x', (d) => d.x)
-        .attr('y', (d) => d.y)
-        .style('font-size', (d) => d.style.fontSize)
-        .style('font-weight', (d) => d.style.fontWeight || null)
-        .style('fill', (d) => d.style.fontColor || null);
+    renderDataLabels({
+        container: svgElement,
+        data: preparedData.labels,
+        className: b('label'),
+    });
     function handleShapeHover(data) {
         const hoverEnabled = hoverOptions === null || hoverOptions === void 0 ? void 0 : hoverOptions.enabled;
         if (hoverEnabled) {

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

@@ -14,6 +14,7 @@ export type HeatmapLabel = {
     x: number;
     y: number;
     text: string;
+    textAnchor: 'start' | 'end' | 'middle';
     style: BaseTextStyle;
 };
 export type PreparedHeatmapData = {

package/dist/cjs/core/shapes/line/prepare-data.js

@@ -1,22 +1,8 @@
 import { prepareAnnotation } from '../../series/prepare-annotation';
-import { filterOverlappingLabels, getLabelsSize, getTextSizeFn } from '../../utils';
-import { getFormattedValue } from '../../utils/format';
-import { getXValue, getYValue } from '../utils';
-async function getHtmlLabel(point, series, xMax) {
-    var _a;
-    const content = String((_a = point.data.label) !== null && _a !== void 0 ? _a : point.data.y);
-    const size = await getLabelsSize({ labels: [content], html: true });
-    const width = size.maxWidth;
-    return {
-        x: Math.min(xMax - size.maxWidth, Math.max(0, point.x - width / 2)),
-        y: Math.max(0, point.y - series.dataLabels.padding - size.maxHeight),
-        content,
-        size: { width, height: size.maxHeight },
-        style: series.dataLabels.style,
-    };
-}
+import { filterOverlappingLabels, preparePointDataLabels } from '../../utils';
+import { getXValue, getYValue, markHiddenPointsOutOfYRange } from '../utils';
 export const prepareLineData = async (args) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f;
     const { series, seriesOptions, xAxis, yAxis, xScale, yScale, split, isOutsideBounds, isRangeSlider, otherLayers, } = args;
     const [_xMin, xRangeMax] = xScale.range();
     const xMax = xRangeMax;
@@ -58,46 +44,15 @@ export const prepareLineData = async (args) => {
         let htmlElements = [];
         let svgLabels = [];
         if (s.dataLabels.enabled && !isRangeSlider) {
-            if (s.dataLabels.html) {
-                const list = await Promise.all(points.reduce((result, p) => {
-                    if (p.y === null || p.x === null || isOutsideBounds(p.x, p.y)) {
-                        return result;
-                    }
-                    result.push(getHtmlLabel(p, s, xMax));
-                    return result;
-                }, []));
-                htmlElements.push(...list);
-            }
-            else {
-                const getTextSize = getTextSizeFn({ style: s.dataLabels.style });
-                for (let index = 0; index < points.length; index++) {
-                    const point = points[index];
-                    if (point.y !== null &&
-                        point.x !== null &&
-                        !isOutsideBounds(point.x, point.y)) {
-                        const labelValue = (_e = point.data.label) !== null && _e !== void 0 ? _e : point.data.y;
-                        const text = getFormattedValue(Object.assign({ value: labelValue }, s.dataLabels));
-                        const labelSize = await getTextSize(text);
-                        const style = s.dataLabels.style;
-                        const y = Math.max(yAxisTop, point.y -
-                            s.dataLabels.padding -
-                            labelSize.height +
-                            labelSize.hangingOffset);
-                        const x = Math.min(xMax - labelSize.width, Math.max(0, point.x - labelSize.width / 2));
-                        const labelData = {
-                            text,
-                            x,
-                            y,
-                            style,
-                            size: labelSize,
-                            textAnchor: 'start',
-                            series: s,
-                            active: true,
-                        };
-                        svgLabels.push(labelData);
-                    }
-                }
-            }
+            const labelsData = await preparePointDataLabels({
+                series: s,
+                points,
+                xMax,
+                yAxisTop,
+                isOutsideBounds,
+            });
+            svgLabels = labelsData.svgLabels;
+            htmlElements = labelsData.htmlLabels;
         }
         if (!s.dataLabels.allowOverlap) {
             svgLabels = filterOverlappingLabels(svgLabels, otherLayers.map((l) => l.svgLabels).flat());
@@ -129,6 +84,14 @@ export const prepareLineData = async (args) => {
             }
             return result;
         }, []);
+        markHiddenPointsOutOfYRange({
+            points,
+            yScale: seriesYScale,
+            yAxisTop,
+            axisMin: seriesYAxis.min,
+            axisMax: seriesYAxis.max,
+            getDataY: (p) => p.data.y,
+        });
         const result = {
             annotations,
             points,
@@ -140,11 +103,11 @@ export const prepareLineData = async (args) => {
             id: s.id,
             htmlLabels: htmlElements,
             color: s.color,
-            lineWidth: (_f = (isRangeSlider ? s.rangeSlider.lineWidth : undefined)) !== null && _f !== void 0 ? _f : s.lineWidth,
+            lineWidth: (_e = (isRangeSlider ? s.rangeSlider.lineWidth : undefined)) !== null && _e !== void 0 ? _e : s.lineWidth,
             dashStyle: s.dashStyle,
             linecap: s.linecap,
             linejoin: s.linejoin,
-            opacity: (_g = (isRangeSlider ? s.rangeSlider.opacity : undefined)) !== null && _g !== void 0 ? _g : s.opacity,
+            opacity: (_f = (isRangeSlider ? s.rangeSlider.opacity : undefined)) !== null && _f !== void 0 ? _f : s.opacity,
         };
         acc.push(result);
     }

package/dist/cjs/core/shapes/line/renderer.js

@@ -5,6 +5,7 @@ import get from 'lodash/get';
 import { block } from '../../../utils';
 import { getLineDashArray } 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('line');
@@ -17,7 +18,7 @@ export function renderLine(elements, preparedData, seriesOptions, dispatcher) {
     const hoverOptions = get(seriesOptions, 'line.states.hover');
     const inactiveOptions = get(seriesOptions, 'line.states.inactive');
     const line = lineGenerator()
-        .defined((d) => d.y !== null && d.x !== null)
+        .defined((d) => d.y !== null && d.x !== null && !d.hiddenInLine)
         .x((d) => d.x)
         .y((d) => d.y);
     plotSvgElement.selectAll('*').remove();
@@ -38,18 +39,11 @@ export function renderLine(elements, preparedData, seriesOptions, dispatcher) {
     const dataLabels = preparedData.reduce((acc, d) => {
         return acc.concat(d.svgLabels);
     }, []);
-    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/line/types.d.ts

@@ -2,12 +2,13 @@ import type { HtmlItem, LabelData, LineSeriesData, LineSeriesLineBaseStyle } fro
 import type { DashStyle, LineCap, LineJoin } from '../../constants';
 import type { AnnotationAnchor, PreparedAnnotation, PreparedLineSeries } from '../../series/types';
 export type PointData = {
-    x: number | null;
-    y: number | null;
-    data: LineSeriesData;
-    series: PreparedLineSeries;
     annotation?: PreparedAnnotation;
     color?: string;
+    data: LineSeriesData;
+    hiddenInLine?: boolean;
+    series: PreparedLineSeries;
+    x: number | null;
+    y: number | null;
 };
 export type MarkerPointData = PointData & {
     y: number;

package/dist/cjs/core/shapes/radar/renderer.js

@@ -3,6 +3,7 @@ import { select } from 'd3-selection';
 import { line } from 'd3-shape';
 import get from 'lodash/get';
 import { block } from '../../../utils';
+import { renderDataLabels } from '../../shapes/data-labels';
 import { getMarkerHaloVisibility, getMarkerVisibility, renderMarker, selectMarkerHalo, selectMarkerSymbol, setMarker, } from '../../shapes/marker';
 import { setActiveState } from '../../shapes/utils';
 const b = block('radar');
@@ -59,18 +60,13 @@ export function renderRadar(elements, preparedData, seriesOptions, dispatcher) {
         .join('g')
         .call(renderMarker);
     // Render labels
-    radarSelection
-        .selectAll('text')
-        .data((radarData) => radarData.labels)
-        .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);
+    radarSelection.each(function (radarData) {
+        renderDataLabels({
+            container: select(this),
+            data: radarData.labels,
+            className: b('label'),
+        });
+    });
     // Handle hover events
     const eventName = `hover-shape.radar`;
     const hoverOptions = get(seriesOptions, 'radar.states.hover');

package/dist/cjs/core/shapes/sankey/renderer.js

@@ -1,5 +1,6 @@
 import { select } from 'd3-selection';
 import { block } from '../../../utils';
+import { renderDataLabels } from '../data-labels';
 const b = block('sankey');
 export function renderSankey(elements, preparedData, _seriesOptions, dispatcher) {
     const svgElement = select(elements.plot);
@@ -28,18 +29,11 @@ export function renderSankey(elements, preparedData, _seriesOptions, dispatcher)
         .attr('stroke', (d) => d.color)
         .attr('stroke-width', (d) => d.strokeWidth);
     // dataLabels
-    svgElement
-        .append('g')
-        .selectAll()
-        .data(preparedData.labels)
-        .join('text')
-        .html((d) => d.text)
-        .attr('class', b('label'))
-        .attr('x', (d) => d.x)
-        .attr('y', (d) => d.y)
-        .attr('dy', '0.35em')
-        .attr('text-anchor', (d) => d.textAnchor)
-        .attr('fill', (d) => { var _a; return (_a = d.style.fontColor) !== null && _a !== void 0 ? _a : null; });
+    renderDataLabels({
+        container: svgElement.append('g'),
+        data: preparedData.labels,
+        className: b('label'),
+    }).attr('dy', '0.35em');
     const eventName = `hover-shape.sankey`;
     dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.on(eventName, (_data) => {
         // no-op hover handler

package/dist/cjs/core/shapes/scatter/prepare-data.d.ts

@@ -1,12 +1,15 @@
 import type { PreparedXAxis, PreparedYAxis } from '../../axes/types';
+import type { PreparedSplit } from '../../layout/split-types';
 import type { ChartScale } from '../../scales/types';
 import type { PreparedScatterSeries } from '../../series/types';
-import type { PreparedScatterData } from './types';
+import type { PreparedScatterShapeData } from './types';
 export declare function prepareScatterData(args: {
     series: PreparedScatterSeries[];
     xAxis: PreparedXAxis;
     xScale: ChartScale;
     yAxis: PreparedYAxis[];
     yScale: (ChartScale | undefined)[];
+    split: PreparedSplit;
     isOutsideBounds: (x: number, y: number) => boolean;
-}): PreparedScatterData[];
+    isRangeSlider?: boolean;
+}): Promise<PreparedScatterShapeData>;

package/dist/cjs/core/shapes/scatter/prepare-data.js

@@ -1,6 +1,6 @@
 import get from 'lodash/get';
 import { getXValue, getYValue } from '../../shapes/utils';
-import { getDataCategoryValue } from '../../utils';
+import { filterOverlappingLabels, getDataCategoryValue, preparePointDataLabels } from '../../utils';
 function getFilteredLinearScatterData(data) {
     return data.filter((d) => typeof d.x === 'number' && typeof d.y === 'number');
 }
@@ -32,9 +32,12 @@ function getFilteredCategoryScatterData(args) {
         return xInRange && yInRange;
     });
 }
-export function prepareScatterData(args) {
-    const { series, xAxis, xScale, yAxis, yScale, isOutsideBounds } = args;
-    return series.reduce((acc, s) => {
+export async function prepareScatterData(args) {
+    var _a;
+    const { series, xAxis, xScale, yAxis, yScale, split, isOutsideBounds, isRangeSlider } = args;
+    const [_xMin, xRangeMax] = xScale.range();
+    const xMax = xRangeMax;
+    const markers = series.reduce((acc, s) => {
         const yAxisIndex = get(s, 'yAxis', 0);
         const seriesYAxis = yAxis[yAxisIndex];
         const seriesYScale = yScale[yAxisIndex];
@@ -74,4 +77,40 @@ export function prepareScatterData(args) {
         });
         return acc;
     }, []);
+    const allSvgLabels = [];
+    const allHtmlLabels = [];
+    if (!isRangeSlider) {
+        for (const s of series) {
+            if (!s.dataLabels.enabled) {
+                continue;
+            }
+            const yAxisIndex = get(s, 'yAxis', 0);
+            const seriesYAxis = yAxis[yAxisIndex];
+            const seriesYScale = yScale[yAxisIndex];
+            if (!seriesYScale) {
+                continue;
+            }
+            const yAxisTop = ((_a = split.plots[seriesYAxis.plotIndex]) === null || _a === void 0 ? void 0 : _a.top) || 0;
+            const seriesPoints = markers
+                .filter((m) => m.point.series.id === s.id && !m.clipped)
+                .map((m) => m.point);
+            const { svgLabels, htmlLabels } = await preparePointDataLabels({
+                series: s,
+                points: seriesPoints,
+                xMax,
+                yAxisTop,
+                isOutsideBounds,
+                anchorYOffset: s.marker.states.normal.radius,
+            });
+            if (s.dataLabels.allowOverlap) {
+                allSvgLabels.push(...svgLabels);
+                allHtmlLabels.push(...htmlLabels);
+            }
+            else {
+                allSvgLabels.push(...filterOverlappingLabels(svgLabels, allSvgLabels));
+                allHtmlLabels.push(...filterOverlappingLabels(htmlLabels, allHtmlLabels));
+            }
+        }
+    }
+    return { markers, svgLabels: allSvgLabels, htmlLabels: allHtmlLabels };
 }

package/dist/cjs/core/shapes/scatter/renderer.d.ts

@@ -1,6 +1,6 @@
 import type { Dispatch } from 'd3-dispatch';
 import type { PreparedSeriesOptions } from '../../series/types';
-import type { PreparedScatterData } from './types';
+import type { PreparedScatterShapeData } from './types';
 export declare function renderScatter(elements: {
     plot: SVGGElement;
-}, preparedData: PreparedScatterData[], seriesOptions: PreparedSeriesOptions, dispatcher?: Dispatch<object>): () => void;
+}, preparedData: PreparedScatterShapeData, seriesOptions: PreparedSeriesOptions, dispatcher?: Dispatch<object>): () => void;

package/dist/cjs/core/shapes/scatter/renderer.js

@@ -1,7 +1,10 @@
 import { select } from 'd3-selection';
 import get from 'lodash/get';
+import { block } from '../../../utils';
 import { getMarkerHaloVisibility, renderMarker, selectMarkerHalo, selectMarkerSymbol, setMarker, } from '../../shapes/marker';
 import { setActiveState, shapeKey } from '../../shapes/utils';
+import { renderDataLabels } from '../data-labels';
+const b = block('scatter');
 export function renderScatter(elements, preparedData, seriesOptions, dispatcher) {
     const svgElement = select(elements.plot);
     const hoverOptions = get(seriesOptions, 'scatter.states.hover');
@@ -9,11 +12,16 @@ export function renderScatter(elements, preparedData, seriesOptions, dispatcher)
     svgElement.selectAll('*').remove();
     const selection = svgElement
         .selectAll('path')
-        .data(preparedData, shapeKey)
+        .data(preparedData.markers, shapeKey)
         .join('g')
         .call(renderMarker)
         .attr('opacity', (d) => d.point.opacity)
         .attr('cursor', (d) => d.point.series.cursor);
+    renderDataLabels({
+        container: svgElement,
+        data: preparedData.svgLabels,
+        className: b('label'),
+    });
     const hoverEnabled = hoverOptions === null || hoverOptions === void 0 ? void 0 : hoverOptions.enabled;
     const inactiveEnabled = inactiveOptions === null || inactiveOptions === void 0 ? void 0 : inactiveOptions.enabled;
     function handleShapeHover(data) {