@gravity-ui/charts 1.45.0 → 1.46.1

package/dist/esm/core/scales/x-scale.js

@@ -1,9 +1,9 @@
 import { extent } from 'd3-array';
 import { scaleBand, scaleLinear, scaleLog, scaleUtc } from 'd3-scale';
 import get from 'lodash/get';
-import { getDefaultMaxXAxisValue, getDefaultMinXAxisValue, getDomainDataXBySeries, getEffectiveXRange, } from '../utils';
-import { getBandSize } from '../../hooks/utils/get-band-size';
 import { DEFAULT_AXIS_TYPE, SERIES_TYPE } from '../constants';
+import { getDefaultMaxXAxisValue, getDefaultMinXAxisValue, getDomainDataXBySeries, getEffectiveXRange, } from '../utils';
+import { getBandSize } from '../utils/band-size';
 import { checkIsPointDomain, filterCategoriesByVisibleSeries, getMinMaxPropsOrState, hasOnlyMarkerSeries, validateArrayData, } from './utils';
 const X_AXIS_ZOOM_PADDING = 0.02;
 function calculateXAxisPadding(series) {

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

@@ -1,10 +1,10 @@
 import { extent, tickStep, ticks } from 'd3-array';
 import { scaleBand, scaleLinear, scaleLog, scaleUtc } from 'd3-scale';
 import get from 'lodash/get';
-import { CHART_SERIES_WITH_VOLUME_ON_Y_AXIS, getDefaultMinYAxisValue, getDomainDataYBySeries, shouldSyncAxisWithPrimary, } from '../utils';
 import { getTickValues } from '../../components/AxisY/utils';
-import { getBandSize } from '../../hooks/utils/get-band-size';
 import { SERIES_TYPE } from '../constants';
+import { CHART_SERIES_WITH_VOLUME_ON_Y_AXIS, getDefaultMinYAxisValue, getDomainDataYBySeries, shouldSyncAxisWithPrimary, } from '../utils';
+import { getBandSize } from '../utils/band-size';
 import { checkIsPointDomain, filterCategoriesByVisibleSeries, getMinMaxPropsOrState, hasOnlyMarkerSeries, validateArrayData, } from './utils';
 // axis is validated in `validation/index.ts`, so the value of `axis.type` is definitely valid.
 // eslint-disable-next-line consistent-return
@@ -70,6 +70,34 @@ function getDomainSyncedToPrimaryTicks(args) {
     }
     return [secondaryTicks[0], secondaryTicks[secondaryTicks.length - 1]];
 }
+function getLogarithmicYMin(args) {
+    var _a;
+    const { axis, domain, yMinDomain, hasSeriesWithVolumeOnYAxis } = args;
+    // scaleLog cannot represent values <= 0. Pick the smallest positive value
+    // present in the domain, falling back to 1 if there is none.
+    const smallestPositive = yMinDomain > 0
+        ? yMinDomain
+        : ((_a = domain.reduce((min, v) => {
+            if (typeof v === 'number' && v > 0) {
+                return min === null ? v : Math.min(min, v);
+            }
+            return min;
+        }, null)) !== null && _a !== void 0 ? _a : 1);
+    if (!hasSeriesWithVolumeOnYAxis) {
+        return smallestPositive;
+    }
+    // Volume series (bar-x, area, waterfall) draw bars from yMin up to the
+    // value, so a bar whose value equals yMin collapses to zero height. Drop
+    // the baseline one decade below to give it visible space — but only when
+    // the later `nice()` pass (triggered by startOnTick) won't supply that
+    // headroom on its own. nice() rounds down to the previous decade, which
+    // covers any value strictly between two decades; it has nothing to round
+    // when the smallest value already sits on a decade (e.g. 1, 10, 100).
+    const startOnTick = get(axis, 'startOnTick', false);
+    const isOnDecade = Number.isInteger(Math.log10(smallestPositive));
+    const needsHeadroom = !startOnTick || isOnDecade;
+    return needsHeadroom ? smallestPositive / 10 : smallestPositive;
+}
 function getDomainMinAlignedToStartTick(args) {
     var _a, _b;
     const { axis, range, scale, series } = args;
@@ -80,6 +108,9 @@ function getDomainMinAlignedToStartTick(args) {
         labelLineHeight: axis.labels.lineHeight,
         series,
     });
