@gravity-ui/charts 1.28.0 → 1.28.2

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

@@ -244,11 +244,15 @@ export async function prepareXAxisData({ axis, yAxis, scale, boundsWidth, bounds
             const labelSize = plotBand.label.text
                 ? await getPlotLabelSize(plotBand.label.text)
                 : null;
+            const plotBandWidth = Math.min(endPos, axisWidth);
+            if (plotBandWidth < 0) {
+                continue;
+            }
             plotBands.push({
                 layerPlacement: plotBand.layerPlacement,
                 x: Math.max(0, startPos),
                 y: 0,
-                width: Math.min(endPos, axisWidth),
+                width: plotBandWidth,
                 height: axisHeight,
                 color: plotBand.color,
                 opacity: plotBand.opacity,
@@ -268,6 +272,9 @@ export async function prepareXAxisData({ axis, yAxis, scale, boundsWidth, bounds
             const plotLine = axis.plotLines[i];
             const axisScale = scale;
             const plotLineValue = Number(axisScale(plotLine.value));
+            if (plotLineValue < 0 || plotLineValue > boundsWidth) {
+                continue;
+            }
             const points = [
                 [plotLineValue, 0],
                 [plotLineValue, axisHeight],

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

@@ -211,12 +211,16 @@ export async function prepareYAxisData({ axis, split, scale, top: topOffset, wid
         const startPos = halfBandwidth + Math.min(from, to);
         const endPos = Math.min(Math.abs(to - from), axisHeight - Math.min(from, to));
         const top = Math.max(0, startPos);
+        const plotBandHeight = Math.min(endPos, axisHeight);
+        if (plotBandHeight < 0) {
+            return;
+        }
         plotBands.push({
             layerPlacement: plotBand.layerPlacement,
             x: 0,
             y: axisPlotTopPosition + top,
             width,
-            height: Math.min(endPos, axisHeight),
+            height: plotBandHeight,
             color: plotBand.color,
             opacity: plotBand.opacity,
             label: plotBand.label.text
@@ -234,6 +238,9 @@ export async function prepareYAxisData({ axis, split, scale, top: topOffset, wid
         const plotLine = axis.plotLines[i];
         const axisScale = scale;
         const plotLineValue = Number(axisScale(plotLine.value));
+        if (plotLineValue < 0 || plotLineValue > axisHeight) {
+            continue;
+        }
         const points = [
             [0, plotLineValue],
             [width, plotLineValue],

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

@@ -275,6 +275,9 @@ export function createXScale(args) {
                 if (typeof xMinPropsOrState === 'number' && !isPointDomain) {
                     xMin = xMinPropsOrState;
                 }
+                else if (xType === 'logarithmic') {
+                    xMin = xMinDomain;
+                }
                 else {
                     const xMinDefault = getDefaultMinXAxisValue(series);
                     xMin = xMinDefault !== null && xMinDefault !== void 0 ? xMinDefault : xMinDomain;

package/dist/cjs/hooks/useShapes/bar-y/prepare-data.js

@@ -5,7 +5,7 @@ import { getFormattedValue } from '../../../utils/chart/format';
 import { getBarYLayout, groupBarYDataByYValue } from '../../utils';
 export async function prepareBarYData(args) {
     var _a;
-    const { boundsHeight, boundsWidth, series, seriesOptions, yAxis, xScale, yScale: [yScale], } = args;
+    const { boundsHeight, boundsWidth, series, seriesOptions, xAxis, yAxis, xScale, yScale: [yScale], } = args;
     const stackGap = seriesOptions['bar-y'].stackGap;
     const xLinearScale = xScale;
     const yLinearScale = yScale;
@@ -43,7 +43,8 @@ export async function prepareBarYData(args) {
         const stacks = Object.values(val);
         const currentBarHeight = barSize * stacks.length + barGap * (stacks.length - 1);
         stacks.forEach((measureValues, groupItemIndex) => {
-            const base = xLinearScale(0) - measureValues[0].series.borderWidth;
+            const baseValue = xAxis.type === 'logarithmic' ? 0 : xLinearScale(0);
+            const base = baseValue - measureValues[0].series.borderWidth;
             let stackSum = base;
             const stackItems = [];
             const sortedData = sortKey

package/dist/cjs/i18n/keysets/en.json

@@ -19,7 +19,8 @@
     "label_invalid-axis-type": "It seems you are trying to use inappropriate type for \"{{key}}\" axis. Available types: [{{values}}].",
     "label_invalid-axis-labels-html-type": "It seems you are trying to use inappropriate type for \"labels.html\" property. Only boolean is allowed.",
     "label_invalid-axis-labels-html-not-supported-axis-type": "It seems you are trying to use \"labels.html\" property for an axis with an unsupported type. This property is supported only for \"category\" axis.",
-    "label_duplicate-axis-categories": "It seems you have duplicate value \"{{duplicate}}\" found in {{key}}[{{axisIndex}}]."
+    "label_duplicate-axis-categories": "It seems you have duplicate value \"{{duplicate}}\" found in {{key}}[{{axisIndex}}].",
+    "label_invalid-axis-categories": "It seems you are trying to use inappropriate value for \"categories\", or defined it incorrectly. Categories must be a non-empty array for an axis with \"category\" type."
   },
   "tooltip": {
     "label_totals_sum": "Sum",

package/dist/cjs/i18n/keysets/ru.json

@@ -19,7 +19,8 @@
     "label_invalid-axis-type": "Похоже, что вы пытаетесь использовать некорректный тип для оси \"{{key}}\". Доступные типы: [{{values}}].",
     "label_invalid-axis-labels-html-type": "Похоже, что вы пытаетесь использовать некорректный тип для свойства \"labels.html\". Допускается только использование булевых значений.",
     "label_invalid-axis-labels-html-not-supported-axis-type": "Похоже, что вы пытаетесь использовать свойство \"labels.html\" для оси с неподдерживаемым типом. Это свойство поддерживается только для оси типа \"category\".",
-    "label_duplicate-axis-categories": "Похоже, что у вас есть дублирующееся значение категории \"{{duplicate}}\" в оси {{key}}[{{axisIndex}}]."
+    "label_duplicate-axis-categories": "Похоже, что у вас есть дублирующееся значение категории \"{{duplicate}}\" в оси {{key}}[{{axisIndex}}].",
+    "label_invalid-axis-categories": "Похоже, что вы пытаетесь использовать недопустимое значение для \"categories\", или указали его неверно. Категории для оси типа \"category\" должны быть непустым массивом."
   },
   "tooltip": {
     "label_totals_sum": "Сумма",

package/dist/cjs/types/chart/axis.d.ts

@@ -215,18 +215,18 @@ export interface AxisPlotBand extends AxisPlot {
      * Can be a number, a string (e.g., a category), or a timestamp if representing a date.
      * When representing a date, the value **must be a timestamp** (number of milliseconds since Unix epoch).
      *
-     * If the value is `-Infinity`, it will be treated as the start of the axis.
+     * If the value is `-Infinity` or `null`, it will be treated as the start of the axis.
      */
-    from: number | string;
+    from: number | string | null;
     /**
      * The end position of the plot band in axis units.
      *
      * Can be a number, a string (e.g., a category), or a timestamp if representing a date.
      * When representing a date, the value **must be a timestamp** (number of milliseconds since Unix epoch).
      *
-     * If the value is `Infinity`, it will be treated as the end of the axis.
+     * If the value is `Infinity` or `null`, it will be treated as the end of the axis.
      */
-    to: number | string;
+    to: number | string | null;
 }
 export interface AxisCrosshair extends Omit<AxisPlotLine, 'value' | 'label'> {
     /** Whether the crosshair should snap to the point or follow the pointer independent of points.

package/dist/cjs/utils/chart/axis/common.js

@@ -68,8 +68,8 @@ export function getBandsPosition(args) {
     var _a, _b, _c;
     const { band, axisScale } = args;
     const range = axisScale.range();
-    const scalePosFrom = band.from === -Infinity ? range[0] : axisScale(band.from);
-    const scalePosTo = band.to === Infinity ? range[1] : axisScale(band.to);
+    const scalePosFrom = band.from === -Infinity || band.from === null ? range[0] : axisScale(band.from);
+    const scalePosTo = band.to === Infinity || band.to === null ? range[1] : axisScale(band.to);
     const isX = args.axis === 'x';
     if (scalePosTo !== undefined && scalePosFrom !== undefined) {
         return {

package/dist/cjs/validation/validate-axes.js

@@ -2,7 +2,15 @@ import { AXIS_TYPE } from '../constants';
 import { i18n } from '../i18n';
 import { CHART_ERROR_CODE, ChartError } from '../libs';
 const AVAILABLE_AXIS_TYPES = Object.values(AXIS_TYPE);
-function validateDuplicateCategories({ categories, key, axisIndex, }) {
+function validateCategories(axis) {
+    if (!axis.categories || !Array.isArray(axis.categories) || axis.categories.length === 0) {
+        throw new ChartError({
+            code: CHART_ERROR_CODE.INVALID_DATA,
+            message: i18n('error', 'label_invalid-axis-categories'),
+        });
+    }
+}
+function validateDuplicateCategories({ axisIndex, key, categories = [], }) {
     const seen = new Set();
     categories.forEach((category) => {
         if (seen.has(category)) {
@@ -54,7 +62,8 @@ export function validateAxes(args) {
     if (xAxis) {
         validateAxisType({ axis: xAxis, key: 'x' });
         validateLabelsHtmlOptions({ axis: xAxis });
-        if ((xAxis === null || xAxis === void 0 ? void 0 : xAxis.type) === 'category' && xAxis.categories) {
+        if ((xAxis === null || xAxis === void 0 ? void 0 : xAxis.type) === 'category') {
+            validateCategories(xAxis);
             validateDuplicateCategories({
                 categories: xAxis.categories,
                 key: 'x',
@@ -64,7 +73,8 @@ export function validateAxes(args) {
     }
     yAxis.forEach((axis, axisIndex) => {
         validateAxisType({ axis, key: 'y' });
-        if (axis.type === 'category' && axis.categories) {
+        if (axis.type === 'category') {
+            validateCategories(axis);
             validateDuplicateCategories({
                 categories: axis.categories,
                 key: 'y',

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

@@ -244,11 +244,15 @@ export async function prepareXAxisData({ axis, yAxis, scale, boundsWidth, bounds
             const labelSize = plotBand.label.text
                 ? await getPlotLabelSize(plotBand.label.text)
                 : null;
+            const plotBandWidth = Math.min(endPos, axisWidth);
+            if (plotBandWidth < 0) {
+                continue;
+            }
             plotBands.push({
                 layerPlacement: plotBand.layerPlacement,
                 x: Math.max(0, startPos),
                 y: 0,
-                width: Math.min(endPos, axisWidth),
+                width: plotBandWidth,
                 height: axisHeight,
                 color: plotBand.color,
                 opacity: plotBand.opacity,
@@ -268,6 +272,9 @@ export async function prepareXAxisData({ axis, yAxis, scale, boundsWidth, bounds
             const plotLine = axis.plotLines[i];
             const axisScale = scale;
             const plotLineValue = Number(axisScale(plotLine.value));
+            if (plotLineValue < 0 || plotLineValue > boundsWidth) {
+                continue;
+            }
             const points = [
                 [plotLineValue, 0],
                 [plotLineValue, axisHeight],

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

@@ -211,12 +211,16 @@ export async function prepareYAxisData({ axis, split, scale, top: topOffset, wid
         const startPos = halfBandwidth + Math.min(from, to);
         const endPos = Math.min(Math.abs(to - from), axisHeight - Math.min(from, to));
         const top = Math.max(0, startPos);
+        const plotBandHeight = Math.min(endPos, axisHeight);
+        if (plotBandHeight < 0) {
+            return;
+        }
         plotBands.push({
             layerPlacement: plotBand.layerPlacement,
             x: 0,
             y: axisPlotTopPosition + top,
             width,
-            height: Math.min(endPos, axisHeight),
+            height: plotBandHeight,
             color: plotBand.color,
             opacity: plotBand.opacity,
             label: plotBand.label.text
@@ -234,6 +238,9 @@ export async function prepareYAxisData({ axis, split, scale, top: topOffset, wid
         const plotLine = axis.plotLines[i];
         const axisScale = scale;
         const plotLineValue = Number(axisScale(plotLine.value));
+        if (plotLineValue < 0 || plotLineValue > axisHeight) {
+            continue;
+        }
         const points = [
             [0, plotLineValue],
             [width, plotLineValue],

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

@@ -275,6 +275,9 @@ export function createXScale(args) {
                 if (typeof xMinPropsOrState === 'number' && !isPointDomain) {
                     xMin = xMinPropsOrState;
                 }
+                else if (xType === 'logarithmic') {
+                    xMin = xMinDomain;
+                }
                 else {
                     const xMinDefault = getDefaultMinXAxisValue(series);
                     xMin = xMinDefault !== null && xMinDefault !== void 0 ? xMinDefault : xMinDomain;

package/dist/esm/hooks/useShapes/bar-y/prepare-data.js

@@ -5,7 +5,7 @@ import { getFormattedValue } from '../../../utils/chart/format';
 import { getBarYLayout, groupBarYDataByYValue } from '../../utils';
 export async function prepareBarYData(args) {
     var _a;
-    const { boundsHeight, boundsWidth, series, seriesOptions, yAxis, xScale, yScale: [yScale], } = args;
+    const { boundsHeight, boundsWidth, series, seriesOptions, xAxis, yAxis, xScale, yScale: [yScale], } = args;
     const stackGap = seriesOptions['bar-y'].stackGap;
     const xLinearScale = xScale;
     const yLinearScale = yScale;
@@ -43,7 +43,8 @@ export async function prepareBarYData(args) {
         const stacks = Object.values(val);
         const currentBarHeight = barSize * stacks.length + barGap * (stacks.length - 1);
         stacks.forEach((measureValues, groupItemIndex) => {
-            const base = xLinearScale(0) - measureValues[0].series.borderWidth;
+            const baseValue = xAxis.type === 'logarithmic' ? 0 : xLinearScale(0);
+            const base = baseValue - measureValues[0].series.borderWidth;
             let stackSum = base;
             const stackItems = [];
             const sortedData = sortKey

package/dist/esm/i18n/keysets/en.json

@@ -19,7 +19,8 @@
     "label_invalid-axis-type": "It seems you are trying to use inappropriate type for \"{{key}}\" axis. Available types: [{{values}}].",
     "label_invalid-axis-labels-html-type": "It seems you are trying to use inappropriate type for \"labels.html\" property. Only boolean is allowed.",
     "label_invalid-axis-labels-html-not-supported-axis-type": "It seems you are trying to use \"labels.html\" property for an axis with an unsupported type. This property is supported only for \"category\" axis.",
-    "label_duplicate-axis-categories": "It seems you have duplicate value \"{{duplicate}}\" found in {{key}}[{{axisIndex}}]."
+    "label_duplicate-axis-categories": "It seems you have duplicate value \"{{duplicate}}\" found in {{key}}[{{axisIndex}}].",
+    "label_invalid-axis-categories": "It seems you are trying to use inappropriate value for \"categories\", or defined it incorrectly. Categories must be a non-empty array for an axis with \"category\" type."
   },
   "tooltip": {
     "label_totals_sum": "Sum",

package/dist/esm/i18n/keysets/ru.json

@@ -19,7 +19,8 @@
     "label_invalid-axis-type": "Похоже, что вы пытаетесь использовать некорректный тип для оси \"{{key}}\". Доступные типы: [{{values}}].",
     "label_invalid-axis-labels-html-type": "Похоже, что вы пытаетесь использовать некорректный тип для свойства \"labels.html\". Допускается только использование булевых значений.",
     "label_invalid-axis-labels-html-not-supported-axis-type": "Похоже, что вы пытаетесь использовать свойство \"labels.html\" для оси с неподдерживаемым типом. Это свойство поддерживается только для оси типа \"category\".",
-    "label_duplicate-axis-categories": "Похоже, что у вас есть дублирующееся значение категории \"{{duplicate}}\" в оси {{key}}[{{axisIndex}}]."
+    "label_duplicate-axis-categories": "Похоже, что у вас есть дублирующееся значение категории \"{{duplicate}}\" в оси {{key}}[{{axisIndex}}].",
+    "label_invalid-axis-categories": "Похоже, что вы пытаетесь использовать недопустимое значение для \"categories\", или указали его неверно. Категории для оси типа \"category\" должны быть непустым массивом."
   },
   "tooltip": {
     "label_totals_sum": "Сумма",

package/dist/esm/types/chart/axis.d.ts

@@ -215,18 +215,18 @@ export interface AxisPlotBand extends AxisPlot {
      * Can be a number, a string (e.g., a category), or a timestamp if representing a date.
      * When representing a date, the value **must be a timestamp** (number of milliseconds since Unix epoch).
      *
-     * If the value is `-Infinity`, it will be treated as the start of the axis.
+     * If the value is `-Infinity` or `null`, it will be treated as the start of the axis.
      */
-    from: number | string;
+    from: number | string | null;
     /**
      * The end position of the plot band in axis units.
      *
      * Can be a number, a string (e.g., a category), or a timestamp if representing a date.
      * When representing a date, the value **must be a timestamp** (number of milliseconds since Unix epoch).
      *
-     * If the value is `Infinity`, it will be treated as the end of the axis.
+     * If the value is `Infinity` or `null`, it will be treated as the end of the axis.
      */
-    to: number | string;
+    to: number | string | null;
 }
 export interface AxisCrosshair extends Omit<AxisPlotLine, 'value' | 'label'> {
     /** Whether the crosshair should snap to the point or follow the pointer independent of points.

package/dist/esm/utils/chart/axis/common.js

@@ -68,8 +68,8 @@ export function getBandsPosition(args) {
     var _a, _b, _c;
     const { band, axisScale } = args;
     const range = axisScale.range();
-    const scalePosFrom = band.from === -Infinity ? range[0] : axisScale(band.from);
-    const scalePosTo = band.to === Infinity ? range[1] : axisScale(band.to);
+    const scalePosFrom = band.from === -Infinity || band.from === null ? range[0] : axisScale(band.from);
+    const scalePosTo = band.to === Infinity || band.to === null ? range[1] : axisScale(band.to);
     const isX = args.axis === 'x';
     if (scalePosTo !== undefined && scalePosFrom !== undefined) {
         return {

package/dist/esm/validation/validate-axes.js

@@ -2,7 +2,15 @@ import { AXIS_TYPE } from '../constants';
 import { i18n } from '../i18n';
 import { CHART_ERROR_CODE, ChartError } from '../libs';
 const AVAILABLE_AXIS_TYPES = Object.values(AXIS_TYPE);
-function validateDuplicateCategories({ categories, key, axisIndex, }) {
+function validateCategories(axis) {
+    if (!axis.categories || !Array.isArray(axis.categories) || axis.categories.length === 0) {
+        throw new ChartError({
+            code: CHART_ERROR_CODE.INVALID_DATA,
+            message: i18n('error', 'label_invalid-axis-categories'),
+        });
+    }
+}
+function validateDuplicateCategories({ axisIndex, key, categories = [], }) {
     const seen = new Set();
     categories.forEach((category) => {
         if (seen.has(category)) {
@@ -54,7 +62,8 @@ export function validateAxes(args) {
     if (xAxis) {
         validateAxisType({ axis: xAxis, key: 'x' });
         validateLabelsHtmlOptions({ axis: xAxis });
-        if ((xAxis === null || xAxis === void 0 ? void 0 : xAxis.type) === 'category' && xAxis.categories) {
+        if ((xAxis === null || xAxis === void 0 ? void 0 : xAxis.type) === 'category') {
+            validateCategories(xAxis);
             validateDuplicateCategories({
                 categories: xAxis.categories,
                 key: 'x',
@@ -64,7 +73,8 @@ export function validateAxes(args) {
     }
     yAxis.forEach((axis, axisIndex) => {
         validateAxisType({ axis, key: 'y' });
-        if (axis.type === 'category' && axis.categories) {
+        if (axis.type === 'category') {
+            validateCategories(axis);
             validateDuplicateCategories({
                 categories: axis.categories,
                 key: 'y',

package/package.json

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