@gravity-ui/charts 1.34.7 → 1.34.9

package/dist/esm/utils/chart/get-closest-data.js

@@ -47,19 +47,53 @@ export function getClosestPoints(args) {
     const [pointerX, pointerY] = position;
     const result = [];
     const groups = groupBy(shapesData, getSeriesType);
+    const closestPointsByXValue = [];
     // eslint-disable-next-line complexity
     Object.entries(groups).forEach(([seriesType, list]) => {
         var _a, _b, _c, _d, _e;
         switch (seriesType) {
+            case 'line': {
+                const linePoints = list.reduce((acc, d) => {
+                    acc.push(...d.points.reduce((accPoints, p) => {
+                        if (p.y !== null && p.x !== null) {
+                            accPoints.push({
+                                data: p.data,
+                                series: p.series,
+                                x: p.x,
+                                y0: p.y,
+                                y1: p.y,
+                            });
+                        }
+                        return accPoints;
+                    }, []));
+                    return acc;
+                }, []);
+                closestPointsByXValue.push(...linePoints);
+                break;
+            }
+            case 'area': {
+                const areaPoints = list.reduce((acc, d) => {
+                    Array.prototype.push.apply(acc, d.points.map((p) => ({
+                        data: p.data,
+                        series: p.series,
+                        x: p.x,
+                        y0: p.y0,
+                        y1: p.y,
+                    })));
+                    return acc;
+                }, []);
+                closestPointsByXValue.push(...areaPoints);
+                break;
+            }
             case 'bar-x': {
-                const points = list.map((d) => ({
+                const barXPoints = list.map((d) => ({
                     data: d.data,
                     series: d.series,
                     x: d.x + d.width / 2,
                     y0: d.y,
                     y1: d.y + d.height,
                 }));
-                result.push(...getClosestPointsByXValue(pointerX, pointerY, points));
+                closestPointsByXValue.push(...barXPoints);
                 break;
             }
             case 'waterfall': {
@@ -74,39 +108,6 @@ export function getClosestPoints(args) {
                 result.push(...getClosestPointsByXValue(pointerX, pointerY, points));
                 break;
             }
-            case 'area': {
-                const points = list.reduce((acc, d) => {
-                    Array.prototype.push.apply(acc, d.points.map((p) => ({
-                        data: p.data,
-                        series: p.series,
-                        x: p.x,
-                        y0: p.y0,
-                        y1: p.y,
-                    })));
-                    return acc;
-                }, []);
-                result.push(...getClosestPointsByXValue(pointerX, pointerY, points));
-                break;
-            }
-            case 'line': {
-                const points = list.reduce((acc, d) => {
-                    acc.push(...d.points.reduce((accPoints, p) => {
-                        if (p.y !== null && p.x !== null) {
-                            accPoints.push({
-                                data: p.data,
-                                series: p.series,
-                                x: p.x,
-                                y0: p.y,
-                                y1: p.y,
-                            });
-                        }
-                        return accPoints;
-                    }, []));
-                    return acc;
-                }, []);
-                result.push(...getClosestPointsByXValue(pointerX, pointerY, points));
-                break;
-            }
             case 'bar-y': {
                 const points = list;
                 const sorted = sort(points, (p) => p.y);
@@ -267,6 +268,9 @@ export function getClosestPoints(args) {
             }
         }
     });
+    if (closestPointsByXValue.length) {
+        result.push(...getClosestPointsByXValue(pointerX, pointerY, closestPointsByXValue));
+    }
     return result;
 }
 function isInsidePath(args) {

package/dist/esm/utils/chart/zoom.d.ts

@@ -1,4 +1,4 @@
-import type { PreparedSeries, PreparedXAxis, PreparedYAxis } from '../../hooks';
+import type { PreparedSeries, PreparedXAxis, PreparedYAxis, RangeSliderState } from '../../hooks';
 import type { ZoomState } from '../../hooks/useZoom/types';
 import type { ChartXAxis, ChartYAxis } from '../../types';
 export declare function getZoomedSeriesData(args: {
@@ -10,3 +10,4 @@ export declare function getZoomedSeriesData(args: {
     preparedSeries: PreparedSeries[];
     preparedShapesSeries: PreparedSeries[];
 };
+export declare function getEffectiveXRange(zoomStateX: [number, number] | undefined, rangeSliderState: RangeSliderState | undefined): [number, number] | undefined;

package/dist/esm/utils/chart/zoom.js

@@ -123,3 +123,12 @@ export function getZoomedSeriesData(args) {
         preparedShapesSeries: zoomedShapesSeriesData,
     };
 }
+export function getEffectiveXRange(zoomStateX, rangeSliderState) {
+    if (zoomStateX && rangeSliderState) {
+        return [
+            Math.max(zoomStateX[0], rangeSliderState.min),
+            Math.min(zoomStateX[1], rangeSliderState.max),
+        ];
+    }
+    return (zoomStateX !== null && zoomStateX !== void 0 ? zoomStateX : (rangeSliderState ? [rangeSliderState.min, rangeSliderState.max] : undefined));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/charts",
-  "version": "1.34.7",
+  "version": "1.34.9",
   "description": "A flexible JavaScript library for data visualization and chart rendering using React",
   "license": "MIT",
   "main": "dist/cjs/index.js",