@gravity-ui/charts 1.11.1 → 1.11.2

package/dist/esm/utils/chart/series/sorting.js

@@ -0,0 +1,12 @@
+import { sort } from 'd3';
+import { SeriesType } from '../../../constants';
+export function getSortedSeriesData(seriesData) {
+    return seriesData.map((s) => {
+        switch (s.type) {
+            case SeriesType.Area: {
+                s.data = sort(s.data, (d) => d.x);
+            }
+        }
+        return s;
+    });
+}

package/dist/{cjs/hooks/hooks-utils → esm/utils/chart}/zoom.d.ts

@@ -1,8 +1,11 @@
+import type { ZoomState } from '../../hooks/useZoom/types';
 import type { ChartSeries, ChartXAxis, ChartYAxis } from '../../types';
-import type { ZoomState } from '../useZoom/types';
 export declare function getZoomedSeriesData(args: {
     seriesData: ChartSeries[];
     zoomState: Partial<ZoomState>;
     xAxis?: ChartXAxis;
     yAxes?: ChartYAxis[];
-}): ChartSeries[];
+}): {
+    zoomedSeriesData: ChartSeries[];
+    zoomedShapesSeriesData: ChartSeries[];
+};

package/dist/{cjs/hooks/hooks-utils → esm/utils/chart}/zoom.js

@@ -1,3 +1,5 @@
+import { SeriesType } from '../../constants';
+const SERIES_TYPE_WITH_HIDDEN_POINTS = [SeriesType.Area, SeriesType.Line];
 // eslint-disable-next-line complexity
 function isValueInRange(args) {
     const { axis, max, min, value } = args;
@@ -41,13 +43,24 @@ function isValueInRange(args) {
 }
 export function getZoomedSeriesData(args) {
     const { seriesData, xAxis, yAxes, zoomState } = args;
-    if (Object.keys(zoomState).length < 0) {
-        return seriesData;
+    if (Object.keys(zoomState).length <= 0) {
+        return { zoomedSeriesData: seriesData, zoomedShapesSeriesData: seriesData };
     }
-    return seriesData.map((seriesItem) => {
-        const filteredData = seriesItem.data.reduce((acc, point) => {
+    const zoomedSeriesData = [];
+    const zoomedShapesSeriesData = [];
+    let prevPointInRange = false;
+    let currentPointInRange = false;
+    seriesData.forEach((seriesItem) => {
+        const filteredData = [];
+        const filteredShapesData = SERIES_TYPE_WITH_HIDDEN_POINTS.includes(seriesItem.type) && (xAxis === null || xAxis === void 0 ? void 0 : xAxis.type) !== 'category'
+            ? []
+            : undefined;
+        seriesItem.data.forEach((point, i) => {
+            const prevPoint = seriesItem.data[i - 1];
+            const isFirstPoint = i === 0;
             let inXRange = true;
             let inYRange = true;
+            prevPointInRange = currentPointInRange;
             if (zoomState.x) {
                 const [xMin, xMax] = zoomState.x;
                 const x = 'x' in point ? point.x : undefined;
@@ -71,11 +84,25 @@ export function getZoomedSeriesData(args) {
                     max: yMax,
                 });
             }
-            if (inXRange && inYRange) {
-                acc.push(point);
+            currentPointInRange = inXRange && inYRange;
+            if (currentPointInRange) {
+                filteredData.push(point);
             }
-            return acc;
-        }, []);
-        return Object.assign(Object.assign({}, seriesItem), { data: filteredData });
+            if (filteredShapesData) {
+                if (prevPointInRange && !currentPointInRange) {
+                    filteredShapesData.push(point);
+                }
+                else if (!isFirstPoint && !prevPointInRange && currentPointInRange) {
+                    filteredShapesData.push(prevPoint, point);
+                }
+                else if ((isFirstPoint || (!isFirstPoint && prevPointInRange)) &&
+                    currentPointInRange) {
+                    filteredShapesData.push(point);
+                }
+            }
+        });
+        zoomedSeriesData.push(Object.assign(Object.assign({}, seriesItem), { data: filteredData }));
+        zoomedShapesSeriesData.push(Object.assign(Object.assign({}, seriesItem), { data: filteredShapesData || filteredData }));
     });
+    return { zoomedSeriesData, zoomedShapesSeriesData };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/charts",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "description": "React component used to render charts",
   "license": "MIT",
   "main": "dist/cjs/index.js",

package/dist/cjs/hooks/hooks-utils/index.d.ts

@@ -1 +0,0 @@
-export * from './zoom';

package/dist/cjs/hooks/hooks-utils/index.js

@@ -1 +0,0 @@
-export * from './zoom';

package/dist/esm/hooks/hooks-utils/index.d.ts

@@ -1 +0,0 @@
-export * from './zoom';

package/dist/esm/hooks/hooks-utils/index.js

@@ -1 +0,0 @@
-export * from './zoom';