@gravity-ui/charts 1.39.1 → 1.41.0

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

@@ -1,5 +1,5 @@
 import type { DashStyle } from '../../constants';
-import type { AxisCrosshair, AxisPlotBand, BaseTextStyle, ChartAxis, ChartAxisLabels, ChartAxisRangeSlider, ChartAxisTitleAlignment, ChartAxisType, DeepRequired, MeaningfulAny, PlotLayerPlacement } from '../../types';
+import type { AxisCrosshair, AxisPlotBand, BaseTextStyle, ChartAxis, ChartAxisLabels, ChartAxisRangeSlider, ChartAxisTitleAlignment, ChartAxisTitleRotation, ChartAxisType, DeepRequired, MeaningfulAny, PlotLayerPlacement } from '../../types';
 type PreparedAxisLabels = Omit<ChartAxisLabels, 'enabled' | 'padding' | 'style' | 'autoRotation'> & Required<Pick<ChartAxisLabels, 'enabled' | 'padding' | 'margin' | 'rotation' | 'html'>> & {
     style: BaseTextStyle;
     rotation: number;
@@ -51,7 +51,7 @@ type PreparedBaseAxis = Omit<ChartAxis, 'type' | 'labels' | 'plotLines' | 'plotB
         style: BaseTextStyle;
         align: ChartAxisTitleAlignment;
         maxRowCount: number;
-        rotation: number;
+        rotation: ChartAxisTitleRotation;
         maxWidth: number;
         html: boolean;
     };
@@ -64,7 +64,6 @@ type PreparedBaseAxis = Omit<ChartAxis, 'type' | 'labels' | 'plotLines' | 'plotB
         pixelInterval?: number;
     };
     tickMarks: PreparedAxisTickMarks;
-    position: 'left' | 'right' | 'top' | 'bottom';
     plotIndex: number;
     plotLines: PreparedAxisPlotLine[];
     plotBands: PreparedAxisPlotBand[];
@@ -72,8 +71,11 @@ type PreparedBaseAxis = Omit<ChartAxis, 'type' | 'labels' | 'plotLines' | 'plotB
 };
 export type PreparedXAxis = PreparedBaseAxis & {
     rangeSlider: PreparedRangeSlider;
+    position: 'bottom';
+};
+export type PreparedYAxis = PreparedBaseAxis & {
+    position: 'left' | 'right';
 };
