@gravity-ui/charts 1.32.1 → 1.34.0

package/dist/esm/hooks/useAxis/y-axis.js

@@ -1,20 +1,12 @@
 import get from 'lodash/get';
 import { getTickValues } from '../../components/AxisY/utils';
 import { DASH_STYLE, DEFAULT_AXIS_LABEL_FONT_SIZE, DEFAULT_AXIS_TYPE, SERIES_TYPE, axisCrosshairDefaults, axisLabelsDefaults, yAxisTitleDefaults, } from '../../constants';
-import { calculateNumericProperty, formatAxisTickLabel, getDefaultDateFormat, getDefaultMinYAxisValue, getHorizontalHtmlTextHeight, getHorizontalSvgTextHeight, getLabelsSize, getMinSpaceBetween, getTextSizeFn, isAxisRelatedSeries, wrapText, } from '../../utils';
+import { calculateNumericProperty, formatAxisTickLabel, getDefaultDateFormat, getDefaultMinYAxisValue, getHorizontalHtmlTextHeight, getHorizontalSvgTextHeight, getLabelsSize, getMinSpaceBetween, getTextSizeFn, isAxisRelatedSeries, shouldSyncAxisWithPrimary, wrapText, } from '../../utils';
 import { createYScale } from '../useAxisScales';
 import { prepareAxisPlotLabel } from './utils';
