@gravity-ui/charts 1.42.4 → 1.43.1

package/dist/esm/components/AxisX/AxisX.js

@@ -23,6 +23,7 @@ export const AxisX = (props) => {
         const plotDataAttr = 'data-plot-x';
         const plotBandDataAttr = `data-plot-x-band-${preparedAxisData.id}`;
         const plotLineDataAttr = `data-plot-x-line-${preparedAxisData.id}`;
+        const plotShapeDataAttr = `data-plot-x-shape-${preparedAxisData.id}`;
         if (plotBeforeRef === null || plotBeforeRef === void 0 ? void 0 : plotBeforeRef.current) {
             plotBeforeContainer = select(plotBeforeRef.current);
         }
@@ -186,14 +187,40 @@ export const AxisX = (props) => {
             setPlotLines(plotBeforeContainer, preparedAxisData.plotLines.filter((item) => item.layerPlacement === 'before'));
             setPlotLines(plotAfterContainer, preparedAxisData.plotLines.filter((item) => item.layerPlacement === 'after'));
         }
+        if (preparedAxisData.plotShapes.length > 0) {
+            const setPlotShapes = (plotContainer, plotShapes) => {
+                if (!plotContainer || !plotShapes.length) {
+                    return;
+                }
+                plotContainer
+                    .selectAll(`[${plotShapeDataAttr}]`)
+                    .remove()
+                    .data(plotShapes)
+                    .join('g')
+                    .attr(plotDataAttr, 1)
+                    .attr(plotShapeDataAttr, 1)
+                    .attr('transform', (d) => `translate(${d.x}, ${d.y})`)
+                    .attr('opacity', (d) => d.opacity)
+                    .html((d) => d.renderer({
+                    x: d.x,
+                    y: 0,
+                    plotHeight: d.plotHeight,
+                    plotWidth: d.plotWidth,
+                }));
+            };
+            setPlotShapes(plotBeforeContainer, preparedAxisData.plotShapes.filter((item) => item.layerPlacement === 'before'));
+            setPlotShapes(plotAfterContainer, preparedAxisData.plotShapes.filter((item) => item.layerPlacement === 'after'));
+        }
         return () => {
             if (plotBeforeContainer) {
                 plotBeforeContainer.selectAll(`[${plotBandDataAttr}]`).remove();
                 plotBeforeContainer.selectAll(`[${plotLineDataAttr}]`).remove();
+                plotBeforeContainer.selectAll(`[${plotShapeDataAttr}]`).remove();
             }
             if (plotAfterContainer) {
                 plotAfterContainer.selectAll(`[${plotBandDataAttr}]`).remove();
                 plotAfterContainer.selectAll(`[${plotLineDataAttr}]`).remove();
+                plotAfterContainer.selectAll(`[${plotShapeDataAttr}]`).remove();
             }
         };
     }, [lineGenerator, plotAfterRef, plotBeforeRef, preparedAxisData]);

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

@@ -1,4 +1,5 @@
 import { getUniqId } from '@gravity-ui/uikit';
+import { select } from 'd3-selection';
 import { calculateCos, calculateSin, formatAxisTickLabel, getBandsPosition, getLabelsSize, getMinSpaceBetween, getTextSizeFn, getTextWithElipsis, } from '../../core/utils';
 import { getXAxisTickValues } from '../../core/utils/axis/x-axis';
 import { getMultilineTitleContentRows } from '../utils/axis-title';
@@ -328,6 +329,45 @@ export async function prepareXAxisData({ axis, boundsOffsetLeft, boundsOffsetRig
                 dashStyle: plotLine.dashStyle,
             });
         }