-export type PreparedYAxis = PreparedBaseAxis;
 export type PreparedAxis = PreparedXAxis | PreparedYAxis;
 export type AxesState = {
     xAxis: PreparedXAxis | null;

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

@@ -1,4 +1,4 @@
-import type { PreparedAxis, PreparedSeries, PreparedSplit, RangeSliderState, ZoomState } from '../../hooks';
+import type { PreparedAxis, PreparedSeries, PreparedSplit, PreparedYAxis, RangeSliderState, ZoomState } from '../../hooks';
 import type { ChartScale } from './types';
 export { createXScale } from './x-scale';
 export { createYScale } from './y-scale';
@@ -7,7 +7,7 @@ type Args = {
     boundsHeight: number;
     series: PreparedSeries[];
     xAxis: PreparedAxis | null;
-    yAxis: PreparedAxis[];
+    yAxis: PreparedYAxis[];
     split: PreparedSplit;
     isRangeSlider?: boolean;
     rangeSliderState?: RangeSliderState;

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

@@ -162,6 +162,7 @@ export const prepareBarXData = async (args) => {
                             : yAxisTop + base + negativeStackHeight,
                         width: rectWidth,
                         height: shapeHeight,
+                        _height: height,
                         opacity: get(yValue.data, 'opacity', null),
                         data: yValue.data,
                         series: yValue.series,
@@ -178,9 +179,9 @@ export const prepareBarXData = async (args) => {
                 }
                 if (series.some((s) => s.stacking === 'percent')) {
                     let acc = 0;
-                    const ratio = plotHeight / (positiveStackHeight - stackItems.length);
+                    const ratio = plotHeight / positiveStackHeight;
                     stackItems.forEach((item) => {
-                        item.height = item.height * ratio;
+                        item.height = item._height * ratio;
                         item.y = plotHeight - item.height - acc;
                         acc += item.height + 1;
                     });

package/dist/cjs/hooks/useShapes/bar-x/types.d.ts

@@ -10,4 +10,9 @@ export type PreparedBarXData = Omit<TooltipDataChunkBarX, 'series'> & {
     label?: LabelData;
     htmlElements: HtmlItem[];
     isLastStackItem: boolean;
+    /**
+     * the utility field for storing the original height (for recalculations, etc.)
+     * should not be used for displaying
+     */
+    _height: number;
 };

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

@@ -1,11 +1,14 @@
 import type { Dispatch } from 'd3';
 import type { AxisPlotBand, AxisPlotLine, PointPosition, TooltipDataChunk } from '../../types';
 import type { PreparedTooltip } from '../types';
+import type { PreparedXAxis, PreparedYAxis } from '../useAxis/types';
 type Args = {
     dispatcher: Dispatch<object>;
     tooltip: PreparedTooltip;
+    xAxis?: PreparedXAxis | null;
+    yAxis?: PreparedYAxis;
 };
-export declare const useTooltip: ({ dispatcher, tooltip }: Args) => {
+export declare const useTooltip: ({ dispatcher, tooltip, xAxis, yAxis }: Args) => {
     hovered: TooltipDataChunk[] | undefined;
     hoveredPlotLines: AxisPlotLine[] | undefined;
     hoveredPlotBands: AxisPlotBand[] | undefined;

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

@@ -1,21 +1,28 @@
 import React from 'react';
 import isEqual from 'lodash/isEqual';
-export const useTooltip = ({ dispatcher, tooltip }) => {
+import { getSortedHovered } from '../../components/Tooltip/DefaultTooltipContent/utils';
+export const useTooltip = ({ dispatcher, tooltip, xAxis, yAxis }) => {
     const [{ hovered, hoveredPlotLines, hoveredPlotBands, pointerPosition }, setTooltipState] = React.useState({});
     const prevHovered = React.useRef(hovered);
     React.useEffect(() => {
         if (tooltip === null || tooltip === void 0 ? void 0 : tooltip.enabled) {
             dispatcher.on('hover-shape.tooltip', (nextHovered, nextPointerPosition, nextHoveredPlots) => {
                 const filteredNextHovered = nextHovered === null || nextHovered === void 0 ? void 0 : nextHovered.filter((item) => 'y' in item.data ? item.data.y !== null : true);
-                const isHoveredChanged = !isEqual(prevHovered.current, filteredNextHovered);
+                const sortedHovered = getSortedHovered({
+                    hovered: filteredNextHovered !== null && filteredNextHovered !== void 0 ? filteredNextHovered : [],
+                    sorting: tooltip === null || tooltip === void 0 ? void 0 : tooltip.sorting,
+                    xAxis,
+                    yAxis,
+                });
+                const isHoveredChanged = !isEqual(prevHovered.current, sortedHovered);
                 const newTooltipState = {
-                    hovered: isHoveredChanged ? filteredNextHovered : prevHovered.current,
+                    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,
                     pointerPosition: nextPointerPosition,
                 };
                 if (isHoveredChanged) {
-                    prevHovered.current = filteredNextHovered;
+                    prevHovered.current = sortedHovered;
                 }
                 setTooltipState(newTooltipState);
             });
@@ -25,7 +32,7 @@ export const useTooltip = ({ dispatcher, tooltip }) => {
                 dispatcher.on('hover-shape.tooltip', null);
             }
         };
-    }, [dispatcher, tooltip]);
+    }, [dispatcher, tooltip, xAxis, yAxis]);
     return {
         hovered,
         hoveredPlotLines,

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

@@ -6,6 +6,7 @@ import type { BaseTextStyle } from './base';
 import type { ChartBrush } from './brush';
 export type ChartAxisType = (typeof AXIS_TYPE)[keyof typeof AXIS_TYPE];
 export type ChartAxisTitleAlignment = 'left' | 'center' | 'right';
+export type ChartAxisTitleRotation = 0 | 90 | -90;
 export interface ChartAxisLabels {
     /** Enable or disable the axis labels. */
     enabled?: boolean;
@@ -314,7 +315,7 @@ export interface ChartYAxisTitle extends ChartAxisTitle {
      *
      * The default values are -90 for the left axis and 90 for the right.
      */
-    rotation?: 0 | 90 | -90;
+    rotation?: ChartAxisTitleRotation;
     /**
      * Interval of the tick marks(absolute or relative to the chart area).
      *

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

@@ -113,8 +113,13 @@ export type ChartTooltipRowRendererArgs = {
     value: string | number | null | undefined;
     formattedValue?: string;
     hovered?: TooltipDataChunk<unknown>[];
+    /**
+     * CSS class name pre-built with active/striped modifiers.
+     * Apply it to the root `<tr>` element of the returned row: `<tr className={className}>`.
+     */
     className?: string;
 };
+export type ChartTooltipSortComparator<T = MeaningfulAny> = (a: TooltipDataChunk<T>, b: TooltipDataChunk<T>) => number;
 export interface ChartTooltip<T = MeaningfulAny> {
     enabled?: boolean;
     /** Specifies the renderer for the tooltip. If returned null default tooltip renderer will be used. */
@@ -122,7 +127,26 @@ export interface ChartTooltip<T = MeaningfulAny> {
     /**
      * Defines the way a single data/series is displayed (corresponding to a separate selected point/ruler/shape on the chart).
      * It is useful in cases where you need to display additional information, but keep the general format of the tooltip.
-     * If a string is returned, it will be interpreted as raw HTML and inserted without escaping.
+     *
+     * The returned React element must be a `<tr>` so that it fits into the table layout used by the tooltip.
+     * Apply the `className` arg to the root `<tr>` to get the correct active/striped styles.
+     *
+     * If a string is returned, it will be parsed as HTML and rendered as-is — the string must be a complete
+     * `<tr>...</tr>` element.
+     * @example React element
+     * ```tsx
+     * rowRenderer: ({id, name, value, className}) => (
+     *   <tr key={id} className={className}>
+     *     <td>{name}</td>
+     *     <td>{value}</td>
+     *   </tr>
+     * )
+     * ```
+     * @example Raw HTML string
+     * ```ts
+     * rowRenderer: ({name, value, className}) =>
+     *   `<tr class="${className}"><td>${name}</td><td>${value}</td></tr>`
+     * ```
      */
     rowRenderer?: ((args: ChartTooltipRowRendererArgs) => React.ReactElement | string) | null;
     pin?: {
@@ -158,4 +182,23 @@ export interface ChartTooltip<T = MeaningfulAny> {
      * It is assigned as a data-qa attribute to an element.
      */
     qa?: string;
+    /**
+     * Controls the order of tooltip rows. Applied to `hovered` before rendering.
+     * Use a custom comparator `(a, b) => number` for arbitrary ordering.
+     */
+    sorting?: {
+        /**
+         * Determines what data should be used to sort by.
+         * `'value'` uses the numeric value of each series point: `y` for most series
+         * (line, area, bar-x, scatter, waterfall), `x` for bar-y, and `value` for
+         * pie, radar, heatmap, treemap, funnel. `null` values are sorted as lowest.
+         * @default undefined (sorting disabled)
+         */
+        key?: 'value' | undefined;
+        /**
+         * Sorting direction.
+         * @default 'asc'
+         */
+        direction?: 'asc' | 'desc';
+    } | ChartTooltipSortComparator<T>;
 }

package/dist/cjs/utils/chart/zoom.js

@@ -50,9 +50,9 @@ export function getZoomedSeriesData(args) {
     }
     const zoomedSeriesData = [];
     const zoomedShapesSeriesData = [];
-    let prevPointInRange = false;
-    let currentPointInRange = false;
     seriesData.forEach((seriesItem) => {
+        let prevPointInRange = false;
+        let currentPointInRange = false;
         const filteredData = [];
         const filteredShapesData = SERIES_TYPE_WITH_HIDDEN_POINTS.includes(seriesItem.type) && (xAxis === null || xAxis === void 0 ? void 0 : xAxis.type) !== 'category'
             ? []

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import type { Dispatch } from 'd3';
-import type { ChartScale, LegendItem, OnLegendItemClick, PreparedLegend, PreparedSeries, PreparedSplit, PreparedXAxis, RangeSliderState, ShapeData, ZoomState } from '../../hooks';
+import type { ChartScale, LegendItem, OnLegendItemClick, PreparedLegend, PreparedSeries, PreparedSplit, PreparedXAxis, PreparedYAxis, RangeSliderState, ShapeData, ZoomState } from '../../hooks';
 import type { PreparedChart } from '../../hooks/types';
 import type { LegendConfig } from '../../types';
 import type { ChartInnerProps } from './types';
@@ -21,43 +21,7 @@ export declare function useChartInnerProps(props: Props): {
     boundsHeight: number;
     boundsWidth: number;
     xAxis: PreparedXAxis | null;
-    yAxis: (Omit<import("../..").ChartAxis, "type" | "labels" | "plotLines" | "plotBands"> & {
-        type: import("../..").ChartAxisType;
-        labels: Omit<import("../..").ChartAxisLabels, "style" | "enabled" | "padding" | "autoRotation"> & Required<Pick<import("../..").ChartAxisLabels, "margin" | "enabled" | "html" | "rotation" | "padding">> & {
-            style: import("../..").BaseTextStyle;
-            rotation: number;
-            height: number;
-            width: number;
-            lineHeight: number;
-            maxWidth: number;
-        };
-        title: {
-            height: number;
-            width: number;
-            text: string;
-            margin: number;
-            style: import("../..").BaseTextStyle;
-            align: import("../..").ChartAxisTitleAlignment;
-            maxRowCount: number;
-            rotation: number;
-            maxWidth: number;
-            html: boolean;
-        };
-        min?: number;
-        grid: {
-            enabled: boolean;
-        };
-        maxPadding: number;
-        ticks: {
-            pixelInterval?: number;
-        };
-        tickMarks: import("../../hooks").PreparedAxisTickMarks;
-        position: "left" | "right" | "top" | "bottom";
-        plotIndex: number;
-        plotLines: import("../../hooks").PreparedAxisPlotLine[];
-        plotBands: import("../../hooks").PreparedAxisPlotBand[];
-        crosshair: Required<import("../..").AxisCrosshair>;
-    })[];
+    yAxis: PreparedYAxis[];
     shapesData: ShapeData[];
     shapesReady: boolean;
     handleLegendItemClick: OnLegendItemClick;

package/dist/esm/components/ChartInner/utils/axis.d.ts

@@ -5,40 +5,4 @@ export declare function recalculateYAxisLabelsWidth(props: {
     seriesData: PreparedSeries[];
     yAxis: PreparedYAxis[];
     yScale?: (ChartScale | undefined)[];
-}): Promise<(Omit<import("../../..").ChartAxis, "type" | "labels" | "plotLines" | "plotBands"> & {
-    type: import("../../..").ChartAxisType;
-    labels: Omit<import("../../..").ChartAxisLabels, "style" | "enabled" | "padding" | "autoRotation"> & Required<Pick<import("../../..").ChartAxisLabels, "margin" | "enabled" | "html" | "rotation" | "padding">> & {
-        style: import("../../..").BaseTextStyle;
-        rotation: number;
-        height: number;
-        width: number;
-        lineHeight: number;
-        maxWidth: number;
-    };
-    title: {
-        height: number;
-        width: number;
-        text: string;
-        margin: number;
-        style: import("../../..").BaseTextStyle;
-        align: import("../../..").ChartAxisTitleAlignment;
-        maxRowCount: number;
-        rotation: number;
-        maxWidth: number;
-        html: boolean;
-    };
-    min?: number;
-    grid: {
-        enabled: boolean;
-    };
-    maxPadding: number;
-    ticks: {
-        pixelInterval?: number;
-    };
-    tickMarks: import("../../../hooks").PreparedAxisTickMarks;
-    position: "left" | "right" | "top" | "bottom";
-    plotIndex: number;
-    plotLines: import("../../../hooks").PreparedAxisPlotLine[];
-    plotBands: import("../../../hooks").PreparedAxisPlotBand[];
-    crosshair: Required<import("../../..").AxisCrosshair>;
-})[]>;
+}): Promise<PreparedYAxis[]>;

package/dist/esm/components/Tooltip/DefaultTooltipContent/Row.js

@@ -12,8 +12,8 @@ export function Row(props) {
         }
         return null;
     }, [color, colorSymbol]);
-    return (React.createElement("div", { className: b('content-row', { active, striped }, className), style: style },
-        colorItem,
-        React.createElement("span", { className: b('content-row-label') }, label),
-        value && React.createElement("span", { className: b('content-row-value') }, value)));
+    return (React.createElement("tr", { className: b('content-row', { active, striped }, className), style: style },
+        colorItem && React.createElement("td", { className: b('content-row-color-cell') }, colorItem),
+        React.createElement("td", { className: b('content-row-label-cell') }, label),
+        value && React.createElement("td", { className: b('content-row-value-cell') }, value)));
 }

package/dist/esm/components/Tooltip/DefaultTooltipContent/RowWithAggregation.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import { block } from '../../../utils';
 import { getFormattedValue } from '../../../utils/chart/format';
-import { Row } from './Row';
 import { getBuiltInAggregatedValue, getBuiltInAggregationLabel } from './utils';
 const b = block('tooltip');
 export function RowWithAggregation(props) {
@@ -19,5 +18,7 @@ export function RowWithAggregation(props) {
             format: valueFormat || { type: 'number' },
         })
         : resultValue;
-    return (React.createElement(Row, { className: b('content-row-totals'), label: resultLabel, style: style, value: formattedResultValue }));
+    return (React.createElement("div", { className: b('content-row', { totals: true }), style: style },
+        React.createElement("span", { className: b('content-row-totals-label') }, resultLabel),
+        formattedResultValue && (React.createElement("span", { className: b('content-row-totals-value') }, formattedResultValue))));
 }

package/dist/esm/components/Tooltip/DefaultTooltipContent/index.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import { Divider } from '@gravity-ui/uikit';
+import parse from 'html-react-parser';
 import get from 'lodash/get';
 import isEqual from 'lodash/isEqual';
 import { usePrevious } from '../../../hooks';
@@ -35,7 +36,7 @@ export const DefaultTooltipContent = ({ hovered, pinned, rowRenderer, totals, va
                 hovered,
             });
             if (typeof result === 'string') {
-                return React.createElement("div", { key: id, dangerouslySetInnerHTML: { __html: result } });
+                return React.createElement(React.Fragment, { key: id }, parse(result));
             }
             return result;
         }
@@ -75,127 +76,136 @@ export const DefaultTooltipContent = ({ hovered, pinned, rowRenderer, totals, va
             setScrollBarWidth(0);
         }
     }, [pinned]);
+    const rowsContent = (React.createElement(React.Fragment, null, visibleHovered.map((seriesItem, i) => {
+        var _a;
+        const { data, series, closest } = seriesItem;
+        const id = `${get(series, 'id')}_${i}`;
+        const color = get(data, 'color') || get(series, 'color');
+        // TODO: improve active item display https://github.com/gravity-ui/charts/issues/208
+        const active = closest && hovered.length > 1;
+        const striped = (i + 1) % 2 === 0;
+        const rowValueFormat = get(series, 'tooltip.valueFormat', valueFormat);
+        switch (series.type) {
+            case 'scatter':
+            case 'line':
+            case 'area':
+            case 'bar-x': {
+                const format = rowValueFormat || getDefaultValueFormat({ axis: yAxis });
+                const formattedValue = getFormattedValue({
+                    value: hoveredValues[i],
+                    format,
+                });
+                return renderRow({
+                    id,
+                    active,
+                    color,
+                    name: series.name,
+                    striped,
+                    value: hoveredValues[i],
+                    formattedValue,
+                    series,
+                });
+            }
+            case 'waterfall': {
+                const isTotal = get(data, 'total', false);
+                const subTotalValue = (_a = seriesItem.subTotal) !== null && _a !== void 0 ? _a : 0;
+                const format = rowValueFormat || getDefaultValueFormat({ axis: yAxis });
+                const subTotal = getFormattedValue({
+                    value: subTotalValue,
+                    format,
+                });
+                const formattedValue = getFormattedValue({
+                    value: hoveredValues[i],
+                    format,
+                });
+                return (React.createElement(React.Fragment, { key: id },
+                    !isTotal && (React.createElement(React.Fragment, null,
+                        React.createElement("div", { className: b('series-name') }, getXRowData(data, xAxis)),
+                        React.createElement(Row, { label: series.name, value: formattedValue }))),
+                    React.createElement(Row, { label: isTotal ? 'Total' : 'Subtotal', value: subTotal })));
+            }
+            case 'bar-y': {
+                const format = rowValueFormat || getDefaultValueFormat({ axis: xAxis });
+                const formattedValue = getFormattedValue({
+                    value: hoveredValues[i],
+                    format,
+                });
+                return renderRow({
+                    id,
+                    active,
+                    color,
+                    name: series.name,
+                    striped,
+                    value: hoveredValues[i],
+                    formattedValue,
+                });
+            }
+            case 'pie':
+            case 'heatmap':
+            case 'treemap':
+            case 'funnel': {
+                const seriesData = data;
+                const formattedValue = getFormattedValue({
+                    value: hoveredValues[i],
+                    format: rowValueFormat || { type: 'number' },
+                });
+                return renderRow({
+                    id,
+                    color,
+                    name: [seriesData.name || seriesData.id].flat().join('\n'),
+                    value: hoveredValues[i],
+                    formattedValue,
+                });
+            }
+            case 'sankey': {
+                const { target, data: source } = seriesItem;
+                const formattedValue = getFormattedValue({
+                    value: hoveredValues[i],
+                    format: rowValueFormat || { type: 'number' },
+                });
+                return renderRow({
+                    id,
+                    color,
+                    name: `${source.name} → ${target === null || target === void 0 ? void 0 : target.name}`,
+                    value: hoveredValues[i],
+                    formattedValue,
+                });
+            }
+            case 'radar': {
+                const radarSeries = series;
+                const formattedValue = getFormattedValue({
+                    value: hoveredValues[i],
+                    format: rowValueFormat || { type: 'number' },
+                });
+                return renderRow({
+                    id,
+                    color,
+                    active,
+                    name: radarSeries.name || radarSeries.id,
+                    value: hoveredValues[i],
+                    formattedValue,
+                });
+            }
+            default: {
+                return null;
+            }
+        }
+    })));
     return (React.createElement("div", { className: b('content'), "data-qa": qa },
         formattedHeadValue && (React.createElement("div", { className: b('series-name') },
             React.createElement("div", { className: b('series-name-text'), dangerouslySetInnerHTML: { __html: formattedHeadValue } }))),
         React.createElement("div", { className: b('content-rows', { pinned }), ref: contentRowsRef, style: pinned ? { maxHeight: maxContentRowsHeight } : undefined },
-            visibleHovered.map((seriesItem, i) => {
-                var _a;
-                const { data, series, closest } = seriesItem;
-                const id = `${get(series, 'id')}_${i}`;
-                const color = get(data, 'color') || get(series, 'color');
-                // TODO: improve action item display https://github.com/gravity-ui/charts/issues/208
-                const active = closest && hovered.length > 1;
-                const striped = (i + 1) % 2 === 0;
-                const rowValueFormat = get(series, 'tooltip.valueFormat', valueFormat);
-                switch (series.type) {
-                    case 'scatter':
-                    case 'line':
-                    case 'area':
-                    case 'bar-x': {
-                        const format = rowValueFormat || getDefaultValueFormat({ axis: yAxis });
-                        const formattedValue = getFormattedValue({
-                            value: hoveredValues[i],
-                            format,
-                        });
-                        return renderRow({
-                            id,
-                            active,
-                            color,
-                            name: series.name,
-                            striped,
-                            value: hoveredValues[i],
-                            formattedValue,
-                            series,
-                        });
-                    }
-                    case 'waterfall': {
-                        const isTotal = get(data, 'total', false);
-                        const subTotalValue = (_a = seriesItem.subTotal) !== null && _a !== void 0 ? _a : 0;
-                        const format = rowValueFormat || getDefaultValueFormat({ axis: yAxis });
-                        const subTotal = getFormattedValue({
-                            value: subTotalValue,
-                            format,
-                        });
-                        const formattedValue = getFormattedValue({
-                            value: hoveredValues[i],
-                            format,
-                        });
-                        return (React.createElement(React.Fragment, { key: id },
-                            !isTotal && (React.createElement(React.Fragment, null,
-                                React.createElement("div", { className: b('series-name') }, getXRowData(data, xAxis)),
-                                React.createElement(Row, { label: series.name, value: formattedValue }))),
-                            React.createElement(Row, { label: isTotal ? 'Total' : 'Subtotal', value: subTotal })));
-                    }
-                    case 'bar-y': {
-                        const format = rowValueFormat || getDefaultValueFormat({ axis: xAxis });
-                        const formattedValue = getFormattedValue({
-                            value: hoveredValues[i],
-                            format,
-                        });
-                        return renderRow({
-                            id,
-                            active,
-                            color,
-                            name: series.name,
-                            striped,
-                            value: hoveredValues[i],
-                            formattedValue,
-                        });
-                    }
-                    case 'pie':
-                    case 'heatmap':
-                    case 'treemap':
-                    case 'funnel': {
-                        const seriesData = data;
-                        const formattedValue = getFormattedValue({
-                            value: hoveredValues[i],
-                            format: rowValueFormat || { type: 'number' },
-                        });
-                        return renderRow({
-                            id,
-                            color,
-                            name: [seriesData.name || seriesData.id].flat().join('\n'),
-                            value: hoveredValues[i],
-                            formattedValue,
-                        });
-                    }
-                    case 'sankey': {
-                        const { target, data: source } = seriesItem;
-                        const formattedValue = getFormattedValue({
-                            value: hoveredValues[i],
-                            format: rowValueFormat || { type: 'number' },
-                        });
-                        return renderRow({
-                            id,
-                            color,
-                            name: `${source.name} → ${target === null || target === void 0 ? void 0 : target.name}`,
-                            value: hoveredValues[i],
-                            formattedValue,
-                        });
-                    }
-                    case 'radar': {
-                        const radarSeries = series;
-                        const formattedValue = getFormattedValue({
-                            value: hoveredValues[i],
-                            format: rowValueFormat || { type: 'number' },
-                        });
-                        return renderRow({
-                            id,
-                            color,
-                            active,
-                            name: radarSeries.name || radarSeries.id,
-                            value: hoveredValues[i],
-                            formattedValue,
-                        });
-                    }
-                    default: {
-                        return null;
-                    }
-                }
-            }),
-            Boolean(restHoveredValues.length) && (React.createElement(Row, { label: i18n('tooltip', 'label_more', { count: restHoveredValues.length }), striped: (visibleHovered.length + 1) % 2 === 0 }))),
+            React.createElement("table", { className: b('content-rows-table') },
+                React.createElement("tbody", null, rowsContent))),
+        Boolean(restHoveredValues.length) && (React.createElement("div", { className: b('content-row', {
+                striped: (visibleHovered.length + 1) % 2 === 0,
+            }) }, i18n('tooltip', 'label_more', { count: restHoveredValues.length }))),
         (totals === null || totals === void 0 ? void 0 : totals.enabled) && hovered.length > 1 && (React.createElement(React.Fragment, null,
             React.createElement(Divider, { className: b('content-row-totals-divider') }),
-            React.createElement(RowWithAggregation, { aggregation: getPreparedAggregation({ hovered, totals, xAxis, yAxis }), label: totals.label, style: { marginRight: scrollBarWidth }, values: hoveredValues, valueFormat: (_a = totals.valueFormat) !== null && _a !== void 0 ? _a : valueFormat })))));
+            React.createElement(RowWithAggregation, { aggregation: getPreparedAggregation({
+                    hovered,
+                    totals,
+                    xAxis,
+                    yAxis,
+                }), label: totals.label, style: { marginRight: scrollBarWidth }, values: hoveredValues, valueFormat: (_a = totals.valueFormat) !== null && _a !== void 0 ? _a : valueFormat })))));
 };

package/dist/esm/components/Tooltip/DefaultTooltipContent/utils.d.ts

@@ -35,6 +35,12 @@ export declare function getPreparedAggregation(args: {
     xAxis?: ChartXAxis | null;
     yAxis?: ChartYAxis;
 }): ChartTooltipTotalsBuiltInAggregation | (() => ChartTooltipTotalsAggregationValue);
+export declare function getSortedHovered(args: {
+    hovered: TooltipDataChunk[];
+    sorting?: ChartTooltip['sorting'];
+    xAxis?: ChartXAxis | null;
+    yAxis?: ChartYAxis;
+}): TooltipDataChunk[];
 export declare function getTooltipRowColorSymbol({ series, color, height, width, }: {
     color?: string;
     series?: TooltipDataChunk['series'];