-const getAxisLabelMaxWidth = async (args) => {
-    const { axis, seriesData, height } = args;
-    if (!axis.labels.enabled) {
-        return { height: 0, width: 0 };
-    }
-    const scale = createYScale({
-        axis,
-        boundsHeight: height,
-        series: seriesData,
-    });
-    if (!scale) {
+export const getYAxisLabelMaxWidth = async (args) => {
+    const { axis, scale, seriesData } = args;
+    if (!axis.labels.enabled || !scale) {
         return { height: 0, width: 0 };
     }
     const getTextSize = getTextSizeFn({ style: axis.labels.style });
@@ -104,6 +96,21 @@ export const getPreparedYAxis = ({ height, boundsHeight, width, seriesData, yAxi
         const axisType = get(axisItem, 'type', DEFAULT_AXIS_TYPE);
         const shouldHideGrid = axisItem.visible === false ||
             axisSeriesData.some((s) => s.type === SERIES_TYPE.Heatmap);
+        let gridEnabled;
+        if (shouldHideGrid) {
+            gridEnabled = false;
+        }
+        else {
+            const gridEnabledProp = get(axisItem, 'grid.enabled');
+            if (firstPlotAxis) {
+                gridEnabled = gridEnabledProp !== null && gridEnabledProp !== void 0 ? gridEnabledProp : true;
+            }
+            else {
+                gridEnabled = shouldSyncAxisWithPrimary(axisItem, axisByPlot[plotIndex][0])
+                    ? false
+                    : !((_g = axisByPlot[plotIndex][0].visible) !== null && _g !== void 0 ? _g : true);
+            }
+        }
         const preparedAxis = {
             type: axisType,
             labels: {
@@ -119,7 +126,7 @@ export const getPreparedYAxis = ({ height, boundsHeight, width, seriesData, yAxi
                 width: 0,
                 height: 0,
                 lineHeight: labelsLineHeight,
-                maxWidth: (_h = calculateNumericProperty({ base: width, value: (_g = axisItem.labels) === null || _g === void 0 ? void 0 : _g.maxWidth })) !== null && _h !== void 0 ? _h : axisLabelsDefaults.maxWidth,
+                maxWidth: (_j = calculateNumericProperty({ base: width, value: (_h = axisItem.labels) === null || _h === void 0 ? void 0 : _h.maxWidth })) !== null && _j !== void 0 ? _j : axisLabelsDefaults.maxWidth,
                 html: labelsHtml,
             },
             lineColor: get(axisItem, 'lineColor'),
@@ -133,18 +140,17 @@ export const getPreparedYAxis = ({ height, boundsHeight, width, seriesData, yAxi
                 height: titleSize.maxHeight * estimatedTitleRows.length,
                 align: get(axisItem, 'title.align', yAxisTitleDefaults.align),
                 maxRowCount: titleMaxRowsCount,
-                html: (_k = (_j = axisItem.title) === null || _j === void 0 ? void 0 : _j.html) !== null && _k !== void 0 ? _k : false,
+                html: (_l = (_k = axisItem.title) === null || _k === void 0 ? void 0 : _k.html) !== null && _l !== void 0 ? _l : false,
                 maxWidth: titleMaxWidth !== null && titleMaxWidth !== void 0 ? titleMaxWidth : Infinity,
                 rotation: titleRotation,
             },
-            min: (_l = get(axisItem, 'min')) !== null && _l !== void 0 ? _l : getDefaultMinYAxisValue(axisSeriesData),
+            min: (_m = get(axisItem, 'min')) !== null && _m !== void 0 ? _m : getDefaultMinYAxisValue(axisSeriesData),
             max: get(axisItem, 'max'),
+            startOnTick: get(axisItem, 'startOnTick'),
+            endOnTick: get(axisItem, 'endOnTick'),
             maxPadding: get(axisItem, 'maxPadding', getMaxPaddingBySeries({ series: axisSeriesData })),
             grid: {
-                enabled: shouldHideGrid
-                    ? false
-                    : get(axisItem, 'grid.enabled', firstPlotAxis ||
-                        (!firstPlotAxis && !((_m = axisByPlot[plotIndex][0].visible) !== null && _m !== void 0 ? _m : true))),
+                enabled: gridEnabled,
             },
             ticks: {
                 pixelInterval: ((_o = axisItem.ticks) === null || _o === void 0 ? void 0 : _o.interval)
@@ -186,10 +192,15 @@ export const getPreparedYAxis = ({ height, boundsHeight, width, seriesData, yAxi
             order: axisItem.order,
         };
         if (labelsEnabled) {
-            const { height: labelsHeight, width: labelsWidth } = await getAxisLabelMaxWidth({
+            const scale = createYScale({
+                axis: preparedAxis,
+                boundsHeight,
+                series: axisSeriesData,
+            });
+            const { height: labelsHeight, width: labelsWidth } = await getYAxisLabelMaxWidth({
                 axis: preparedAxis,
                 seriesData: axisSeriesData,
-                height: boundsHeight,
+                scale,
             });
             preparedAxis.labels.height = labelsHeight;
             preparedAxis.labels.width = Math.min(preparedAxis.labels.maxWidth, labelsWidth);

package/dist/esm/hooks/useAxisScales/index.d.ts

@@ -1,10 +1,7 @@
-import type { ScaleBand, ScaleLinear, ScaleTime } from 'd3';
 import type { PreparedAxis, PreparedSeries, PreparedSplit, RangeSliderState, ZoomState } from '../../hooks';
-import type { ChartAxis, ChartSeries } from '../../types';
-type ChartScaleBand = ScaleBand<string>;
-export type ChartScaleLinear = ScaleLinear<number, number>;
-export type ChartScaleTime = ScaleTime<number, number>;
-export type ChartScale = ChartScaleBand | ChartScaleLinear | ChartScaleTime;
+import type { ChartScale } from './types';
+export { createXScale } from './x-scale';
+export { createYScale } from './y-scale';
 type Args = {
     boundsWidth: number;
     boundsHeight: number;
@@ -12,6 +9,7 @@ type Args = {
     xAxis: PreparedAxis | null;
     yAxis: PreparedAxis[];
     split: PreparedSplit;
+    isRangeSlider?: boolean;
     rangeSliderState?: RangeSliderState;
     zoomState?: Partial<ZoomState>;
 };
@@ -19,21 +17,7 @@ type ReturnValue = {
     xScale?: ChartScale;
     yScale?: (ChartScale | undefined)[];
 };
-export declare function createYScale(args: {
-    axis: PreparedAxis;
-    boundsHeight: number;
-    series: (PreparedSeries | ChartSeries)[];
-    zoomStateY?: [number, number];
-}): ScaleBand<string> | ScaleLinear<number, number, never> | ScaleTime<number, number, never> | undefined;
-export declare function createXScale(args: {
-    axis: PreparedAxis | ChartAxis;
-    boundsWidth: number;
-    series: (PreparedSeries | ChartSeries)[];
-    rangeSliderState?: RangeSliderState;
-    zoomStateX?: [number, number];
-}): ScaleBand<string> | ScaleLinear<number, number, never> | ScaleTime<number, number, never> | undefined;
 /**
  * Uses to create scales for axis related series
  */
 export declare const useAxisScales: (args: Args) => ReturnValue;
-export {};