@gravity-ui/charts 1.46.0 → 1.46.1

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

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

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

@@ -0,0 +1,115 @@
+import { color } from 'd3-color';
+import { select } from 'd3-selection';
+import { line as lineGenerator } from 'd3-shape';
+import get from 'lodash/get';
+import { block } from '../../../utils';
+import { DASH_STYLE } from '../../constants';
+import { filterOverlappingLabels, getLineDashArray, getWaterfallPointColor } from '../../utils';
+const b = block('waterfall');
+export function renderWaterfall(elements, preparedData, seriesOptions, allowOverlapDataLabels, dispatcher) {
+    const svgElement = select(elements.plot);
+    const connectorSelector = `.${b('connector')}`;
+    const hoverOptions = get(seriesOptions, 'waterfall.states.hover');
+    const inactiveOptions = get(seriesOptions, 'waterfall.states.inactive');
+    svgElement.selectAll('*').remove();
+    const rectSelection = svgElement
+        .selectAll('allRects')
+        .data(preparedData)
+        .join('rect')
+        .attr('class', b('segment'))
+        .attr('x', (d) => d.x)
+        .attr('y', (d) => d.y)
+        .attr('height', (d) => d.height)
+        .attr('width', (d) => d.width)
+        .attr('fill', (d) => getWaterfallPointColor(d.data, d.series))
+        .attr('opacity', (d) => d.opacity)
+        .attr('cursor', (d) => d.series.cursor);
+    let dataLabels = preparedData.map((d) => d.label).filter(Boolean);
+    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);
+    // Add the connector line between bars
+    svgElement
+        .selectAll(connectorSelector)
+        .data(preparedData)
+        .join('path')
+        .attr('class', b('connector'))
+        .attr('d', (d, index) => {
+        const line = lineGenerator();
+        const prev = preparedData[index - 1];
+        if (!prev) {
+            return null;
+        }
+        const points = [];
+        if (Number(prev.data.y) > 0) {
+            points.push([prev.x, prev.y]);
+        }
+        else {
+            points.push([prev.x, prev.y + prev.height]);
+        }
+        if (Number(d.data.y) > 0 && !d.data.total) {
+            points.push([d.x + d.width, d.y + d.height]);
+        }
+        else {
+            points.push([d.x + d.width, d.y]);
+        }
+        return line(points);
+    })
+        .attr('stroke-width', 1)
+        .attr('stroke-dasharray', () => getLineDashArray(DASH_STYLE.Dash, 1));
+    function handleShapeHover(data) {
+        const hoverEnabled = hoverOptions === null || hoverOptions === void 0 ? void 0 : hoverOptions.enabled;
+        const inactiveEnabled = inactiveOptions === null || inactiveOptions === void 0 ? void 0 : inactiveOptions.enabled;
+        if (!data) {
+            if (hoverEnabled) {
+                rectSelection.attr('fill', (d) => getWaterfallPointColor(d.data, d.series));
+            }
+            if (inactiveEnabled) {
+                rectSelection.attr('opacity', null);
+                labelSelection.attr('opacity', null);
+            }
+            return;
+        }
+        if (hoverEnabled) {
+            const hoveredValues = data.map((d) => d.data.x);
+            rectSelection.attr('fill', (d) => {
+                var _a;
+                const fillColor = getWaterfallPointColor(d.data, d.series);
+                if (hoveredValues.includes(d.data.x)) {
+                    const brightness = hoverOptions === null || hoverOptions === void 0 ? void 0 : hoverOptions.brightness;
+                    return ((_a = color(fillColor)) === null || _a === void 0 ? void 0 : _a.brighter(brightness).toString()) || fillColor;
+                }
+                return fillColor;
+            });
+        }
+        if (inactiveEnabled) {
+            const hoveredSeries = data.map((d) => d.series.id);
+            rectSelection.attr('opacity', (d) => {
+                return hoveredSeries.includes(d.series.id)
+                    ? null
+                    : (inactiveOptions === null || inactiveOptions === void 0 ? void 0 : inactiveOptions.opacity) || null;
+            });
+            labelSelection.attr('opacity', (d) => {
+                return hoveredSeries.includes(d.series.id)
+                    ? null
+                    : (inactiveOptions === null || inactiveOptions === void 0 ? void 0 : inactiveOptions.opacity) || null;
+            });
+        }
+    }
+    dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.on('hover-shape.waterfall', handleShapeHover);
+    return () => {
+        dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.on('hover-shape.waterfall', null);
+    };
+}

