@gravity-ui/charts 1.34.8 → 1.34.10

package/dist/esm/hooks/useAxisScales/x-scale.js

@@ -1,7 +1,7 @@
 import { extent, scaleBand, scaleLinear, scaleLog, scaleUtc } from 'd3';
 import get from 'lodash/get';
 import { DEFAULT_AXIS_TYPE, SERIES_TYPE } from '../../constants';
-import { getAxisCategories, getDefaultMaxXAxisValue, getDefaultMinXAxisValue, getDomainDataXBySeries, } from '../../utils';
+import { getDefaultMaxXAxisValue, getDefaultMinXAxisValue, getDomainDataXBySeries, getEffectiveXRange, } from '../../utils';
 import { getBandSize } from '../utils/get-band-size';
 import { checkIsPointDomain, filterCategoriesByVisibleSeries, getMinMaxPropsOrState, hasOnlyMarkerSeries, validateArrayData, } from './utils';
 const X_AXIS_ZOOM_PADDING = 0.02;
@@ -27,23 +27,6 @@ function isSeriesWithXAxisOffset(series) {
     const types = [SERIES_TYPE.Heatmap, SERIES_TYPE.BarX];
     return series.some((s) => types.includes(s.type));
 }
-export function getXMaxDomainResult(args) {
-    const { xMaxDomain, xMaxProps, xMaxRangeSlider, xMaxZoom } = args;
-    let xMaxDomainResult = xMaxDomain;
-    // When xMaxRangeSlider is provided, we use it directly without considering xMaxDomain.
-    // This is intentional: the range slider needs to display the chart's maxPadding area,
-    // which would be clipped if we constrained it to xMaxDomain.
-    if (typeof xMaxRangeSlider === 'number') {
-        xMaxDomainResult = xMaxRangeSlider;
-    }
-    else if (typeof xMaxZoom === 'number' && xMaxZoom < xMaxDomain) {
-        xMaxDomainResult = xMaxZoom;
-    }
-    else if (typeof xMaxProps === 'number' && xMaxProps < xMaxDomain) {
-        xMaxDomainResult = xMaxProps;
-    }
-    return xMaxDomainResult;
-}
 function getXScaleRange({ boundsWidth, hasZoomX }) {
     const xAxisZoomPadding = boundsWidth * X_AXIS_ZOOM_PADDING;
     const xRange = [0, boundsWidth];
@@ -54,22 +37,17 @@ function getXScaleRange({ boundsWidth, hasZoomX }) {
 // eslint-disable-next-line complexity
 export function createXScale(args) {
     const { axis, boundsWidth, series, rangeSliderState, zoomStateX } = args;
+    const effectiveX = getEffectiveXRange(zoomStateX, rangeSliderState);
+    const effectiveXMin = effectiveX === null || effectiveX === void 0 ? void 0 : effectiveX[0];
+    const effectiveXMax = effectiveX === null || effectiveX === void 0 ? void 0 : effectiveX[1];
     const [xMinPropsOrState, xMaxPropsOrState] = getMinMaxPropsOrState({
         axis,
-        maxValues: [zoomStateX === null || zoomStateX === void 0 ? void 0 : zoomStateX[1], rangeSliderState === null || rangeSliderState === void 0 ? void 0 : rangeSliderState.max],
-        minValues: [zoomStateX === null || zoomStateX === void 0 ? void 0 : zoomStateX[0], rangeSliderState === null || rangeSliderState === void 0 ? void 0 : rangeSliderState.min],
+        maxValues: [effectiveXMax],
+        minValues: [effectiveXMin],
     });
     const xType = get(axis, 'type', DEFAULT_AXIS_TYPE);
     const hasZoomX = Boolean(zoomStateX);
-    let xCategories = get(axis, 'categories');
-    if (rangeSliderState && xCategories) {
-        xCategories = getAxisCategories({
-            categories: xCategories,
-            min: rangeSliderState.min,
-            max: rangeSliderState.max,
-            order: axis.order,
-        });
-    }
+    const xCategories = get(axis, 'categories');
     const maxPadding = get(axis, 'maxPadding', 0);
     const xAxisMaxPadding = boundsWidth * maxPadding + calculateXAxisPadding(series);
     const range = getXScaleRange({
@@ -193,12 +171,11 @@ export function createXScale(args) {
                     !isPointDomain
                     ? xMinPropsOrState
                     : xMinTimestamp;
-                const xMax = getXMaxDomainResult({
-                    xMaxDomain: xMaxTimestamp,
-                    xMaxProps: get(axis, 'max'),
-                    xMaxRangeSlider: rangeSliderState === null || rangeSliderState === void 0 ? void 0 : rangeSliderState.max,
-                    xMaxZoom: zoomStateX === null || zoomStateX === void 0 ? void 0 : zoomStateX[1],
-                });
+                const xMax = typeof xMaxPropsOrState === 'number' &&
+                    xMaxPropsOrState < xMaxTimestamp &&
+                    !isPointDomain
+                    ? xMaxPropsOrState
+                    : xMaxTimestamp;
                 domain = [xMin, xMax];
                 const scale = scaleUtc().domain(domain).range(range);
                 let offsetMin = 0;

package/dist/esm/hooks/useRangeSlider/types.d.ts

@@ -13,7 +13,7 @@ export interface RangeSliderProps {
     boundsWidth: number;
     height: number;
     htmlLayout: HTMLElement | null;
-    onUpdate: (nextRangeSliderState?: RangeSliderState, syncZoom?: boolean) => void;
+    onUpdate: (nextRangeSliderState?: RangeSliderState) => void;
     preparedChart: PreparedChart;
     preparedLegend: PreparedLegend | null;
     preparedRangeSlider: PreparedRangeSlider;

package/dist/esm/hooks/useSeries/prepare-legend.js

@@ -8,7 +8,8 @@ import { getDefaultColorStops, getDomainForContinuousColorScale, getLabelsSize }
 export async function getPreparedLegend(args) {
     var _a, _b, _c, _d, _e, _f, _g;
     const { legend, series } = args;
-    const enabled = Boolean(typeof (legend === null || legend === void 0 ? void 0 : legend.enabled) === 'boolean' ? legend === null || legend === void 0 ? void 0 : legend.enabled : series.length > 1);
+    const seriesWithEnabledLegend = series.filter((s) => { var _a; return ((_a = s.legend) === null || _a === void 0 ? void 0 : _a.enabled) !== false; });
+    const enabled = Boolean(typeof (legend === null || legend === void 0 ? void 0 : legend.enabled) === 'boolean' ? legend === null || legend === void 0 ? void 0 : legend.enabled : seriesWithEnabledLegend.length > 1);
     const defaultItemStyle = clone(legendDefaults.itemStyle);
     const itemStyle = get(legend, 'itemStyle');
     const computedItemStyle = merge(defaultItemStyle, itemStyle);

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

@@ -205,18 +205,23 @@ export function getTextSizeFn({ style }) {
 // We ignore an inaccuracy of less than a pixel.
 // To do this, we round the font size down when comparing it, and the size of the allowed space up.
 export async function getTextWithElipsis({ text: originalText, getTextWidth, maxWidth, }) {
-    let textWidth = Math.floor(await getTextWidth(originalText));
+    const textWidth = Math.floor(await getTextWidth(originalText));
     const textMaxWidth = Math.ceil(maxWidth);
     if (textWidth <= textMaxWidth) {
         return originalText;
     }
-    let text = originalText + '…';
-    while (textWidth > textMaxWidth && text.length > 2) {
-        text = text.slice(0, -2) + '…';
-        textWidth = Math.floor(await getTextWidth(text));
-    }
-    if (textWidth > textMaxWidth) {
-        text = '';
+    let low = 0;
+    let high = originalText.length;
+    while (low < high) {
+        const mid = Math.floor((low + high + 1) / 2);
+        const candidate = originalText.slice(0, mid) + '…';
+        const candidateWidth = Math.floor(await getTextWidth(candidate));
+        if (candidateWidth <= textMaxWidth) {
+            low = mid;
+        }
+        else {
+            high = mid - 1;
+        }
     }
-    return text;
+    return low > 0 ? originalText.slice(0, low) + '…' : '';
 }

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.8",
+  "version": "1.34.10",
   "description": "A flexible JavaScript library for data visualization and chart rendering using React",
   "license": "MIT",
   "main": "dist/cjs/index.js",