@gravity-ui/charts 1.42.4 → 1.43.0

package/dist/cjs/core/axes/types.d.ts

@@ -1,4 +1,4 @@
-import type { AxisCrosshair, AxisPlotBand, BaseTextStyle, ChartAxis, ChartAxisLabels, ChartAxisRangeSlider, ChartAxisTitleAlignment, ChartAxisTitleRotation, ChartAxisType, DeepRequired, MeaningfulAny, PlotLayerPlacement } from '../../types';
+import type { AxisCrosshair, AxisPlotBand, AxisPlotShape, BaseTextStyle, ChartAxis, ChartAxisLabels, ChartAxisRangeSlider, ChartAxisTitleAlignment, ChartAxisTitleRotation, ChartAxisType, DeepRequired, MeaningfulAny, PlotLayerPlacement } from '../../types';
 import type { DashStyle } from '../constants';
 type PreparedAxisLabels = Omit<ChartAxisLabels, 'enabled' | 'padding' | 'style' | 'autoRotation'> & Required<Pick<ChartAxisLabels, 'enabled' | 'padding' | 'margin' | 'rotation' | 'html'>> & {
     style: BaseTextStyle;
@@ -19,19 +19,35 @@ export type PreparedAxisPlotBand = Required<AxisPlotBand> & {
 };
 type PreparedAxisCrosshair = Required<AxisCrosshair>;
 export type PreparedAxisPlotLine = {
-    value: number;
     color: string;
-    width: number;
-    dashStyle: DashStyle;
-    opacity: number;
-    layerPlacement: PlotLayerPlacement;
     custom?: MeaningfulAny;
+    dashStyle: DashStyle;
+    hoverThreshold: number;
     label: {
-        text: string;
-        style: BaseTextStyle;
         padding: number;
         qa?: string;
+        style: BaseTextStyle;
+        text: string;
     };
+    layerPlacement: PlotLayerPlacement;
+    opacity: number;
+    value: number;
+    width: number;
+};
+export type PreparedAxisPlotShape = {
+    custom?: MeaningfulAny;
+    hitbox: {
+        height: number;
+        width: number;
+        x: number;
+        y: number;
+    };
+    layerPlacement: PlotLayerPlacement;
+    opacity: number;
+    renderer: AxisPlotShape['renderer'];
+    value: number | string;
+    x: number;
+    y: number;
 };
 export type PreparedRangeSlider = DeepRequired<Omit<ChartAxisRangeSlider, 'defaultRange'>> & {
     defaultRange?: ChartAxisRangeSlider['defaultRange'];
@@ -40,7 +56,7 @@ export type PreparedAxisTickMarks = {
     enabled: boolean;
     length: number;
 };
-type PreparedBaseAxis = Omit<ChartAxis, 'type' | 'labels' | 'plotLines' | 'plotBands'> & {
+type PreparedBaseAxis = Omit<ChartAxis, 'type' | 'labels' | 'plotLines' | 'plotBands' | 'plotShapes'> & {
     type: ChartAxisType;
     labels: PreparedAxisLabels;
     title: {
@@ -67,6 +83,7 @@ type PreparedBaseAxis = Omit<ChartAxis, 'type' | 'labels' | 'plotLines' | 'plotB
     plotIndex: number;
     plotLines: PreparedAxisPlotLine[];
     plotBands: PreparedAxisPlotBand[];
+    plotShapes: PreparedAxisPlotShape[];
     crosshair: PreparedAxisCrosshair;
 };
 export type PreparedXAxis = PreparedBaseAxis & {

package/dist/cjs/core/axes/x-axis.js

@@ -1,6 +1,6 @@
 import get from 'lodash/get';
 import { TIME_UNITS, calculateCos, calculateNumericProperty, calculateSin, formatAxisTickLabel, getDefaultDateFormat, getHorizontalHtmlTextHeight, getLabelsSize, getMinSpaceBetween, getTextSizeFn, isAxisRelatedSeries, wrapText, } from '../utils';
-import { DASH_STYLE, DEFAULT_AXIS_LABEL_FONT_SIZE, SERIES_TYPE, axisCrosshairDefaults, axisLabelsDefaults, axisTickMarksDefaults, xAxisTitleDefaults, } from '../constants';
+import { DASH_STYLE, DEFAULT_AXIS_LABEL_FONT_SIZE, PLOT_LINE_HOVER_THRESHOLD, SERIES_TYPE, axisCrosshairDefaults, axisLabelsDefaults, axisTickMarksDefaults, xAxisTitleDefaults, } from '../constants';
 import { createXScale } from '../scales/x-scale';
 import { getXAxisTickValues } from '../utils/axis/x-axis';
 import { getPreparedRangeSlider } from './range-slider';
@@ -155,6 +155,7 @@ export const getPreparedXAxis = async ({ xAxis, seriesData, width, boundsWidth,
             color: get(d, 'color', 'var(--g-color-base-brand)'),
             width: get(d, 'width', 1),
             dashStyle: get(d, 'dashStyle', DASH_STYLE.Solid),
+            hoverThreshold: get(d, 'hoverThreshold', PLOT_LINE_HOVER_THRESHOLD),
             opacity: get(d, 'opacity', 1),
             layerPlacement: get(d, 'layerPlacement', 'before'),
             custom: d.custom,
@@ -169,6 +170,18 @@ export const getPreparedXAxis = async ({ xAxis, seriesData, width, boundsWidth,
             custom: d.custom,
             label: prepareAxisPlotLabel(d),
         })),
+        // x, y and hitbox are populated later in prepare-axis-data
+        // after pixel coordinates and element dimensions are computed
+        plotShapes: get(xAxis, 'plotShapes', []).map((d) => ({
+            custom: d.custom,
+            hitbox: { x: 0, y: 0, width: 0, height: 0 },
+            layerPlacement: get(d, 'layerPlacement', 'before'),
+            opacity: get(d, 'opacity', 1),
+            renderer: d.renderer,
+            value: d.value,
+            x: 0,
+            y: 0,
+        })),
         crosshair: {
             enabled: get(xAxis, 'crosshair.enabled', axisCrosshairDefaults.enabled),
             color: get(xAxis, 'crosshair.color', axisCrosshairDefaults.color),

package/dist/cjs/core/axes/y-axis.js

@@ -1,7 +1,7 @@
 import get from 'lodash/get';
-import { calculateNumericProperty, formatAxisTickLabel, getDefaultDateFormat, getDefaultMinYAxisValue, getHorizontalHtmlTextHeight, getLabelsSize, getMinSpaceBetween, getTextSizeFn, isAxisRelatedSeries, shouldSyncAxisWithPrimary, wrapText, } from '../utils';
+import { calculateNumericProperty, formatAxisTickLabel, getDefaultDateFormat, getHorizontalHtmlTextHeight, getLabelsSize, getMinSpaceBetween, getTextSizeFn, isAxisRelatedSeries, shouldSyncAxisWithPrimary, wrapText, } from '../utils';
 import { getTickValues } from '../../components/AxisY/utils';
-import { DASH_STYLE, DEFAULT_AXIS_LABEL_FONT_SIZE, DEFAULT_AXIS_TYPE, SERIES_TYPE, axisCrosshairDefaults, axisLabelsDefaults, axisTickMarksDefaults, yAxisTitleDefaults, } from '../constants';
+import { DASH_STYLE, DEFAULT_AXIS_LABEL_FONT_SIZE, DEFAULT_AXIS_TYPE, PLOT_LINE_HOVER_THRESHOLD, SERIES_TYPE, axisCrosshairDefaults, axisLabelsDefaults, axisTickMarksDefaults, yAxisTitleDefaults, } from '../constants';
 import { createYScale } from '../scales/y-scale';
 import { prepareAxisPlotLabel } from './utils';
 export const getYAxisLabelMaxWidth = async (args) => {
@@ -50,7 +50,7 @@ export const getPreparedYAxis = ({ height, boundsHeight, width, seriesData, yAxi
         return Promise.resolve([]);
     }
     return Promise.all(axisItems.map(async (axisItem, axisIndex) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         const plotIndex = get(axisItem, 'plotIndex', 0);
         const firstPlotAxis = !axisByPlot[plotIndex];
         if (firstPlotAxis) {
@@ -142,7 +142,7 @@ export const getPreparedYAxis = ({ height, boundsHeight, width, seriesData, yAxi
                 maxWidth: titleMaxWidth !== null && titleMaxWidth !== void 0 ? titleMaxWidth : Infinity,
                 rotation: titleRotation,
             },
-            min: (_o = get(axisItem, 'min')) !== null && _o !== void 0 ? _o : getDefaultMinYAxisValue(axisSeriesData),
+            min: get(axisItem, 'min'),
             max: get(axisItem, 'max'),
             startOnTick: get(axisItem, 'startOnTick'),
             endOnTick: get(axisItem, 'endOnTick'),
@@ -151,12 +151,12 @@ export const getPreparedYAxis = ({ height, boundsHeight, width, seriesData, yAxi
                 enabled: gridEnabled,
             },
             ticks: {
-                pixelInterval: ((_p = axisItem.ticks) === null || _p === void 0 ? void 0 : _p.interval)
+                pixelInterval: ((_o = axisItem.ticks) === null || _o === void 0 ? void 0 : _o.interval)
                     ? calculateNumericProperty({
                         base: height,
-                        value: (_q = axisItem.ticks) === null || _q === void 0 ? void 0 : _q.interval,
+                        value: (_p = axisItem.ticks) === null || _p === void 0 ? void 0 : _p.interval,
                     })
-                    : (_r = axisItem.ticks) === null || _r === void 0 ? void 0 : _r.pixelInterval,
+                    : (_q = axisItem.ticks) === null || _q === void 0 ? void 0 : _q.pixelInterval,
             },
             tickMarks: {
                 enabled: isAxisVisible &&
@@ -170,6 +170,7 @@ export const getPreparedYAxis = ({ height, boundsHeight, width, seriesData, yAxi
                 color: get(d, 'color', 'var(--g-color-base-brand)'),
                 width: get(d, 'width', 1),
                 dashStyle: get(d, 'dashStyle', DASH_STYLE.Solid),
+                hoverThreshold: get(d, 'hoverThreshold', PLOT_LINE_HOVER_THRESHOLD),
                 opacity: get(d, 'opacity', 1),
                 layerPlacement: get(d, 'layerPlacement', 'before'),
                 custom: d.custom,
@@ -184,6 +185,18 @@ export const getPreparedYAxis = ({ height, boundsHeight, width, seriesData, yAxi
                 custom: d.custom,
                 label: prepareAxisPlotLabel(d),
             })),
+            // x, y and hitbox are populated later in prepare-axis-data
+            // after pixel coordinates and element dimensions are computed
+            plotShapes: get(axisItem, 'plotShapes', []).map((d) => ({
+                custom: d.custom,
+                hitbox: { x: 0, y: 0, width: 0, height: 0 },
+                layerPlacement: get(d, 'layerPlacement', 'before'),
+                opacity: get(d, 'opacity', 1),
+                renderer: d.renderer,
+                value: d.value,
+                x: 0,
+                y: 0,
+            })),
             crosshair: {
                 enabled: get(axisItem, 'crosshair.enabled', axisCrosshairDefaults.enabled),
                 color: get(axisItem, 'crosshair.color', axisCrosshairDefaults.color),

package/dist/cjs/core/constants/defaults/axis.d.ts

@@ -17,4 +17,5 @@ export declare const axisTickMarksDefaults: {
     length: number;
 };
 export declare const DEFAULT_AXIS_TYPE: ChartAxisType;
+export declare const PLOT_LINE_HOVER_THRESHOLD = 4;
 export {};

package/dist/cjs/core/constants/defaults/axis.js

@@ -30,3 +30,4 @@ export const axisTickMarksDefaults = {
     length: 6,
 };
 export const DEFAULT_AXIS_TYPE = 'linear';
+export const PLOT_LINE_HOVER_THRESHOLD = 4;

package/dist/cjs/core/scales/y-scale.js

@@ -1,7 +1,7 @@
 import { extent, tickStep, ticks } from 'd3-array';
 import { scaleBand, scaleLinear, scaleLog, scaleUtc } from 'd3-scale';
 import get from 'lodash/get';
-import { CHART_SERIES_WITH_VOLUME_ON_Y_AXIS, getDomainDataYBySeries, shouldSyncAxisWithPrimary, } from '../utils';
+import { CHART_SERIES_WITH_VOLUME_ON_Y_AXIS, getDefaultMinYAxisValue, getDomainDataYBySeries, shouldSyncAxisWithPrimary, } from '../utils';
 import { getTickValues } from '../../components/AxisY/utils';
 import { getBandSize } from '../../hooks/utils/get-band-size';
 import { SERIES_TYPE } from '../constants';
@@ -83,14 +83,21 @@ function getDomainMinAlignedToStartTick(args) {
     const isStartOnTick = tickValues[0].y === range[0];
     let dNewMin = dMin;
     if (!isStartOnTick) {
-        let step;
-        if (typeof ((_a = tickValues[0]) === null || _a === void 0 ? void 0 : _a.value) === 'number' && typeof ((_b = tickValues[1]) === null || _b === void 0 ? void 0 : _b.value) === 'number') {
-            step = tickValues[1].value - tickValues[0].value;
+        if (axis.type === 'logarithmic') {
+            const [nicedMin, _nicedMax] = scale.copy().nice().domain();
+            dNewMin = nicedMin;
         }
         else {
-            step = tickStep(dMin, dMax, 1);
+            let step;
+            if (typeof ((_a = tickValues[0]) === null || _a === void 0 ? void 0 : _a.value) === 'number' &&
+                typeof ((_b = tickValues[1]) === null || _b === void 0 ? void 0 : _b.value) === 'number') {
+                step = tickValues[1].value - tickValues[0].value;
+            }
+            else {
+                step = tickStep(dMin, dMax, 1);
+            }
+            dNewMin = tickValues[0].value - step;
         }
-        dNewMin = tickValues[0].value - step;
     }
     return dNewMin;
 }
@@ -104,17 +111,24 @@ function getDomainMaxAlignedToEndTick(args) {
         labelLineHeight: axis.labels.lineHeight,
         series,
     });
-    const isEndOnTick = tickValues[tickValues.length - 1].y === range[1];
     let dNewMax = dMax;
+    const isEndOnTick = tickValues[tickValues.length - 1].y === range[1];
     if (!isEndOnTick) {
-        let step;
-        if (typeof ((_a = tickValues[0]) === null || _a === void 0 ? void 0 : _a.value) === 'number' && typeof ((_b = tickValues[1]) === null || _b === void 0 ? void 0 : _b.value) === 'number') {
-            step = tickValues[1].value - tickValues[0].value;
+        if (axis.type === 'logarithmic') {
+            const [_nicedMin, nicedMax] = scale.copy().nice().domain();
+            dNewMax = nicedMax;
         }
         else {
-            step = tickStep(dMin, dMax, 1);
+            let step;
+            if (typeof ((_a = tickValues[0]) === null || _a === void 0 ? void 0 : _a.value) === 'number' &&
+                typeof ((_b = tickValues[1]) === null || _b === void 0 ? void 0 : _b.value) === 'number') {
+                step = tickValues[1].value - tickValues[0].value;
+            }
+            else {
+                step = tickStep(dMin, dMax, 1);
+            }
+            dNewMax = tickValues[tickValues.length - 1].value + step;
         }
-        dNewMax = tickValues[tickValues.length - 1].value + step;
     }
     return dNewMax;
 }
@@ -141,7 +155,17 @@ export function createYScale(args) {
             }
             if (hasNumberAndNullValues) {
                 const [yMinDomain, yMaxDomain] = extent(domain);
-                const yMin = typeof yMinPropsOrState === 'number' ? yMinPropsOrState : yMinDomain;
+                let yMin;
+                if (typeof yMinPropsOrState === 'number') {
+                    yMin = yMinPropsOrState;
+                }
+                else if (axis.type === 'logarithmic') {
+                    yMin = yMinDomain;
+                }
+                else {
+                    const yMinDefault = getDefaultMinYAxisValue(series);
+                    yMin = typeof yMinDefault === 'number' ? yMinDefault : yMinDomain;
+                }
                 let yMax;
                 if (typeof yMaxPropsOrState === 'number') {
                     yMax = yMaxPropsOrState;

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

@@ -187,6 +187,8 @@ export interface ChartAxis {
     plotLines?: AxisPlotLine[];
     /** An array of colored bands stretching across the plot area marking an interval on the axis. */
     plotBands?: AxisPlotBand[];
+    /** An array of custom SVG elements placed at specific axis values. */
+    plotShapes?: AxisPlotShape[];
     /**
      * Small perpendicular marks on the axis line at each tick position.
      *
@@ -275,6 +277,46 @@ export interface AxisPlotLine extends AxisPlot {
     width?: number;
     /** Option for line stroke style. */
     dashStyle?: DashStyle;
+    /**
+     * Extra pixels added to each side of the line for hover detection.
+     * The total hoverable area equals `line.width + hoverThreshold * 2`.
+     * @default 4
+     */
+    hoverThreshold?: number;
+}
+export interface AxisPlotShape extends AxisPlot {
+    /**
+     * The position of the shape in axis units.
+     *
+     * Can be a number or a string (e.g., a category).
+     * When representing a date, the value **must be a timestamp** (number of milliseconds since Unix epoch).
+     */
+    value: number | string;
+    /**
+     * Custom SVG content renderer.
+     *
+     * Called with the pixel coordinates of the shape and the plot area dimensions.
+     * Must return a string of valid SVG markup that will be inserted inside a `<g>` container
+     * positioned at the shape's axis value.
+     *
+     * @example
+     * ```
+     * renderer: ({plotHeight}) =>
+     *   `<circle cx="0" cy="${plotHeight}" r="4" fill="red"/>
+     *    <line x1="0" y1="0" x2="0" y2="${plotHeight}" stroke="red" stroke-width="1"/>
+     *    <text x="4" y="12" font-size="11" fill="currentColor">Label</text>`
+     * ```
+     */
+    renderer: (args: {
+        /** Pixel X coordinate in the plot area coordinate system */
+        x: number;
+        /** Pixel Y coordinate in the plot area coordinate system */
+        y: number;
+        /** Width of the plot area in pixels */
+        plotWidth: number;
+        /** Height of the plot area in pixels */
+        plotHeight: number;
+    }) => string;
 }
 export interface AxisPlotBand extends AxisPlot {
     /**
@@ -296,7 +338,7 @@ export interface AxisPlotBand extends AxisPlot {
      */
     to: number | string | null;
 }
-export interface AxisCrosshair extends Omit<AxisPlotLine, 'value' | 'label' | 'custom'> {
+export interface AxisCrosshair extends Pick<AxisPlotLine, 'color' | 'dashStyle' | 'opacity' | 'layerPlacement' | 'width'> {
     /**
      * Whether the crosshair should snap to the point or follow the pointer independent of points.
      * @default true

package/dist/cjs/core/types/chart/title.d.ts

@@ -2,6 +2,16 @@ import type { BaseTextStyle } from './base';
 export interface ChartTitle {
     text: string;
     style?: Partial<BaseTextStyle>;
+    /**
+     * Maximum number of text rows. If the text exceeds this limit, it is truncated with an ellipsis.
+     * Default: 1
+     */
+    maxRowCount?: number;
+    /**
+     * Space between the title and the chart area (in pixels).
+     * Default: 10
+     */
+    margin?: number;
     /**
      * Can be used for the UI automated test.
      * It is assigned as a data-qa attribute to an element.

package/dist/cjs/core/types/chart/tooltip.d.ts

@@ -2,7 +2,7 @@ import type { TOOLTIP_TOTALS_BUILT_IN_AGGREGATION } from '../../constants';
 import type { DateTimeLabelFormats } from '../../utils/time';
 import type { MeaningfulAny } from '../misc';
 import type { AreaSeries, AreaSeriesData } from './area';
-import type { AxisPlotBand, AxisPlotLine, ChartXAxis, ChartYAxis } from './axis';
+import type { AxisPlotBand, AxisPlotLine, AxisPlotShape, ChartXAxis, ChartYAxis } from './axis';
 import type { BarXSeries, BarXSeriesData } from './bar-x';
 import type { BarYSeries, BarYSeriesData } from './bar-y';
 import type { CustomFormat, ValueFormat } from './base';
@@ -96,6 +96,8 @@ export interface ChartTooltipRendererArgs<T = MeaningfulAny> {
     hoveredPlotLines?: AxisPlotLine[];
     /** Plot bands that contain the current pointer position. */
     hoveredPlotBands?: AxisPlotBand[];
+    /** Plot shapes that contain the current pointer position. */
+    hoveredPlotShapes?: AxisPlotShape[];
     xAxis?: ChartXAxis | null;
     yAxis?: ChartYAxis;
     /** Formatting settings for tooltip header row (includes computed default). */

package/dist/cjs/core/utils/common.js

@@ -88,7 +88,7 @@ export const getDomainDataYBySeries = (series) => {
         switch (type) {
             case 'area':
             case 'bar-x': {
-                acc.push(0, ...getDomainDataForStackedSeries(seriesList));
+                acc.push(...getDomainDataForStackedSeries(seriesList));
                 break;
             }
             case 'waterfall': {

package/dist/cjs/core/utils/get-hovered-plots.d.ts

@@ -1,4 +1,4 @@
-import type { AxisPlotBand, AxisPlotLine } from '../../types';
+import type { AxisPlotBand, AxisPlotLine, AxisPlotShape } from '../../types';
 import type { PreparedXAxis, PreparedYAxis } from '../axes/types';
 import type { ChartScale } from '../scales/types';
 export declare function getHoveredPlots(args: {
@@ -9,6 +9,7 @@ export declare function getHoveredPlots(args: {
     xScale?: ChartScale;
     yScale?: (ChartScale | undefined)[];
 }): {
-    plotLines: AxisPlotLine[];
     plotBands: AxisPlotBand[];
+    plotLines: AxisPlotLine[];
+    plotShapes: AxisPlotShape[];
 };

package/dist/cjs/core/utils/get-hovered-plots.js

@@ -1,5 +1,4 @@
 import { getBandsPosition, isBandScale } from './axis/common';
-const PLOT_LINE_HIT_THRESHOLD_PX = 4;
 function getHoveredAxisPlotBands(args) {
     const { pointerPx, plotBands, scale, axis } = args;
     const axisScale = scale;
@@ -22,16 +21,31 @@ function getHoveredAxisPlotLines(args) {
     }
     for (const line of plotLines) {
         const linePx = Number(scale(line.value));
-        if (Math.abs(pointerPx - linePx) <= PLOT_LINE_HIT_THRESHOLD_PX + line.width / 2) {
+        if (Math.abs(pointerPx - linePx) <= line.hoverThreshold + line.width / 2) {
             result.push(line);
         }
     }
     return result;
 }
+function getHoveredAxisPlotShapes(args) {
+    const { pointerX, pointerY, plotShapes } = args;
+    const result = [];
+    for (const shape of plotShapes) {
+        const left = shape.x + shape.hitbox.x;
+        const top = shape.y + shape.hitbox.y;
+        const inX = pointerX >= left && pointerX <= left + shape.hitbox.width;
+        const inY = pointerY >= top && pointerY <= top + shape.hitbox.height;
+        if (inX && inY) {
+            result.push(shape);
+        }
+    }
+    return result;
+}
 export function getHoveredPlots(args) {
     const { pointerX, pointerY, xAxis, yAxis, xScale, yScale } = args;
-    const plotLines = [];
     const plotBands = [];
+    const plotLines = [];
+    const plotShapes = [];
     if (xAxis && xScale) {
         plotBands.push(...getHoveredAxisPlotBands({
             pointerPx: pointerX,
@@ -44,6 +58,11 @@ export function getHoveredPlots(args) {
             plotLines: xAxis.plotLines,
             scale: xScale,
         }));
+        plotShapes.push(...getHoveredAxisPlotShapes({
+            pointerX,
+            pointerY,
+            plotShapes: xAxis.plotShapes,
+        }));
     }
     for (let i = 0; i < yAxis.length; i++) {
         const yAxisItem = yAxis[i];
@@ -62,6 +81,11 @@ export function getHoveredPlots(args) {
             plotLines: yAxisItem.plotLines,
             scale: yScaleItem,
         }));
+        plotShapes.push(...getHoveredAxisPlotShapes({
+            pointerX,
+            pointerY,
+            plotShapes: yAxisItem.plotShapes,
+        }));
     }
-    return { plotLines, plotBands };
+    return { plotBands, plotLines, plotShapes };
 }

package/dist/cjs/core/utils/text.js

@@ -189,10 +189,20 @@ export function getTextSizeFn({ style }) {
     const defaultFontFamily = computedStyle.getPropertyValue('font-family');
     const defaultFontSize = computedStyle.getPropertyValue('font-size');
     const defaultFontWeight = computedStyle.getPropertyValue('font-weight');
+    const resolveCSSVar = (value) => {
+        const match = value.match(/^var\(\s*([\w-]+)/);
+        if (match) {
+            return computedStyle.getPropertyValue(match[1]).trim() || value;
+        }
+        return value;
+    };
     return async (str) => {
-        var _a, _b;
         await document.fonts.ready;
-        context.font = `${(_a = style === null || style === void 0 ? void 0 : style.fontWeight) !== null && _a !== void 0 ? _a : defaultFontWeight} ${(_b = style === null || style === void 0 ? void 0 : style.fontSize) !== null && _b !== void 0 ? _b : defaultFontSize} ${defaultFontFamily}`;
+        const fontWeight = (style === null || style === void 0 ? void 0 : style.fontWeight)
+            ? resolveCSSVar(String(style.fontWeight))
+            : defaultFontWeight;
+        const fontSize = (style === null || style === void 0 ? void 0 : style.fontSize) ? resolveCSSVar(style.fontSize) : defaultFontSize;
+        context.font = `${fontWeight} ${fontSize} ${defaultFontFamily}`;
         const textMetric = context.measureText(unescapeHtml(str));
         // we calculate hanging based on an approximate algorithm from chromium
         // https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/core/html/canvas/text_metrics.cc;l=32;drc=7cf6ac3dd6dca800fbc0d28e80a7732d4ea90340?q=member_hanging_&ss=chromium%2Fchromium%2Fsrc

package/dist/cjs/hooks/types.d.ts

@@ -1,4 +1,5 @@
-import type { ChartBrush, ChartData, ChartMargin, ChartZoom, DeepRequired } from '../types';
+import type { TextRowData } from '../components/types';
+import type { ChartBrush, ChartData, ChartMargin, ChartTitle, ChartZoom, DeepRequired } from '../types';
 export type PreparedZoom = DeepRequired<Omit<ChartZoom, 'enabled' | 'brush'>> & DeepRequired<{
     brush: ChartBrush;
 }>;
@@ -6,8 +7,10 @@ export type PreparedChart = {
     margin: ChartMargin;
     zoom: PreparedZoom | null;
 };
-export type PreparedTitle = ChartData['title'] & {
+export type PreparedTitle = Omit<ChartTitle, 'margin'> & {
     height: number;
+    margin: number;
+    contentRows: TextRowData[];
 };
 export type PreparedTooltip = ChartData['tooltip'] & {
     enabled: boolean;

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

@@ -1,4 +1,4 @@
-import { group } from 'd3-array';
+import { group, min } from 'd3-array';
 import isNil from 'lodash/isNil';
 import round from 'lodash/round';
 import { getDataCategoryValue, getLabelsSize, getTextSizeFn } from '../../../core/utils';
@@ -76,7 +76,7 @@ async function prepareDataLabels({ series, points, xMax, yAxisTop, isOutsideBoun
     return { svgLabels, htmlLabels };
 }
 export const prepareAreaData = async (args) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const { series, xAxis, xScale, yAxis, yScale, split, isOutsideBounds, isRangeSlider } = args;
     const [_xMin, xRangeMax] = xScale.range();
     const xMax = xRangeMax;
@@ -144,12 +144,17 @@ export const prepareAreaData = async (args) => {
                     continue;
                 }
                 const yAxisTop = ((_a = split.plots[plotIndex]) === null || _a === void 0 ? void 0 : _a.top) || 0;
-                const yMin = (_b = getYValue({
-                    point: { y: 0 },
+                let base = 0;
+                if (seriesYAxis.type === 'logarithmic') {
+                    const domainData = seriesYScale.domain();
+                    base = (_b = min(domainData)) !== null && _b !== void 0 ? _b : 0;
+                }
+                const yMin = (_c = getYValue({
+                    point: { y: base },
                     points: s.data,
                     yAxis: seriesYAxis,
                     yScale: seriesYScale,
-                })) !== null && _b !== void 0 ? _b : 0;
+                })) !== null && _c !== void 0 ? _c : 0;
                 const seriesData = s.data.reduce((m, d) => {
                     const key = String(xAxis.type === 'category'
                         ? getDataCategoryValue({
@@ -309,7 +314,7 @@ export const prepareAreaData = async (args) => {
             for (let itemIndex = 0; itemIndex < seriesStackData.length; itemIndex++) {
                 const item = seriesStackData[itemIndex];
                 const currentYAxis = yAxis[item.series.yAxis];
-                const itemYAxisTop = ((_c = split.plots[currentYAxis.plotIndex]) === null || _c === void 0 ? void 0 : _c.top) || 0;
+                const itemYAxisTop = ((_d = split.plots[currentYAxis.plotIndex]) === null || _d === void 0 ? void 0 : _d.top) || 0;
                 if (item.series.dataLabels.enabled && !isRangeSlider) {
                     const labelsData = await prepareDataLabels({
                         series: item.series,

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

@@ -1,4 +1,4 @@
-import { ascending, descending, max, reverse, sort } from 'd3-array';
+import { ascending, descending, max, min, reverse, sort } from 'd3-array';
 import get from 'lodash/get';
 import { getDataCategoryValue, getLabelsSize } from '../../../core/utils';
 import { getFormattedValue } from '../../../core/utils/format';
@@ -35,7 +35,7 @@ async function getLabelData(d, xMax) {
     };
 }
 export const prepareBarXData = async (args) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const { series, seriesOptions, xAxis, xScale, yAxis, yScale, boundsHeight: plotHeight, split, isRangeSlider, } = args;
     const stackGap = seriesOptions['bar-x'].stackGap;
     const categories = (_a = xAxis === null || xAxis === void 0 ? void 0 : xAxis.categories) !== null && _a !== void 0 ? _a : [];
@@ -145,7 +145,15 @@ export const prepareBarXData = async (args) => {
                     const x = xCenter - currentGroupWidth / 2 + (rectWidth + rectGap) * groupItemIndex;
                     const yDataValue = ((_d = yValue.data.y) !== null && _d !== void 0 ? _d : 0);
                     const y = seriesYScale(yDataValue);
-                    const base = seriesYScale(0);
+                    let base = 0;
+                    if (seriesYAxis.type === 'logarithmic') {
+                        const domainData = seriesYScale.domain();
+                        const yMinValue = (_e = min(domainData)) !== null && _e !== void 0 ? _e : 0;
+                        base = seriesYScale(yMinValue);
+                    }
+                    else {
+                        base = seriesYScale(0);
+                    }
                     const isLastStackItem = yValueIndex === sortedData.length - 1;
                     const height = Math.abs(base - y);
                     let shapeHeight = height - (stackItems.length ? stackGap : 0);
@@ -198,7 +206,7 @@ export const prepareBarXData = async (args) => {
             barData.x >= xMax ||
             barData.y + barData.height <= 0 ||
             barData.y >= plotHeight;
-        const isZeroValue = ((_e = barData.data.y) !== null && _e !== void 0 ? _e : 0) === 0;
+        const isZeroValue = ((_f = barData.data.y) !== null && _f !== void 0 ? _f : 0) === 0;
         if (barData.series.dataLabels.enabled &&
             !isRangeSlider &&
             (!isBarOutsideBounds || isZeroValue)) {

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

@@ -1,5 +1,5 @@
 import type { Dispatch } from 'd3-dispatch';
-import type { AxisPlotBand, AxisPlotLine, PointPosition, TooltipDataChunk } from '../../types';
+import type { AxisPlotBand, AxisPlotLine, AxisPlotShape, PointPosition, TooltipDataChunk } from '../../types';
 import type { PreparedTooltip } from '../types';
 import type { PreparedXAxis, PreparedYAxis } from '../useAxis/types';
 type Args = {
@@ -10,8 +10,9 @@ type Args = {
 };
 export declare const useTooltip: ({ dispatcher, tooltip, xAxis, yAxis }: Args) => {
     hovered: TooltipDataChunk[] | undefined;
-    hoveredPlotLines: AxisPlotLine[] | undefined;
     hoveredPlotBands: AxisPlotBand[] | undefined;
+    hoveredPlotLines: AxisPlotLine[] | undefined;
+    hoveredPlotShapes: AxisPlotShape[] | undefined;
     pointerPosition: PointPosition | undefined;
 };
 export {};

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

@@ -2,7 +2,7 @@ import React from 'react';
 import isEqual from 'lodash/isEqual';
 import { getSortedHovered } from '../../components/Tooltip/DefaultTooltipContent/utils';
 export const useTooltip = ({ dispatcher, tooltip, xAxis, yAxis }) => {
-    const [{ hovered, hoveredPlotLines, hoveredPlotBands, pointerPosition }, setTooltipState] = React.useState({});
+    const [{ hovered, hoveredPlotBands, hoveredPlotLines, hoveredPlotShapes, pointerPosition }, setTooltipState,] = React.useState({});
     const prevHovered = React.useRef(hovered);
     React.useEffect(() => {
         if (tooltip === null || tooltip === void 0 ? void 0 : tooltip.enabled) {
@@ -17,8 +17,9 @@ export const useTooltip = ({ dispatcher, tooltip, xAxis, yAxis }) => {
                 const isHoveredChanged = !isEqual(prevHovered.current, sortedHovered);
                 const newTooltipState = {
                     hovered: isHoveredChanged ? sortedHovered : prevHovered.current,
-                    hoveredPlotLines: nextHoveredPlots === null || nextHoveredPlots === void 0 ? void 0 : nextHoveredPlots.lines,
                     hoveredPlotBands: nextHoveredPlots === null || nextHoveredPlots === void 0 ? void 0 : nextHoveredPlots.bands,
+                    hoveredPlotLines: nextHoveredPlots === null || nextHoveredPlots === void 0 ? void 0 : nextHoveredPlots.lines,
+                    hoveredPlotShapes: nextHoveredPlots === null || nextHoveredPlots === void 0 ? void 0 : nextHoveredPlots.shapes,
                     pointerPosition: nextPointerPosition,
                 };
                 if (isHoveredChanged) {
@@ -35,8 +36,9 @@ export const useTooltip = ({ dispatcher, tooltip, xAxis, yAxis }) => {
     }, [dispatcher, tooltip, xAxis, yAxis]);
     return {
         hovered,
-        hoveredPlotLines,
         hoveredPlotBands,
+        hoveredPlotLines,
+        hoveredPlotShapes,
         pointerPosition,
     };
 };