package/dist/{esm/hooks/useShapes → cjs/core/shapes}/waterfall/types.d.ts

@@ -1,5 +1,5 @@
 import type { HtmlItem, LabelData, WaterfallSeriesData } from '../../../types';
-import type { PreparedWaterfallSeries } from '../../useSeries/types';
+import type { PreparedWaterfallSeries } from '../../series/types';
 export type PreparedWaterfallData = {
     x: number;
     y: number;

package/dist/cjs/{hooks/useShapes → core/shapes}/x-range/prepare-data.d.ts

@@ -1,6 +1,6 @@
-import type { ChartScale } from '../../../core/scales/types';
-import type { PreparedXAxis, PreparedYAxis } from '../../useAxis/types';
-import type { PreparedXRangeSeries } from '../../useSeries/types';
+import type { PreparedXAxis, PreparedYAxis } from '../../axes/types';
+import type { ChartScale } from '../../scales/types';
+import type { PreparedXRangeSeries } from '../../series/types';
 import type { PreparedXRangeData } from './types';
 type PrepareXRangeDataArgs = {
     series: PreparedXRangeSeries[];

package/dist/cjs/{hooks/useShapes → core/shapes}/x-range/prepare-data.js

@@ -1,8 +1,8 @@
 import get from 'lodash/get';
-import { getDataCategoryValue, getLabelsSize, getTextSizeFn, getTextWithElipsis } from '../../../core/utils';
-import { getFormattedValue } from '../../../core/utils/format';
-import { MIN_BAR_WIDTH } from '../../constants';
-import { getBandSize } from '../../utils/get-band-size';
+import { MIN_BAR_WIDTH } from '../../shapes/bar-constants';
+import { getDataCategoryValue, getLabelsSize, getTextSizeFn, getTextWithElipsis } from '../../utils';
+import { getBandSize } from '../../utils/band-size';
+import { getFormattedValue } from '../../utils/format';
 const DEFAULT_BAR_PADDING = 0.2;
 export async function prepareXRangeData(args) {
     var _a;

package/dist/cjs/core/shapes/x-range/renderer.d.ts

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

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

@@ -0,0 +1,94 @@
+import { color } from 'd3-color';
+import { select } from 'd3-selection';
+import get from 'lodash/get';
+import { block } from '../../../utils';
+import { getRectPath } from '../../shapes/utils';
+import { getLineDashArray } from '../../utils';
+const b = block('x-range');
+export function renderXRange(elements, preparedData, seriesOptions, dispatcher) {
+    const svgElement = select(elements.plot);
+    svgElement.selectAll('*').remove();
+    const segmentSelection = svgElement
+        .selectAll(`path.${b('segment')}`)
+        .data(preparedData)
+        .join('path')
+        .attr('d', (d) => {
+        const borderRadius = Math.min(d.height / 2, d.width / 2, d.series.borderRadius);
+        return getRectPath({
+            x: d.x,
+            y: d.y,
+            width: d.width,
+            height: d.height,
+            borderRadius,
+        }).toString();
+    })
+        .attr('class', b('segment'))
+        .attr('fill', (d) => d.color)
+        .attr('opacity', (d) => { var _a; return (_a = d.data.opacity) !== null && _a !== void 0 ? _a : d.series.opacity; })
+        .attr('cursor', (d) => d.series.cursor);
+    svgElement
+        .selectAll(`path.${b('segment-border')}`)
+        .data(preparedData.filter((d) => d.series.borderWidth > 0))
+        .join('path')
+        .attr('d', (d) => {
+        const borderRadius = Math.min(d.height / 2, d.width / 2, d.series.borderRadius);
+        return getRectPath({
+            x: d.x,
+            y: d.y,
+            width: d.width,
+            height: d.height,
+            borderRadius,
+        }).toString();
+    })
+        .attr('class', b('segment-border'))
+        .attr('fill', 'none')
+        .attr('stroke', (d) => d.series.borderColor)
+        .attr('stroke-width', (d) => d.series.borderWidth)
+        .attr('stroke-dasharray', (d) => getLineDashArray(d.series.borderDashStyle, d.series.borderWidth))
+        .attr('opacity', (d) => { var _a; return (_a = d.data.opacity) !== null && _a !== void 0 ? _a : d.series.opacity; })
+        .attr('pointer-events', 'none');
+    const svgLabels = preparedData.flatMap((d) => d.svgLabels);
+    svgElement
+        .selectAll(`text.${b('label')}`)
+        .data(svgLabels)
+        .join('text')
+        .attr('class', b('label'))
+        .attr('x', (d) => d.x)
+        .attr('y', (d) => d.y)
+        .attr('text-anchor', (d) => d.textAnchor)
+        .attr('dominant-baseline', 'central')
+        .attr('pointer-events', 'none')
+        .style('font-size', (d) => d.style.fontSize)
+        .style('font-weight', (d) => d.style.fontWeight || null)
+        .style('fill', (d) => d.style.fontColor || null)
+        .html((d) => d.text);
+    const hoverOptions = get(seriesOptions, 'x-range.states.hover');
+    const inactiveOptions = get(seriesOptions, 'x-range.states.inactive');
+    function handleShapeHover(data) {
+        if (hoverOptions === null || hoverOptions === void 0 ? void 0 : hoverOptions.enabled) {
+            const hoveredSet = new Set(data === null || data === void 0 ? void 0 : data.map((d) => d.data));
+            segmentSelection.attr('fill', (d) => {
+                var _a;
+                const fillColor = d.color;
+                if (hoveredSet.has(d.data)) {
+                    return (((_a = color(fillColor)) === null || _a === void 0 ? void 0 : _a.brighter(hoverOptions.brightness).toString()) || fillColor);
+                }
+                return fillColor;
+            });
+        }
+        if (inactiveOptions === null || inactiveOptions === void 0 ? void 0 : inactiveOptions.enabled) {
+            const hoveredSeries = data === null || data === void 0 ? void 0 : data.map((d) => d.series.id);
+            segmentSelection.attr('opacity', (d) => {
+                var _a, _b;
+                if ((hoveredSeries === null || hoveredSeries === void 0 ? void 0 : hoveredSeries.length) && !hoveredSeries.includes(d.series.id)) {
+                    return inactiveOptions.opacity || null;
+                }
+                return (_b = (_a = d.data.opacity) !== null && _a !== void 0 ? _a : d.series.opacity) !== null && _b !== void 0 ? _b : null;
+            });
+        }
+    }
+    dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.on('hover-shape.x-range', handleShapeHover);
+    return () => {
+        dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.on('hover-shape.x-range', null);
+    };
+}

package/dist/{esm/hooks/useShapes → cjs/core/shapes}/x-range/types.d.ts

@@ -1,5 +1,5 @@
 import type { HtmlItem, LabelData, TooltipDataChunkXRange } from '../../../types';
-import type { PreparedXRangeSeries } from '../../useSeries/types';
+import type { PreparedXRangeSeries } from '../../series/types';
 export type PreparedXRangeData = Omit<TooltipDataChunkXRange, 'series'> & {
     x: number;
     y: number;

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

@@ -87,7 +87,6 @@ export interface AreaSeries<T = MeaningfulAny> extends BaseSeries {
      * - `'connect'`: Connect points across null values (skip nulls in rendering). **Not supported with `stacking`.**
      * - `'zero'`: Treat null values as zero
      * - `'skip'`: Omit the data point (creates gap in area)
-     *
      * @default 'skip'
      */
     nullMode?: 'connect' | 'zero' | 'skip';

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

@@ -298,7 +298,6 @@ export interface AxisPlotShape extends AxisPlot {
      * Called with the pixel coordinates of the shape and the plot area dimensions.
      * Must return a string of valid SVG markup that will be inserted inside a `<g>` container
      * positioned at the shape's axis value.
-     *
      * @example
      * ```
      * renderer: ({plotHeight}) =>

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

@@ -19,17 +19,14 @@ export type CustomFormat = {
  * Specifies how a value should be formatted for display.
  *
  * - `{ type: 'number' }` — numeric formatting with optional precision, units, percent display, etc.
- *   See [FormatNumberOptions](https://gravity-ui.github.io/charts/pages/api/Utilities/interfaces/FormatNumberOptions.html) for all available options.
+ * See [FormatNumberOptions](https://gravity-ui.github.io/charts/pages/api/Utilities/interfaces/FormatNumberOptions.html) for all available options.
  * - `{ type: 'date' }` — date/time formatting
- *
  * @example
  * // Two decimal places, shown as percent
  * { type: 'number', precision: 2, format: 'percent' }
- *
  * @example
  * // Compact thousands: 1 500 000 → "1.5M"
  * { type: 'number', unit: 'auto', precision: 1 }
- *
  * @example
  * // Date value (Unix ms) formatted as "17 October 2025"
  * { type: 'date', format: 'DD MMMM YYYY' }

package/dist/cjs/{hooks/utils/get-band-size.js → core/utils/band-size.js}

@@ -1,4 +1,4 @@
-import { isBandScale } from '../../core/utils';
+import { isBandScale } from '../utils';
 export function getBandSize({ domain, scale, }) {
     if (!scale || !domain.length) {
         return 0;

package/dist/{esm/hooks → cjs/core}/utils/bar-y.d.ts

@@ -1,7 +1,7 @@
-import type { ChartScale } from '../../core/scales/types';
 import type { BarYSeries, BarYSeriesData } from '../../types';
-import type { PreparedYAxis } from '../useAxis/types';
-import type { PreparedBarYSeries, PreparedSeriesOptions } from '../useSeries/types';
+import type { PreparedYAxis } from '../axes/types';
+import type { ChartScale } from '../scales/types';
+import type { PreparedBarYSeries, PreparedSeriesOptions } from '../series/types';
 /**
  * BarY always filters out data with null or replace null by zero.
  */

package/dist/cjs/{hooks → core}/utils/bar-y.js

@@ -1,9 +1,9 @@
 import { max } from 'd3-array';
 import get from 'lodash/get';
-import { getDataCategoryValue } from '../../core/utils';
-import { MIN_BAR_GAP, MIN_BAR_GROUP_GAP, MIN_BAR_WIDTH } from '../constants';
-import { getSeriesStackId } from '../useSeries/utils';
-import { getBandSize } from './get-band-size';
+import { getSeriesStackId } from '../series/utils';
+import { MIN_BAR_GAP, MIN_BAR_GROUP_GAP, MIN_BAR_WIDTH } from '../shapes/bar-constants';
+import { getDataCategoryValue } from '../utils';
+import { getBandSize } from './band-size';
 const isSeriesDataValid = (d) => d.x !== null;
 export function groupBarYDataByYValue(series, yAxis) {
     const data = {};

package/dist/cjs/core/utils/get-closest-data.d.ts

@@ -1,4 +1,4 @@
-import type { ShapeData } from '../../hooks';
+import type { ShapeData } from '../../hooks/useShapes';
 import type { ChartSeries, ChartSeriesData, TooltipDataChunk } from '../../types';
 type GetClosestPointsArgs = {
     position: [number, number];

package/dist/cjs/core/utils/series/sorting.js

@@ -1,8 +1,8 @@
 import { sort } from 'd3-array';
 import { isEmpty } from 'lodash';
 import get from 'lodash/get';
-import { getAxisCategories } from '../../utils';
 import { SERIES_TYPE } from '../../constants';
+import { getAxisCategories } from '../../utils';
 function applyAxisCategoriesOrder({ series, axis, key, }) {
     var _a, _b;
     const originalCategories = (_a = axis === null || axis === void 0 ? void 0 : axis.categories) !== null && _a !== void 0 ? _a : [];

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

@@ -4,7 +4,6 @@ import type { BaseTextStyle, MeaningfulAny } from '../../types';
  * Approximate ratio of descenders relative to the full font em height.
  * Based on the Chromium hanging baseline algorithm where hanging offset ≈ ascent × 0.2.
  * This means ascent ≈ 80% of em height, descenders ≈ 20%.
- *
  * @see https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/core/html/canvas/text_metrics.cc;l=32
  */
 export declare const DESCENDER_RATIO = 0.2;

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

@@ -5,7 +5,6 @@ const b = block('chart');
  * Approximate ratio of descenders relative to the full font em height.
  * Based on the Chromium hanging baseline algorithm where hanging offset ≈ ascent × 0.2.
  * This means ascent ≈ 80% of em height, descenders ≈ 20%.
- *
  * @see https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/core/html/canvas/text_metrics.cc;l=32
  */
 export const DESCENDER_RATIO = 0.2;

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

@@ -8,7 +8,7 @@ export * from './useCrosshair';
 export * from './usePrevious';
 export * from './useRangeSlider';
 export * from './useRangeSlider/types';
-export * from './useSeries';
+export { getPreparedSeries, getVisibleSeries } from '../core/series';
 export * from '../core/series/types';
 export * from './useShapes';
 export * from '../core/layout/split';

package/dist/cjs/hooks/index.js

@@ -8,7 +8,7 @@ export * from './useCrosshair';
 export * from './usePrevious';
 export * from './useRangeSlider';
 export * from './useRangeSlider/types';
-export * from './useSeries';
+export { getPreparedSeries, getVisibleSeries } from '../core/series';
 export * from '../core/series/types';
 export * from './useShapes';
 export * from '../core/layout/split';

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

@@ -1,9 +1,9 @@
 import type { ChartScale } from '../../core/scales/types';
+import type { PreparedLegend, PreparedSeries, PreparedSeriesOptions } from '../../core/series/types';
 import type { ChartXAxis, ChartYAxis, LegendConfig } from '../../types';
 import type { PreparedChart } from '../types';
 import type { PreparedRangeSlider, PreparedXAxis, PreparedYAxis } from '../useAxis/types';
 import type { BrushSelection, UseBrushProps } from '../useBrush/types';
-import type { PreparedLegend, PreparedSeries, PreparedSeriesOptions } from '../useSeries/types';
 export type RangeSliderState = {
     max: number;
     min: number;

package/dist/cjs/hooks/useRangeSlider/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 { PreparedLegend } from '../useSeries/types';
 import type { RangeSliderState } from './types';
 export declare function getRangeSliderOffsetTop(args: {
     height: number;

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { Dispatch } from 'd3-dispatch';
-import type { PreparedSeriesOptions } from '../../useSeries/types';
-import type { PreparedAreaData } from './types';
+import type { PreparedSeriesOptions } from '../../../core/series/types';
+import type { PreparedAreaData } from '../../../core/shapes/area/types';
 type Args = {
     boundsHeight: number;
     boundsWidth: number;

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

@@ -1,18 +1,11 @@
 import React from 'react';
-import { color } from 'd3-color';
-import { select } from 'd3-selection';
-import { area as areaGenerator, line as lineGenerator } from 'd3-shape';
-import get from 'lodash/get';
+import { renderArea } from '../../../core/shapes/area/renderer';
 import { filterOverlappingLabels } from '../../../core/utils';
 import { block } from '../../../utils';
 import { HtmlLayer } from '../HtmlLayer';
-import { renderAnnotations } from '../annotation';
-import { getMarkerHaloVisibility, getMarkerVisibility, renderMarker, selectMarkerHalo, selectMarkerSymbol, setMarker, } from '../marker';
-import { setActiveState } from '../utils';
 const b = block('area');
 export const AreaSeriesShapes = (args) => {
     const { boundsHeight, boundsWidth, dispatcher, preparedData, seriesOptions, htmlLayout, clipPathId, } = args;
-    const hoveredDataRef = React.useRef(null);
     const plotRef = React.useRef(null);
     const markersRef = React.useRef(null);
     const hoverMarkersRef = React.useRef(null);
@@ -21,185 +14,20 @@ export const AreaSeriesShapes = (args) => {
         return preparedData.some((d) => d === null || d === void 0 ? void 0 : d.series.dataLabels.allowOverlap);
     }, [preparedData]);
     React.useEffect(() => {
-        if (!plotRef.current || !markersRef.current) {
+        if (!plotRef.current ||
+            !markersRef.current ||
+            !hoverMarkersRef.current ||
+            !annotationsRef.current) {
             return () => { };
         }
-        const plotSvgElement = select(plotRef.current);
-        const markersSvgElement = select(markersRef.current);
-        const hoverMarkersSvgElement = select(hoverMarkersRef.current);
-        const hoverOptions = get(seriesOptions, 'area.states.hover');
-        const inactiveOptions = get(seriesOptions, 'area.states.inactive');
-        const line = lineGenerator()
-            .x((d) => d.x)
-            .defined((d) => d.y !== null)
-            .y((d) => d.y);
-        plotSvgElement.selectAll('*').remove();
-        markersSvgElement.selectAll('*').remove();
-        const shapeSelection = plotSvgElement
-            .selectAll('shape')
-            .data(preparedData)
-            .join('g')
-            .attr('class', b('series'))
-            .attr('cursor', (d) => d.series.cursor);
-        shapeSelection
-            .append('path')
-            .attr('class', b('line'))
-            .attr('d', (d) => line(d.points))
-            .attr('fill', 'none')
-            .attr('stroke', (d) => d.color)
-            .attr('stroke-width', (d) => d.width)
-            .attr('stroke-linejoin', 'round')
-            .attr('stroke-linecap', 'round');
-        const area = areaGenerator()
-            .defined((d) => d.y !== null)
-            .x((d) => d.x)
-            .y0((d) => d.y0)
-            .y1((d) => d.y);
-        shapeSelection
-            .append('path')
-            .attr('class', b('region'))
-            .attr('d', (d) => area(d.points))
-            .attr('fill', (d) => d.color)
-            .attr('opacity', (d) => d.opacity);
-        let dataLabels = preparedData.reduce((acc, d) => {
-            return acc.concat(d.svgLabels);
-        }, []);
-        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 markers = preparedData.reduce((acc, d) => acc.concat(d.markers), []);
-        const markerSelection = markersSvgElement
-            .selectAll('marker')
-            .data(markers)
-            .join('g')
-            .call(renderMarker);
-        if (annotationsRef.current) {
-            const anchors = preparedData.flatMap((d) => d.annotations);
-            renderAnnotations({
-                anchors,
-                container: select(annotationsRef.current),
-                plotHeight: boundsHeight,
-                plotWidth: boundsWidth,
-            });
-        }
-        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) {
-            hoveredDataRef.current = data;
-            const selected = (data === null || data === void 0 ? void 0 : data.filter((d) => d.series.type === 'area')) || [];
-            const selectedDataItems = selected.map((d) => d.data);
-            const selectedSeriesIds = selected.map((d) => { var _a; return (_a = d.series) === null || _a === void 0 ? void 0 : _a.id; });
-            shapeSelection.datum((d, index, list) => {
-                var _a;
-                const elementSelection = select(list[index]);
-                const hovered = Boolean(hoverEnabled && selectedSeriesIds.includes(d.id));
-                if (d.hovered !== hovered) {
-                    d.hovered = hovered;
-                    let strokeColor = d.color || '';
-                    if (d.hovered) {
-                        strokeColor =
-                            ((_a = color(strokeColor)) === null || _a === void 0 ? void 0 : _a.brighter(hoverOptions === null || hoverOptions === void 0 ? void 0 : hoverOptions.brightness).toString()) ||
-                                strokeColor;
-                    }
-                    elementSelection.selectAll(`.${b('line')}`).attr('stroke', strokeColor);
-                    elementSelection.selectAll(`.${b('region')}`).attr('fill', strokeColor);
-                }
-                return setActiveState({
-                    element: list[index],
-                    state: inactiveOptions,
-                    active: Boolean(!inactiveEnabled ||
-                        !selectedSeriesIds.length ||
-                        selectedSeriesIds.includes(d.id)),
-                    datum: d,
-                });
-            });
-            labelsSelection.datum((d, index, list) => {
-                return setActiveState({
-                    element: list[index],
-                    state: inactiveOptions,
-                    active: Boolean(!inactiveEnabled ||
-                        !selectedSeriesIds.length ||
-                        selectedSeriesIds.includes(d.series.id)),
-                    datum: d,
-                });
-            });
-            markerSelection.datum((d, index, list) => {
-                const elementSelection = select(list[index]);
-                const hovered = Boolean(hoverEnabled && selectedDataItems.includes(d.point.data));
-                if (d.hovered !== hovered) {
-                    d.hovered = hovered;
-                    elementSelection.attr('visibility', getMarkerVisibility(d));
-                    selectMarkerHalo(elementSelection).attr('visibility', getMarkerHaloVisibility);
-                    selectMarkerSymbol(elementSelection).call(setMarker, hovered ? 'hover' : 'normal');
-                }
-                if (d.point.series.marker.states.normal.enabled) {
-                    const isActive = Boolean(!inactiveEnabled ||
-                        !selectedSeriesIds.length ||
-                        selectedSeriesIds.includes(d.point.series.id));
-                    setActiveState({
-                        element: list[index],
-                        state: inactiveOptions,
-                        active: isActive,
-                        datum: d,
-                    });
-                }
-                return d;
-            });
-            hoverMarkersSvgElement.selectAll('*').remove();
-            if (hoverEnabled && selected.length > 0) {
-                const hoverOnlyMarkers = [];
-                for (const chunk of selected) {
-                    const seriesData = preparedData.find((pd) => pd.id === chunk.series.id);
-                    if (!seriesData) {
-                        continue;
-                    }
-                    const { series } = seriesData;
-                    if (series.marker.states.normal.enabled ||
-                        !series.marker.states.hover.enabled) {
-                        continue;
-                    }
-                    const point = seriesData.points.find((p) => p.data === chunk.data);
-                    if (!point || point.y === null) {
-                        continue;
-                    }
-                    hoverOnlyMarkers.push({
-                        point: point,
-                        active: true,
-                        hovered: true,
-                        clipped: false,
-                    });
-                }
-                if (hoverOnlyMarkers.length > 0) {
-                    hoverMarkersSvgElement
-                        .selectAll('g')
-                        .data(hoverOnlyMarkers)
-                        .join('g')
-                        .call(renderMarker)
-                        .each((_d, i, nodes) => {
-                        selectMarkerSymbol(select(nodes[i])).call(setMarker, 'hover');
-                    });
-                }
-            }
-        }
-        if (hoveredDataRef.current !== null) {
-            handleShapeHover(hoveredDataRef.current);
-        }
-        dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.on('hover-shape.area', handleShapeHover);
-        return () => {
-            dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.on('hover-shape.area', null);
-        };
+        return renderArea({
+            plot: plotRef.current,
+            markers: markersRef.current,
+            hoverMarkers: hoverMarkersRef.current,
+            annotations: annotationsRef.current,
+            boundsWidth,
+            boundsHeight,
+        }, preparedData, seriesOptions, allowOverlapDataLabels, dispatcher);
     }, [
         allowOverlapDataLabels,
         boundsHeight,