@gravity-ui/charts 0.6.0 → 0.6.1-beta.2

package/dist/cjs/hooks/useSeries/prepareSeries.js

@@ -4,6 +4,7 @@ import { prepareBarXSeries } from './prepare-bar-x';
 import { prepareBarYSeries } from './prepare-bar-y';
 import { prepareLineSeries } from './prepare-line';
 import { preparePieSeries } from './prepare-pie';
+import { prepareSankeySeries } from './prepare-sankey';
 import { prepareScatterSeries } from './prepare-scatter';
 import { prepareTreemap } from './prepare-treemap';
 import { prepareWaterfallSeries } from './prepare-waterfall';
@@ -17,10 +18,20 @@ export function prepareSeries(args) {
             }, []);
         }
         case 'bar-x': {
-            return prepareBarXSeries({ series: series, legend, colorScale });
+            return prepareBarXSeries({
+                series: series,
+                legend,
+                colorScale,
+                seriesOptions,
+            });
         }
         case 'bar-y': {
-            return prepareBarYSeries({ series: series, legend, colorScale });
+            return prepareBarYSeries({
+                series: series,
+                legend,
+                colorScale,
+                seriesOptions,
+            });
         }
         case 'scatter': {
             return prepareScatterSeries({ series: series, legend, colorScale });
@@ -56,6 +67,14 @@ export function prepareSeries(args) {
                 colorScale,
             });
         }
