@gravity-ui/chartkit 5.0.0 → 5.1.0

package/build/plugins/d3/renderer/components/Chart.js

@@ -60,6 +60,15 @@ export const Chart = (props) => {
         yScale,
         svgContainer: svgRef.current,
     });
+    React.useEffect(() => {
+        var _a, _b, _c, _d;
+        if ((_b = (_a = data.chart) === null || _a === void 0 ? void 0 : _a.events) === null || _b === void 0 ? void 0 : _b.click) {
+            dispatcher.on('click-chart', (_d = (_c = data.chart) === null || _c === void 0 ? void 0 : _c.events) === null || _d === void 0 ? void 0 : _d.click);
+        }
+        return () => {
+            dispatcher.on('click-chart', null);
+        };
+    }, [dispatcher]);
     const boundsOffsetTop = chart.margin.top;
     const boundsOffsetLeft = chart.margin.left + getWidthOccupiedByYAxis({ preparedAxis: yAxis });
     return (React.createElement(React.Fragment, null,

package/build/plugins/d3/renderer/components/Tooltip/TooltipTriggerArea.js

@@ -101,7 +101,7 @@ export const TooltipTriggerArea = (args) => {
         });
         return sort(result, (item) => item.y);
     }, [shapesData]);
-    const handleMouseMove = (e) => {
+    const getShapeData = (point) => {
         var _a, _b;
         const { left: ownLeft, top: ownTop } = ((_a = rectRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect()) || {
             left: 0,
@@ -111,9 +111,9 @@ export const TooltipTriggerArea = (args) => {
             left: 0,
             top: 0,
         };
-        const [pointerX, pointerY] = pointer(e, svgContainer);
-        const hoverShapeData = [];
-        hoverShapeData === null || hoverShapeData === void 0 ? void 0 : hoverShapeData.push(...getBarXShapeData({
+        const [pointerX, pointerY] = point; //pointer(e, svgContainer);
+        const result = [];
+        result === null || result === void 0 ? void 0 : result.push(...getBarXShapeData({
             shapesData,
             point: [pointerX, pointerY],
             left: ownLeft - containerLeft,
@@ -127,6 +127,11 @@ export const TooltipTriggerArea = (args) => {
             data: barYData,
             point: [pointerX - (ownLeft - containerLeft), pointerY - (ownTop - containerTop)],
         }));
+        return result;
+    };
+    const handleMouseMove = (e) => {
+        const [pointerX, pointerY] = pointer(e, svgContainer);
+        const hoverShapeData = getShapeData([pointerX, pointerY]);
         if (hoverShapeData.length) {
             const position = [pointerX, pointerY];
             dispatcher.call('hover-shape', e.target, hoverShapeData, position);
@@ -137,5 +142,12 @@ export const TooltipTriggerArea = (args) => {
         throttledHandleMouseMove.cancel();
         dispatcher.call('hover-shape', {}, undefined);
     };
-    return (React.createElement("rect", { ref: rectRef, width: boundsWidth, height: boundsHeight, fill: "transparent", onMouseMove: throttledHandleMouseMove, onMouseLeave: handleMouseLeave }));
+    const handleClick = (e) => {
+        const [pointerX, pointerY] = pointer(e, svgContainer);
+        const shapeData = getShapeData([pointerX, pointerY]);
+        if (shapeData.length) {
+            dispatcher.call('click-chart', undefined, { point: get(shapeData, '[0].data'), series: get(shapeData, '[0].series') }, e);
+        }
+    };
+    return (React.createElement("rect", { ref: rectRef, width: boundsWidth, height: boundsHeight, fill: "transparent", onMouseMove: throttledHandleMouseMove, onMouseLeave: handleMouseLeave, onClick: handleClick }));
 };

package/build/plugins/d3/renderer/d3-dispatcher.js

@@ -1,4 +1,4 @@
 import { dispatch } from 'd3';
 export const getD3Dispatcher = () => {
-    return dispatch('hover-shape');
+    return dispatch('hover-shape', 'click-chart');
 };

package/build/plugins/d3/renderer/hooks/useSeries/prepare-line.js

@@ -72,6 +72,7 @@ export function prepareLineSeries(args) {
             marker: prepareMarker(series, seriesOptions),
             dashStyle: dashStyle,
             linecap: prepareLinecap(dashStyle, series, seriesOptions),
+            opacity: get(series, 'opacity', null),
         };
         return prepared;
     }, []);

package/build/plugins/d3/renderer/hooks/useSeries/prepare-pie.js

@@ -52,6 +52,7 @@ export function preparePieSeries(args) {
                 },
             },
             renderCustomShape: series.renderCustomShape,
+            opacity: get(dataItem, 'opacity', null),
         };
         return result;
     });

package/build/plugins/d3/renderer/hooks/useSeries/types.d.ts

@@ -130,6 +130,7 @@ export type PreparedPieSeries = {
         };
     };
     renderCustomShape?: PieSeries['renderCustomShape'];
+    opacity: number | null;
 } & BasePreparedSeries;
 export type PreparedLineSeries = {
     type: LineSeries['type'];
@@ -161,6 +162,7 @@ export type PreparedLineSeries = {
     };
     dashStyle: DashStyle;
     linecap: LineCap;
+    opacity: number | null;
 } & BasePreparedSeries;
 export type PreparedAreaSeries = {
     type: AreaSeries['type'];

package/build/plugins/d3/renderer/hooks/useShapes/bar-x/index.js

@@ -27,7 +27,8 @@ export const BarXSeriesShapes = (args) => {
             .attr('y', (d) => d.y)
             .attr('height', (d) => d.height)
             .attr('width', (d) => d.width)
-            .attr('fill', (d) => d.data.color || d.series.color);
+            .attr('fill', (d) => d.data.color || d.series.color)
+            .attr('opacity', (d) => d.opacity);
         let dataLabels = preparedData.map((d) => d.label).filter(Boolean);
         if (!((_a = preparedData[0]) === null || _a === void 0 ? void 0 : _a.series.dataLabels.allowOverlap)) {
             dataLabels = filterOverlappingLabels(dataLabels);

package/build/plugins/d3/renderer/hooks/useShapes/bar-x/prepare-data.js

@@ -117,6 +117,7 @@ export const prepareBarXData = (args) => {
                     y: y - stackHeight,
                     width: rectWidth,
                     height,
+                    opacity: get(yValue.data, 'opacity', null),
                     data: yValue.data,
                     series: yValue.series,
                 };

package/build/plugins/d3/renderer/hooks/useShapes/bar-x/types.d.ts

@@ -6,6 +6,7 @@ export type PreparedBarXData = Omit<TooltipDataChunkBarX, 'series'> & {
     y: number;
     width: number;
     height: number;
+    opacity: number | null;
     series: PreparedBarXSeries;
     label?: LabelData;
 };

package/build/plugins/d3/renderer/hooks/useShapes/bar-y/index.js

@@ -23,7 +23,8 @@ export const BarYSeriesShapes = (args) => {
             .attr('y', (d) => d.y)
             .attr('height', (d) => d.height)
             .attr('width', (d) => d.width)
-            .attr('fill', (d) => d.color);
+            .attr('fill', (d) => d.color)
+            .attr('opacity', (d) => d.data.opacity || null);
         const dataLabels = preparedData.filter((d) => d.series.dataLabels.enabled);
         const labelSelection = svgElement
             .selectAll('text')

package/build/plugins/d3/renderer/hooks/useShapes/bar-y/prepare-data.js

@@ -104,6 +104,7 @@ export const prepareBarYData = (args) => {
                     width,
                     height: barHeight,
                     color: data.color || s.color,
+                    opacity: get(data, 'opacity', null),
                     data,
                     series: s,
                 });

package/build/plugins/d3/renderer/hooks/useShapes/bar-y/types.d.ts

@@ -6,5 +6,6 @@ export type PreparedBarYData = Omit<TooltipDataChunkBarX, 'series'> & {
     width: number;
     height: number;
     color: string;
+    opacity: number | null;
     series: PreparedBarYSeries;
 };

package/build/plugins/d3/renderer/hooks/useShapes/line/index.js

@@ -31,7 +31,8 @@ export const LineSeriesShapes = (args) => {
             .attr('stroke-width', (d) => d.width)
             .attr('stroke-linejoin', (d) => d.linecap)
             .attr('stroke-linecap', (d) => d.linecap)
-            .attr('stroke-dasharray', (d) => getLineDashArray(d.dashStyle, d.width));
+            .attr('stroke-dasharray', (d) => getLineDashArray(d.dashStyle, d.width))
+            .attr('opacity', (d) => d.opacity);
         let dataLabels = preparedData.reduce((acc, d) => {
             return acc.concat(d.labels);
         }, []);

package/build/plugins/d3/renderer/hooks/useShapes/line/prepare-data.js

@@ -63,6 +63,7 @@ export const prepareLineData = (args) => {
             id: s.id,
             dashStyle: s.dashStyle,
             linecap: s.linecap,
+            opacity: s.opacity,
         };
         acc.push(result);
         return acc;

package/build/plugins/d3/renderer/hooks/useShapes/line/types.d.ts

@@ -25,4 +25,5 @@ export type PreparedLineData = {
     labels: LabelData[];
     dashStyle: DashStyle;
     linecap: LineCap;
+    opacity: number | null;
 };

package/build/plugins/d3/renderer/hooks/useShapes/marker.js

@@ -36,7 +36,14 @@ export function renderMarker(selection) {
 }
 export function getMarkerVisibility(d) {
     const markerStates = d.point.series.marker.states;
-    const enabled = (markerStates.hover.enabled && d.hovered) || markerStates.normal.enabled;
+    let enabled;
+    if (d.hovered) {
+        enabled = markerStates.hover.enabled && d.hovered;
+    }
+    else {
+        enabled =
+            markerStates.normal.enabled || get(d.point.data, 'marker.states.normal.enabled', false);
+    }
     return enabled ? '' : 'hidden';
 }
 export function getMarkerHaloVisibility(d) {

package/build/plugins/d3/renderer/hooks/useShapes/pie/index.js

@@ -68,7 +68,8 @@ export function PieSeriesShapes(args) {
             return arcGenerator(d);
         })
             .attr('class', b('segment'))
-            .attr('fill', (d) => d.data.color);
+            .attr('fill', (d) => d.data.color)
+            .attr('opacity', (d) => d.data.opacity);
         shapesSelection
             .selectAll('text')
             .data((pieData) => pieData.labels)
@@ -114,17 +115,20 @@ export function PieSeriesShapes(args) {
                 nodes[index].append(customShape);
             }
         });
+        const getSelectedSegment = (element) => {
+            const datum = select(element).datum();
+            const seriesId = get(datum, 'data.series.id', get(datum, 'series.id'));
+            return preparedData.reduce((result, pie) => {
+                var _a;
+                return result || ((_a = pie.segments.find((s) => s.data.series.id === seriesId)) === null || _a === void 0 ? void 0 : _a.data);
+            }, undefined);
+        };
         const eventName = `hover-shape.pie`;
         const hoverOptions = get(seriesOptions, 'pie.states.hover');
         const inactiveOptions = get(seriesOptions, 'pie.states.inactive');
         svgElement
             .on('mousemove', (e) => {
-            const datum = select(e.target).datum();
-            const seriesId = get(datum, 'data.series.id', get(datum, 'series.id'));
-            const currentSegment = preparedData.reduce((result, pie) => {
-                var _a;
-                return (result || ((_a = pie.segments.find((s) => s.data.series.id === seriesId)) === null || _a === void 0 ? void 0 : _a.data));
-            }, undefined);
+            const currentSegment = getSelectedSegment(e.target);
             if (currentSegment) {
                 const data = {
                     series: {
@@ -132,13 +136,19 @@ export function PieSeriesShapes(args) {
                         type: 'pie',
                         name: currentSegment.series.name,
                     },
-                    data: currentSegment.series,
+                    data: currentSegment.series.data,
                 };
                 dispatcher.call('hover-shape', {}, [data], pointer(e, svgContainer));
             }
         })
             .on('mouseleave', () => {
             dispatcher.call('hover-shape', {}, undefined);
+        })
+            .on('click', (e) => {
+            const selectedSegment = getSelectedSegment(e.target);
+            if (selectedSegment) {
+                dispatcher.call('click-chart', undefined, { point: selectedSegment.series.data, series: selectedSegment.series }, e);
+            }
         });
         dispatcher.on(eventName, (data) => {
             const selectedSeriesId = data === null || data === void 0 ? void 0 : data[0].series.id;

package/build/plugins/d3/renderer/hooks/useShapes/pie/prepare-data.js

@@ -45,6 +45,7 @@ export function preparePieData(args) {
             return {
                 value: item.value,
                 color: item.color,
+                opacity: item.opacity,
                 series: item,
                 hovered: false,
                 active: true,

package/build/plugins/d3/renderer/hooks/useShapes/pie/types.d.ts

@@ -5,6 +5,7 @@ import { PreparedPieSeries } from '../../useSeries/types';
 export type SegmentData = {
     value: number;
     color: string;
+    opacity: number | null;
     series: PreparedPieSeries;
     hovered: boolean;
     active: boolean;

package/build/plugins/d3/renderer/hooks/useShapes/scatter/index.js

@@ -22,10 +22,14 @@ export function ScatterSeriesShape(props) {
             .data(preparedData, shapeKey)
             .join('g')
             .call(renderMarker)
-            .attr('fill', (d) => d.point.data.color || d.point.series.color || '');
+            .attr('fill', (d) => d.point.data.color || d.point.series.color || '')
+            .attr('opacity', (d) => d.point.opacity);
+        const getSelectedPoint = (element) => {
+            return select(element).datum();
+        };
         svgElement
             .on('mousemove', (e) => {
-            const datum = select(e.target).datum();
+            const datum = getSelectedPoint(e.target);
             if (!datum) {
                 return;
             }
@@ -42,6 +46,12 @@ export function ScatterSeriesShape(props) {
         })
             .on('mouseleave', () => {
             dispatcher.call('hover-shape', {}, undefined);
+        })
+            .on('click', (e) => {
+            const datum = getSelectedPoint(e.target);
+            if (datum) {
+                dispatcher.call('click-chart', undefined, { point: datum.point.data, series: datum.point.series }, e);
+            }
         });
         const hoverEnabled = hoverOptions === null || hoverOptions === void 0 ? void 0 : hoverOptions.enabled;
         const inactiveEnabled = inactiveOptions === null || inactiveOptions === void 0 ? void 0 : inactiveOptions.enabled;

package/build/plugins/d3/renderer/hooks/useShapes/scatter/prepare-data.js

@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import { getXValue, getYValue } from '../utils';
 const getFilteredLinearScatterData = (data) => {
     return data.filter((d) => typeof d.x === 'number' && typeof d.y === 'number');
@@ -15,6 +16,7 @@ export const prepareScatterData = (args) => {
                     series: s,
                     x: getXValue({ point: d, xAxis, xScale }),
                     y: getYValue({ point: d, yAxis, yScale }),
+                    opacity: get(d, 'opacity', null),
                 },
                 hovered: false,
                 active: true,

package/build/plugins/d3/renderer/hooks/useShapes/scatter/types.d.ts

@@ -3,6 +3,7 @@ import { PreparedScatterSeries } from '../../useSeries/types';
 type PointData = {
     x: number;
     y: number;
+    opacity: number | null;
     data: ScatterSeriesData;
     series: PreparedScatterSeries;
 };

package/build/plugins/d3/renderer/hooks/useShapes/treemap/index.js

@@ -44,17 +44,24 @@ export const TreemapSeriesShape = (props) => {
             .style('font-weight', () => { var _a; return ((_a = series.dataLabels.style) === null || _a === void 0 ? void 0 : _a.fontWeight) || null; })
             .style('fill', () => { var _a; return ((_a = series.dataLabels.style) === null || _a === void 0 ? void 0 : _a.fontColor) || null; })
             .call(setEllipsisForOverflowTexts, (d) => d.width);
-        const eventName = `hover-shape.pie`;
+        const getSelectedPart = (node) => {
+            const hoveredRect = select(node);
+            return hoveredRect.datum();
+        };
+        const eventName = `hover-shape.treemap`;
         const hoverOptions = get(seriesOptions, 'treemap.states.hover');
         const inactiveOptions = get(seriesOptions, 'treemap.states.inactive');
         svgElement
             .on('mousemove', (e) => {
-            const hoveredRect = select(e.target);
-            const datum = hoveredRect.datum();
+            const datum = getSelectedPart(e.target);
             dispatcher.call('hover-shape', {}, [{ data: datum.data, series }], pointer(e, svgContainer));
         })
             .on('mouseleave', () => {
             dispatcher.call('hover-shape', {}, undefined);
+        })
+            .on('click', (e) => {
+            const datum = getSelectedPart(e.target);
+            dispatcher.call('click-chart', undefined, { point: datum.data, series }, e);
         });
         dispatcher.on(eventName, (data) => {
             const hoverEnabled = hoverOptions === null || hoverOptions === void 0 ? void 0 : hoverOptions.enabled;

package/build/types/widget-data/area.d.ts

@@ -19,6 +19,21 @@ export type AreaSeriesData<T = any> = BaseSeriesData<T> & {
     y?: string | number;
     /** Data label value of the point. If not specified, the y value is used. */
     label?: string | number;
+    /** Individual marker options for the point. */
+    marker?: {
+        /** States for a single point marker. */
+        states?: {
+            /** The normal state of a single point marker. */
+            normal?: {
+                /**
+                 * Enable or disable the point marker.
+                 *
+                 * @default false
+                 * */
+                enabled: boolean;
+            };
+        };
+    };
 };
 export type AreaMarkerSymbol = 'circle' | 'square';
 export type AreaMarkerOptions = PointMarkerOptions & {

package/build/types/widget-data/bar-x.d.ts

@@ -25,6 +25,8 @@ export type BarXSeriesData<T = any> = BaseSeriesData<T> & {
     category?: string;
     /** Data label value of the bar-x column. If not specified, the y value is used. */
     label?: string | number;
+    /** Individual opacity for the bar-x column. */
+    opacity?: number;
 };
 export type BarXSeries<T = any> = BaseSeries & {
     type: typeof SeriesType.BarX;

package/build/types/widget-data/bar-y.d.ts

@@ -19,6 +19,8 @@ export type BarYSeriesData<T = any> = BaseSeriesData<T> & {
     y?: string | number;
     /** Data label value of the bar. If not specified, the x value is used. */
     label?: string | number;
+    /** Individual opacity for the bar. */
+    opacity?: number;
 };
 export type BarYSeries<T = any> = BaseSeries & {
     type: typeof SeriesType.BarY;

package/build/types/widget-data/chart.d.ts

@@ -6,4 +6,10 @@ export type ChartMargin = {
 };
 export type ChartKitWidgetChart = {
     margin?: Partial<ChartMargin>;
+    events?: {
+        click?: (data: {
+            point: unknown;
+            series: unknown;
+        }, event: PointerEvent) => void;
+    };
 };

package/build/types/widget-data/line.d.ts

@@ -19,6 +19,13 @@ export type LineSeriesData<T = any> = BaseSeriesData<T> & {
     y?: string | number;
     /** Data label value of the point. If not specified, the y value is used. */
     label?: string | number;
+    marker?: {
+        states?: {
+            normal?: {
+                enabled: boolean;
+            };
+        };
+    };
 };
 export type LineSeries<T = any> = BaseSeries & {
     type: typeof SeriesType.Line;
@@ -42,4 +49,6 @@ export type LineSeries<T = any> = BaseSeries & {
     dashStyle?: `${DashStyle}`;
     /** Option for line cap style */
     linecap?: `${LineCap}`;
+    /** Individual opacity for the line. */
+    opacity?: number;
 };

package/build/types/widget-data/pie.d.ts

@@ -11,6 +11,8 @@ export type PieSeriesData<T = any> = BaseSeriesData<T> & {
     visible?: boolean;
     /** Initial data label of the pie segment. If not specified, the value is used. */
     label?: string;
+    /** Individual opacity for the pie segment. */
+    opacity?: number;
 };
 export type ConnectorShape = 'straight-line' | 'polyline';
 export type ConnectorCurve = 'linear' | 'basic';

package/build/types/widget-data/scatter.d.ts

@@ -22,7 +22,10 @@ export type ScatterSeriesData<T = any> = BaseSeriesData<T> & {
      * @deprecated use `x` or `y` instead
      */
     category?: string;
+    /** Individual radius for the point. */
     radius?: number;
+    /** Individual opacity for the point. */
+    opacity?: number;
 };
 export type ScatterSeries<T = any> = BaseSeries & {
     type: typeof SeriesType.Scatter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/chartkit",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "description": "React component used to render charts based on any sources you need",
   "license": "MIT",
   "repository": "git@github.com:gravity-ui/ChartKit.git",