@gravity-ui/charts 0.7.0 → 0.8.0

package/dist/cjs/hooks/useShapes/bar-y/prepare-data.js

@@ -124,7 +124,7 @@ export const prepareBarYData = (args) => {
             const sortedData = sortKey
                 ? sort(measureValues, (a, b) => comparator(get(a, sortKey), get(b, sortKey)))
                 : measureValues;
-            sortedData.forEach(({ data, series: s }) => {
+            sortedData.forEach(({ data, series: s }, xValueIndex) => {
                 let center;
                 if (yAxis[0].type === 'category') {
                     const bandScale = yScale;
@@ -147,6 +147,7 @@ export const prepareBarYData = (args) => {
                     data,
                     series: s,
                     htmlElements: [],
+                    isLastStackItem: xValueIndex === sortedData.length - 1,
                 };
                 stackItems.push(item);
                 stackSum += width + 1;

package/dist/cjs/hooks/useShapes/bar-y/types.d.ts

@@ -10,4 +10,5 @@ export type PreparedBarYData = Omit<TooltipDataChunkBarX, 'series'> & {
     series: PreparedBarYSeries;
     label?: LabelData;
     htmlElements: HtmlItem[];
+    isLastStackItem: boolean;
 };

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

@@ -8,12 +8,13 @@ import type { PreparedBarXData } from './bar-x';
 import type { PreparedBarYData } from './bar-y/types';
 import type { PreparedLineData } from './line/types';
 import type { PreparedPieData } from './pie/types';
+import type { PreparedSankeyData } from './sankey/types';
 import type { PreparedScatterData } from './scatter/types';
 export type { PreparedBarXData } from './bar-x';
 export type { PreparedScatterData } from './scatter/types';
 import type { PreparedWaterfallData } from './waterfall';
 import './styles.css';
-export type ShapeData = PreparedBarXData | PreparedBarYData | PreparedScatterData | PreparedLineData | PreparedPieData | PreparedAreaData | PreparedWaterfallData;
+export type ShapeData = PreparedBarXData | PreparedBarYData | PreparedScatterData | PreparedLineData | PreparedPieData | PreparedAreaData | PreparedWaterfallData | PreparedSankeyData;
 type Args = {
     boundsWidth: number;
     boundsHeight: number;

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

@@ -1,5 +1,6 @@
 import React from 'react';
 import { group } from 'd3';
+import { ChartError } from '../../libs';
 import { getOnlyVisibleSeries } from '../../utils';
 import { AreaSeriesShapes } from './area';
 import { prepareAreaData } from './area/prepare-data';
@@ -9,6 +10,8 @@ import { LineSeriesShapes } from './line';
 import { prepareLineData } from './line/prepare-data';
 import { PieSeriesShapes } from './pie';
 import { preparePieData } from './pie/prepare-data';
+import { SankeySeriesShape } from './sankey';
+import { prepareSankeyData } from './sankey/prepare-data';
 import { ScatterSeriesShape, prepareScatterData } from './scatter';
 import { TreemapSeriesShape } from './treemap';
 import { prepareTreemapData } from './treemap/prepare-data';
@@ -134,6 +137,22 @@ export const useShapes = (args) => {
                     });
                     acc.push(React.createElement(TreemapSeriesShape, { key: "treemap", dispatcher: dispatcher, preparedData: preparedData, seriesOptions: seriesOptions, htmlLayout: htmlLayout }));
                     shapesData.push(preparedData);
+                    break;
+                }
+                case 'sankey': {
+                    const preparedData = prepareSankeyData({
+                        series: chartSeries[0],
+                        width: boundsWidth,
+                        height: boundsHeight,
+                    });
+                    acc.push(React.createElement(SankeySeriesShape, { key: "sankey", dispatcher: dispatcher, preparedData: preparedData, seriesOptions: seriesOptions, htmlLayout: htmlLayout }));
+                    shapesData.push(preparedData);
+                    break;
+                }
+                default: {
+                    throw new ChartError({
+                        message: `The display method is not defined for a series with type "${seriesType}"`,
+                    });
                 }
             }
             return acc;

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

@@ -1,10 +1,10 @@
 import React from 'react';
 import { color, line as lineGenerator, select } from 'd3';
 import get from 'lodash/get';
-import { block, filterOverlappingLabels } from '../../../utils';
+import { block, filterOverlappingLabels, getLineDashArray } from '../../../utils';
 import { HtmlLayer } from '../HtmlLayer';
 import { getMarkerHaloVisibility, getMarkerVisibility, renderMarker, selectMarkerHalo, selectMarkerSymbol, setMarker, } from '../marker';
-import { getLineDashArray, setActiveState } from '../utils';
+import { setActiveState } from '../utils';
 const b = block('d3-line');
 export const LineSeriesShapes = (args) => {
     const { dispatcher, preparedData, seriesOptions, htmlLayout } = args;

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

@@ -30,7 +30,6 @@ export function PieSeriesShapes(args) {
             const [x, y] = pieData.center;
             return `translate(${x}, ${y})`;
         })
-            .style('stroke', (pieData) => pieData.borderColor)
             .style('stroke-width', (pieData) => pieData.borderWidth)
             .attr('cursor', (pieData) => pieData.series.cursor);
         // Render halo appearing outside the hovered slice
@@ -46,7 +45,7 @@ export function PieSeriesShapes(args) {
             .attr('d', (d) => {
             const arcGenerator = arc()
                 .innerRadius(d.data.pie.innerRadius)
-                .outerRadius(d.data.pie.radius + d.data.pie.halo.size)
+                .outerRadius(d.data.radius + d.data.pie.halo.size)
                 .cornerRadius(d.data.pie.borderRadius);
             return arcGenerator(d);
         })
@@ -63,11 +62,12 @@ export function PieSeriesShapes(args) {
             .attr('d', (d) => {
             const arcGenerator = arc()
                 .innerRadius(d.data.pie.innerRadius)
-                .outerRadius(d.data.pie.radius)
+                .outerRadius(d.data.radius)
                 .cornerRadius(d.data.pie.borderRadius);
             return arcGenerator(d);
         })
             .attr('class', b('segment'))
+            .style('stroke', (d) => d.data.series.borderColor)
             .attr('fill', (d) => d.data.color)
             .attr('opacity', (d) => d.data.opacity);
         // render Labels

package/dist/cjs/hooks/useShapes/pie/prepare-data.js

@@ -19,15 +19,13 @@ export function preparePieData(args) {
     const maxRadius = Math.min(boundsWidth, boundsHeight) / 2;
     const groupedPieSeries = group(preparedSeries, (pieSeries) => pieSeries.stackId);
     const prepareItem = (stackId, items) => {
-        var _a, _b, _c;
+        var _a;
         const series = items[0];
-        const { center, borderWidth, borderColor, borderRadius, radius: seriesRadius, innerRadius: seriesInnerRadius, dataLabels, } = series;
-        const radius = (_a = calculateNumericProperty({ value: seriesRadius, base: maxRadius })) !== null && _a !== void 0 ? _a : maxRadius;
+        const { center, borderWidth, borderColor, borderRadius, innerRadius: seriesInnerRadius, dataLabels, } = series;
         const data = {
             id: stackId,
             center: getCenter(boundsWidth, boundsHeight, center),
-            innerRadius: (_b = calculateNumericProperty({ value: seriesInnerRadius, base: radius })) !== null && _b !== void 0 ? _b : 0,
-            radius,
+            innerRadius: 0,
             segments: [],
             labels: [],
             htmlLabels: [],
@@ -43,7 +41,19 @@ export function preparePieData(args) {
                 size: series.states.hover.halo.size,
             },
         };
+        const { maxHeight: labelHeight } = getLabelsSize({
+            labels: ['Some Label'],
+            style: dataLabels.style,
+        });
+        let segmentMaxRadius = 0;
         const segments = items.map((item) => {
+            var _a;
+            let maxSegmentRadius = maxRadius;
+            if (dataLabels.enabled) {
+                maxSegmentRadius -= dataLabels.distance + dataLabels.connectorPadding + labelHeight;
+            }
+            const segmentRadius = (_a = calculateNumericProperty({ value: item.radius, base: maxSegmentRadius })) !== null && _a !== void 0 ? _a : maxSegmentRadius;
+            segmentMaxRadius = Math.max(segmentMaxRadius, segmentRadius);
             return {
                 value: item.value,
                 color: item.color,
@@ -52,19 +62,12 @@ export function preparePieData(args) {
                 hovered: false,
                 active: true,
                 pie: data,
+                radius: segmentRadius,
             };
         });
         data.segments = pieGenerator(segments);
-        if (dataLabels.enabled) {
-            const { style, connectorPadding, distance } = dataLabels;
-            const { maxHeight: labelHeight } = getLabelsSize({ labels: ['Some Label'], style });
-            const minSegmentRadius = maxRadius - distance - connectorPadding - labelHeight;
-            if (data.radius > minSegmentRadius) {
-                data.radius = minSegmentRadius;
-                data.innerRadius =
-                    (_c = calculateNumericProperty({ value: seriesInnerRadius, base: data.radius })) !== null && _c !== void 0 ? _c : 0;
-            }
-        }
+        data.innerRadius =
+            (_a = calculateNumericProperty({ value: seriesInnerRadius, base: segmentMaxRadius })) !== null && _a !== void 0 ? _a : 0;
         return data;
     };
     const prepareLabels = (prepareLabelsArgs) => {
@@ -84,20 +87,17 @@ export function preparePieData(args) {
         const { style, connectorPadding, distance } = dataLabels;
         const { maxHeight: labelHeight } = getLabelsSize({ labels: ['Some Label'], style });
         const connectorStartPointGenerator = arc()
-            .innerRadius(data.radius)
-            .outerRadius(data.radius);
-        const connectorMidPointRadius = data.radius + distance / 2;
+            .innerRadius((d) => d.data.radius)
+            .outerRadius((d) => d.data.radius);
         const connectorMidPointGenerator = arc()
-            .innerRadius(connectorMidPointRadius)
-            .outerRadius(connectorMidPointRadius);
-        const connectorArcRadius = data.radius + distance;
+            .innerRadius((d) => d.data.radius + distance / 2)
+            .outerRadius((d) => d.data.radius + distance / 2);
         const connectorEndPointGenerator = arc()
-            .innerRadius(connectorArcRadius)
-            .outerRadius(connectorArcRadius);
-        const labelArcRadius = connectorArcRadius + connectorPadding;
+            .innerRadius((d) => d.data.radius + distance)
+            .outerRadius((d) => d.data.radius + distance);
         const labelArcGenerator = arc()
-            .innerRadius(labelArcRadius)
-            .outerRadius(labelArcRadius);
+            .innerRadius((d) => d.data.radius + distance + connectorPadding)
+            .outerRadius((d) => d.data.radius + distance + connectorPadding);
         series.forEach((d, index) => {
             const prevLabel = labels[labels.length - 1];
             const text = String(d.data.label || d.data.value);
@@ -179,8 +179,8 @@ export function preparePieData(args) {
                 }
                 if (shouldUseHtml) {
                     htmlLabels.push({
-                        x: boundsWidth / 2 + label.x,
-                        y: boundsHeight / 2 + label.y,
+                        x: data.center[0] + label.x,
+                        y: Math.max(0, data.center[1] + label.y),
                         content: label.text,
                         size: label.size,
                     });
@@ -207,19 +207,21 @@ export function preparePieData(args) {
             data,
             series: items,
         });
-        const allPreparedLabels = [...preparedLabels.labels, ...preparedLabels.htmlLabels];
-        const top = Math.min(data.center[1] - data.radius, ...allPreparedLabels.map((l) => l.y + data.center[1]));
-        const bottom = Math.max(data.center[1] + data.radius, ...allPreparedLabels.map((l) => data.center[1] + l.y + l.size.height));
+        const segmentMaxRadius = Math.max(...data.segments.map((s) => s.data.radius));
+        const top = Math.min(data.center[1] - segmentMaxRadius, ...preparedLabels.labels.map((l) => l.y + data.center[1]), ...preparedLabels.htmlLabels.map((l) => l.y));
+        const bottom = Math.max(data.center[1] + segmentMaxRadius, ...preparedLabels.labels.map((l) => l.y + data.center[1] + l.size.height), ...preparedLabels.htmlLabels.map((l) => l.y + l.size.height));
         const topAdjustment = Math.floor(top - data.halo.size);
         if (topAdjustment > 0) {
-            // should adjust top position and height
-            data.radius += topAdjustment / 2;
+            data.segments.forEach((s) => {
+                s.data.radius += topAdjustment / 2;
+            });
             data.center[1] -= topAdjustment / 2;
         }
         const bottomAdjustment = Math.floor(boundsHeight - bottom - data.halo.size);
         if (bottomAdjustment > 0) {
-            // should adjust position and radius
-            data.radius += bottomAdjustment / 2;
+            data.segments.forEach((s) => {
+                s.data.radius += bottomAdjustment / 2;
+            });
             data.center[1] += bottomAdjustment / 2;
         }
         const { labels, htmlLabels, connectors } = prepareLabels({

package/dist/cjs/hooks/useShapes/pie/types.d.ts

@@ -9,6 +9,7 @@ export type SegmentData = {
     hovered: boolean;
     active: boolean;
     pie: PreparedPieData;
+    radius: number;
 };
 export type PieLabelData = LabelData & {
     segment: SegmentData;
@@ -25,7 +26,6 @@ export type PreparedPieData = {
     labels: PieLabelData[];
     connectors: PieConnectorData[];
     center: [number, number];
-    radius: number;
     innerRadius: number;
     borderRadius: number;
     borderWidth: number;

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

@@ -0,0 +1,12 @@
+import React from 'react';
+import type { Dispatch } from 'd3';
+import type { PreparedSeriesOptions } from '../../useSeries/types';
+import type { PreparedSankeyData } from './types';
+type ShapeProps = {
+    dispatcher: Dispatch<object>;
+    preparedData: PreparedSankeyData;
+    seriesOptions: PreparedSeriesOptions;
+    htmlLayout: HTMLElement | null;
+};
+export declare const SankeySeriesShape: (props: ShapeProps) => React.JSX.Element;
+export {};

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

@@ -0,0 +1,67 @@
+import React from 'react';
+import { select } from 'd3';
+import { block } from '../../../utils';
+import { HtmlLayer } from '../HtmlLayer';
+const b = block('sankey');
+export const SankeySeriesShape = (props) => {
+    const { dispatcher, preparedData, seriesOptions, htmlLayout } = props;
+    const hoveredDataRef = React.useRef(null);
+    const ref = React.useRef(null);
+    React.useEffect(() => {
+        if (!ref.current) {
+            return () => { };
+        }
+        const svgElement = select(ref.current);
+        svgElement.selectAll('*').remove();
+        // nodes
+        svgElement
+            .append('g')
+            .selectAll()
+            .data(preparedData.nodes)
+            .join('rect')
+            .attr('x', (d) => d.x0)
+            .attr('y', (d) => d.y0)
+            .attr('height', (d) => d.y1 - d.y0)
+            .attr('width', (d) => d.x1 - d.x0)
+            .attr('fill', (d) => d.color);
+        // links
+        svgElement
+            .append('g')
+            .attr('fill', 'none')
+            .selectAll()
+            .data(preparedData.links)
+            .join('g')
+            .append('path')
+            .attr('stroke-opacity', (d) => d.opacity)
+            .attr('d', (d) => d.path)
+            .attr('stroke', (d) => d.color)
+            .attr('stroke-width', (d) => d.strokeWidth);
+        // dataLabels
+        svgElement
+            .append('g')
+            .selectAll()
+            .data(preparedData.labels)
+            .join('text')
+            .text((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; });
+        const eventName = `hover-shape.sankey`;
+        function handleShapeHover(data) {
+            hoveredDataRef.current = data;
+        }
+        if (hoveredDataRef.current !== null) {
+            handleShapeHover(hoveredDataRef.current);
+        }
+        dispatcher.on(eventName, handleShapeHover);
+        return () => {
+            dispatcher.on(eventName, null);
+        };
+    }, [dispatcher, preparedData, seriesOptions]);
+    return (React.createElement(React.Fragment, null,
+        React.createElement("g", { ref: ref, className: b() }),
+        React.createElement(HtmlLayer, { preparedData: preparedData, htmlLayout: htmlLayout })));
+};

package/dist/cjs/hooks/useShapes/sankey/prepare-data.d.ts

@@ -0,0 +1,7 @@
+import type { PreparedSankeySeries } from '../../useSeries/types';
+import type { PreparedSankeyData } from './types';
+export declare function prepareSankeyData(args: {
+    series: PreparedSankeySeries;
+    width: number;
+    height: number;
+}): PreparedSankeyData;

package/dist/cjs/hooks/useShapes/sankey/prepare-data.js

@@ -0,0 +1,72 @@
+import { sankey, sankeyLinkHorizontal } from 'd3-sankey';
+export function prepareSankeyData(args) {
+    const { series, width, height } = args;
+    const htmlElements = [];
+    const sankeyGenerator = sankey()
+        .nodeId((d) => d.name)
+        .nodeSort((d) => d.index)
+        .nodeWidth(15)
+        .nodePadding(10)
+        .extent([
+        [1, 5],
+        [width - 1, height - 5],
+    ]);
+    const { nodes, links } = sankeyGenerator({
+        nodes: series.data,
+        links: series.data.reduce((acc, item) => {
+            item.links.forEach((l) => {
+                const target = series.data.find((d) => d.name === l.name);
+                if (target) {
+                    acc.push({
+                        source: item,
+                        target,
+                        value: l.value,
+                    });
+                }
+            });
+            return acc;
+        }, []),
+    });
+    const sankeyNodes = nodes.map((node) => {
+        var _a, _b, _c, _d, _e, _f;
+        return {
+            x0: (_a = node.x0) !== null && _a !== void 0 ? _a : 0,
+            x1: (_b = node.x1) !== null && _b !== void 0 ? _b : 0,
+            y0: (_c = node.y0) !== null && _c !== void 0 ? _c : 0,
+            y1: (_d = node.y1) !== null && _d !== void 0 ? _d : 0,
+            color: (_e = node.color) !== null && _e !== void 0 ? _e : '',
+            data: series.data[(_f = node.index) !== null && _f !== void 0 ? _f : 0],
+        };
+    });
+    const sankeyLinks = links.map((d) => {
+        var _a, _b;
+        return {
+            opacity: 0.75,
+            color: (_a = d.source.color) !== null && _a !== void 0 ? _a : '',
+            path: sankeyLinkHorizontal()(d),
+            strokeWidth: Math.max(1, (_b = d.width) !== null && _b !== void 0 ? _b : 0),
+            source: d.source,
+            target: d.target,
+            value: d.value,
+        };
+    });
+    const dataLabels = [];
+    if (series.dataLabels.enabled) {
+        const labels = nodes.map((d) => {
+            var _a, _b, _c, _d;
+            const x0 = (_a = d.x0) !== null && _a !== void 0 ? _a : 0;
+            const x1 = (_b = d.x1) !== null && _b !== void 0 ? _b : 0;
+            const y0 = (_c = d.y0) !== null && _c !== void 0 ? _c : 0;
+            const y1 = (_d = d.y1) !== null && _d !== void 0 ? _d : 0;
+            return {
+                text: d.name,
+                x: x0 < width / 2 ? x1 + 6 : x0 - 6,
+                y: (y1 + y0) / 2,
+                textAnchor: x0 < width / 2 ? 'start' : 'end',
+                style: series.dataLabels.style,
+            };
+        });
+        dataLabels.push(...labels);
+    }
+    return { series, nodes: sankeyNodes, links: sankeyLinks, htmlElements, labels: dataLabels };
+}

package/dist/cjs/hooks/useShapes/sankey/types.d.ts

@@ -0,0 +1,33 @@
+import type { BaseTextStyle, HtmlItem, SankeySeriesData } from '../../../types';
+import type { PreparedSankeySeries } from '../../useSeries/types';
+export type SankeyDataLabel = {
+    text: string;
+    x: number;
+    y: number;
+    textAnchor: 'start' | 'end';
+    style: BaseTextStyle;
+};
+export type SankeyNode = {
+    x0: number;
+    x1: number;
+    y0: number;
+    y1: number;
+    color: string;
+    data: SankeySeriesData;
+};
+export type SankeyLink = {
+    opacity: number;
+    color: string;
+    path: string | null;
+    strokeWidth: number;
+    source: SankeySeriesData;
+    target: SankeySeriesData;
+    value: number;
+};
+export type PreparedSankeyData = {
+    series: PreparedSankeySeries;
+    htmlElements: HtmlItem[];
+    nodes: SankeyNode[];
+    links: SankeyLink[];
+    labels: SankeyDataLabel[];
+};

package/dist/cjs/hooks/useShapes/sankey/types.js

@@ -0,0 +1 @@
+export {};

package/dist/cjs/hooks/useShapes/styles.css

@@ -12,12 +12,12 @@
   alignment-baseline: before-edge;
 }
 
-.gcharts-d3-bar-x__label {
+.gcharts-bar-x__label {
   user-select: none;
   fill: var(--g-color-text-complementary);
 }
 
-.gcharts-d3-bar-y__label {
+.gcharts-bar-y__label {
   user-select: none;
   fill: var(--g-color-text-complementary);
   alignment-baseline: after-edge;

package/dist/cjs/hooks/useShapes/utils.d.ts

@@ -1,5 +1,4 @@
 import type { BaseType } from 'd3';
-import type { DashStyle } from '../../constants';
 import type { BasicInactiveState } from '../../types';
 import type { ChartScale } from '../useAxisScales';
 import type { PreparedAxis } from '../useChartOptions/types';
@@ -26,4 +25,10 @@ export declare function setActiveState<T extends {
     state: BasicInactiveState | undefined;
     active: boolean;
 }): T;
-export declare function getLineDashArray(dashStyle: DashStyle, strokeWidth?: number): string;
+export declare function getRectPath(args: {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+    borderRadius?: number | number[];
+}): import("d3-path").Path;

package/dist/cjs/hooks/useShapes/utils.js

@@ -1,4 +1,4 @@
-import { select } from 'd3';
+import { path, select } from 'd3';
 import get from 'lodash/get';
 import { getDataCategoryValue } from '../../utils';
 export function getXValue(args) {
@@ -36,20 +36,25 @@ export function setActiveState(args) {
     }
     return datum;
 }
-export function getLineDashArray(dashStyle, strokeWidth = 2) {
-    const value = dashStyle.toLowerCase();
-    const arrayValue = value
-        .replace('shortdashdotdot', '3,1,1,1,1,1,')
-        .replace('shortdashdot', '3,1,1,1')
-        .replace('shortdot', '1,1,')
-        .replace('shortdash', '3,1,')
-        .replace('longdash', '8,3,')
-        .replace(/dot/g, '1,3,')
-        .replace('dash', '4,3,')
-        .replace(/,$/, '')
-        .split(',')
-        .map((part) => {
-        return `${parseInt(part, 10) * strokeWidth}`;
-    });
-    return arrayValue.join(',').replace(/NaN/g, 'none');
+export function getRectPath(args) {
+    const { x, y, width, height, borderRadius = 0 } = args;
+    const borderRadiuses = typeof borderRadius === 'number' ? new Array(4).fill(borderRadius) : borderRadius;
+    const [borderRadiusTopLeft = 0, borderRadiusTopRight = 0, borderRadiusBottomRight = 0, borderRadiusBottomLeft = 0,] = borderRadiuses !== null && borderRadiuses !== void 0 ? borderRadiuses : [];
+    const p = path();
+    let startAngle = -Math.PI / 2;
+    const angle = Math.PI / 2;
+    p.moveTo(x + borderRadiusTopLeft, y);
+    p.lineTo(x + width - borderRadiusTopRight, y);
+    p.arc(x + width - borderRadiusTopRight, y + borderRadiusTopRight, borderRadiusTopRight, startAngle, startAngle + angle);
+    startAngle += angle;
+    p.lineTo(x + width, y + height - borderRadiusBottomRight);
+    p.arc(x + width - borderRadiusBottomRight, y + height - borderRadiusBottomRight, borderRadiusBottomRight, startAngle, startAngle + angle);
+    startAngle += angle;
+    p.lineTo(x + borderRadiusBottomLeft, y + height);
+    p.arc(x + borderRadiusBottomLeft, y + height - borderRadiusBottomLeft, borderRadiusBottomLeft, startAngle, startAngle + angle);
+    startAngle += angle;
+    p.lineTo(x, y + borderRadiusTopLeft);
+    p.arc(x + borderRadiusTopLeft, y + borderRadiusTopLeft, borderRadiusTopLeft, startAngle, startAngle + angle);
+    p.closePath();
+    return p;
 }

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

@@ -2,9 +2,8 @@ import React from 'react';
 import { color, line as lineGenerator, select } from 'd3';
 import get from 'lodash/get';
 import { DashStyle } from '../../../constants';
-import { block, filterOverlappingLabels, getWaterfallPointColor } from '../../../utils';
+import { block, filterOverlappingLabels, getLineDashArray, getWaterfallPointColor, } from '../../../utils';
 import { HtmlLayer } from '../HtmlLayer';
-import { getLineDashArray } from '../utils';
 export { prepareWaterfallData } from './prepare-data';
 export * from './types';
 const b = block('d3-waterfall');

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

@@ -1,3 +1,4 @@
+import type { DashStyle } from 'src/constants';
 import type { FormatNumberOptions } from '../formatter';
 import type { BaseTextStyle } from './base';
 export type ChartAxisType = 'category' | 'datetime' | 'linear' | 'logarithmic';
@@ -75,6 +76,27 @@ export interface ChartAxis {
 }
 export interface ChartXAxis extends ChartAxis {
 }
+export interface AxisPlotLine {
+    /** The position of the line in axis units. */
+    value?: number;
+    /** The color of the plot line (hex, rgba). */
+    color?: string;
+    /** Pixel width of the plot line.
+     *
+     * @default 1
+     * */
+    width?: number;
+    /** Option for line stroke style. */
+    dashStyle?: `${DashStyle}`;
+    /**
+     * Individual opacity for the line.
+     *
+     * @default 1
+     * */
+    opacity?: number;
+    /** Place the line behind or above the chart. */
+    layerPlacement?: 'before' | 'after';
+}
 export interface ChartYAxis extends ChartAxis {
     /** Axis location.
      * Possible values - 'left' and 'right'.
@@ -83,4 +105,6 @@ export interface ChartYAxis extends ChartAxis {
     /** Property for splitting charts. Determines which area the axis is located in.
      * */
     plotIndex?: number;
+    /** An array of lines stretching across the plot area, marking a specific value */
+    plotLines?: AxisPlotLine[];
 }

package/dist/cjs/types/chart/bar-x.d.ts

@@ -36,6 +36,11 @@ export interface BarXSeries<T = MeaningfulAny> extends BaseSeries {
     name: string;
     /** The main color of the series (hex, rgba) */
     color?: string;
+    /**
+     * The corner radius of the border surrounding each bar.
+     * @default 0
+     */
+    borderRadius?: number;
     /** Whether to stack the values of each series on top of each other.
      * Possible values are undefined to disable, "normal" to stack by value or "percent"
      *

package/dist/cjs/types/chart/bar-y.d.ts

@@ -29,6 +29,11 @@ export interface BarYSeries<T = MeaningfulAny> extends BaseSeries {
     name: string;
     /** The main color of the series (hex, rgba) */
     color?: string;
+    /**
+     * The corner radius of the border surrounding each bar.
+     * @default 0
+     */
+    borderRadius?: number;
     /** Whether to stack the values of each series on top of each other.
      * Possible values are undefined to disable, "normal" to stack by value or "percent"
      *

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

@@ -14,6 +14,8 @@ export interface PieSeriesData<T = MeaningfulAny> extends BaseSeriesData<T> {
     label?: string;
     /** Individual opacity for the pie segment. */
     opacity?: number;
+    /** The individual radius of the pie segment. The default value is series.radius */
+    radius?: string | number;
 }
 export type ConnectorShape = 'straight-line' | 'polyline';
 export type ConnectorCurve = 'linear' | 'basic';