+        const plotShapes = [];
+        const measureContainer = axis.plotShapes.length
+            ? select(document.body)
+                .append('svg')
+                .style('visibility', 'hidden')
+                .style('position', 'absolute')
+                .style('top', '-200vw')
+            : null;
+        for (let i = 0; i < axis.plotShapes.length; i++) {
+            if (!measureContainer) {
+                break;
+            }
+            const plotShape = axis.plotShapes[i];
+            const axisScale = scale;
+            const shapeX = Number(axisScale(plotShape.value));
+            if (shapeX < 0 || shapeX > boundsWidth) {
+                continue;
+            }
+            const markup = plotShape.renderer({
+                x: shapeX,
+                y: 0,
+                plotHeight: axisHeight,
+                plotWidth: axisWidth,
+            });
+            const wrapper = measureContainer.append('g').html(markup);
+            const bbox = wrapper.node().getBBox();
+            wrapper.remove();
+            plotShapes.push({
+                hitbox: { x: bbox.x, y: bbox.y, width: bbox.width, height: bbox.height },
+                layerPlacement: plotShape.layerPlacement,
+                opacity: plotShape.opacity,
+                plotHeight: axisHeight,
+                plotWidth: axisWidth,
+                renderer: plotShape.renderer,
+                x: shapeX,
+                y: axisTop,
+            });
+        }
+        measureContainer === null || measureContainer === void 0 ? void 0 : measureContainer.remove();
         xAxisItems.push({
             id: getUniqId(),
             gridEnabled: axis.grid.enabled,
@@ -336,6 +376,7 @@ export async function prepareXAxisData({ axis, boundsOffsetLeft, boundsOffsetRig
             domain,
             plotBands,
             plotLines,
+            plotShapes,
         });
     }
     return xAxisItems;

package/dist/esm/components/AxisX/types.d.ts

@@ -1,4 +1,5 @@
 import type { DashStyle } from 'src/core/constants';
+import type { AxisPlotShape } from '../../core/types/chart/axis';
 import type { BaseTextStyle, HtmlItem, PlotLayerPlacement, PointPosition } from '../../types';
 import type { TextRowData } from '../types';
 export type AxisSvgLabelData = {
@@ -67,6 +68,21 @@ export type AxisPlotBandData = {
     opacity: number;
     label: AxisPlotLineLabel | null;
 };
+export type AxisPlotShapeData = {
+    hitbox: {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    };
+    layerPlacement: PlotLayerPlacement;
+    opacity: number;
+    plotHeight: number;
+    plotWidth: number;
+    renderer: AxisPlotShape['renderer'];
+    x: number;
+    y: number;
+};
 export type AxisDomainData = {
     start: [number, number];
     end: [number, number];
@@ -78,6 +94,7 @@ export type AxisXData = {
     title: AxisTitleData | null;
     domain: AxisDomainData | null;
     ticks: AxisTickData[];
-    plotLines: AxisPlotLineData[];
     plotBands: AxisPlotBandData[];
+    plotLines: AxisPlotLineData[];
+    plotShapes: AxisPlotShapeData[];
 };

package/dist/esm/components/AxisY/AxisY.js

@@ -28,6 +28,7 @@ export const AxisY = (props) => {
         const plotDataAttr = 'data-plot-y';
         const plotBandDataAttr = `data-plot-y-band-${preparedAxisData.id}`;
         const plotLineDataAttr = `data-plot-y-line-${preparedAxisData.id}`;
+        const plotShapeDataAttr = `data-plot-y-shape-${preparedAxisData.id}`;
         if (plotBeforeRef === null || plotBeforeRef === void 0 ? void 0 : plotBeforeRef.current) {
             plotBeforeContainer = select(plotBeforeRef.current);
         }
@@ -191,14 +192,40 @@ export const AxisY = (props) => {
             setPlotLines(plotBeforeContainer, preparedAxisData.plotLines.filter((item) => item.layerPlacement === 'before'));
             setPlotLines(plotAfterContainer, preparedAxisData.plotLines.filter((item) => item.layerPlacement === 'after'));
         }
+        if (preparedAxisData.plotShapes.length > 0) {
+            const setPlotShapes = (plotContainer, plotShapes) => {
+                if (!plotContainer || !plotShapes.length) {
+                    return;
+                }
+                plotContainer
+                    .selectAll(`[${plotShapeDataAttr}]`)
+                    .remove()
+                    .data(plotShapes)
+                    .join('g')
+                    .attr(plotDataAttr, 1)
+                    .attr(plotShapeDataAttr, 1)
+                    .attr('transform', (d) => `translate(${d.x}, ${d.y})`)
+                    .attr('opacity', (d) => d.opacity)
+                    .html((d) => d.renderer({
+                    x: 0,
+                    y: d.y,
+                    plotHeight: d.plotHeight,
+                    plotWidth: d.plotWidth,
+                }));
+            };
+            setPlotShapes(plotBeforeContainer, preparedAxisData.plotShapes.filter((item) => item.layerPlacement === 'before'));
+            setPlotShapes(plotAfterContainer, preparedAxisData.plotShapes.filter((item) => item.layerPlacement === 'after'));
+        }
         return () => {
             if (plotBeforeContainer) {
                 plotBeforeContainer.selectAll(`[${plotBandDataAttr}]`).remove();
                 plotBeforeContainer.selectAll(`[${plotLineDataAttr}]`).remove();
+                plotBeforeContainer.selectAll(`[${plotShapeDataAttr}]`).remove();
             }
             if (plotAfterContainer) {
                 plotAfterContainer.selectAll(`[${plotBandDataAttr}]`).remove();
                 plotAfterContainer.selectAll(`[${plotLineDataAttr}]`).remove();
+                plotAfterContainer.selectAll(`[${plotShapeDataAttr}]`).remove();
             }
         };
     }, [lineGenerator, plotAfterRef, plotBeforeRef, preparedAxisData]);

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

@@ -1,4 +1,5 @@
 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 { prepareHtmlYAxisTitle, prepareSvgYAxisTitle } from './prepare-axis-title';
 import { getTickValues } from './utils';
@@ -290,6 +291,45 @@ export async function prepareYAxisData({ axis, split, scale, top: topOffset, wid
             dashStyle: plotLine.dashStyle,
         });
     }
+    const plotShapes = [];
+    const measureContainer = axis.plotShapes.length
+        ? select(document.body)
+            .append('svg')
+            .style('visibility', 'hidden')
+            .style('position', 'absolute')
+            .style('top', '-200vw')
+        : null;
+    for (let i = 0; i < axis.plotShapes.length; i++) {
+        if (!measureContainer) {
+            break;
+        }
+        const plotShape = axis.plotShapes[i];
+        const axisScale = scale;
+        const shapeY = Number(axisScale(plotShape.value));
+        if (shapeY < 0 || shapeY > axisHeight) {
+            continue;
+        }
+        const markup = plotShape.renderer({
+            x: 0,
+            y: shapeY,
+            plotHeight: axisHeight,
+            plotWidth: width,
+        });
+        const wrapper = measureContainer.append('g').html(markup);
+        const bbox = wrapper.node().getBBox();
+        wrapper.remove();
+        plotShapes.push({
+            hitbox: { x: bbox.x, y: bbox.y, width: bbox.width, height: bbox.height },
+            layerPlacement: plotShape.layerPlacement,
+            opacity: plotShape.opacity,
+            plotHeight: axisHeight,
+            plotWidth: width,
+            renderer: plotShape.renderer,
+            x: 0,
+            y: axisPlotTopPosition + shapeY,
+        });
+    }
+    measureContainer === null || measureContainer === void 0 ? void 0 : measureContainer.remove();
     return {
         id: getUniqId(),
         gridEnabled: axis.grid.enabled,
@@ -298,5 +338,6 @@ export async function prepareYAxisData({ axis, split, scale, top: topOffset, wid
         domain,
         plotBands,
         plotLines,
+        plotShapes,
     };
 }

package/dist/esm/components/AxisY/types.d.ts

@@ -1,4 +1,5 @@
 import type { DashStyle } from 'src/core/constants';
+import type { AxisPlotShape } from '../../core/types/chart/axis';
 import type { BaseTextStyle, HtmlItem, PlotLayerPlacement, PointPosition } from '../../types';
 import type { TextRowData } from '../types';
 export type AxisSvgLabelData = {
@@ -78,6 +79,21 @@ export type AxisPlotBandData = {
     opacity: number;
     label: AxisPlotLineLabel | null;
 };
+export type AxisPlotShapeData = {
+    hitbox: {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    };
+    layerPlacement: PlotLayerPlacement;
+    opacity: number;
+    plotHeight: number;
+    plotWidth: number;
+    renderer: AxisPlotShape['renderer'];
+    x: number;
+    y: number;
+};
 export type AxisDomainData = {
     start: [number, number];
     end: [number, number];
@@ -89,6 +105,7 @@ export type AxisYData = {
     title: HtmlAxisTitleData | SvgAxisTitleData | null;
     domain: AxisDomainData | null;
     ticks: AxisTickData[];
-    plotLines: AxisPlotLineData[];
     plotBands: AxisPlotBandData[];
+    plotLines: AxisPlotLineData[];
+    plotShapes: AxisPlotShapeData[];
 };

package/dist/esm/components/ChartInner/index.js

@@ -71,7 +71,7 @@ export const ChartInner = (props) => {
         value: allPreparedSeries,
         delay: DEBOUNCED_VALUE_DELAY,
     });
-    const { handleChartClick, handleMouseLeave, throttledHandleMouseMove, throttledHandleTouchMove } = useChartInnerHandlers({
+    const { handleChartClick, handlePointerLeave, throttledHandlePointerMove, throttledHandleTouchMove, } = useChartInnerHandlers({
         boundsHeight,
         boundsOffsetLeft,
         boundsOffsetTop,
@@ -154,6 +154,13 @@ export const ChartInner = (props) => {
                     split: preparedSplit,
                     series: preparedSeries.filter((s) => s.visible),
                 });
+                axisData.plotShapes.forEach((shapeData, j) => {
+                    if (axis.plotShapes[j]) {
+                        axis.plotShapes[j].hitbox = shapeData.hitbox;
+                        axis.plotShapes[j].x = shapeData.x;
+                        axis.plotShapes[j].y = shapeData.y;
+                    }
+                });
                 items.push(axisData);
             }
         }
@@ -180,6 +187,15 @@ export const ChartInner = (props) => {
                 split: preparedSplit,
                 yAxis,
             });
+            axisData.forEach((data) => {
+                data.plotShapes.forEach((shapeData, i) => {
+                    if (axis.plotShapes[i]) {
+                        axis.plotShapes[i].hitbox = shapeData.hitbox;
+                        axis.plotShapes[i].x = shapeData.x;
+                        axis.plotShapes[i].y = shapeData.y;
+                    }
+                });
+            });
             items.push(...axisData);
         }
         return items;
@@ -240,7 +256,7 @@ export const ChartInner = (props) => {
                 React.createElement("rect", { x: 0, y: 0, width: boundsWidth, height: boundsHeight })),
             React.createElement("clipPath", { id: getClipPathIdByBounds({ clipPathId, bounds: 'horizontal' }) },
                 React.createElement("rect", { x: 0, y: -boundsHeight, width: boundsWidth, height: boundsHeight * 3 }))),
-        preparedTitle && React.createElement(Title, Object.assign({}, preparedTitle, { chartWidth: width })),
+        preparedTitle && React.createElement(Title, Object.assign({}, preparedTitle)),
         React.createElement("g", { transform: `translate(0, ${boundsOffsetTop})` }, preparedSplit === null || preparedSplit === void 0 ? void 0 : preparedSplit.plots.map((plot, index) => {
             return React.createElement(PlotTitle, { key: `plot-${index}`, title: plot.title });
         })),
@@ -267,7 +283,7 @@ export const ChartInner = (props) => {
         React.createElement("svg", { ref: svgRef, width: width, height: height, 
             // We use onPointerMove here because onMouseMove works incorrectly when the zoom setting is enabled:
             // when starting to select an area, the tooltip remains in the position where the selection began
-            onPointerMove: throttledHandleMouseMove, onMouseLeave: handleMouseLeave, onTouchStart: throttledHandleTouchMove, onTouchMove: throttledHandleTouchMove, onClick: handleChartClick }, initialized ? chartContent : null),
+            onPointerMove: throttledHandlePointerMove, onPointerLeave: handlePointerLeave, onTouchStart: throttledHandleTouchMove, onTouchMove: throttledHandleTouchMove, onClick: handleChartClick }, initialized ? chartContent : null),
         React.createElement("div", { className: b('html-layer'), ref: setHtmlLayout, style: {
                 '--g-html-layout-transform': `translate(${boundsOffsetLeft}px, ${boundsOffsetTop}px)`,
             } }),

