@gravity-ui/charts 1.46.1 → 1.48.0

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

@@ -16,8 +16,8 @@ import type { PreparedSankeyData } from '../../core/shapes/sankey/types';
 import type { PreparedScatterData } from '../../core/shapes/scatter/types';
 import type { PreparedWaterfallData } from '../../core/shapes/waterfall/types';
 import type { PreparedXRangeData } from '../../core/shapes/x-range/types';
+import type { ZoomState } from '../../core/zoom/types';
 import type { PreparedXAxis, PreparedYAxis } from '../useAxis/types';
-import type { ZoomState } from '../useZoom/types';
 import './styles.css';
 export type ShapeData = PreparedBarXData | PreparedBarYData | PreparedScatterData | PreparedLineData | PreparedPieData | PreparedAreaData | PreparedWaterfallData | PreparedSankeyData | PreparedRadarData | PreparedHeatmapData | PreparedFunnelData | PreparedXRangeData;
 export type ClipPathBySeriesType = Partial<Record<SeriesType, boolean>>;

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

@@ -146,18 +146,20 @@ export async function getShapes(args) {
             }
             case SERIES_TYPE.Scatter: {
                 if (xAxis && xScale && (yScale === null || yScale === void 0 ? void 0 : yScale.length)) {
-                    const preparedData = prepareScatterData({
+                    const scatterShapeData = await prepareScatterData({
                         series: chartSeries,
                         xAxis,
                         xScale,
                         yAxis,
                         yScale,
+                        split,
                         isOutsideBounds,
+                        isRangeSlider,
                     });
                     shapes[index] = (React.createElement(ScatterSeriesShape, { key: SERIES_TYPE.Scatter, clipPathId: shouldUseClipPathId(SERIES_TYPE.Scatter, clipPathBySeriesType)
                             ? clipPathId
-                            : undefined, dispatcher: dispatcher, preparedData: preparedData, seriesOptions: seriesOptions, htmlLayout: htmlLayout }));
-                    shapesData.splice(index, 0, ...preparedData);
+                            : undefined, dispatcher: dispatcher, preparedData: scatterShapeData, seriesOptions: seriesOptions, htmlLayout: htmlLayout }));
+                    shapesData.splice(index, 0, ...scatterShapeData.markers);
                 }
                 break;
             }

package/dist/cjs/hooks/useShapes/scatter/index.d.ts

@@ -1,11 +1,11 @@
 import React from 'react';
 import type { Dispatch } from 'd3-dispatch';
 import type { PreparedSeriesOptions } from '../../../core/series/types';
-import type { PreparedScatterData } from '../../../core/shapes/scatter/types';
+import type { PreparedScatterShapeData } from '../../../core/shapes/scatter/types';
 export { prepareScatterData } from '../../../core/shapes/scatter/prepare-data';
 type ScatterSeriesShapeProps = {
     htmlLayout: HTMLElement | null;
-    preparedData: PreparedScatterData[];
+    preparedData: PreparedScatterShapeData;
     seriesOptions: PreparedSeriesOptions;
     clipPathId?: string;
     dispatcher?: Dispatch<object>;

package/dist/cjs/hooks/useShapes/scatter/index.js

@@ -13,7 +13,10 @@ export function ScatterSeriesShape(props) {
         }
         return renderScatter({ plot: ref.current }, preparedData, seriesOptions, dispatcher);
     }, [dispatcher, preparedData, seriesOptions]);
+    const htmlLayerData = React.useMemo(() => {
+        return { htmlElements: preparedData.htmlLabels };
+    }, [preparedData]);
     return (React.createElement(React.Fragment, null,
         React.createElement("g", { ref: ref, className: b(), clipPath: clipPathId ? `url(#${clipPathId})` : undefined }),
-        React.createElement(HtmlLayer, { preparedData: preparedData, htmlLayout: htmlLayout })));
+        React.createElement(HtmlLayer, { preparedData: htmlLayerData, htmlLayout: htmlLayout })));
 }

package/dist/cjs/hooks/useShapes/styles.css

@@ -1,8 +1,15 @@
 .gcharts-line__label,
 .gcharts-area__label,
 .gcharts-radar__label,