+        case 'sankey': {
+            return prepareSankeySeries({
+                series: series,
+                seriesOptions,
+                colorScale,
+                legend,
+            });
+        }
         default: {
             throw new ChartError({
                 message: `Series type "${type}" does not support data preparation for series that do not support the presence of axes`,

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

@@ -1,5 +1,5 @@
 import type { DashStyle, LayoutAlgorithm, LineCap, SeriesOptionsDefaults, SymbolType } from '../../constants';
-import type { AreaSeries, AreaSeriesData, BarXSeries, BarXSeriesData, BarYSeries, BarYSeriesData, BaseTextStyle, ChartLegend, ConnectorCurve, ConnectorShape, LineSeries, LineSeriesData, PathLegendSymbolOptions, PieSeries, PieSeriesData, RectLegendSymbolOptions, ScatterSeries, ScatterSeriesData, SymbolLegendSymbolOptions, TreemapSeries, TreemapSeriesData, WaterfallSeries, WaterfallSeriesData } from '../../types';
+import type { AreaSeries, AreaSeriesData, BarXSeries, BarXSeriesData, BarYSeries, BarYSeriesData, BaseTextStyle, ChartLegend, ConnectorCurve, ConnectorShape, LineSeries, LineSeriesData, PathLegendSymbolOptions, PieSeries, PieSeriesData, RectLegendSymbolOptions, SankeySeries, SankeySeriesData, ScatterSeries, ScatterSeriesData, SymbolLegendSymbolOptions, TreemapSeries, TreemapSeriesData, WaterfallSeries, WaterfallSeriesData } from '../../types';
 export type RectLegendSymbol = {
     shape: 'rect';
 } & Required<RectLegendSymbolOptions>;
@@ -107,6 +107,7 @@ export type PreparedBarXSeries = {
         padding: number;
         html: boolean;
     };
+    borderRadius: number;
     yAxis: number;
 } & BasePreparedSeries;
 export type PreparedBarYSeries = {
@@ -122,6 +123,7 @@ export type PreparedBarYSeries = {
         maxWidth: number;
         html: boolean;
     };
+    borderRadius: number;
 } & BasePreparedSeries;
 export type PreparedPieSeries = {
     type: PieSeries['type'];
@@ -248,7 +250,15 @@ export type PreparedWaterfallSeries = {
     positiveColor: string;
     negativeColor: string;
 } & BasePreparedSeries;
-export type PreparedSeries = PreparedScatterSeries | PreparedBarXSeries | PreparedBarYSeries | PreparedPieSeries | PreparedLineSeries | PreparedAreaSeries | PreparedTreemapSeries | PreparedWaterfallSeries;
+export type PreparedSankeySeries = {
+    type: SankeySeries['type'];
+    data: SankeySeriesData[];
+    dataLabels: {
+        enabled: boolean;
+        style: BaseTextStyle;
+    };
+} & BasePreparedSeries & Omit<SankeySeries, keyof BasePreparedSeries>;
+export type PreparedSeries = PreparedScatterSeries | PreparedBarXSeries | PreparedBarYSeries | PreparedPieSeries | PreparedLineSeries | PreparedAreaSeries | PreparedTreemapSeries | PreparedWaterfallSeries | PreparedSankeySeries;
 export type PreparedSeriesOptions = SeriesOptionsDefaults;
 export type StackedSeries = BarXSeries | AreaSeries | BarYSeries;
 export {};

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

@@ -1,6 +1,6 @@
 import memoize from 'lodash/memoize';
 import { SymbolType } from '../../constants';
-import { getUniqId } from '../../utils';
+import { getUniqId } from '../../utils/misc';
 import { DEFAULT_LEGEND_SYMBOL_PADDING, DEFAULT_LEGEND_SYMBOL_SIZE } from './constants';
 export const getActiveLegendItems = (series) => {
     return series.reduce((acc, s) => {

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

@@ -102,10 +102,14 @@ export const prepareAreaData = (args) => {
                 const labelItems = points.map((p) => getLabelData(p, s, xMax));
                 if (s.dataLabels.html) {
                     const htmlLabels = labelItems.map((l) => {
+                        var _a;
+                        const style = (_a = l.style) !== null && _a !== void 0 ? _a : s.dataLabels.style;
+                        const labelSize = getLabelsSize({ labels: [l.text], style, html: true });
                         return {
                             x: l.x - l.size.width / 2,
                             y: l.y,
                             content: l.text,
+                            size: { width: labelSize.maxWidth, height: labelSize.maxHeight },
                         };
                     });
                     htmlElements.push(...htmlLabels);

package/dist/cjs/hooks/useShapes/bar-x/index.js

@@ -3,9 +3,10 @@ import { color, select } from 'd3';
 import get from 'lodash/get';
 import { block, filterOverlappingLabels } from '../../../utils';
 import { HtmlLayer } from '../HtmlLayer';
+import { getRectPath } from '../utils';
 export { prepareBarXData } from './prepare-data';
 export * from './types';
-const b = block('d3-bar-x');
+const b = block('bar-x');
 export const BarXSeriesShapes = (args) => {
     const { dispatcher, preparedData, seriesOptions, htmlLayout } = args;
     const hoveredDataRef = React.useRef(null);
@@ -22,7 +23,20 @@ export const BarXSeriesShapes = (args) => {
         const rectSelection = svgElement
             .selectAll('allRects')
             .data(preparedData)
-            .join('rect')
+            .join('path')
+            .attr('d', (d) => {
+            const borderRadius = d.isLastStackItem
+                ? Math.min(d.height, d.width / 2, d.series.borderRadius)
+                : 0;
+            const p = getRectPath({
+                x: d.x,
+                y: d.y,
+                width: d.width,
+                height: d.height,
+                borderRadius: [borderRadius, borderRadius, 0, 0],
+            });
+            return p.toString();
+        })
             .attr('class', b('segment'))
             .attr('x', (d) => d.x)
             .attr('y', (d) => d.y)

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

@@ -103,7 +103,7 @@ export const prepareBarXData = (args) => {
             const sortedData = sortKey
                 ? sort(yValues, (a, b) => comparator(get(a, sortKey), get(b, sortKey)))
                 : yValues;
-            sortedData.forEach((yValue) => {
+            sortedData.forEach((yValue, yValueIndex) => {
                 const yAxisIndex = yValue.series.yAxis;
                 const seriesYScale = yScale[yAxisIndex];
                 let xCenter;
@@ -129,6 +129,7 @@ export const prepareBarXData = (args) => {
                     data: yValue.data,
                     series: yValue.series,
                     htmlElements: [],
+                    isLastStackItem: yValueIndex === sortedData.length - 1,
                 };
                 const label = getLabelData(barData);
                 if (yValue.series.dataLabels.html && label) {
@@ -136,6 +137,7 @@ export const prepareBarXData = (args) => {
                         x: label.x,
                         y: label.y,
                         content: label.text,
+                        size: label.size,
                     });
                 }
                 else {

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

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

package/dist/cjs/hooks/useShapes/bar-y/index.js

@@ -3,8 +3,9 @@ import { color, select } from 'd3';
 import get from 'lodash/get';
 import { block } from '../../../utils';
 import { HtmlLayer } from '../HtmlLayer';
+import { getRectPath } from '../utils';
 export { prepareBarYData } from './prepare-data';
-const b = block('d3-bar-y');
+const b = block('bar-y');
 export const BarYSeriesShapes = (args) => {
     const { dispatcher, preparedData, seriesOptions, htmlLayout } = args;
     const hoveredDataRef = React.useRef(null);
@@ -18,7 +19,20 @@ export const BarYSeriesShapes = (args) => {
         const rectSelection = svgElement
             .selectAll('rect')
             .data(preparedData)
-            .join('rect')
+            .join('path')
+            .attr('d', (d) => {
+            const borderRadius = d.isLastStackItem
+                ? Math.min(d.height, d.width / 2, d.series.borderRadius)
+                : 0;
+            const p = getRectPath({
+                x: d.x,
+                y: d.y,
+                width: d.width,
+                height: d.height,
+                borderRadius: [0, borderRadius, borderRadius, 0],
+            });
+            return p.toString();
+        })
             .attr('class', b('segment'))
             .attr('x', (d) => d.x)
             .attr('y', (d) => d.y)

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

@@ -69,6 +69,7 @@ function setLabel(prepared) {
             x,
             y: y - height / 2,
             content,
+            size: { width, height },
         });
     }
     else {
@@ -123,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;
@@ -146,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/line/prepare-data.js

@@ -33,6 +33,7 @@ function getHtmlLabel(point, series, xMax) {
         x: Math.min(xMax - size.maxWidth, Math.max(0, point.x)),
         y: Math.max(0, point.y - series.dataLabels.padding - size.maxHeight),
         content,
+        size: { width: size.maxWidth, height: size.maxHeight },
     };
 }
 export const prepareLineData = (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
@@ -165,7 +165,8 @@ export function PieSeriesShapes(args) {
             dispatcher.on(eventName, null);
         };
     }, [dispatcher, preparedData, seriesOptions]);
+    const htmlElements = preparedData.map((d) => d.htmlLabels).flat();
     return (React.createElement(React.Fragment, null,
         React.createElement("g", { ref: ref, className: b(), style: { zIndex: 9 } }),
-        React.createElement(HtmlLayer, { preparedData: preparedData, htmlLayout: htmlLayout })));
+        React.createElement(HtmlLayer, { preparedData: { htmlElements }, htmlLayout: htmlLayout })));
 }