@gravity-ui/charts 1.46.0 → 1.46.1

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

@@ -1,190 +1,32 @@
 import React from 'react';
-import { color } from 'd3-color';
-import { select } from 'd3-selection';
-import { line as lineGenerator } from 'd3-shape';
-import get from 'lodash/get';
-import { getLineDashArray } from '../../../core/utils';
+import { renderLine } from '../../../core/shapes/line/renderer';
 import { block } from '../../../utils';
 import { HtmlLayer } from '../HtmlLayer';
-import { renderAnnotations } from '../annotation';
-import { getMarkerHaloVisibility, getMarkerVisibility, renderMarker, selectMarkerHalo, selectMarkerSymbol, setMarker, } from '../marker';
-import { setActiveState } from '../utils';
 const b = block('line');
 export const LineSeriesShapes = (args) => {
     const { boundsHeight, boundsWidth, dispatcher, preparedData, seriesOptions, htmlLayout, clipPathId, } = args;
-    const hoveredDataRef = React.useRef(null);
     const plotRef = React.useRef(null);
     const markersRef = React.useRef(null);
     const hoverMarkersRef = React.useRef(null);
     const annotationsRef = React.useRef(null);
     React.useEffect(() => {
-        var _a, _b;
-        if (!plotRef.current || !markersRef.current) {
+        if (!plotRef.current ||
+            !markersRef.current ||
+            !hoverMarkersRef.current ||
+            !annotationsRef.current) {
             return () => { };
         }
-        const plotSvgElement = select(plotRef.current);
-        const markersSvgElement = select(markersRef.current);
-        const hoverMarkersSvgElement = select(hoverMarkersRef.current);
-        const hoverOptions = get(seriesOptions, 'line.states.hover');
-        const inactiveOptions = get(seriesOptions, 'line.states.inactive');
-        const line = lineGenerator()
-            .defined((d) => d.y !== null && d.x !== null)
-            .x((d) => d.x)
-            .y((d) => d.y);
-        plotSvgElement.selectAll('*').remove();
-        markersSvgElement.selectAll('*').remove();
-        const lineSelection = plotSvgElement
-            .selectAll('path')
-            .data(preparedData)
-            .join('path')
-            .attr('d', (d) => line(d.points))
-            .attr('fill', 'none')
-            .attr('stroke', (d) => d.color)
-            .attr('stroke-width', (d) => d.lineWidth)
-            .attr('stroke-linejoin', (d) => d.linejoin)
-            .attr('stroke-linecap', (d) => d.linecap)
-            .attr('stroke-dasharray', (d) => getLineDashArray(d.dashStyle, d.lineWidth))
-            .attr('opacity', (d) => d.opacity)
-            .attr('cursor', (d) => d.series.cursor);
-        const dataLabels = preparedData.reduce((acc, d) => {
-            return acc.concat(d.svgLabels);
-        }, []);
-        const labelsSelection = plotSvgElement
-            .selectAll('text')
-            .data(dataLabels)
-            .join('text')
-            .html((d) => d.text)
-            .attr('class', b('label'))
-            .attr('x', (d) => d.x)
-            .attr('y', (d) => d.y)
-            .attr('text-anchor', (d) => d.textAnchor)
-            .style('font-size', (d) => d.style.fontSize)
-            .style('font-weight', (d) => d.style.fontWeight || null)
-            .style('fill', (d) => d.style.fontColor || null);
-        const markers = preparedData.reduce((acc, d) => acc.concat(d.markers), []);
-        const markerSelection = markersSvgElement
-            .selectAll('marker')
-            .data(markers)
-            .join('g')
-            .call(renderMarker);
-        if (annotationsRef.current) {
-            const anchors = preparedData.flatMap((d) => d.annotations);
-            renderAnnotations({
-                anchors,
-                container: select(annotationsRef.current),
-                plotHeight: boundsHeight,
-                plotWidth: boundsWidth,
-            });
-        }
-        const hoverEnabled = hoverOptions === null || hoverOptions === void 0 ? void 0 : hoverOptions.enabled;
-        const inactiveEnabled = inactiveOptions === null || inactiveOptions === void 0 ? void 0 : inactiveOptions.enabled;
-        function handleShapeHover(data) {
-            hoveredDataRef.current = data;
-            const selected = (data === null || data === void 0 ? void 0 : data.filter((d) => d.series.type === 'line')) || [];
-            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; });
-            lineSelection.datum((d, index, list) => {
-                const elementSelection = select(list[index]);
-                const hovered = Boolean(hoverEnabled && selectedSeriesIds.includes(d.id));
-                if (d.hovered !== hovered) {
-                    d.hovered = hovered;
-                    elementSelection.attr('stroke', (dSelection) => {
-                        var _a;
-                        const initialColor = dSelection.color || '';
-                        if (dSelection.hovered) {
-                            return (((_a = color(initialColor)) === null || _a === void 0 ? void 0 : _a.brighter(hoverOptions === null || hoverOptions === void 0 ? void 0 : hoverOptions.brightness).toString()) || initialColor);
-                        }
-                        return initialColor;
-                    });
-                }
-                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.x === null || point.y === null) {
-                        continue;
-                    }
-                    hoverOnlyMarkers.push({
-                        point: point,
-                        active: true,
-                        hovered: true,
-                        clipped: false,
-                    });
-                }
-                if (hoverOnlyMarkers.length > 0) {
-                    hoverMarkersSvgElement
-                        .selectAll('g')
-                        .data(hoverOnlyMarkers)
-                        .join('g')
-                        .call(renderMarker)
-                        .each((_d, i, nodes) => {
-                        selectMarkerSymbol(select(nodes[i])).call(setMarker, 'hover');
-                    });
-                }
-            }
-        }
-        if (hoveredDataRef.current !== null) {
-            handleShapeHover(hoveredDataRef.current);
-        }
-        const eventName = `hover-shape.line-${(_b = (_a = preparedData[0]) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : 'unknown'}`;
-        dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.on(eventName, handleShapeHover);
-        return () => {
-            dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.on(eventName, null);
-        };
+        return renderLine({
+            plot: plotRef.current,
+            markers: markersRef.current,
+            hoverMarkers: hoverMarkersRef.current,
+            annotations: annotationsRef.current,
+            boundsWidth,
+            boundsHeight,
+        }, preparedData, seriesOptions, dispatcher);
     }, [boundsHeight, boundsWidth, dispatcher, preparedData, seriesOptions]);
     const htmlLayerData = React.useMemo(() => {
-        const items = preparedData.map((d) => d === null || d === void 0 ? void 0 : d.htmlLabels).flat();
+        const items = preparedData.flatMap((d) => d.htmlLabels);
         return { htmlElements: items };
     }, [preparedData]);
     return (React.createElement(React.Fragment, null,

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

@@ -1,14 +1,12 @@
 import React from 'react';
 import type { Dispatch } from 'd3-dispatch';
-import type { PieArcDatum } from 'd3-shape';
-import type { PreparedSeriesOptions } from '../../useSeries/types';
-import type { PreparedPieData, SegmentData } from './types';
+import type { PreparedSeriesOptions } from '../../../core/series/types';
+import type { PreparedPieData } from '../../../core/shapes/pie/types';
+export { getHaloVisibility } from '../../../core/shapes/pie/renderer';
 type PreparePieSeriesArgs = {
     htmlLayout: HTMLElement | null;
     preparedData: PreparedPieData[];
     seriesOptions: PreparedSeriesOptions;
     dispatcher?: Dispatch<object>;
 };
-export declare function getHaloVisibility(d: PieArcDatum<SegmentData>): "" | "hidden";
 export declare function PieSeriesShapes(args: PreparePieSeriesArgs): React.JSX.Element;
-export {};

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

@@ -1,17 +1,9 @@
 import React from 'react';
-import { color } from 'd3-color';
-import { select } from 'd3-selection';
-import { arc } from 'd3-shape';
-import get from 'lodash/get';
-import { setEllipsisForOverflowTexts } from '../../../core/utils';
+import { renderPie } from '../../../core/shapes/pie/renderer';
 import { block } from '../../../utils';
 import { HtmlLayer } from '../HtmlLayer';
-import { setActiveState } from '../utils';
+export { getHaloVisibility } from '../../../core/shapes/pie/renderer';
 const b = block('pie');
-export function getHaloVisibility(d) {
-    const enabled = d.data.pie.halo.enabled && d.data.hovered;
-    return enabled ? '' : 'hidden';
-}
 export function PieSeriesShapes(args) {
     const { dispatcher, preparedData, seriesOptions, htmlLayout } = args;
     const ref = React.useRef(null);
@@ -19,154 +11,7 @@ export function PieSeriesShapes(args) {
         if (!ref.current) {
             return () => { };
         }
-        const svgElement = select(ref.current);
-        svgElement.selectAll('*').remove();
-        const segmentSelector = `.${b('segment')}`;
-        const connectorSelector = `.${b('connector')}`;
-        const shapesSelection = svgElement
-            .selectAll('pie')
-            .data(preparedData)
-            .join('g')
-            .attr('id', (pieData) => pieData.id)
-            .attr('class', b('item'))
-            .attr('transform', (pieData) => {
-            const [x, y] = pieData.center;
-            return `translate(${x}, ${y})`;
-        })
-            .style('stroke-width', (pieData) => pieData.borderWidth)
-            .attr('cursor', (pieData) => pieData.series.cursor);
-        // Render halo appearing outside the hovered slice
-        shapesSelection
-            .selectAll('halo')
-            .data((pieData) => {
-            if (pieData.halo.enabled) {
-                return pieData.segments;
-            }
-            return [];
-        })
-            .join('path')
-            .attr('d', (d) => {
-            const arcGenerator = arc()
-                .innerRadius(d.data.pie.innerRadius)
-                .outerRadius(d.data.radius + d.data.pie.halo.size)
-                .cornerRadius(d.data.pie.borderRadius);
-            return arcGenerator(d);
-        })
-            .attr('class', b('halo'))
-            .attr('fill', (d) => d.data.color)
-            .attr('opacity', (d) => d.data.pie.halo.opacity)
-            .attr('z-index', -1)
-            .attr('visibility', getHaloVisibility);
-        // Render segments
-        shapesSelection
-            .selectAll(segmentSelector)
-            .data((pieData) => pieData.segments)
-            .join('path')
-            .attr('d', (d) => {
-            const arcGenerator = arc()
-                .innerRadius(d.data.pie.innerRadius)
-                .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
-        shapesSelection
-            .selectAll('text')
-            .data((pieData) => pieData.labels)
-            .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)
-            .call(setEllipsisForOverflowTexts, (d) => d.size.width > d.maxWidth ? d.maxWidth : Infinity);
-        // Add the polyline between chart and labels
-        shapesSelection
-            .selectAll(connectorSelector)
-            .data((pieData) => pieData.connectors)
-            .enter()
-            .append('path')
-            .attr('class', b('connector'))
-            .attr('d', (d) => d.path)
-            .attr('stroke', (d) => d.color)
-            .attr('stroke-width', 1)
-            .attr('stroke-linejoin', 'round')
-            .attr('stroke-linecap', 'round')
-            .style('fill', 'none');
-        // Render custom shapes if defined
-        shapesSelection.each(async function (d, index, nodes) {
-            var _a, _b;
-            const customShape = await ((_b = (_a = d.series).renderCustomShape) === null || _b === void 0 ? void 0 : _b.call(_a, {
-                series: {
-                    innerRadius: d.innerRadius,
-                },
-            }));
-            if (customShape) {
-                nodes[index].append(customShape);
-            }
-        });
-        const eventName = `hover-shape.pie`;
-        const hoverOptions = get(seriesOptions, 'pie.states.hover');
-        const inactiveOptions = get(seriesOptions, 'pie.states.inactive');
-        dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.on(eventName, (data) => {
-            var _a, _b;
-            const selectedSeriesId = (_b = (_a = data === null || data === void 0 ? void 0 : data[0]) === null || _a === void 0 ? void 0 : _a.series) === null || _b === void 0 ? void 0 : _b.id;
-            const hoverEnabled = hoverOptions === null || hoverOptions === void 0 ? void 0 : hoverOptions.enabled;
-            const inactiveEnabled = inactiveOptions === null || inactiveOptions === void 0 ? void 0 : inactiveOptions.enabled;
-            shapesSelection.datum((_d, index, list) => {
-                const pieSelection = select(list[index]);
-                const haloSelection = pieSelection.selectAll(`.${b('halo')}`);
-                pieSelection
-                    .selectAll(segmentSelector)
-                    .datum((d, i, elements) => {
-                    const hovered = Boolean(hoverEnabled && d.data.series.id === selectedSeriesId);
-                    if (d.data.hovered !== hovered) {
-                        d.data.hovered = hovered;
-                        select(elements[i]).attr('fill', () => {
-                            var _a;
-                            const initialColor = d.data.color;
-                            if (d.data.hovered) {
-                                return (((_a = color(initialColor)) === null || _a === void 0 ? void 0 : _a.brighter(hoverOptions === null || hoverOptions === void 0 ? void 0 : hoverOptions.brightness).toString()) || initialColor);
-                            }
-                            return initialColor;
-                        });
-                        const currentSegmentHalo = haloSelection.nodes()[i];
-                        select(currentSegmentHalo).attr('visibility', getHaloVisibility);
-                    }
-                    setActiveState({
-                        element: elements[i],
-                        state: inactiveOptions,
-                        active: Boolean(!inactiveEnabled ||
-                            !selectedSeriesId ||
-                            selectedSeriesId === d.data.series.id),
-                        datum: d.data,
-                    });
-                    return d;
-                });
-                const labelSelection = pieSelection.selectAll(`.${b('label')} tspan`);
-                const connectorSelection = pieSelection.selectAll(connectorSelector);
-                labelSelection.merge(connectorSelection).datum((d, i, elements) => {
-                    return setActiveState({
-                        element: elements[i],
-                        state: inactiveOptions,
-                        active: Boolean(!inactiveEnabled ||
-                            !selectedSeriesId ||
-                            selectedSeriesId === d.series.id),
-                        datum: d,
-                    });
-                });
-            });
-        });
-        return () => {
-            dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.on(eventName, null);
-        };
+        return renderPie({ plot: ref.current }, preparedData, seriesOptions, dispatcher);
     }, [dispatcher, preparedData, seriesOptions]);
     const htmlElements = preparedData.map((d) => d.htmlLabels).flat();
     return (React.createElement(React.Fragment, null,

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { Dispatch } from 'd3-dispatch';
-import type { PreparedSeriesOptions } from '../../useSeries/types';
-import type { PreparedRadarData } from './types';
+import type { PreparedSeriesOptions } from '../../../core/series/types';
+import type { PreparedRadarData } from '../../../core/shapes/radar/types';
 type PrepareRadarSeriesArgs = {
     htmlLayout: HTMLElement | null;
     series: PreparedRadarData[];

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

@@ -1,12 +1,7 @@
 import React from 'react';
-import { color } from 'd3-color';
-import { select } from 'd3-selection';
-import { line } from 'd3-shape';
-import get from 'lodash/get';
+import { renderRadar } from '../../../core/shapes/radar/renderer';
 import { block } from '../../../utils';
 import { HtmlLayer } from '../HtmlLayer';
-import { getMarkerHaloVisibility, getMarkerVisibility, renderMarker, selectMarkerHalo, selectMarkerSymbol, setMarker, } from '../marker';
-import { setActiveState } from '../utils';
 const b = block('radar');
 export function RadarSeriesShapes(args) {
     const { dispatcher, series: preparedData, seriesOptions, htmlLayout } = args;
@@ -15,121 +10,7 @@ export function RadarSeriesShapes(args) {
         if (!ref.current) {
             return () => { };
         }
-        const svgElement = select(ref.current);
-        svgElement.selectAll('*').remove();
-        const areaSelector = `.${b('area')}`;
-        const radarSelection = svgElement
-            .selectAll('radar')
-            .data(preparedData)
-            .join('g')
-            .attr('id', (radarData) => radarData.id)
-            .attr('class', b('item'))
-            .attr('cursor', (radarData) => radarData.cursor);
-        // render axes
-        radarSelection
-            .selectAll(`.${b('axis')}`)
-            .data((radarData) => radarData.axes)
-            .join('line')
-            .attr('class', b('axis'))
-            .attr('x1', (d) => d.radar.center[0])
-            .attr('y1', (d) => d.radar.center[1])
-            .attr('x2', (d) => d.point[0])
-            .attr('y2', (d) => d.point[1])
-            .attr('stroke', (d) => d.strokeColor)
-            .attr('stroke-width', (d) => d.strokeWidth);
-        // render grid lines
-        radarSelection
-            .selectAll(`.${b('grid')}`)
-            .data((radarData) => radarData.grid)
-            .join('path')
-            .attr('class', b('grid'))
-            .attr('d', (d) => `${line()(d.path)} Z`)
-            .attr('fill', 'none')
-            .attr('stroke', (d) => d.strokeColor)
-            .attr('stroke-width', (d) => d.strokeWidth);
-        // render radar area
-        const shapesSelection = radarSelection
-            .selectAll(areaSelector)
-            .data((radarData) => radarData.shapes)
-            .join('g')
-            .attr('class', b('area'));
-        shapesSelection
-            .append('path')
-            .attr('d', (d) => d.path)
-            .attr('fill', (d) => d.color)
-            .attr('fill-opacity', (d) => d.fillOpacity)
-            .attr('stroke', (d) => d.borderColor)
-            .attr('stroke-width', (d) => d.borderWidth);
-        // render markers
-        const markerSelection = shapesSelection
-            .selectAll('marker')
-            .data((radarData) => radarData.points)
-            .join('g')
-            .call(renderMarker);
-        // Render labels
-        radarSelection
-            .selectAll('text')
-            .data((radarData) => radarData.labels)
-            .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);
-        // Handle hover events
-        const eventName = `hover-shape.radar`;
-        const hoverOptions = get(seriesOptions, 'radar.states.hover');
-        const inactiveOptions = get(seriesOptions, 'radar.states.inactive');
-        dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.on(eventName, (data) => {
-            const closest = data === null || data === void 0 ? void 0 : data.find((d) => d.closest);
-            const selectedSeries = closest === null || closest === void 0 ? void 0 : closest.series;
-            const selectedSeriesData = closest === null || closest === void 0 ? void 0 : closest.data;
-            const selectedSeriesId = selectedSeries === null || selectedSeries === void 0 ? void 0 : selectedSeries.id;
-            const hoverEnabled = hoverOptions === null || hoverOptions === void 0 ? void 0 : hoverOptions.enabled;
-            const inactiveEnabled = inactiveOptions === null || inactiveOptions === void 0 ? void 0 : inactiveOptions.enabled;
-            shapesSelection.datum((d, i, elements) => {
-                var _a;
-                const hovered = Boolean(hoverEnabled && ((_a = d.series) === null || _a === void 0 ? void 0 : _a.id) === selectedSeriesId);
-                if (d.hovered !== hovered) {
-                    d.hovered = hovered;
-                    select(elements[i]).attr('fill', () => {
-                        var _a;
-                        const initialColor = d.color;
-                        if (d.hovered) {
-                            return (((_a = color(initialColor)) === null || _a === void 0 ? void 0 : _a.brighter(hoverOptions === null || hoverOptions === void 0 ? void 0 : hoverOptions.brightness).toString()) || initialColor);
-                        }
-                        return initialColor;
-                    });
-                    if (hovered) {
-                        select(elements[i]).raise();
-                    }
-                }
-                setActiveState({
-                    element: elements[i],
-                    state: inactiveOptions,
-                    active: Boolean(!inactiveEnabled || !selectedSeriesId || selectedSeriesId === d.series.id),
-                    datum: d,
-                });
-                markerSelection.datum((markerData, index, markers) => {
-                    const hoveredState = Boolean(hoverEnabled && markerData.data === selectedSeriesData);
-                    if (markerData.hovered !== hoveredState) {
-                        markerData.hovered = hoveredState;
-                        const elementSelection = select(markers[index]);
-                        elementSelection.attr('visibility', getMarkerVisibility(markerData));
-                        selectMarkerHalo(elementSelection).attr('visibility', getMarkerHaloVisibility);
-                        selectMarkerSymbol(elementSelection).call(setMarker, hoveredState ? 'hover' : 'normal');
-                    }
-                    return markerData;
-                });
-                return d;
-            });
-        });
-        return () => {
-            dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.on(eventName, null);
-        };
+        return renderRadar({ plot: ref.current }, preparedData, seriesOptions, dispatcher);
     }, [dispatcher, preparedData, seriesOptions]);
     const htmlElements = preparedData.map((d) => d.htmlLabels).flat();
     return (React.createElement(React.Fragment, null,

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { Dispatch } from 'd3-dispatch';
-import type { PreparedSeriesOptions } from '../../useSeries/types';
-import type { PreparedSankeyData } from './types';
+import type { PreparedSeriesOptions } from '../../../core/series/types';
+import type { PreparedSankeyData } from '../../../core/shapes/sankey/types';
 type ShapeProps = {
     htmlLayout: HTMLElement | null;
     preparedData: PreparedSankeyData;

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

@@ -1,65 +1,16 @@
 import React from 'react';
-import { select } from 'd3-selection';
+import { renderSankey } from '../../../core/shapes/sankey/renderer';
 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')
-            .html((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 === null || dispatcher === void 0 ? void 0 : dispatcher.on(eventName, handleShapeHover);
-        return () => {
-            dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.on(eventName, null);
-        };
+        return renderSankey({ plot: ref.current }, preparedData, seriesOptions, dispatcher);
     }, [dispatcher, preparedData, seriesOptions]);
     return (React.createElement(React.Fragment, null,
         React.createElement("g", { ref: ref, className: b() }),

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

@@ -1,8 +1,8 @@
 import React from 'react';
 import type { Dispatch } from 'd3-dispatch';
-import type { PreparedSeriesOptions } from '../../useSeries/types';
-import type { PreparedScatterData } from './types';
-export { prepareScatterData } from './prepare-data';
+import type { PreparedSeriesOptions } from '../../../core/series/types';
+import type { PreparedScatterData } from '../../../core/shapes/scatter/types';
+export { prepareScatterData } from '../../../core/shapes/scatter/prepare-data';
 type ScatterSeriesShapeProps = {
     htmlLayout: HTMLElement | null;
     preparedData: PreparedScatterData[];