+.gcharts-bar-x__label,
+.gcharts-bar-y__label,
 .gcharts-heatmap__label,
-.gcharts-funnel__label {
+.gcharts-funnel__label,
+.gcharts-treemap__label,
+.gcharts-pie__label,
+.gcharts-scatter__label {
+  user-select: none;
+  pointer-events: none;
   dominant-baseline: hanging;
 }
 
@@ -13,30 +20,6 @@
 .gcharts-pie__segment {
   stroke: var(--g-color-base-background);
 }
-.gcharts-pie__label {
-  font-size: 11px;
-  font-weight: bold;
-  fill: var(--g-color-text-complementary);
-  dominant-baseline: hanging;
-}
-
-.gcharts-bar-x__label {
-  user-select: none;
-  fill: var(--g-color-text-complementary);
-}
-
-.gcharts-bar-y__label {
-  user-select: none;
-  fill: var(--g-color-text-complementary);
-  dominant-baseline: hanging;
-}
-
-.gcharts-treemap__label {
-  user-select: none;
-  pointer-events: none;
-  fill: var(--g-color-text-complementary);
-  dominant-baseline: hanging;
-}
 
 .gcharts-waterfall__connector {
   stroke: var(--g-color-line-generic-active);

package/dist/cjs/hooks/useShapes/utils.d.ts

@@ -1,5 +1,5 @@
+import type { ZoomState } from '../../core/zoom/types';
 import type { PreparedYAxis } from '../useAxis/types';
-import type { ZoomState } from '../useZoom/types';
 export * from '../../core/shapes/utils';
 export declare function getSeriesClipPathId(args: {
     clipPathId: string;

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

@@ -1,8 +1,8 @@
 import type { PreparedSplit } from '../../core/layout/split-types';
 import type { ChartScale } from '../../core/scales/types';
+import type { ZoomState } from '../../core/zoom/types';
 import type { PreparedZoom } from '../types';
 import type { PreparedXAxis, PreparedYAxis } from '../useAxis/types';
-import type { ZoomState } from './types';
 interface UseZoomProps {
     node: SVGGElement | null;
     onUpdate: (zoomState: Partial<ZoomState>) => void;

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { select } from 'd3-selection';
+import { selectionToZoomBounds } from '../../core/zoom/utils';
 import { useBrush } from '../useBrush';
-import { selectionToZoomBounds } from './utils';
 export function useZoom(props) {
     const { node, onUpdate, plotContainerHeight, plotContainerWidth, preparedSplit, preparedZoom, rangeSliderDomain, xAxis, xScale, yAxis, yScale, } = props;
     const isBrushDisabled = Boolean(!xAxis || !yAxis || !xScale || !yScale);

package/dist/cjs/index.d.ts

@@ -1,5 +1,6 @@
 export { CustomShapeRenderer } from './utils';
 export { getFormattedValue } from './core/utils';
 export { getDefaultTooltipHeaderFormat } from './core/utils/tooltip';
+export { FORMAT_UNITS_BITS, FORMAT_UNITS_BYTES, FORMAT_UNITS_NUMBERS, } from './libs/format-number/presets';
 export * from './components';
 export * from './types';

package/dist/cjs/index.js

@@ -1,5 +1,6 @@
 export { CustomShapeRenderer } from './utils';
 export { getFormattedValue } from './core/utils';
 export { getDefaultTooltipHeaderFormat } from './core/utils/tooltip';
+export { FORMAT_UNITS_BITS, FORMAT_UNITS_BYTES, FORMAT_UNITS_NUMBERS, } from './libs/format-number/presets';
 export * from './components';
 export * from './types';

package/dist/cjs/libs/format-number/index.js

@@ -11,26 +11,30 @@ function getUnitRate(value, exponent, unitsI18nKeys) {
     }
     return resultUnitRate - 1;
 }
+const formatScaledNumber = (value, options) => {
+    const { precision, showRankDelimiter = true, lang } = options;
+    let result = value;
+    if (typeof precision === 'number') {
+        result = Number(result.toFixed(precision));
+    }
+    else if (precision === 'auto' && result % 1 !== 0) {
+        result = Number(result.toFixed(Math.abs(result) > 1 ? 2 : 4));
+    }
+    return new Intl.NumberFormat(lang !== null && lang !== void 0 ? lang : i18nInstance.lang, {
+        minimumFractionDigits: typeof precision === 'number' ? precision : 0,
+        maximumFractionDigits: 20,
+        useGrouping: showRankDelimiter,
+    }).format(result);
+};
 const unitFormatter = ({ exponent, unitsI18nKeys, unitDelimiterI18nKey, }) => {
     return function formatUnit(value, options = {}) {
-        const { precision, unitRate, showRankDelimiter = true, lang } = options;
+        const { unitRate, lang } = options;
         const i18nLang = i18nInstance.lang;
         if (lang) {
             i18nInstance.setLang(lang);
         }
         const resultUnitRate = typeof unitRate === 'number' ? unitRate : getUnitRate(value, exponent, unitsI18nKeys);
-        let result = value / Math.pow(exponent, resultUnitRate);
-        if (typeof precision === 'number') {
-            result = Number(result.toFixed(precision));
-        }
-        else if (precision === 'auto' && result % 1 !== 0) {
-            result = Number(result.toFixed(Math.abs(result) > 1 ? 2 : 4));
-        }
-        result = new Intl.NumberFormat(lang !== null && lang !== void 0 ? lang : i18nLang, {
-            minimumFractionDigits: typeof precision === 'number' ? precision : 0,
-            maximumFractionDigits: 20,
-            useGrouping: showRankDelimiter,
-        }).format(result);
+        const result = formatScaledNumber(value / Math.pow(exponent, resultUnitRate), options);
         const unit = i18n(unitsI18nKeys[resultUnitRate]);
         const delimiter = i18n(unitDelimiterI18nKey);
         i18nInstance.setLang(i18nLang);
@@ -59,6 +63,65 @@ const baseFormatNumber = unitFormatter({
     unitDelimiterI18nKey: 'value_number-delimiter',
     unitsI18nKeys: BASE_NUMBER_FORMAT_UNIT_KEYS,
 });
+const resolvePostfix = (postfix, lang) => {
+    var _a, _b;
+    if (typeof postfix === 'string') {
+        return postfix;
+    }
+    return (_b = (_a = postfix[lang]) !== null && _a !== void 0 ? _a : postfix.en) !== null && _b !== void 0 ? _b : '';
+};
+const FALLBACK_UNIT_ENTRY = { factor: 1, postfix: '' };
+const normalizedUnitsCache = new WeakMap();
+const normalizeUnits = (units) => {
+    const cached = normalizedUnitsCache.get(units);
+    if (cached) {
+        return cached;
+    }
+    const { scale } = units;
+    const rawEntries = Array.isArray(scale)
+        ? scale.map((e) => ({ factor: e.factor, postfix: e.postfix }))
+        : scale.postfixes.map((postfix, i) => ({ factor: Math.pow(scale.base, i), postfix }));
+    const valid = rawEntries.filter((e) => Number.isFinite(e.factor) && e.factor > 0);
+    valid.sort((a, b) => a.factor - b.factor);
+    const deduped = [];
+    for (const e of valid) {
+        if (deduped.length === 0 || deduped[deduped.length - 1].factor !== e.factor) {
+            deduped.push(e);
+        }
+    }
+    const result = deduped.length > 0 ? deduped : [FALLBACK_UNIT_ENTRY];
+    normalizedUnitsCache.set(units, result);
+    return result;
+};
+const pickUnitEntry = (value, scale) => {
+    const av = Math.abs(value);
+    let chosen = scale[0];
+    for (const e of scale) {
+        if (av / e.factor >= 1) {
+            chosen = e;
+        }
+        else {
+            break;
+        }
+    }
+    return chosen;
+};
+const customUnitFormatter = (value, units, options) => {
+    const { lang } = options;
+    const i18nLang = i18nInstance.lang;
+    if (lang) {
+        i18nInstance.setLang(lang);
+    }
+    const normalizedScale = normalizeUnits(units);
+    const entry = pickUnitEntry(value, normalizedScale);
+    const result = formatScaledNumber(value / entry.factor, options);
+    const effectiveLang = lang !== null && lang !== void 0 ? lang : i18nLang;
+    const resolvedPostfix = resolvePostfix(entry.postfix, effectiveLang);
+    const resolvedDelimiter = typeof units.delimiter === 'string' ? units.delimiter : ' ';
+    const delimiter = resolvedPostfix ? resolvedDelimiter : '';
+    i18nInstance.setLang(i18nLang);
+    return `${result}${delimiter}${resolvedPostfix}`;
+};
 const NUMBER_UNIT_RATE_BY_UNIT = {
     default: 0,
     auto: undefined,
@@ -77,7 +140,7 @@ export const formatNumber = (value, options = {}) => {
     if (Number.isNaN(value) || Number.isNaN(Number(value))) {
         return new Intl.NumberFormat('en').format(Number(value));
     }
-    const { format = 'number', multiplier = 1, prefix = '', postfix = '', unit, labelMode } = options;
+    const { format = 'number', multiplier = 1, prefix = '', postfix = '', unit, units, labelMode, } = options;
     let changedMultiplier = multiplier;
     let prePostfix = '';
     if (format === 'percent') {
@@ -87,6 +150,11 @@ export const formatNumber = (value, options = {}) => {
     if (labelMode === 'percent') {
         prePostfix = '%';
     }
+    if (units) {
+        const unitScale = 'scale' in units ? units : { scale: [units] };
+        const formattedValue = customUnitFormatter(Number(value) * changedMultiplier, unitScale, options);
+        return `${prefix}${formattedValue}${prePostfix}${postfix}`;
+    }
     const formattedValue = baseFormatNumber(Number(value) * changedMultiplier, Object.assign(Object.assign({}, options), { unitRate: NUMBER_UNIT_RATE_BY_UNIT[unit !== null && unit !== void 0 ? unit : 'default'] }));
     return `${prefix}${formattedValue}${prePostfix}${postfix}`;
 };

package/dist/cjs/libs/format-number/presets.d.ts

@@ -0,0 +1,40 @@
+import type { FormatUnitScale } from './types';
+/**
+ * Byte scale with binary base (`1024`) and localized postfixes.
+ *
+ * @example
+ * ```ts
+ * tooltip: {
+ *   valueFormat: {type: 'number', units: FORMAT_UNITS_BYTES, precision: 1},
+ * }
+ * ```
+ */
+export declare const FORMAT_UNITS_BYTES: FormatUnitScale;
+/**
+ * Short number scale with decimal base (`1000`). Renders large numbers
+ * compactly as `K/M/B/T`. Postfixes are plain Latin letters and stay the
+ * same regardless of language. The first entry has an empty postfix, so
+ * values below `1000` render as plain numbers without a delimiter.
+ *
+ * @example
+ * ```ts
+ * tooltip: {
+ *   valueFormat: {type: 'number', units: FORMAT_UNITS_NUMBERS, precision: 1},
+ * }
+ * // 300       → "300"
+ * // 1_500     → "1.5 K"
+ * // 1_500_000 → "1.5 M"
+ * ```
+ */
+export declare const FORMAT_UNITS_NUMBERS: FormatUnitScale;
+/**
+ * Bit scale with decimal base (`1000`) and localized postfixes.
+ *
+ * @example
+ * ```ts
+ * tooltip: {
+ *   valueFormat: {type: 'number', units: FORMAT_UNITS_BITS, precision: 1},
+ * }
+ * ```
+ */
+export declare const FORMAT_UNITS_BITS: FormatUnitScale;

package/dist/cjs/libs/format-number/presets.js

@@ -0,0 +1,66 @@
+/**
+ * Byte scale with binary base (`1024`) and localized postfixes.
+ *
+ * @example
+ * ```ts
+ * tooltip: {
+ *   valueFormat: {type: 'number', units: FORMAT_UNITS_BYTES, precision: 1},
+ * }
+ * ```
+ */
+export const FORMAT_UNITS_BYTES = {
+    scale: {
+        base: 1024,
+        postfixes: [
+            { en: 'B', ru: 'Б' },
+            { en: 'KB', ru: 'КБ' },
+            { en: 'MB', ru: 'МБ' },
+            { en: 'GB', ru: 'ГБ' },
+            { en: 'TB', ru: 'ТБ' },
+        ],
+    },
+};
+/**
+ * Short number scale with decimal base (`1000`). Renders large numbers
+ * compactly as `K/M/B/T`. Postfixes are plain Latin letters and stay the
+ * same regardless of language. The first entry has an empty postfix, so
+ * values below `1000` render as plain numbers without a delimiter.
+ *
+ * @example
+ * ```ts
+ * tooltip: {
+ *   valueFormat: {type: 'number', units: FORMAT_UNITS_NUMBERS, precision: 1},
+ * }
+ * // 300       → "300"
+ * // 1_500     → "1.5 K"
+ * // 1_500_000 → "1.5 M"
+ * ```
+ */
+export const FORMAT_UNITS_NUMBERS = {
+    scale: {
+        base: 1000,
+        postfixes: ['', 'K', 'M', 'B', 'T'],
+    },
+};
+/**
+ * Bit scale with decimal base (`1000`) and localized postfixes.
+ *
+ * @example
+ * ```ts
+ * tooltip: {
+ *   valueFormat: {type: 'number', units: FORMAT_UNITS_BITS, precision: 1},
+ * }
+ * ```
+ */
+export const FORMAT_UNITS_BITS = {
+    scale: {
+        base: 1000,
+        postfixes: [
+            { en: 'bit', ru: 'бит' },
+            { en: 'Kbit', ru: 'Кбит' },
+            { en: 'Mbit', ru: 'Мбит' },
+            { en: 'Gbit', ru: 'Гбит' },
+            { en: 'Tbit', ru: 'Тбит' },
+        ],
+    },
+};

package/dist/cjs/libs/format-number/types.d.ts

@@ -1,13 +1,92 @@
-export type FormatOptions = {
+export interface FormatOptions {
+    /**
+     * Number of decimal places to display.
+     * Use `'auto'` to determine precision automatically based on the value magnitude.
+     */
     precision?: number | 'auto';
+    /** When `true`, inserts a thousands separator (e.g. `1 500 000`). */
     showRankDelimiter?: boolean;
+    /**
+     * BCP 47 language tag used for locale-aware formatting (e.g. `'en'`, `'ru'`).
+     * Defaults to the application locale when omitted.
+     */
     lang?: string;
+    /** Internal rendering hint for axis label layout. Not intended for public use. */
     labelMode?: string;
+}
+/**
+ * Plain string or a per-language dictionary of strings.
+ * When a dictionary is used, the lookup chain is:
+ * current `lang` → `en` → empty string.
+ */
+export type FormatI18nString = string | Partial<Record<string, string>>;
+/** Single entry of a custom unit scale. */
+export type FormatUnitScaleEntry = {
+    /** Positive multiplier applied to the value. The entry wins when `|value| / factor >= 1`. */
+    factor: number;
+    /**
+     * String appended after the scaled value (e.g. `'KB'`).
+     * Use an empty string to suppress the suffix and the delimiter.
+     * Pass a `{lang: string}` dictionary to localize the postfix — resolution falls back to `en`, then to empty.
+     */
+    postfix: FormatI18nString;
 };
-export type FormatNumberOptions = FormatOptions & {
+/**
+ * Custom unit scale for numeric formatting.
+ *
+ * `scale` describes the unit table in one of two forms:
+ * - `{base, postfixes}` — geometric progression: `postfixes[i]` is bound to `factor = base^i` (e.g. `{base: 1024, postfixes: ['B','KB','MB']}`).
+ * - `FormatUnitScaleEntry[]` — arbitrary factors; required for non-linear scales (e.g. `[{factor:1,postfix:'s'},{factor:60,postfix:'min'},{factor:3600,postfix:'h'}]`).
+ *
+ * `delimiter` is the shared string placed between the scaled value and the
+ * postfix. Defaults to a locale-aware space; pass `''` to suppress it.
+ *
+ * The normalized scale is cached by object identity, so for best performance
+ * reuse the same `units` object across `formatNumber` calls instead of
+ * creating a new inline literal on every render.
+ */
+export type FormatUnitScale = {
+    scale: {
+        base: number;
+        postfixes: FormatI18nString[];
+    } | FormatUnitScaleEntry[];
+    delimiter?: string;
+};
+export interface FormatNumberOptions extends FormatOptions {
+    /**
+     * Display mode for the numeric value.
+     * - `'number'` — plain number (default).
+     * - `'percent'` — value is multiplied by 100 and rendered with a `%` suffix.
+     *
+     * Combining `'percent'` with `units` is not meaningful and should be avoided.
+     */
     format?: 'number' | 'percent';
+    /** Factor applied to the value before formatting. For example, `multiplier: 1000` converts seconds to milliseconds. */
     multiplier?: number;
+    /** String prepended to the formatted value (e.g. `'$'`). */
     prefix?: string;
+    /** String appended to the formatted value (e.g. `' USD'`). */
     postfix?: string;
+    /**
+     * Compact unit suffix applied to large numbers.
+     * - `'auto'` — picks the most appropriate unit automatically (`k`, `m`, `b`, `t`).
+     * - `'k'` — thousands (÷ 1 000).
+     * - `'m'` — millions (÷ 1 000 000).
+     * - `'b'` — billions (÷ 1 000 000 000).
+     * - `'t'` — trillions (÷ 1 000 000 000 000).
+     * - `null` — no unit suffix.
+     *
+     * @deprecated Use `units` for custom scales. This option is fully ignored when `units` is set.
+     */
     unit?: 'auto' | 'k' | 'm' | 'b' | 't' | null;
-};
+    /**
+     * Custom unit scale, or a single `FormatUnitScaleEntry` as sugar for
+     * locking every value to one unit (equivalent to the legacy `unit: 'k'`).
+     * When set, fully overrides `unit`.
+     *
+     * Unit selection is always automatic: the entry with the largest `factor`
+     * such that `|value| / factor >= 1`, clamped to the smallest entry for
+     * very small values.
+     */
+    units?: FormatUnitScale | FormatUnitScaleEntry;
+}

package/dist/esm/components/AxisX/prepare-axis-data.js

@@ -1,6 +1,6 @@
 import { getUniqId } from '@gravity-ui/uikit';
 import { select } from 'd3-selection';
-import { calculateCos, calculateSin, formatAxisTickLabel, getBandsPosition, getLabelsSize, getMinSpaceBetween, getTextSizeFn, getTextWithElipsis, } from '../../core/utils';
+import { calculateCos, calculateNumericProperty, calculateSin, formatAxisTickLabel, getBandsPosition, getLabelsSize, getMinSpaceBetween, getTextSizeFn, getTextWithElipsis, } from '../../core/utils';
 import { getXAxisTickValues } from '../../core/utils/axis/x-axis';
 import { getMultilineTitleContentRows } from '../utils/axis-title';
 async function getSvgAxisLabel({ getTextSize, text, axis, top, left, labelMaxWidth, axisWidth, boundsOffsetLeft, boundsOffsetRight, }) {
@@ -72,7 +72,7 @@ async function getSvgAxisLabel({ getTextSize, text, axis, top, left, labelMaxWid
     return svgLabel;
 }
 export async function prepareXAxisData({ axis, boundsOffsetLeft, boundsOffsetRight, boundsWidth, height, scale, series, split, yAxis, }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const xAxisItems = [];
     const splitPlots = (_a = split === null || split === void 0 ? void 0 : split.plots) !== null && _a !== void 0 ? _a : [];
     for (let plotIndex = 0; plotIndex < splitPlots.length; plotIndex++) {
@@ -267,6 +267,9 @@ export async function prepareXAxisData({ axis, boundsOffsetLeft, boundsOffsetRig
             if (plotBandWidth < 0) {
                 continue;
             }
+            const perpExtent = (_g = calculateNumericProperty({ value: plotBand.size, base: axisHeight })) !== null && _g !== void 0 ? _g : axisHeight;
+            // X axis is positioned at the bottom of the plot area, so 'start' = bottom edge.
+            const bandY = plotBand.align === 'end' ? axisTop : axisTop + axisHeight - perpExtent;
             const getPlotLabelSize = getTextSizeFn({ style: plotBand.label.style });
             const labelSize = plotBand.label.text
                 ? await getPlotLabelSize(plotBand.label.text)
@@ -274,17 +277,17 @@ export async function prepareXAxisData({ axis, boundsOffsetLeft, boundsOffsetRig
             plotBands.push({
                 layerPlacement: plotBand.layerPlacement,
                 x: Math.max(0, startPos),
-                y: axisTop,
+                y: bandY,
                 width: plotBandWidth,
-                height: axisHeight,
+                height: perpExtent,
                 color: plotBand.color,
                 opacity: plotBand.opacity,
                 label: plotBand.label.text
                     ? {
                         text: plotBand.label.text,
                         style: plotBand.label.style,
-                        x: plotBand.label.padding + ((_g = labelSize === null || labelSize === void 0 ? void 0 : labelSize.hangingOffset) !== null && _g !== void 0 ? _g : 0),
-                        y: plotBand.label.padding + ((_h = labelSize === null || labelSize === void 0 ? void 0 : labelSize.width) !== null && _h !== void 0 ? _h : 0),
+                        x: plotBand.label.padding + ((_h = labelSize === null || labelSize === void 0 ? void 0 : labelSize.hangingOffset) !== null && _h !== void 0 ? _h : 0),
+                        y: plotBand.label.padding + ((_j = labelSize === null || labelSize === void 0 ? void 0 : labelSize.width) !== null && _j !== void 0 ? _j : 0),
                         rotate: -90,
                         qa: plotBand.label.qa,
                     }

package/dist/esm/components/AxisY/prepare-axis-data.js

@@ -1,6 +1,6 @@
 import { getUniqId } from '@gravity-ui/uikit';
 import { select } from 'd3-selection';
-import { calculateCos, calculateSin, formatAxisTickLabel, getBandsPosition, getLabelsSize, getMinSpaceBetween, getTextSizeFn, getTextWithElipsis, wrapText, } from '../../core/utils';
+import { calculateCos, calculateNumericProperty, calculateSin, formatAxisTickLabel, getBandsPosition, getLabelsSize, getMinSpaceBetween, getTextSizeFn, getTextWithElipsis, wrapText, } from '../../core/utils';
 import { prepareHtmlYAxisTitle, prepareSvgYAxisTitle } from './prepare-axis-title';
 import { getTickValues } from './utils';
 async function getSvgAxisLabel({ getTextSize, text, axis, top, left, labelMaxHeight, topOffset, }) {
@@ -113,7 +113,7 @@ async function getSvgAxisLabel({ getTextSize, text, axis, top, left, labelMaxHei
     return svgLabel;
 }
 export async function prepareYAxisData({ axis, split, scale, top: topOffset, width, height, series, }) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const axisPlotTopPosition = ((_a = split === null || split === void 0 ? void 0 : split.plots[axis.plotIndex]) === null || _a === void 0 ? void 0 : _a.top) || 0;
     const axisHeight = ((_b = split === null || split === void 0 ? void 0 : split.plots[axis.plotIndex]) === null || _b === void 0 ? void 0 : _b.height) || height;
     const domainX = axis.position === 'left' ? 0 : width;
@@ -231,11 +231,18 @@ export async function prepareYAxisData({ axis, split, scale, top: topOffset, wid
         if (plotBandHeight < 0) {
             continue;
         }
+        const perpExtent = (_f = calculateNumericProperty({ value: plotBand.size, base: width })) !== null && _f !== void 0 ? _f : width;
+        // 'start' = at the main Y axis line. For a left axis that's x=0;
+        // for a right axis that's x = width - perpExtent. 'end' is mirrored.
+        const isLeftAxis = axis.position === 'left';
+        const atMainAxis = isLeftAxis ? 0 : width - perpExtent;
+        const atOpposite = isLeftAxis ? width - perpExtent : 0;
+        const bandX = plotBand.align === 'end' ? atOpposite : atMainAxis;
         const plotBandItem = {
             layerPlacement: plotBand.layerPlacement,
-            x: 0,
+            x: bandX,
             y: axisPlotTopPosition + top,
-            width,
+            width: perpExtent,
             height: plotBandHeight,
             color: plotBand.color,
             opacity: plotBand.opacity,

package/dist/esm/components/ChartInner/index.js

@@ -55,6 +55,7 @@ export const ChartInner = (props) => {
     const { activeLegendItems, allPreparedSeries, boundsHeight, boundsOffsetLeft, boundsOffsetTop, boundsWidth, handleLegendItemClick, legendConfig, legendItems, preparedLegend, preparedSeries, preparedSeriesOptions, preparedSplit, shapes, shapesData, shapesReady, xAxis, xScale, yAxis, yScale, preparedTitle, preparedChart, } = useChartInnerProps(Object.assign(Object.assign({}, props), { clipPathId,
         dispatcher,
         htmlLayout, plotNode: plotRef.current, rangeSliderState,
+        updateRangeSliderState,
         updateZoomState,
         zoomState }));
     const prevWidth = usePrevious(width);

package/dist/esm/components/ChartInner/useChartInnerProps.d.ts

@@ -9,6 +9,7 @@ type Props = ChartInnerProps & {
     dispatcher: Dispatch<object>;
     htmlLayout: HTMLElement | null;
     plotNode: SVGGElement | null;
+    updateRangeSliderState: (nextState?: RangeSliderState) => void;
     updateZoomState: (nextZoomState: Partial<ZoomState>) => void;
     zoomState: Partial<ZoomState>;
     rangeSliderState?: RangeSliderState;

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

@@ -38,7 +38,7 @@ function getBoundsOffsetLeft(args) {
 }
 export function useChartInnerProps(props) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    const { clipPathId, data, dispatcher, height, htmlLayout, plotNode, rangeSliderState, width, updateZoomState, zoomState, } = props;
+    const { clipPathId, data, dispatcher, height, htmlLayout, plotNode, rangeSliderState, width, updateRangeSliderState, updateZoomState, zoomState, } = props;
     const [selectedLegendItems, setSelectedLegendItems] = React.useState(null);
     const [chartState, setState] = React.useState(null);
     const prevStateValue = React.useRef(chartState);
@@ -48,20 +48,26 @@ export function useChartInnerProps(props) {
         currentRunRef.current++;
         const currentRun = currentRunRef.current;
         (async function () {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e, _f, _g;
             const chartDataChanged = !(previousChartData.current && isEqual(previousChartData.current, data));
+            const axisTypeChanged = ((_b = (_a = previousChartData.current) === null || _a === void 0 ? void 0 : _a.xAxis) === null || _b === void 0 ? void 0 : _b.type) !== undefined &&
+                previousChartData.current.xAxis.type !== ((_c = data.xAxis) === null || _c === void 0 ? void 0 : _c.type);
+            if (axisTypeChanged && rangeSliderState !== undefined) {
+                updateRangeSliderState(undefined);
+                return;
+            }
             const preparedTitle = await getPreparedTitle({
                 title: data.title,
                 chartWidth: width,
                 chartHeight: height,
-                chartMargin: (_a = data.chart) === null || _a === void 0 ? void 0 : _a.margin,
+                chartMargin: (_d = data.chart) === null || _d === void 0 ? void 0 : _d.margin,
             });
             const preparedChart = getPreparedChart({
                 chart: data.chart,
                 seriesData: data.series.data,
                 preparedTitle,
             });
-            const colors = (_b = data.colors) !== null && _b !== void 0 ? _b : DEFAULT_PALETTE;
+            const colors = (_e = data.colors) !== null && _e !== void 0 ? _e : DEFAULT_PALETTE;
             const normalizedSeriesData = getSortedSeriesData({
                 seriesData: data.series.data,
                 xAxis: data.xAxis,
@@ -84,7 +90,7 @@ export function useChartInnerProps(props) {
                 });
             }
             else {
-                allPreparedSeries = (_d = (_c = prevStateValue.current) === null || _c === void 0 ? void 0 : _c.allPreparedSeries) !== null && _d !== void 0 ? _d : [];
+                allPreparedSeries = (_g = (_f = prevStateValue.current) === null || _f === void 0 ? void 0 : _f.allPreparedSeries) !== null && _g !== void 0 ? _g : [];
             }
             const activeLegendItems = selectedLegendItems !== null && selectedLegendItems !== void 0 ? selectedLegendItems : getActiveLegendItems(allPreparedSeries);
             const visiblePreparedSeries = getVisibleSeries({
@@ -243,6 +249,7 @@ export function useChartInnerProps(props) {
         rangeSliderState,
         dispatcher,
         htmlLayout,
+        updateRangeSliderState,
         clipPathId,
     ]);
     // additional start