@gravity-ui/charts 1.11.0 → 1.11.2

package/dist/cjs/components/Axis/AxisY.js

@@ -125,6 +125,9 @@ export const AxisY = (props) => {
                 scale: seriesScale,
             });
             yAxisGenerator(axisItem);
+            // because the standard generator interrupts the desired font
+            // https://github.com/d3/d3-axis/blob/main/src/axis.js#L110
+            axisItem.attr('font-family', null);
             if (d.labels.enabled) {
                 const labels = axisItem.selectAll('.tick text');
                 const tickTexts = labels

package/dist/cjs/components/ChartInner/useChartInnerProps.js

@@ -1,10 +1,12 @@
 import React from 'react';
 import { useAxisScales, useChartDimensions, useChartOptions, usePrevious, useSeries, useShapes, useSplit, } from '../../hooks';
-import { getZoomedSeriesData } from '../../hooks/hooks-utils';
 import { getYAxisWidth } from '../../hooks/useChartDimensions/utils';
 import { getPreparedXAxis } from '../../hooks/useChartOptions/x-axis';
 import { getPreparedYAxis } from '../../hooks/useChartOptions/y-axis';
+import { getLegendComponents } from '../../hooks/useSeries/prepare-legend';
+import { getPreparedOptions } from '../../hooks/useSeries/prepare-options';
 import { useZoom } from '../../hooks/useZoom';
+import { getSortedSeriesData, getZoomedSeriesData } from '../../utils';
 import { hasAtLeastOneSeriesDataPerPlot } from './utils';
 export function useChartInnerProps(props) {
     var _a;
@@ -13,33 +15,57 @@ export function useChartInnerProps(props) {
     const prevHeight = usePrevious(height);
     const [zoomState, setZoomState] = React.useState({});
     const { chart, title, tooltip, colors } = useChartOptions({ data });
-    const zoomedSeriesData = React.useMemo(() => {
+    const sortedSeriesData = React.useMemo(() => {
+        return getSortedSeriesData(data.series.data);
+    }, [data.series.data]);
+    const { zoomedSeriesData, zoomedShapesSeriesData } = React.useMemo(() => {
         return getZoomedSeriesData({
-            seriesData: data.series.data,
+            seriesData: sortedSeriesData,
             xAxis: data.xAxis,
             yAxes: data.yAxis,
             zoomState,
         });
-    }, [data.series.data, data.xAxis, data.yAxis, zoomState]);
+    }, [data.xAxis, data.yAxis, sortedSeriesData, zoomState]);
     const [xAxis, setXAxis] = React.useState(null);
     React.useEffect(() => {
+        setXAxis(null);
         getPreparedXAxis({ xAxis: data.xAxis, width, seriesData: zoomedSeriesData }).then((val) => setXAxis(val));
     }, [data.xAxis, width, zoomedSeriesData]);
     const [yAxis, setYAxis] = React.useState([]);
     React.useEffect(() => {
+        setYAxis([]);
         getPreparedYAxis({ yAxis: data.yAxis, height, seriesData: zoomedSeriesData }).then((val) => setYAxis(val));
     }, [data.yAxis, height, zoomedSeriesData]);
-    const { legendItems, legendConfig, preparedSeries, preparedSeriesOptions, preparedLegend, handleLegendItemClick, } = useSeries({
-        chartWidth: width,
-        chartHeight: height,
-        chartMargin: chart.margin,
+    const preparedSeriesOptions = React.useMemo(() => {
+        return getPreparedOptions(data.series.options);
+    }, [data.series.options]);
+    const { preparedSeries, preparedLegend, handleLegendItemClick } = useSeries({
         colors,
         legend: data.legend,
         originalSeriesData: data.series.data,
         seriesData: zoomedSeriesData,
         seriesOptions: data.series.options,
-        preparedYAxis: yAxis,
     });
+    const { preparedSeries: preparedShapesSeries } = useSeries({
+        colors,
+        legend: data.legend,
+        originalSeriesData: data.series.data,
+        seriesData: zoomedShapesSeriesData,
+        seriesOptions: data.series.options,
+    });
+    const { legendConfig, legendItems } = React.useMemo(() => {
+        if (!preparedLegend) {
+            return { legendConfig: undefined, legendItems: [] };
+        }
+        return getLegendComponents({
+            chartWidth: width,
+            chartHeight: height,
+            chartMargin: chart.margin,
+            series: preparedSeries,
+            preparedLegend,
+            preparedYAxis: yAxis,
+        });
+    }, [width, height, chart.margin, preparedSeries, preparedLegend, yAxis]);
     const { boundsWidth, boundsHeight } = useChartDimensions({
         width,
         height,
@@ -67,7 +93,7 @@ export function useChartInnerProps(props) {
         boundsWidth,
         boundsHeight,
         dispatcher,
-        series: preparedSeries,
+        series: preparedShapesSeries,
         seriesOptions: preparedSeriesOptions,
         xAxis,
         xScale,
@@ -79,7 +105,7 @@ export function useChartInnerProps(props) {
         isOutsideBounds,
     });
     const handleAttemptToSetZoomState = React.useCallback((nextZoomState) => {
-        const nextZoomedSeriesData = getZoomedSeriesData({
+        const { zoomedSeriesData: nextZoomedSeriesData } = getZoomedSeriesData({
             seriesData: zoomedSeriesData,
             xAxis: data.xAxis,
             yAxes: data.yAxis,

package/dist/cjs/components/Legend/index.js

@@ -321,6 +321,7 @@ export const Legend = (props) => {
                     .call(xAxisGenerator);
                 legendWidth = legend.width;
             }
+            const legendTitleClassname = b('title');
             if (legend.title.enable) {
                 const { maxWidth: titleWidth } = await getLabelsSize({
                     labels: [legend.title.text],
@@ -342,7 +343,6 @@ export const Legend = (props) => {
                         break;
                     }
                 }
-                const legendTitleClassname = b('title');
                 svgElement.selectAll(`.${legendTitleClassname}`).remove();
                 svgElement
                     .append('g')
@@ -355,6 +355,9 @@ export const Legend = (props) => {
                     .style('dominant-baseline', 'text-before-edge')
                     .html(legend.title.text);
             }
+            else {
+                svgElement.selectAll(`.${legendTitleClassname}`).remove();
+            }
             const { left } = getLegendPosition({
                 align: legend.align,
                 width: boundsWidth,

package/dist/cjs/components/Tooltip/DefaultContent.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import get from 'lodash/get';
-import { block, getDataCategoryValue, getWaterfallPointSubtotal } from '../../utils';
+import { block, getDataCategoryValue } from '../../utils';
 import { getFormattedValue } from '../../utils/chart/format';
 const b = block('tooltip');
 const DEFAULT_DATE_FORMAT = 'DD.MM.YY';
@@ -62,7 +62,7 @@ export const DefaultContent = ({ hovered, xAxis, yAxis, valueFormat }) => {
         measureValue && React.createElement("div", { className: b('series-name') }, measureValue),
         // eslint-disable-next-line complexity
         hovered.map((seriesItem, i) => {
-            var _a;
+            var _a, _b;
             const { data, series, closest } = seriesItem;
             const id = `${get(series, 'id')}_${i}`;
             const color = get(series, 'color');
@@ -87,7 +87,7 @@ export const DefaultContent = ({ hovered, xAxis, yAxis, valueFormat }) => {
                 }
                 case 'waterfall': {
                     const isTotal = get(data, 'total', false);
-                    const subTotalValue = getWaterfallPointSubtotal(data, series);
+                    const subTotalValue = (_a = seriesItem.subTotal) !== null && _a !== void 0 ? _a : 0;
                     const format = valueFormat !== null && valueFormat !== void 0 ? valueFormat : getDefaultValueFormat({ axis: yAxis });
                     const subTotal = getFormattedValue({
                         value: subTotalValue,
@@ -145,7 +145,7 @@ export const DefaultContent = ({ hovered, xAxis, yAxis, valueFormat }) => {
                 }
                 case 'sankey': {
                     const { target, data: source } = seriesItem;
-                    const value = (_a = source.links.find((d) => d.name === (target === null || target === void 0 ? void 0 : target.name))) === null || _a === void 0 ? void 0 : _a.value;
+                    const value = (_b = source.links.find((d) => d.name === (target === null || target === void 0 ? void 0 : target.name))) === null || _b === void 0 ? void 0 : _b.value;
                     const formattedValue = getFormattedValue({
                         value,
                         format: valueFormat !== null && valueFormat !== void 0 ? valueFormat : { type: 'number' },

package/dist/cjs/hooks/useAxisScales/index.js

@@ -3,6 +3,7 @@ import { extent, scaleBand, scaleLinear, scaleLog, scaleUtc } from 'd3';
 import get from 'lodash/get';
 import { DEFAULT_AXIS_TYPE } from '../../constants';
 import { CHART_SERIES_WITH_VOLUME_ON_Y_AXIS, getAxisHeight, getDataCategoryValue, getDefaultMaxXAxisValue, getDefaultMinXAxisValue, getDomainDataXBySeries, getDomainDataYBySeries, getOnlyVisibleSeries, isAxisRelatedSeries, isSeriesWithCategoryValues, } from '../../utils';
+const X_AXIS_ZOOM_PADDING = 0.02;
 const isNumericalArrayData = (data) => {
     return data.every((d) => typeof d === 'number' || d === null);
 };
@@ -103,8 +104,10 @@ export function createXScale(axis, series, boundsWidth, hasZoomX) {
     const xCategories = get(axis, 'categories');
     const xTimestamps = get(axis, 'timestamps');
     const maxPadding = get(axis, 'maxPadding', 0);
-    const xAxisMinPadding = boundsWidth * maxPadding + calculateXAxisPadding(series);
-    const xRange = [0, boundsWidth - xAxisMinPadding];
+    const xAxisMaxPadding = boundsWidth * maxPadding + calculateXAxisPadding(series);
+    const xAxisZoomPadding = boundsWidth * X_AXIS_ZOOM_PADDING;
+    const xRange = [0, boundsWidth - xAxisMaxPadding];
+    const xRangeZoom = [0 + xAxisZoomPadding, boundsWidth - xAxisZoomPadding];
     switch (xType) {
         case 'linear':
         case 'logarithmic': {
@@ -131,7 +134,9 @@ export function createXScale(axis, series, boundsWidth, hasZoomX) {
                             : xMaxDomain;
                 }
                 const scaleFn = xType === 'logarithmic' ? scaleLog : scaleLinear;
-                const scale = scaleFn().domain([xMin, xMax]).range(xRange);
+                const scale = scaleFn()
+                    .domain([xMin, xMax])
+                    .range(hasZoomX ? xRangeZoom : xRange);
                 if (!hasZoomX) {
                     scale.nice();
                 }
@@ -147,7 +152,7 @@ export function createXScale(axis, series, boundsWidth, hasZoomX) {
                     series: series,
                 });
                 const xScale = scaleBand().domain(filteredCategories).range([0, boundsWidth]);
-                if (xScale.step() / 2 < xAxisMinPadding) {
+                if (xScale.step() / 2 < xAxisMaxPadding) {
                     xScale.range(xRange);
                 }
                 return xScale;
@@ -159,7 +164,9 @@ export function createXScale(axis, series, boundsWidth, hasZoomX) {
                 const [xMinTimestamp, xMaxTimestamp] = extent(xTimestamps);
                 const xMin = typeof xMinProps === 'number' ? xMinProps : xMinTimestamp;
                 const xMax = typeof xMaxProps === 'number' ? xMaxProps : xMaxTimestamp;
-                const scale = scaleUtc().domain([xMin, xMax]).range(xRange);
+                const scale = scaleUtc()
+                    .domain([xMin, xMax])
+                    .range(hasZoomX ? xRangeZoom : xRange);
                 if (!hasZoomX) {
                     scale.nice();
                 }
@@ -171,7 +178,9 @@ export function createXScale(axis, series, boundsWidth, hasZoomX) {
                     const [xMinTimestamp, xMaxTimestamp] = extent(domain);
                     const xMin = typeof xMinProps === 'number' ? xMinProps : xMinTimestamp;
                     const xMax = typeof xMaxProps === 'number' ? xMaxProps : xMaxTimestamp;
-                    const scale = scaleUtc().domain([xMin, xMax]).range(xRange);
+                    const scale = scaleUtc()
+                        .domain([xMin, xMax])
+                        .range(hasZoomX ? xRangeZoom : xRange);
                     if (!hasZoomX) {
                         scale.nice();
                     }

package/dist/cjs/hooks/useSeries/index.d.ts

@@ -1,34 +1,16 @@
 import type { ChartData } from '../../types';
-import type { PreparedAxis, PreparedChart } from '../useChartOptions/types';
 import type { OnLegendItemClick, PreparedLegend, PreparedSeries } from './types';
 type Args = {
-    chartWidth: number;
-    chartHeight: number;
-    chartMargin: PreparedChart['margin'];
     colors: string[];
     legend: ChartData['legend'];
     originalSeriesData: ChartData['series']['data'];
     seriesData: ChartData['series']['data'];
     seriesOptions: ChartData['series']['options'];
-    preparedYAxis: PreparedAxis[];
+    preparedLegend?: PreparedLegend;
 };
 export declare const useSeries: (args: Args) => {
-    legendItems: never[] | import("./types").LegendItem[][];
-    legendConfig: {
-        offset: {
-            left: number;
-            top: number;
-        };
-        pagination: {
-            pages: {
-                start: number;
-                end: number;
-            }[];
-        } | undefined;
-    } | undefined;
     preparedLegend: PreparedLegend | null;
     preparedSeries: PreparedSeries[];
-    preparedSeriesOptions: import("../../constants").SeriesOptionsDefaults;
     handleLegendItemClick: OnLegendItemClick;
 };
 export {};

package/dist/cjs/hooks/useSeries/index.js

@@ -2,16 +2,17 @@ import React from 'react';
 import { group, scaleOrdinal } from 'd3';
 import { getSeriesNames } from '../../utils';
 import { usePrevious } from '../usePrevious';
-import { getLegendComponents, getPreparedLegend } from './prepare-legend';
-import { getPreparedOptions } from './prepare-options';
+import { getPreparedLegend } from './prepare-legend';
 import { prepareSeries } from './prepareSeries';
 import { getActiveLegendItems, getAllLegendItems } from './utils';
 export const useSeries = (args) => {
-    const { chartWidth, chartHeight, chartMargin, legend, originalSeriesData, preparedYAxis, seriesData, seriesOptions, colors, } = args;
-    const [preparedLegend, setPreparedLegend] = React.useState(null);
+    const { legend, originalSeriesData, seriesData, seriesOptions, colors, preparedLegend: preparedLegendProps = null, } = args;
+    const [preparedLegend, setPreparedLegend] = React.useState(preparedLegendProps);
     React.useEffect(() => {
-        getPreparedLegend({ legend, series: seriesData }).then((value) => setPreparedLegend(value));
-    }, [legend, seriesData]);
+        if (!preparedLegendProps) {
+            getPreparedLegend({ legend, series: seriesData }).then((value) => setPreparedLegend(value));
+        }
+    }, [legend, preparedLegendProps, seriesData]);
     const [preparedSeries, setPreparedSeries] = React.useState([]);
     const [activeLegendItems, setActiveLegendItems] = React.useState(getActiveLegendItems(preparedSeries));
     React.useEffect(() => {
@@ -39,9 +40,6 @@ export const useSeries = (args) => {
             setActiveLegendItems(getActiveLegendItems(acc));
         })();
     }, [seriesData, seriesOptions, preparedLegend, colors]);
-    const preparedSeriesOptions = React.useMemo(() => {
-        return getPreparedOptions(seriesOptions);
-    }, [seriesOptions]);
     const prevOriginalSeriesData = usePrevious(originalSeriesData);
     const chartSeries = React.useMemo(() => {
         return preparedSeries.map((singleSeries) => {
@@ -51,19 +49,6 @@ export const useSeries = (args) => {
             return singleSeries;
         });
     }, [preparedSeries, activeLegendItems]);
-    const { legendConfig, legendItems } = React.useMemo(() => {
-        if (!preparedLegend) {
-            return { legendConfig: undefined, legendItems: [] };
-        }
-        return getLegendComponents({
-            chartHeight,
-            chartMargin,
-            chartWidth,
-            series: chartSeries,
-            preparedLegend,
-            preparedYAxis,
-        });
-    }, [chartWidth, chartHeight, chartMargin, chartSeries, preparedLegend, preparedYAxis]);
     const handleLegendItemClick = React.useCallback(({ name, metaKey }) => {
         const allItems = getAllLegendItems(preparedSeries);
         const onlyItemSelected = activeLegendItems.length === 1 && activeLegendItems.includes(name);
@@ -91,11 +76,8 @@ export const useSeries = (args) => {
         }
     }, [originalSeriesData, prevOriginalSeriesData, preparedSeries]);
     return {
-        legendItems,
-        legendConfig,
         preparedLegend,
         preparedSeries: chartSeries,
-        preparedSeriesOptions,
         handleLegendItemClick,
     };
 };

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

@@ -3,7 +3,7 @@ import clone from 'lodash/clone';
 import get from 'lodash/get';
 import merge from 'lodash/merge';
 import { CONTINUOUS_LEGEND_SIZE, legendDefaults } from '../../constants';
-import { getDefaultColorStops, getDomainForContinuousColorScale, getHorisontalSvgTextHeight, getLabelsSize, } from '../../utils';
+import { getDefaultColorStops, getDomainForContinuousColorScale, getLabelsSize } from '../../utils';
 import { getBoundsWidth } from '../useChartDimensions';
 import { getYAxisWidth } from '../useChartDimensions/utils';
 export async function getPreparedLegend(args) {
@@ -13,7 +13,7 @@ export async function getPreparedLegend(args) {
     const defaultItemStyle = clone(legendDefaults.itemStyle);
     const itemStyle = get(legend, 'itemStyle');
     const computedItemStyle = merge(defaultItemStyle, itemStyle);
-    const lineHeight = getHorisontalSvgTextHeight({ text: 'Tmp', style: computedItemStyle });
+    const lineHeight = (await getLabelsSize({ labels: ['Tmp'], style: computedItemStyle })).maxHeight;
     const legendType = get(legend, 'type', 'discrete');
     const isTitleEnabled = Boolean((_a = legend === null || legend === void 0 ? void 0 : legend.title) === null || _a === void 0 ? void 0 : _a.text);
     const titleMargin = isTitleEnabled ? get(legend, 'title.margin', 4) : 0;

package/dist/cjs/hooks/useShapes/area/prepare-data.js

@@ -1,4 +1,4 @@
-import { group, sort } from 'd3';
+import { group } from 'd3';
 import { getDataCategoryValue, getLabelsSize, getLeftPosition } from '../../../utils';
 import { getFormattedValue } from '../../../utils/chart/format';
 import { getXValue, getYValue } from '../utils';
@@ -36,7 +36,7 @@ function getXValues(series, xAxis, xScale) {
                 ? getDataCategoryValue({ axisDirection: 'x', categories, data: d })
                 : d.x);
             if (!acc.has(key)) {
-                acc.set(key, getXValue({ point: d, xAxis, xScale }));
+                acc.set(key, getXValue({ point: d, points: s.data, xAxis, xScale }));
             }
         });
         return acc;
@@ -50,7 +50,7 @@ function getXValues(series, xAxis, xScale) {
             return acc;
         }, []);
     }
-    return sort(Array.from(xValues), ([_x, xValue]) => xValue);
+    return Array.from(xValues);
 }
 export const prepareAreaData = async (args) => {
     const { series, xAxis, xScale, yAxis, yScale, boundsHeight: plotHeight, isOutsideBounds } = args;
@@ -73,6 +73,7 @@ export const prepareAreaData = async (args) => {
             const seriesYScale = yScale[yAxisIndex];
             const yMin = getYValue({
                 point: { y: 0 },
+                points: s.data,
                 yAxis: seriesYAxis,
                 yScale: seriesYScale,
             });