package/dist/esm/components/ChartInner/useChartInnerHandlers.d.ts

@@ -23,8 +23,8 @@ type Props = {
 };
 export declare function useChartInnerHandlers(props: Props): {
     handleChartClick: (event: React.MouseEvent<SVGSVGElement>) => void;
-    handleMouseLeave: React.MouseEventHandler<SVGSVGElement>;
-    throttledHandleMouseMove: import("lodash").DebouncedFuncLeading<React.MouseEventHandler<SVGSVGElement>> | undefined;
-    throttledHandleTouchMove: import("lodash").DebouncedFuncLeading<React.TouchEventHandler<SVGSVGElement>> | undefined;
+    handlePointerLeave: React.PointerEventHandler<SVGSVGElement>;
+    throttledHandlePointerMove: import("lodash").DebouncedFuncLeading<React.PointerEventHandler<SVGSVGElement>>;
+    throttledHandleTouchMove: import("lodash").DebouncedFuncLeading<React.TouchEventHandler<SVGSVGElement>>;
 };
 export {};

package/dist/esm/components/ChartInner/useChartInnerHandlers.js

@@ -2,7 +2,6 @@ import React from 'react';
 import { pointer } from 'd3-selection';
 import get from 'lodash/get';
 import throttle from 'lodash/throttle';