+    if (tickValues.length === 0) {
+        return dMin;
+    }
     const isStartOnTick = tickValues[0].y === range[0];
     let dNewMin = dMin;
     if (!isStartOnTick) {
@@ -111,6 +142,9 @@ function getDomainMaxAlignedToEndTick(args) {
         labelLineHeight: axis.labels.lineHeight,
         series,
     });
+    if (tickValues.length === 0) {
+        return dMax;
+    }
     let dNewMax = dMax;
     const isEndOnTick = tickValues[tickValues.length - 1].y === range[1];
     if (!isEndOnTick) {
@@ -155,12 +189,18 @@ export function createYScale(args) {
             }
             if (hasNumberAndNullValues) {
                 const [yMinDomain, yMaxDomain] = extent(domain);
+                const hasSeriesWithVolumeOnYAxis = series.some((s) => CHART_SERIES_WITH_VOLUME_ON_Y_AXIS.includes(s.type));
                 let yMin;
                 if (typeof yMinPropsOrState === 'number') {
                     yMin = yMinPropsOrState;
                 }
                 else if (axis.type === 'logarithmic') {
-                    yMin = yMinDomain;
+                    yMin = getLogarithmicYMin({
+                        axis,
+                        domain,
+                        yMinDomain,
+                        hasSeriesWithVolumeOnYAxis,
+                    });
                 }
                 else {
                     const yMinDefault = getDefaultMinYAxisValue(series);
@@ -170,8 +210,12 @@ export function createYScale(args) {
                 if (typeof yMaxPropsOrState === 'number') {
                     yMax = yMaxPropsOrState;
                 }
+                else if (axis.type === 'logarithmic') {
+                    // scaleLog cannot represent values <= 0; ensure yMax is strictly
+                    // greater than yMin so the resulting domain stays valid.
+                    yMax = yMaxDomain > yMin ? yMaxDomain : yMin * 10;
+                }
                 else {
-                    const hasSeriesWithVolumeOnYAxis = series.some((s) => CHART_SERIES_WITH_VOLUME_ON_Y_AXIS.includes(s.type));
                     yMax = hasSeriesWithVolumeOnYAxis ? Math.max(yMaxDomain, 0) : yMaxDomain;
                 }
                 const scaleFn = axis.type === 'logarithmic' ? scaleLog : scaleLinear;

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

@@ -1,7 +1,7 @@
 import get from 'lodash/get';
 import merge from 'lodash/merge';
-import { getUniqId } from '../utils';
 import { DEFAULT_DATALABELS_STYLE, seriesRangeSliderOptionsDefaults } from '../constants';
+import { getUniqId } from '../utils';
 import { DEFAULT_DATALABELS_PADDING, DEFAULT_HALO_OPTIONS, DEFAULT_POINT_MARKER_OPTIONS, } from './constants';
 import { getSeriesStackId, prepareLegendSymbol } from './utils';
 export const DEFAULT_LINE_WIDTH = 1;

package/dist/esm/core/series/prepare-bar-x.js

@@ -1,6 +1,6 @@
 import get from 'lodash/get';
-import { getUniqId } from '../utils';
 import { DEFAULT_DATALABELS_STYLE, seriesRangeSliderOptionsDefaults } from '../constants';
+import { getUniqId } from '../utils';
 import { DEFAULT_DATALABELS_PADDING } from './constants';
 import { getSeriesStackId, prepareLegendSymbol } from './utils';
 function prepareSeriesData(series) {

package/dist/esm/core/series/prepare-bar-y.js

@@ -1,6 +1,6 @@
 import get from 'lodash/get';
-import { getLabelsSize, getUniqId } from '../utils';
 import { DEFAULT_DATALABELS_STYLE } from '../constants';
+import { getLabelsSize, getUniqId } from '../utils';
 import { getFormattedValue } from '../utils/format';
 import { getSeriesStackId, prepareLegendSymbol } from './utils';
 const DEFAULT_LABEL_PADDING = 7;

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

@@ -1,7 +1,7 @@
 import { scaleOrdinal } from 'd3-scale';
 import get from 'lodash/get';
-import { getUniqId } from '../utils';
 import { DEFAULT_DATALABELS_STYLE } from '../constants';
+import { getUniqId } from '../utils';
 import { prepareLegendSymbol } from './utils';
 export function prepareFunnelSeries(args) {
     var _a, _b;

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

@@ -1,6 +1,6 @@
 import get from 'lodash/get';
-import { getUniqId } from '../utils';
 import { DEFAULT_DATALABELS_STYLE } from '../constants';
+import { getUniqId } from '../utils';
 import { DEFAULT_DATALABELS_PADDING } from './constants';
 import { prepareLegendSymbol } from './utils';
 function prepareSeriesData(series) {

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

@@ -2,8 +2,8 @@ import { groupBy } from 'lodash';
 import clone from 'lodash/clone';
 import get from 'lodash/get';
 import merge from 'lodash/merge';
-import { getDefaultColorStops, getDomainForContinuousColorScale, getLabelsSize, getTextSizeFn, getTextWithElipsis, } from '../utils';
 import { CONTINUOUS_LEGEND_SIZE, legendDefaults } from '../constants';
+import { getDefaultColorStops, getDomainForContinuousColorScale, getLabelsSize, getTextSizeFn, getTextWithElipsis, } from '../utils';
 export async function getPreparedLegend(args) {
     var _a, _b, _c, _d, _e, _f, _g;
     const { legend, series } = args;
@@ -120,8 +120,8 @@ async function getGroupedLegendItems(args) {
         }
         resultItem.height = textHeight;
         if (textWidth > maxTextWidth) {
+            resultItem.overflowed = true;
             if (preparedLegend.html) {
-                resultItem.overflowed = true;
                 resultItem.textWidth = maxTextWidth;
             }
             else {

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

@@ -1,7 +1,7 @@
 import get from 'lodash/get';
 import merge from 'lodash/merge';
-import { getUniqId } from '../utils';
 import { DASH_STYLE, DEFAULT_DATALABELS_STYLE, LineCap, LineJoin, seriesRangeSliderOptionsDefaults, } from '../constants';
+import { getUniqId } from '../utils';
 import { DEFAULT_DATALABELS_PADDING, DEFAULT_HALO_OPTIONS, DEFAULT_LEGEND_SYMBOL_PADDING, DEFAULT_POINT_MARKER_OPTIONS, } from './constants';
 export const DEFAULT_LEGEND_SYMBOL_SIZE = 16;
 export const DEFAULT_LINE_WIDTH = 1;

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

@@ -1,7 +1,7 @@
 import { scaleOrdinal } from 'd3-scale';
 import get from 'lodash/get';
-import { getUniqId } from '../utils';
 import { DEFAULT_DATALABELS_STYLE } from '../constants';
+import { getUniqId } from '../utils';
 import { DEFAULT_DATALABELS_PADDING } from './constants';
 import { prepareLegendSymbol } from './utils';
 function prepareSeriesData(series) {

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

@@ -1,8 +1,8 @@
 import { scaleOrdinal } from 'd3-scale';
 import get from 'lodash/get';
 import merge from 'lodash/merge';
-import { getUniqId } from '../utils';
 import { DEFAULT_DATALABELS_STYLE } from '../constants';
+import { getUniqId } from '../utils';
 import { DEFAULT_DATALABELS_PADDING, DEFAULT_HALO_OPTIONS, DEFAULT_POINT_MARKER_OPTIONS, } from './constants';
 import { prepareLegendSymbol } from './utils';
 export const DEFAULT_MARKER = Object.assign(Object.assign({}, DEFAULT_POINT_MARKER_OPTIONS), { enabled: true, radius: 2 });

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

@@ -1,6 +1,6 @@
 import get from 'lodash/get';
-import { getUniqId } from '../utils';
 import { DEFAULT_DATALABELS_STYLE } from '../constants';
+import { getUniqId } from '../utils';
 import { prepareLegendSymbol } from './utils';
 export function prepareSankeySeries(args) {
     const { colorScale, legend, series } = args;

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

@@ -1,7 +1,7 @@
 import get from 'lodash/get';
 import merge from 'lodash/merge';
-import { getSymbolType, getUniqId } from '../utils';
 import { seriesRangeSliderOptionsDefaults } from '../constants';
+import { getSymbolType, getUniqId } from '../utils';
 import { DEFAULT_HALO_OPTIONS, DEFAULT_POINT_MARKER_OPTIONS } from './constants';
 import { prepareLegendSymbol } from './utils';
 function prepareMarker(series, seriesOptions, index) {

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

@@ -1,6 +1,6 @@
 import get from 'lodash/get';
-import { getUniqId } from '../utils';
 import { DEFAULT_DATALABELS_STYLE, LayoutAlgorithm } from '../constants';
+import { getUniqId } from '../utils';
 import { DEFAULT_DATALABELS_PADDING } from './constants';
 import { prepareLegendSymbol } from './utils';
 export function prepareTreemap(args) {

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

@@ -1,6 +1,6 @@
 import get from 'lodash/get';
-import { getUniqId } from '../utils';
 import { DEFAULT_DATALABELS_STYLE } from '../constants';
+import { getUniqId } from '../utils';
 import { DEFAULT_DATALABELS_PADDING } from './constants';
 import { prepareLegendSymbol } from './utils';
 function prepareSeriesData(series) {

package/dist/esm/core/series/prepare-x-range.js

@@ -1,6 +1,6 @@
 import get from 'lodash/get';
-import { getUniqId } from '../utils';
 import { DASH_STYLE, DEFAULT_DATALABELS_STYLE } from '../constants';
+import { getUniqId } from '../utils';
 import { DEFAULT_DATALABELS_PADDING } from './constants';
 import { prepareLegendSymbol } from './utils';
 export function prepareXRangeSeries(args) {

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

@@ -1,6 +1,12 @@
 import type { ScaleOrdinal } from 'd3-scale';
-import type { ChartSeries, ChartSeriesOptions } from '../../types';
+import type { ChartData, ChartSeries, ChartSeriesOptions } from '../../types';
 import type { PreparedLegend, PreparedSeries } from './types';
+export declare const getPreparedSeries: ({ seriesData, seriesOptions, colors, preparedLegend, }: {
+    seriesData: ChartData["series"]["data"];
+    seriesOptions: ChartData["series"]["options"];
+    colors: string[];
+    preparedLegend?: PreparedLegend | null;
+}) => Promise<PreparedSeries[]>;
 export declare function prepareSeries(args: {
     type: ChartSeries['type'];
     series: ChartSeries[];

package/dist/esm/core/series/prepareSeries.js

@@ -1,4 +1,7 @@
+import { group } from 'd3-array';
+import { scaleOrdinal } from 'd3-scale';
 import { ChartError } from '../../libs';
+import { getSeriesNames } from '../utils';
 import { prepareArea } from './prepare-area';
 import { prepareBarXSeries } from './prepare-bar-x';
 import { prepareBarYSeries } from './prepare-bar-y';
@@ -12,6 +15,34 @@ import { prepareScatterSeries } from './prepare-scatter';
 import { prepareTreemap } from './prepare-treemap';
 import { prepareWaterfallSeries } from './prepare-waterfall';
 import { prepareXRangeSeries } from './prepare-x-range';
+export const getPreparedSeries = async ({ seriesData, seriesOptions, colors, preparedLegend, }) => {
+    const seriesNames = getSeriesNames(seriesData);
+    const colorScale = scaleOrdinal(seriesNames, colors);
+    const groupedSeries = group(seriesData, (item, index) => {
+        if (item.type === 'line') {
+            return `${item.type}_${index}`;
+        }
+        return item.type;
+    });
+    const acc = [];
+    if (!preparedLegend) {
+        return acc;
+    }
+    const list = Array.from(groupedSeries);
+    for (let i = 0; i < list.length; i++) {
+        const [_groupId, seriesList] = list[i];
+        const seriesType = seriesList[0].type;
+        acc.push(...(await prepareSeries({
+            type: seriesType,
+            series: seriesList,
+            seriesOptions,
+            legend: preparedLegend,
+            colorScale,
+            colors,
+        })));
+    }
+    return acc;
+};
 export async function prepareSeries(args) {
     const { type, series, seriesOptions, legend, colors, colorScale } = args;
     switch (type) {

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

@@ -16,6 +16,11 @@ export type PreparedAnnotation = {
         padding: [number, number];
     };
 };
+export type AnnotationAnchor = {
+    annotation: PreparedAnnotation;
+    x: number;
+    y: number;
+};
 export type RectLegendSymbol = {
     shape: 'rect';
 } & Required<RectLegendSymbolOptions>;

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

@@ -9,3 +9,7 @@ export declare function prepareLegendSymbol(series: {
     };
 }, symbolType?: `${SymbolType}`): PreparedLegendSymbol;
 export declare function getSeriesStackId(series: StackedSeries): string;
+export declare const getVisibleSeries: ({ preparedSeries, activeLegendItems, }: {
+    preparedSeries: PreparedSeries[];
+    activeLegendItems: string[];
+}) => PreparedSeries[];

package/dist/esm/core/series/utils.js

@@ -1,6 +1,6 @@
 import memoize from 'lodash/memoize';
-import { getSymbolBBoxWidth } from '../utils';
 import { SymbolType } from '../constants';
+import { getSymbolBBoxWidth } from '../utils';
 import { getUniqId } from '../utils/misc';
 import { DEFAULT_LEGEND_SYMBOL_PADDING, DEFAULT_LEGEND_SYMBOL_SIZE } from './constants';
 export const getActiveLegendItems = (series) => {
@@ -35,3 +35,11 @@ export function getSeriesStackId(series) {
     }
     return stackId;
 }
+export const getVisibleSeries = ({ preparedSeries, activeLegendItems, }) => {
+    return preparedSeries.map((singleSeries) => {
+        if (singleSeries.legend.enabled) {
+            return Object.assign(Object.assign({}, singleSeries), { visible: activeLegendItems.includes(singleSeries.legend.groupId) });
+        }
+        return singleSeries;
+    });
+};

package/dist/esm/{hooks/useShapes/annotation/index.d.ts → core/shapes/annotation.d.ts}

@@ -1,11 +1,5 @@
 import type { Selection } from 'd3-selection';
-import type { PreparedAnnotation } from '../../../core/series/types';
-type AnnotationAnchor = {
-    annotation: PreparedAnnotation;
-    x: number;
-    y: number;
-};
-export { type AnnotationAnchor };
+import type { AnnotationAnchor } from '../series/types';
 export declare function renderAnnotations(args: {
     anchors: AnnotationAnchor[];
     container: Selection<SVGGElement, unknown, null, undefined>;

package/dist/esm/{hooks/useShapes/annotation/index.js → core/shapes/annotation.js}

@@ -1,6 +1,6 @@
 import { select } from 'd3-selection';
-import { DESCENDER_RATIO } from '../../../core/utils/text';
-import { block } from '../../../utils';
+import { block } from '../../utils';
+import { DESCENDER_RATIO } from '../utils/text';
 const b = block('annotation');
 const ARROW_WIDTH = 18;
 const ARROW_HEIGHT = 9;

package/dist/esm/{hooks/useShapes → core/shapes}/area/prepare-data.d.ts

@@ -1,7 +1,7 @@
-import type { PreparedSplit } from '../../../core/layout/split-types';
-import type { ChartScale } from '../../../core/scales/types';
-import type { PreparedXAxis, PreparedYAxis } from '../../useAxis/types';
-import type { PreparedAreaSeries, PreparedSeriesOptions } from '../../useSeries/types';
+import type { PreparedXAxis, PreparedYAxis } from '../../axes/types';
+import type { PreparedSplit } from '../../layout/split-types';
+import type { ChartScale } from '../../scales/types';
+import type { PreparedAreaSeries, PreparedSeriesOptions } from '../../series/types';
 import type { PreparedAreaData } from './types';
 export declare const prepareAreaData: (args: {
     series: PreparedAreaSeries[];

package/dist/esm/{hooks/useShapes → core/shapes}/area/prepare-data.js

@@ -1,10 +1,10 @@
 import { group, min, sort } from 'd3-array';
 import isNil from 'lodash/isNil';
 import round from 'lodash/round';
-import { prepareAnnotation } from '../../../core/series/prepare-annotation';
-import { getDataCategoryValue, getLabelsSize, getTextSizeFn } from '../../../core/utils';
-import { getFormattedValue } from '../../../core/utils/format';
-import { getXValue, getYValue } from '../utils';
+import { prepareAnnotation } from '../../series/prepare-annotation';
+import { getXValue, getYValue } from '../../shapes/utils';
+import { getDataCategoryValue, getLabelsSize, getTextSizeFn } from '../../utils';
+import { getFormattedValue } from '../../utils/format';
 function getXValues(series, xAxis, xScale) {
     const categories = xAxis.categories || [];
     const xValues = series.reduce((acc, s) => {

package/dist/esm/core/shapes/area/renderer.d.ts

@@ -0,0 +1,11 @@
+import type { Dispatch } from 'd3-dispatch';
+import type { PreparedSeriesOptions } from '../../series/types';
+import type { PreparedAreaData } from './types';
+export declare function renderArea(elements: {
+    plot: SVGGElement;
+    markers: SVGGElement;
+    hoverMarkers: SVGGElement;
+    annotations: SVGGElement;
+    boundsWidth: number;
+    boundsHeight: number;
+}, preparedData: PreparedAreaData[], seriesOptions: PreparedSeriesOptions, allowOverlapDataLabels: boolean, dispatcher?: Dispatch<object>): () => void;

package/dist/esm/core/shapes/area/renderer.js

@@ -0,0 +1,181 @@
+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 { block } from '../../../utils';
+import { filterOverlappingLabels } from '../../utils';
+import { renderAnnotations } from '../annotation';
+import { getMarkerHaloVisibility, getMarkerVisibility, renderMarker, selectMarkerHalo, selectMarkerSymbol, setMarker, } from '../marker';
+import { setActiveState } from '../utils';
+const b = block('area');
+export function renderArea(elements, preparedData, seriesOptions, allowOverlapDataLabels, dispatcher) {
+    const plotSvgElement = select(elements.plot);
+    const markersSvgElement = select(elements.markers);
+    const hoverMarkersSvgElement = select(elements.hoverMarkers);
+    const annotationsSvgElement = select(elements.annotations);
+    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);
+    renderAnnotations({
+        anchors: preparedData.flatMap((d) => d.annotations),
+        container: annotationsSvgElement,
+        plotHeight: elements.boundsHeight,
+        plotWidth: elements.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) {
+        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');
+                });
+            }
+        }
+    }
+    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);
+    };
+}

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

@@ -1,7 +1,5 @@
-import type { PreparedAnnotation } from '../../../core/series/types';
 import type { AreaSeriesData, HtmlItem, LabelData } from '../../../types';
-import type { PreparedAreaSeries } from '../../useSeries/types';
-import type { AnnotationAnchor } from '../annotation';
+import type { AnnotationAnchor, PreparedAnnotation, PreparedAreaSeries } from '../../series/types';
 export type PointData = {
     y0: number;
     x: number;

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

@@ -1,7 +1,7 @@
-import type { PreparedSplit } from '../../../core/layout/split-types';
-import type { ChartScale } from '../../../core/scales/types';
-import type { PreparedXAxis, PreparedYAxis } from '../../useAxis/types';
-import type { PreparedBarXSeries, PreparedSeriesOptions } from '../../useSeries/types';
+import type { PreparedXAxis, PreparedYAxis } from '../../axes/types';
+import type { PreparedSplit } from '../../layout/split-types';
+import type { ChartScale } from '../../scales/types';
+import type { PreparedBarXSeries, PreparedSeriesOptions } from '../../series/types';
 import type { PreparedBarXData } from './types';
 export declare const prepareBarXData: (args: {
     series: PreparedBarXSeries[];