-import { IS_TOUCH_ENABLED } from '../../core/constants';
 import { EventType } from '../../core/utils';
 import { getClosestPoints } from '../../core/utils/get-closest-data';
 import { getHoveredPlots } from '../../core/utils/get-hovered-plots';
@@ -29,7 +28,7 @@ export function useChartInnerHandlers(props) {
             boundsHeight,
             boundsWidth,
         });
-        const { plotLines, plotBands } = getHoveredPlots({
+        const { plotBands, plotLines, plotShapes } = getHoveredPlots({
             pointerX: x,
             pointerY: y,
             xAxis,
@@ -37,7 +36,7 @@ export function useChartInnerHandlers(props) {
             xScale,
             yScale,
         });
-        const hoveredPlotsArg = { lines: plotLines, bands: plotBands };
+        const hoveredPlotsArg = { bands: plotBands, lines: plotLines, shapes: plotShapes };
         dispatcher.call(EventType.HOVER_SHAPE, event.target, closest, [pointerX, pointerY], hoveredPlotsArg);
         dispatcher.call(EventType.POINTERMOVE_CHART, {}, {
             hovered: closest,
@@ -47,18 +46,19 @@ export function useChartInnerHandlers(props) {
             hoveredPlotBands: plotBands,
         }, event);
     };
-    const handleMouseMove = (event) => {
+    const handlePointerMove = (event) => {
+        if (event.pointerType === 'touch') {
+            return;
+        }
         const [pointerX, pointerY] = pointer(event, svgContainer);
         handleMove([pointerX, pointerY], event);
     };
-    const throttledHandleMouseMove = IS_TOUCH_ENABLED
-        ? undefined
-        : throttle(handleMouseMove, tooltipThrottle);
-    const handleMouseLeave = (event) => {
+    const throttledHandlePointerMove = throttle(handlePointerMove, tooltipThrottle);
+    const handlePointerLeave = (event) => {
         if (tooltipPinned) {
             return;
         }
-        throttledHandleMouseMove === null || throttledHandleMouseMove === void 0 ? void 0 : throttledHandleMouseMove.cancel();
+        throttledHandlePointerMove.cancel();
         dispatcher.call(EventType.HOVER_SHAPE, {}, undefined);
         dispatcher.call(EventType.POINTERMOVE_CHART, {}, undefined, event);
     };
@@ -67,9 +67,7 @@ export function useChartInnerHandlers(props) {
         const [pointerX, pointerY] = pointer(touch, svgContainer);
         handleMove([pointerX, pointerY], event);
     };
-    const throttledHandleTouchMove = IS_TOUCH_ENABLED
-        ? throttle(handleTouchMove, tooltipThrottle)
-        : undefined;
+    const throttledHandleTouchMove = throttle(handleTouchMove, tooltipThrottle);
     const handleChartClick = (event) => {
         const [pointerX, pointerY] = pointer(event, svgContainer);
         const x = pointerX - boundsOffsetLeft;
@@ -93,7 +91,7 @@ export function useChartInnerHandlers(props) {
         dispatcher.call(EventType.CLICK_CHART, undefined, { point: selected.data, series: selected.series }, event);
         const nextTooltipFixed = !tooltipPinned;
         if (!nextTooltipFixed) {
-            const { plotLines, plotBands } = getHoveredPlots({
+            const { plotBands, plotLines, plotShapes } = getHoveredPlots({
                 pointerX: x,
                 pointerY: y,
                 xAxis,
@@ -101,22 +99,23 @@ export function useChartInnerHandlers(props) {
                 xScale,
                 yScale,
             });
-            const hoveredPlotsArg = { lines: plotLines, bands: plotBands };
+            const hoveredPlotsArg = { bands: plotBands, lines: plotLines, shapes: plotShapes };
             dispatcher.call(EventType.HOVER_SHAPE, event.target, items, [pointerX, pointerY], hoveredPlotsArg);
             dispatcher.call(EventType.POINTERMOVE_CHART, {}, {
                 hovered: items,
                 xAxis,
                 yAxis: yAxis[0],
-                hoveredPlotLines: plotLines,
                 hoveredPlotBands: plotBands,
+                hoveredPlotLines: plotLines,
+                hoveredPlotShapes: plotShapes,
             }, event);
         }
         togglePinTooltip === null || togglePinTooltip === void 0 ? void 0 : togglePinTooltip(nextTooltipFixed, event);
     };
     return {
         handleChartClick,
-        handleMouseLeave,
-        throttledHandleMouseMove,
+        handlePointerLeave,
+        throttledHandlePointerMove,
         throttledHandleTouchMove,
     };
 }

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { Dispatch } from 'd3-dispatch';
 import type { ChartScale, LegendItem, OnLegendItemClick, PreparedLegend, PreparedSeries, PreparedSplit, PreparedXAxis, PreparedYAxis, RangeSliderState, ShapeData, ZoomState } from '../../hooks';
-import type { PreparedChart } from '../../hooks/types';
+import type { PreparedChart, PreparedTitle } from '../../hooks/types';
 import type { LegendConfig } from '../../types';
 import type { ChartInnerProps } from './types';
 type Props = ChartInnerProps & {
@@ -24,9 +24,7 @@ export declare function useChartInnerProps(props: Props): {
     shapesData: ShapeData[];
     shapesReady: boolean;
     handleLegendItemClick: OnLegendItemClick;
-    preparedTitle: (import("../..").ChartTitle & {
-        height: number;
-    }) | undefined;
+    preparedTitle: PreparedTitle | undefined;
     preparedChart: PreparedChart | undefined;
     allPreparedSeries?: PreparedSeries[] | undefined;
     legendConfig?: LegendConfig | undefined;

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

@@ -48,15 +48,19 @@ export function useChartInnerProps(props) {
         currentRunRef.current++;
         const currentRun = currentRunRef.current;
         (async function () {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             const chartDataChanged = !(previousChartData.current && isEqual(previousChartData.current, data));
-            const preparedTitle = await getPreparedTitle({ title: data.title });
+            const preparedTitle = await getPreparedTitle({
+                title: data.title,
+                chartWidth: width,
+                chartMargin: (_a = data.chart) === null || _a === void 0 ? void 0 : _a.margin,
+            });
             const preparedChart = getPreparedChart({
                 chart: data.chart,
                 seriesData: data.series.data,
                 preparedTitle,
             });
-            const colors = (_a = data.colors) !== null && _a !== void 0 ? _a : DEFAULT_PALETTE;
+            const colors = (_b = data.colors) !== null && _b !== void 0 ? _b : DEFAULT_PALETTE;
             const normalizedSeriesData = getSortedSeriesData({
                 seriesData: data.series.data,
                 xAxis: data.xAxis,
@@ -79,7 +83,7 @@ export function useChartInnerProps(props) {
                 });
             }
             else {
-                allPreparedSeries = (_c = (_b = prevStateValue.current) === null || _b === void 0 ? void 0 : _b.allPreparedSeries) !== null && _c !== void 0 ? _c : [];
+                allPreparedSeries = (_d = (_c = prevStateValue.current) === null || _c === void 0 ? void 0 : _c.allPreparedSeries) !== null && _d !== void 0 ? _d : [];
             }
             const activeLegendItems = selectedLegendItems !== null && selectedLegendItems !== void 0 ? selectedLegendItems : getActiveLegendItems(allPreparedSeries);
             const visiblePreparedSeries = getVisibleSeries({

package/dist/esm/components/ChartInner/useDefaultState.js

@@ -29,7 +29,7 @@ export function useDefaultState(props) {
                 boundsHeight,
                 boundsWidth,
             });
-            const { plotLines, plotBands } = getHoveredPlots({
+            const { plotBands, plotLines, plotShapes } = getHoveredPlots({
                 pointerX: x,
                 pointerY: y,
                 xAxis,
@@ -37,7 +37,7 @@ export function useDefaultState(props) {
                 xScale,
                 yScale,
             });
-            const hoveredPlotsArg = { lines: plotLines, bands: plotBands };
+            const hoveredPlotsArg = { bands: plotBands, lines: plotLines, shapes: plotShapes };
             const svgPointerX = x + boundsOffsetLeft;
             const svgPointerY = y + boundsOffsetTop;
             dispatcher.call(EventType.HOVER_SHAPE, undefined, closest, [svgPointerX, svgPointerY], hoveredPlotsArg);
@@ -55,8 +55,9 @@ export function useDefaultState(props) {
                 hovered: closest,
                 xAxis,
                 yAxis: yAxis[0],
-                hoveredPlotLines: plotLines,
                 hoveredPlotBands: plotBands,
+                hoveredPlotLines: plotLines,
+                hoveredPlotShapes: plotShapes,
             }, syntheticEvent);
         });
     }, [

package/dist/esm/components/ChartInner/utils/chart.js

@@ -4,7 +4,7 @@ const getMarginTop = (args) => {
     const { chart, preparedTitle } = args;
     let marginTop = get(chart, 'margin.top', 0);
     if (preparedTitle === null || preparedTitle === void 0 ? void 0 : preparedTitle.height) {
-        marginTop += preparedTitle.height;
+        marginTop += preparedTitle.height + preparedTitle.margin;
     }
     return marginTop;
 };

package/dist/esm/components/ChartInner/utils/normalized-original-data.d.ts

@@ -22,6 +22,7 @@ export declare function getNormalizedXAxis(props: {
     maxPadding?: number;
     plotLines?: import("../../..").AxisPlotLine[];
     plotBands?: import("../../..").AxisPlotBand[];
+    plotShapes?: import("../../..").AxisPlotShape[];
     tickMarks?: import("../../..").ChartAxisTickMarks;
     visible?: boolean;
     order?: "sortAsc" | "sortDesc" | "reverse";

package/dist/esm/components/ChartInner/utils/title.d.ts

@@ -1,5 +1,7 @@
 import type { PreparedTitle } from '../../../hooks/types';
-import type { ChartData } from '../../../types';
-export declare const getPreparedTitle: ({ title, }: {
+import type { ChartData, ChartMargin } from '../../../types';
+export declare const getPreparedTitle: ({ title, chartWidth, chartMargin, }: {
     title: ChartData["title"];
+    chartWidth: number;
+    chartMargin?: Partial<ChartMargin>;
 }) => Promise<PreparedTitle | undefined>;